File tree Expand file tree Collapse file tree 4 files changed +21
-13
lines changed Expand file tree Collapse file tree 4 files changed +21
-13
lines changed Original file line number Diff line number Diff line change @@ -16,16 +16,20 @@ android {
1616 applicationId = " com.launium.mcping"
1717 minSdk = 21
1818 targetSdk = 34
19- versionCode = 7
20- versionName = " 0.3.1 "
19+ versionCode = 8
20+ versionName = " 0.3.2 "
2121 setProperty(" archivesBaseName" , " MCPing-$versionName " )
2222
2323 testInstrumentationRunner = " androidx.test.runner.AndroidJUnitRunner"
2424 }
2525
2626 buildTypes {
27+ debug {
28+ applicationIdSuffix = " .debug"
29+ }
2730 release {
2831 isMinifyEnabled = true
32+ isShrinkResources = true
2933 proguardFiles(
3034 getDefaultProguardFile(" proguard-android-optimize.txt" ), " proguard-rules.pro"
3135 )
@@ -56,7 +60,7 @@ dependencies {
5660 implementation(" androidx.room:room-runtime:2.6.1" )
5761 implementation(" io.ktor:ktor-network:2.3.5" )
5862 implementation(" androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" )
59- implementation(" com.alibaba.fastjson2:fastjson2:2.0.45.android4 " )
63+ implementation(" com.alibaba.fastjson2:fastjson2:2.0.46.android5 " )
6064 implementation(" androidx.core:core-ktx:1.12.0" )
6165 implementation(" androidx.appcompat:appcompat:1.6.1" )
6266 implementation(" com.google.android.material:material:1.11.0" )
Original file line number Diff line number Diff line change @@ -62,12 +62,16 @@ fun parseMinecraftColor(message: String): SpannableStringBuilder {
6262 else -> null
6363 }
6464 if (span != null ) {
65- builder.setSpan(
66- span,
67- it.second,
68- resetSymbols.find { r -> it.second <= r.second }?.second ? : builder.length,
69- Spannable .SPAN_EXCLUSIVE_EXCLUSIVE ,
70- )
65+ val endPosition =
66+ resetSymbols.find { r -> it.second <= r.second }?.second ? : builder.length
67+ if (endPosition - it.second > 0 ) {
68+ builder.setSpan(
69+ span,
70+ it.second,
71+ endPosition,
72+ Spannable .SPAN_EXCLUSIVE_EXCLUSIVE ,
73+ )
74+ }
7175 }
7276 }
7377
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ import kotlinx.coroutines.sync.Semaphore
2828import java.net.URL
2929import java.util.Locale
3030
31- private const val SERVER_LIST_URL = " https://www.jsip.club/api/ajax .php?request=get_line_list "
31+ private const val SERVER_LIST_URL = " https://www.jsip.club/pub- api/line .php"
3232
3333class DiscoveryFragment : Fragment (), SwipeRefreshLayout.OnRefreshListener {
3434
Original file line number Diff line number Diff line change 113113 android : layout_gravity =" center_horizontal"
114114 android : layout_marginStart =" 8dp"
115115 android : layout_marginTop =" 10dp"
116- android : layout_marginEnd =" 8dp "
116+ android : layout_marginEnd =" 4dp "
117117 app : layout_constraintEnd_toStartOf =" @id/server_sheet_version_card"
118118 app : layout_constraintStart_toStartOf =" parent"
119119 app : layout_constraintTop_toBottomOf =" @id/server_sheet_motd_card" >
157157 android : layout_width =" 0dp"
158158 android : layout_height =" 72dp"
159159 android : layout_gravity =" center_horizontal"
160- android : layout_marginStart =" 8dp "
160+ android : layout_marginStart =" 4dp "
161161 android : layout_marginTop =" 10dp"
162162 android : layout_marginEnd =" 8dp"
163163 app : layout_constraintEnd_toEndOf =" parent"
288288 android : text =" @string/description_share"
289289 android : textColor =" @color/white"
290290 android : theme =" @style/Widget.Material3.Button.IconButton.Filled.Tonal"
291- app : backgroundTint =" @color/material_dynamic_neutral30 "
291+ app : backgroundTint =" #454749 "
292292 app : icon =" @drawable/ic_share_24dp"
293293 app : iconTint =" @color/white" />
294294
You can’t perform that action at this time.
0 commit comments