Update build.gradle

2022-08-30 14:53:13 +08:00 · 2022-08-30 14:53:06 +08:00 · 2022-08-13 08:34:43 +08:00 · 2022-08-12 20:11:34 +08:00 · 2022-08-12 20:02:40 +08:00 · 2022-08-12 15:15:32 +08:00
5 changed files with 20 additions and 26 deletions
@@ -18,8 +18,8 @@ android {
        minSdkVersion 21
        targetSdkVersion Integer.parseInt("$targetSdkVer")
        multiDexEnabled true
-        versionCode 470
-        versionName "1.7.17"
+        versionCode 473
+        versionName "1.7.19"
    }

    if (props["sign"]) {
@@ -112,15 +112,15 @@ dependencies {
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.preference:preference-ktx:1.2.0'
    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.0'
+    implementation 'androidx.fragment:fragment-ktx:1.5.2'
    implementation 'androidx.multidex:multidex:2.0.1'
    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'

    // Androidx ktx
-    implementation 'androidx.activity:activity-ktx:1.5.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
+    implementation 'androidx.activity:activity-ktx:1.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'

    //kotlin
    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
@@ -141,12 +141,11 @@ dependencies {
    implementation 'com.blacksquircle.ui:language-json:2.1.1'
 }

-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://maven.google.com' }
-        maven { url 'https://jitpack.io' }
-        jcenter()
-    }
-}
+//buildscript {
+//    repositories {
+//        google()
+//        mavenCentral()
+//        maven { url 'https://maven.google.com' }
+//        maven { url 'https://jitpack.io' }
+//    }
+//}
@@ -141,10 +141,10 @@ class UserAssetActivity : BaseActivity() {
                val result = downloadGeo(it, 60000, httpPort)
                launch(Dispatchers.Main) {
                    if (result) {
-                        toast(getString(R.string.toast_success) + it)
+                        toast(getString(R.string.toast_success) + " " + it)
                        binding.recyclerView.adapter?.notifyDataSetChanged()
                    } else {
-                        toast(getString(R.string.toast_failure) + it)
+                        toast(getString(R.string.toast_failure) + " " + it)
                    }
                }
            }
@@ -54,12 +54,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {

    fun reloadServerList() {
        serverList = MmkvManager.decodeServerList()
-        viewModelScope.launch(Dispatchers.Default) {
-            updateCache()
-            launch(Dispatchers.Main) {
-                updateListAction.value = -1
-            }
-        }
+        updateCache()
+        updateListAction.value = -1
    }

    fun removeServer(guid: String) {
@@ -31,7 +31,7 @@
    <string name="menu_item_import_config_manually_trojan">手動鍵入 [Trojan]</string>
    <string name="menu_item_import_config_custom">自訂組態</string>
    <string name="menu_item_import_config_custom_clipboard">從剪貼簿匯入自訂組態</string>
-    <string name="menu_item_import_config_custom_local">從 URL 匯入自訂組態</string>
+    <string name="menu_item_import_config_custom_local">從本地匯入自訂組態</string>
    <string name="menu_item_import_config_custom_url">從 URL 匯入自訂組態</string>
    <string name="menu_item_import_config_custom_url_scan">掃描 URL 匯入自訂組態</string>
    <string name="del_config_comfirm">確定刪除？</string>
@@ -6,7 +6,6 @@ buildscript {
        mavenCentral()
        maven { url 'https://maven.google.com' }
        maven { url 'https://jitpack.io' }
-        jcenter()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:7.2.1'
Author	SHA1	Message	Date
2dust	236923d0a0	Update build.gradle	2022-08-30 14:53:13 +08:00
2dust	a4816b8251	Update build.gradle	2022-08-30 14:53:06 +08:00
2dust	2c2bc86457	Update build.gradle	2022-08-13 08:34:43 +08:00
2dust	68a03a93b5	Merge pull request #1618 from zhaoguomanong/master Fix app crashing during updating subscribe & translation error	2022-08-12 20:11:34 +08:00
2dust	5127a30ae9	Merge pull request #1617 from Fe3O4-Git/patch-1 tweak toast in UserAssetActivity.kt	2022-08-12 20:02:40 +08:00
zhaoguomanong	8b76a7a4f4	avoid modifying serversCache serverList from multithreading Bug: app force close during updating subscribe Reroduce steps: quickly scroll up and down the RecyclerView during updating subscribe if the server list length is more than the screen height, the bug can be 100% reproduced Solution: reloadServerList from UI Thread Signed-off-by: zhaoguomanong <zhaoguomanong@gmail.com>	2022-08-12 15:15:32 +08:00
zhaoguomanong	b6aec3fd63	fix translation error Signed-off-by: zhaoguomanong <zhaoguomanong@gmail.com>	2022-08-12 11:09:23 +08:00
LiAlH4	18e0dc4546	fix	2022-08-12 08:07:46 +08:00
LiAlH4	129c1db995	tweak toast in UserAssetActivity.kt add missing space	2022-08-12 08:06:06 +08:00