diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt index f5b2d09b..41c98874 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt @@ -19,7 +19,13 @@ import android.view.View.FOCUS_FORWARD import android.view.ViewGroup import android.view.Window import android.view.inputmethod.EditorInfo -import android.widget.* +import android.widget.AdapterView +import android.widget.ArrayAdapter +import android.widget.BaseAdapter +import android.widget.CompoundButton +import android.widget.FrameLayout +import android.widget.Spinner +import android.widget.TextView import android.widget.TextView.OnEditorActionListener import androidx.annotation.ColorInt import androidx.annotation.WorkerThread @@ -53,22 +59,35 @@ import jp.juggler.subwaytooter.util.CustomShare import jp.juggler.subwaytooter.util.CustomShareTarget import jp.juggler.subwaytooter.util.cn import jp.juggler.subwaytooter.view.MyTextView -import jp.juggler.util.* +import jp.juggler.util.backPressed import jp.juggler.util.coroutine.launchAndShowError import jp.juggler.util.coroutine.launchProgress -import jp.juggler.util.data.* +import jp.juggler.util.data.cast +import jp.juggler.util.data.defaultLocale +import jp.juggler.util.data.handleGetContentResult +import jp.juggler.util.data.intentOpenDocument +import jp.juggler.util.data.notEmpty +import jp.juggler.util.data.notZero +import jp.juggler.util.getPackageInfoCompat import jp.juggler.util.log.LogCategory import jp.juggler.util.log.dialogOrToast import jp.juggler.util.log.showToast import jp.juggler.util.log.withCaption -import jp.juggler.util.ui.* +import jp.juggler.util.queryIntentActivitiesCompat +import jp.juggler.util.ui.ActivityResultHandler +import jp.juggler.util.ui.attrColor +import jp.juggler.util.ui.hideKeyboard +import jp.juggler.util.ui.isEnabledAlpha +import jp.juggler.util.ui.isNotOk +import jp.juggler.util.ui.launch +import jp.juggler.util.ui.vg import java.io.File import java.io.FileInputStream import java.io.FileOutputStream import java.io.InputStream import java.io.OutputStreamWriter import java.text.NumberFormat -import java.util.* +import java.util.TimeZone import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit import java.util.zip.ZipEntry diff --git a/app/src/main/java/jp/juggler/subwaytooter/notification/PollingState.kt b/app/src/main/java/jp/juggler/subwaytooter/notification/PollingState.kt index 253e85ef..e20b54bf 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/notification/PollingState.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/notification/PollingState.kt @@ -10,5 +10,4 @@ enum class PollingState(val desc: String) { CheckServerInformation("check server information"), CheckPushSubscription("check push subscription"), CheckNotifications("check notifications"), - ; } diff --git a/buildSrc/src/main/java/Vers.kt b/buildSrc/src/main/java/Vers.kt index 6a067dd7..64bd9bb7 100644 --- a/buildSrc/src/main/java/Vers.kt +++ b/buildSrc/src/main/java/Vers.kt @@ -17,7 +17,7 @@ object Vers { const val conscryptVersion = "2.5.2" const val coreKtxVersion = "1.12.0" const val desugarLibVersion = "2.0.3" - const val detektVersion = "1.23.1" + const val detektVersion = "1.23.4" const val emoji2Version = "1.4.0" const val glideVersion = "4.15.1" const val junitVersion = "4.13.2" diff --git a/colorpicker/build.gradle.kts b/colorpicker/build.gradle.kts index c760542f..d0c803b2 100644 --- a/colorpicker/build.gradle.kts +++ b/colorpicker/build.gradle.kts @@ -15,7 +15,6 @@ android { defaultConfig { minSdk = Vers.stMinSdkVersion - targetSdk = Vers.stTargetSdkVersion testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/config/detekt/config.yml b/config/detekt/config.yml index 02666583..362aeeea 100644 --- a/config/detekt/config.yml +++ b/config/detekt/config.yml @@ -671,7 +671,7 @@ style: active: true OptionalUnit: active: false - OptionalWhenBraces: + BracesOnWhenStatements: active: false PreferToOverPairSyntax: active: false diff --git a/emoji/build.gradle.kts b/emoji/build.gradle.kts index 39add67b..64eac986 100644 --- a/emoji/build.gradle.kts +++ b/emoji/build.gradle.kts @@ -13,7 +13,6 @@ android { defaultConfig { minSdk = Vers.stMinSdkVersion - targetSdk = Vers.stTargetSdkVersion vectorDrawables.useSupportLibrary = true } diff --git a/icon_material_symbols/build.gradle.kts b/icon_material_symbols/build.gradle.kts index e49ba5e1..be7cf91f 100644 --- a/icon_material_symbols/build.gradle.kts +++ b/icon_material_symbols/build.gradle.kts @@ -13,7 +13,6 @@ android { defaultConfig { minSdk = Vers.stMinSdkVersion - targetSdk = Vers.stTargetSdkVersion testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/sample_apng/build.gradle.kts b/sample_apng/build.gradle.kts index 8c28aacb..3cd9a5dc 100644 --- a/sample_apng/build.gradle.kts +++ b/sample_apng/build.gradle.kts @@ -31,7 +31,7 @@ android { ) } } - packagingOptions { + packaging { resources { pickFirsts += listOf("META-INF/atomicfu.kotlin_module") }