Release 3.0

.github/workflows/code_quality.yml

@@ -1,7 +1,6 @@
 name: Qodana
 on:
   workflow_dispatch:
-  pull_request:
   push:
 
 jobs:

.gitignore

@@ -84,4 +84,6 @@ app/debug/*
 .project
 .settings/org.eclipse.buildship.core.prefs
 app/.settings/org.eclipse.buildship.core.prefs
-.DS_Store
+.DS_Store
+
+resources/

app/build.gradle

@@ -4,14 +4,13 @@ plugins {
 }
 
 private static String baseVersionName() {
-    return "2.8.7"
+    return "3.0.0"
 }
 
 android {
     compileSdk 33
 
     defaultConfig {
-
         applicationId "com.qhy040404.libraryonetap"
         minSdk 29
         targetSdk 33
@@ -43,21 +42,38 @@ android {
     }
 }
 
+configurations.all {
+    exclude group: 'androidx.appcompat', module: 'appcompat'
+}
+
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:deprecation"
+    }
+}
+
 dependencies {
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0-alpha05'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.0'
-    implementation("com.squareup.okhttp3:okhttp:4.10.0")
-    implementation("com.google.code.gson:gson:2.9.0")
-    implementation("dev.rikka.rikkax.preference:simplemenu-preference:1.0.3")
-    implementation('com.tencent.bugly:crashreport:4.0.4')
-    implementation("com.drakeet.about:about:2.5.1")
-    implementation("com.drakeet.multitype:multitype:4.3.0")
-    implementation("io.coil-kt:coil:2.1.0")
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.drakeet.about:about:2.5.1'
+    implementation 'com.drakeet.multitype:multitype:4.3.0'
+    implementation 'com.github.zhaobozhen.libraries:utils:1.1.1'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.tencent.bugly:crashreport:4.0.4'
+    implementation 'dev.rikka.rikkax.appcompat:appcompat:1.4.1'
+    implementation 'dev.rikka.rikkax.material:material:2.5.0'
+    implementation 'dev.rikka.rikkax.material:material-preference:2.0.0'
+    implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
+    implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1'
+    implementation 'dev.rikka.rikkax.widget:borderview:1.1.0'
+    implementation 'io.coil-kt:coil:2.1.0'
+    implementation 'me.zhanghai.android.appiconloader:appiconloader:1.4.0'
 }
 
 import java.text.SimpleDateFormat

app/src/main/AndroidManifest.xml

@@ -14,21 +14,18 @@
     <application
         android:name=".LibraryOneTapApp"
         android:allowBackup="true"
-        android:icon="@mipmap/launcher_lol"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/launcher_lol"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Simple.NoActionBar"
+        android:theme="@style/AppTheme"
         tools:targetApi="33">
         <activity
-            android:name=".ui.tools.ToolsInitActivity"
+            android:name=".ui.about.AboutActivity"
             android:exported="false"
-            android:label="@string/tools_title" />
-        <activity
-            android:name=".ui.AboutActivity"
-            android:exported="false"
-            android:label="@string/about_title" />
+            android:label="@string/about_title"
+            android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar.Library" />
         <activity
             android:name=".ui.secret.SecretActivity"
             android:exported="false"
@@ -42,19 +39,7 @@
             android:exported="false"
             android:label="@string/bath_title" />
         <activity
-            android:name=".ui.YanxiujianActivity"
-            android:exported="false"
-            android:label="@string/title_activity_yanxiujian" />
-        <activity
-            android:name=".ui.SettingsActivity"
-            android:exported="false"
-            android:label="@string/title_activity_settings" />
-        <activity
-            android:name=".ui.DetailActivity"
-            android:exported="false"
-            android:label="@string/library" />
-        <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.main.MainBottomActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/qhy040404/libraryonetap/LibraryOneTapApp.kt

@@ -2,8 +2,17 @@ package com.qhy040404.libraryonetap
 
 import android.app.Activity
 import android.app.Application
+import coil.Coil
+import coil.ImageLoader
+import com.absinthe.libraries.utils.utils.Utility
+import com.google.android.material.color.DynamicColors
+import com.qhy040404.libraryonetap.app.AppIconFetcherFactory
 import com.qhy040404.libraryonetap.constant.Constants
+import com.qhy040404.libraryonetap.constant.GlobalValues
+import com.qhy040404.libraryonetap.utils.AppUtils
 import com.tencent.bugly.crashreport.CrashReport
+import rikka.material.app.DayNightDelegate
+import rikka.material.app.LocaleDelegate
 import java.util.*
 
 class LibraryOneTapApp : Application() {
@@ -22,6 +31,21 @@ class LibraryOneTapApp : Application() {
             strategy
         )
         app = this
+
+        LocaleDelegate.defaultLocale = AppUtils.locale
+        DayNightDelegate.setApplicationContext(this)
+        DayNightDelegate.setDefaultNightMode(AppUtils.getNightMode(GlobalValues.darkMode))
+        DynamicColors.applyToActivitiesIfAvailable(this)
+
+        Utility.init(this)
+
+        Coil.setImageLoader {
+            ImageLoader(this).newBuilder()
+                .components {
+                    add(AppIconFetcherFactory(this@LibraryOneTapApp))
+                }
+                .build()
+        }
     }
 
     fun addActivity(activity: Activity) = activityList.add(activity)

app/src/main/java/com/qhy040404/libraryonetap/app/AppIconFetcherFactory.kt

@@ -0,0 +1,32 @@
+package com.qhy040404.libraryonetap.app
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.graphics.drawable.BitmapDrawable
+import coil.ImageLoader
+import coil.decode.DataSource
+import coil.fetch.DrawableResult
+import coil.fetch.FetchResult
+import coil.fetch.Fetcher
+import coil.request.Options
+import com.qhy040404.libraryonetap.utils.extensions.ViewExtensions.dp
+import me.zhanghai.android.appiconloader.AppIconLoader
+
+class AppIconFetcherFactory(private val ctx: Context) : Fetcher.Factory<PackageInfo> {
+    private val loader = AppIconLoader(40.dp, false, ctx)
+
+    override fun create(data: PackageInfo, options: Options, imageLoader: ImageLoader): Fetcher {
+        return AppIconFetcher(ctx, data, loader)
+    }
+
+    class AppIconFetcher(
+        private val context: Context,
+        private val info: PackageInfo,
+        private val loader: AppIconLoader,
+    ) : Fetcher {
+        override suspend fun fetch(): FetchResult {
+            val icon = loader.loadIcon(info.applicationInfo)
+            return DrawableResult(BitmapDrawable(context.resources, icon), true, DataSource.DISK)
+        }
+    }
+}

app/src/main/java/com/qhy040404/libraryonetap/base/BaseActivity.kt

@@ -1,61 +1,72 @@
 package com.qhy040404.libraryonetap.base
 
+import android.content.res.Resources
+import android.graphics.Color
 import android.os.Bundle
 import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
+import androidx.viewbinding.ViewBinding
 import com.qhy040404.libraryonetap.LibraryOneTapApp
 import com.qhy040404.libraryonetap.R
 import com.qhy040404.libraryonetap.constant.GlobalValues
-import com.qhy040404.libraryonetap.utils.RandomDataUtils
-import java.util.*
+import com.qhy040404.libraryonetap.utils.AppUtils
+import com.qhy040404.libraryonetap.utils.OsUtils
+import com.qhy040404.libraryonetap.utils.extensions.CompatExtensions.inflateBinding
+import rikka.material.app.MaterialActivity
 
 @Suppress("DEPRECATION")
-abstract class BaseActivity : AppCompatActivity() {
+abstract class BaseActivity<VB : ViewBinding> : MaterialActivity() {
+
+    protected lateinit var binding: VB
+
     override fun onCreate(savedInstanceState: Bundle?) {
-        val config = resources.configuration
-        val dm = resources.displayMetrics
-        var theme = GlobalValues.theme
-
-        when (GlobalValues.darkMode) {
-            "system" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-            "on" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-            "off" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-        }
-        if (GlobalValues.theme == "random") {
-            theme = RandomDataUtils.randomTheme
+        if (!GlobalValues.md3) {
+            setTheme(AppUtils.getThemeID(GlobalValues.theme))
         }
-        when (theme) {
-            "purple" -> setTheme(R.style.Theme_Purple)
-            "blue" -> setTheme(R.style.Theme_Blue)
-            "pink" -> setTheme(R.style.Theme_Pink)
-            "green" -> setTheme(R.style.Theme_Green)
-            "simple" -> setTheme(R.style.Theme_Simple)
-        }
-        config.setLocale(
-            when (GlobalValues.locale) {
-                "zh" -> Locale.SIMPLIFIED_CHINESE
-                "en" -> Locale.ENGLISH
-                else -> Locale.getDefault()
-            }
-        )
-        resources.updateConfiguration(config, dm)
 
         super.onCreate(savedInstanceState)
         LibraryOneTapApp.instance?.addActivity(this)
 
-        setContentView(getLayoutId())
+        if (!this::binding.isInitialized) {
+            binding = inflateBinding(layoutInflater)
+        }
+
+        setContentView(binding.root)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         init()
     }
 
+    override fun shouldApplyTranslucentSystemBars(): Boolean {
+        return true
+    }
+
+    override fun computeUserThemeKey(): String? {
+        return GlobalValues.darkMode + GlobalValues.theme + GlobalValues.md3
+    }
+
+    override fun onApplyTranslucentSystemBars() {
+        super.onApplyTranslucentSystemBars()
+        window.statusBarColor = Color.TRANSPARENT
+        window.decorView.post {
+            window.navigationBarColor = Color.TRANSPARENT
+            if (OsUtils.atLeastQ()) {
+                window.isNavigationBarContrastEnforced = false
+            }
+        }
+    }
+
+    override fun onApplyUserThemeResource(theme: Resources.Theme, isDecorView: Boolean) {
+        theme.applyStyle(R.style.ThemeOverlay, true)
+
+        if (!GlobalValues.md3) {
+            theme.applyStyle(AppUtils.getThemeID(GlobalValues.theme), true)
+        }
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         finish()
         return super.onOptionsItemSelected(item)
     }
 
     protected abstract fun init()
-
-    protected abstract fun getLayoutId(): Int
 }

app/src/main/java/com/qhy040404/libraryonetap/base/BaseFragment.kt

@@ -0,0 +1,38 @@
+package com.qhy040404.libraryonetap.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.CallSuper
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+import com.qhy040404.libraryonetap.utils.extensions.CompatExtensions.inflateBinding
+
+abstract class BaseFragment<VB : ViewBinding> : Fragment() {
+    protected lateinit var binding: VB
+
+    private var parentActivityVisible = false
+    private var visible = false
+    private var localParentFragment: BaseFragment<VB>? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        init()
+    }
+
+    abstract fun init()
+
+    @CallSuper
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = inflateBinding(layoutInflater)
+    }
+
+    @CallSuper
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View = binding.root
+}

app/src/main/java/com/qhy040404/libraryonetap/constant/Constants.kt

@@ -11,15 +11,17 @@ object Constants {
 
     const val PREF_DARK = "dark"
     const val PREF_THEME = "theme"
+    const val PREF_MD3 = "md3"
     const val PREF_LOCALE = "locale"
     const val PREF_RESET = "reset"
 
     const val PREF_INIT = "initialized"
 
+    const val PREF_CACHE = "cache"
     const val PREF_ABOUT = "about"
 
     const val DEFAULT_DARK = "system"
-    const val DEFAULT_THEME = "simple"
+    const val DEFAULT_THEME = "blue"
     const val DEFAULT_LOCALE = "system"
 
     const val CONTENT_TYPE_SSO = "application/x-www-form-urlencoded; charset=utf-8"

app/src/main/java/com/qhy040404/libraryonetap/constant/GlobalManager.kt

@@ -1,12 +1,15 @@
 package com.qhy040404.libraryonetap.constant
 
 import android.content.pm.PackageManager
-import com.google.gson.Gson
 import com.qhy040404.libraryonetap.LibraryOneTapApp
 import com.qhy040404.libraryonetap.utils.lazy.ResettableLazyUtils
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 
 object GlobalManager {
     val packageManager: PackageManager by lazy { LibraryOneTapApp.app.packageManager }
     val lazyMgr = ResettableLazyUtils.resettableManager()
-    val gson: Gson by lazy { Gson() }
+    val moshi: Moshi = Moshi.Builder()
+        .addLast(KotlinJsonAdapterFactory())
+        .build()
 }