feat: Project modularization

Signed-off-by: Hu Shenghao <dede.hu@qq.com>

Author: hushenghao

.idea/gradle.xml

@@ -4,6 +4,8 @@
 
 - Optimize the setting of theme logic
 - Optimize APK file size
+- Project modularization
+- Upgrade project dependencies
 
 ### v3.2.0 (2024-12-03)
 

.idea/kotlinc.xml

@@ -4,6 +4,8 @@
 
 - 优化设置主题逻辑
 - 优化 APK 文件大小
+- 项目模块化
+- 升级项目依赖项
 
 ### v3.2.0 (2024-12-03)
 

CHANGELOG.md

@@ -138,11 +138,17 @@ dependencies {
     implementation(libs.blurhash.android)
     debugImplementation(libs.squareup.leakcanary)
 
-    implementation(project(":theme"))
+    implementation(project(":core:theme"))
+    implementation(project(":core:settings"))
+    implementation(project(":core:shortcut"))
+    implementation(project(":core:activity-actions"))
+    implementation(project(":core:resources"))
+    implementation(project(":core:alterable-adaptive-icon"))
+    implementation(project(":core:custom-tab-browser"))
+
     implementation(project(":feature:widget"))
     implementation(project(":feature:crash"))
     implementation(project(":feature:embedding-splits"))
-    implementation(project(":feature:custom-tab-browser"))
 
     implementation(project(":eggs:AndroidNext"))
     implementation(project(":eggs:VanillaIceCream"))

CHANGELOG_zh.md

@@ -3,7 +3,6 @@ package com.dede.android_eggs.startup
 import android.app.Application
 import android.content.Context
 import androidx.startup.Initializer
-import com.dede.android_eggs.util.ActivityActionDispatcher
 import com.dede.android_eggs.views.settings.compose.prefs.ThemePrefUtil
 import com.dede.basic.GlobalContext
 
@@ -13,7 +12,6 @@ class ApplicationInitializer : Initializer<Unit> {
         val application = context.applicationContext as Application
         // apply compat style
         ThemePrefUtil.apply(application)
-        ActivityActionDispatcher.register(application)
     }
 
     override fun dependencies(): List<Class<out Initializer<*>>> = listOf(

app/build.gradle.kts

@@ -18,9 +18,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.dede.android_eggs.R
 import com.dede.basic.Utils
 import com.dede.basic.toast
+import com.dede.android_eggs.resources.R as StringsR
 
 
 @Composable
@@ -40,13 +40,14 @@ fun AnimatorDisabledAlertDialog(
             Text(
                 text = stringResource(android.R.string.dialog_alert_title),
                 textAlign = TextAlign.Center,
-                modifier = Modifier.padding(6.dp)
+                modifier = Modifier
+                    .padding(6.dp)
                     .fillMaxWidth()
             )
         },
         text = {
             Column {
-                Text(text = stringResource(R.string.animator_disabled_alert_message))
+                Text(text = stringResource(StringsR.string.animator_disabled_alert_message))
             }
         },
         dismissButton = {
@@ -64,7 +65,7 @@ fun AnimatorDisabledAlertDialog(
                 }
                 visible = false
             }) {
-                Text(text = stringResource(R.string.action_goto_settings))
+                Text(text = stringResource(StringsR.string.action_goto_settings))
             }
         },
         onDismissRequest = {

app/src/main/java/com/dede/android_eggs/startup/ApplicationInitializer.kt

@@ -53,8 +53,8 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.bundleOf
-import com.dede.android_eggs.R
 import kotlinx.coroutines.flow.catch
+import com.dede.android_eggs.resources.R as StringsR
 
 @Stable
 class BottomSearchBarState(initVisible: Boolean, initSearchText: String) {
@@ -202,7 +202,7 @@ private fun BottomSearchBarView(
                 state.searchText = it
             },
             placeholder = {
-                Text(text = stringResource(R.string.label_search_hint))
+                Text(text = stringResource(StringsR.string.label_search_hint))
             },
             keyboardOptions = KeyboardOptions(
                 keyboardType = KeyboardType.Ascii, imeAction = ImeAction.Search

app/src/main/java/com/dede/android_eggs/views/main/compose/AnimatorDisabledAlertDialog.kt

@@ -26,7 +26,7 @@ private fun PreviewImage() {
     Column(horizontalAlignment = Alignment.CenterHorizontally) {
         DrawableImage(res = R.mipmap.ic_launcher_round, contentDescription = null)
 
-        val maskPath = stringArrayResource(id = R.array.icon_shape_override_paths).last()
+        val maskPath = stringArrayResource(id = com.dede.android_eggs.settings.R.array.icon_shape_override_paths).last()
         val drawable = remember(context.theme, maskPath) {
             AlterableAdaptiveIconDrawable(context, R.mipmap.ic_launcher, maskPath)
         }

app/src/main/java/com/dede/android_eggs/views/main/compose/BottomSearchBar.kt

@@ -60,7 +60,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import com.dede.android_eggs.R
 import com.dede.android_eggs.ui.views.ViscousFluidInterpolator
 import com.dede.android_eggs.views.main.util.EasterEggHelp
 import com.dede.android_eggs.views.main.util.EasterEggShortcutsHelp
@@ -71,6 +70,7 @@ import com.dede.basic.provider.EasterEggGroup
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.roundToInt
+import com.dede.android_eggs.resources.R as StringsR
 
 
 @Composable
@@ -255,7 +255,7 @@ fun EasterEggItemContent(
                                 .padding(start = 4.dp)
                                 .size(22.dp),
                             imageVector = Icons.Rounded.KeyboardArrowDown,
-                            contentDescription = stringResource(R.string.pref_title_language_more)
+                            contentDescription = stringResource(StringsR.string.pref_title_language_more)
                         )
                     }
                 }
@@ -308,7 +308,7 @@ fun EasterEggItemFloor(
                 modifier = Modifier.offset(x = (swipeProgress * -14).dp)
             ) {
                 Text(
-                    text = stringResource(R.string.label_add_shortcut),
+                    text = stringResource(StringsR.string.label_add_shortcut),
                     modifier = Modifier.padding(end = 4.dp),
                     maxLines = 2,
                     style = typography.labelLarge
@@ -332,7 +332,7 @@ private fun ShortcutIcon(showShortcut: Boolean = false) {
             Icon(
                 modifier = Modifier.size(30.dp),
                 imageVector = Icons.Rounded.AppShortcut,
-                contentDescription = stringResource(R.string.label_add_shortcut)
+                contentDescription = stringResource(StringsR.string.label_add_shortcut)
             )
         } else {
             val swipeIcon = if (LocalLayoutDirection.current == LayoutDirection.Rtl) {
@@ -343,7 +343,7 @@ private fun ShortcutIcon(showShortcut: Boolean = false) {
             Icon(
                 modifier = Modifier.size(30.dp),
                 imageVector = swipeIcon,
-                contentDescription = stringResource(R.string.label_add_shortcut)
+                contentDescription = stringResource(StringsR.string.label_add_shortcut)
             )
         }
     }