From 7b89c92560d1d26c61730665da824f96af66ad69 Mon Sep 17 00:00:00 2001 From: Absinthe Date: Sat, 12 Aug 2023 14:40:15 +0800 Subject: [PATCH] Misc. --- app/build.gradle.kts | 8 ++++---- .../anywhere_/adapter/applist/AppListAdapter.kt | 3 ++- .../anywhere_/adapter/cloud/CloudRulesAdapter.kt | 3 ++- color-picker/build.gradle | 2 +- .../java/com/flask/colorpicker/ApplicationTest.java | 13 ------------- color-picker/src/main/AndroidManifest.xml | 5 ----- 6 files changed, 9 insertions(+), 25 deletions(-) delete mode 100755 color-picker/src/androidTest/java/com/flask/colorpicker/ApplicationTest.java delete mode 100755 color-picker/src/main/AndroidManifest.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 18901ac2..7f17b599 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,8 +68,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } androidComponents.onVariants { v -> @@ -212,7 +212,7 @@ dependencies { implementation("com.google.zxing:core:3.5.2") implementation("com.blankj:utilcodex:1.31.1") implementation("com.tencent:mmkv-static:1.3.1") - implementation("com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.14") + implementation("com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.11") implementation("com.github.heruoxin.Delegated-Scopes-Manager:client:master-SNAPSHOT") implementation("com.github.topjohnwu.libsu:core:5.2.0") implementation("com.github.thegrizzlylabs:sardine-android:0.8") @@ -227,7 +227,7 @@ dependencies { implementation("com.leinardi.android:speed-dial:3.3.0") implementation("me.zhanghai.android.fastscroll:library:1.3.0") - val shizukuVersion = "13.1.4" + val shizukuVersion = "12.2.0" // required by Shizuku and Sui implementation("dev.rikka.shizuku:api:$shizukuVersion") // required by Shizuku diff --git a/app/src/main/java/com/absinthe/anywhere_/adapter/applist/AppListAdapter.kt b/app/src/main/java/com/absinthe/anywhere_/adapter/applist/AppListAdapter.kt index f854ec88..28a4173b 100644 --- a/app/src/main/java/com/absinthe/anywhere_/adapter/applist/AppListAdapter.kt +++ b/app/src/main/java/com/absinthe/anywhere_/adapter/applist/AppListAdapter.kt @@ -1,6 +1,7 @@ package com.absinthe.anywhere_.adapter.applist import android.graphics.Color +import android.view.View import androidx.core.content.ContextCompat import com.absinthe.anywhere_.R import com.absinthe.anywhere_.constants.Const @@ -88,7 +89,7 @@ class AppListAdapter(mode: Int) : fun onClick(bean: AppListBean, which: Int) } - override fun getPopupText(position: Int): String { + override fun getPopupText(view: View, position: Int): CharSequence { return data[position].appName.ifEmpty { " " }.first().toString() } } diff --git a/app/src/main/java/com/absinthe/anywhere_/adapter/cloud/CloudRulesAdapter.kt b/app/src/main/java/com/absinthe/anywhere_/adapter/cloud/CloudRulesAdapter.kt index 7935a9ee..4ea372b3 100644 --- a/app/src/main/java/com/absinthe/anywhere_/adapter/cloud/CloudRulesAdapter.kt +++ b/app/src/main/java/com/absinthe/anywhere_/adapter/cloud/CloudRulesAdapter.kt @@ -1,5 +1,6 @@ package com.absinthe.anywhere_.adapter.cloud +import android.view.View import com.absinthe.anywhere_.R import com.absinthe.anywhere_.model.cloud.RuleEntity import com.chad.library.adapter.base.BaseQuickAdapter @@ -15,7 +16,7 @@ class CloudRulesAdapter : holder.setText(R.id.tv_contributor, item.contributor) } - override fun getPopupText(position: Int): String { + override fun getPopupText(view: View, position: Int): CharSequence { return data[position].name.ifEmpty { " " }.first().toString() } diff --git a/color-picker/build.gradle b/color-picker/build.gradle index 206fbeb8..5c6dfb8f 100755 --- a/color-picker/build.gradle +++ b/color-picker/build.gradle @@ -20,5 +20,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.1.0' } diff --git a/color-picker/src/androidTest/java/com/flask/colorpicker/ApplicationTest.java b/color-picker/src/androidTest/java/com/flask/colorpicker/ApplicationTest.java deleted file mode 100755 index 9aca1fc2..00000000 --- a/color-picker/src/androidTest/java/com/flask/colorpicker/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.flask.colorpicker; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/color-picker/src/main/AndroidManifest.xml b/color-picker/src/main/AndroidManifest.xml deleted file mode 100755 index 804b8ac1..00000000 --- a/color-picker/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - -