[DO NOT MERGE] Feature/modular

app/build.gradle.kts

@@ -85,14 +85,6 @@ android {
         }
     }
 
-    // START Non-FOSS component
-    if (project.file("google-services.json").exists()) {
-        sourceSets.getByName("main").kotlin.directories.add("src/play/java")
-    }
-    // END Non-FOSS component
-    if (!project.file("google-services.json").exists()){
-        sourceSets.getByName("main").kotlin.directories.add("src/foss/java")
-    }
 }
 
 dependencies {
@@ -123,7 +115,14 @@ dependencies {
     implementation(libs.androidx.window)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
     implementation(libs.compose.webview)
-    implementation(projects.shared)
+    implementation(projects.presentation.features)
+    implementation(projects.core.humanizer)
+    implementation(projects.modules.draft.presentation)
+    implementation(projects.modules.ai.data)
+    implementation(projects.foundation.network)
+    implementation(projects.foundation.filesystem)
+    implementation(projects.social.rss)
+    implementation(projects.social.rss.model)
     implementation(projects.composeUi)
     implementation(libs.androidx.splash)
     implementation(libs.materialKolor)
@@ -142,9 +141,6 @@ dependencies {
         implementation(platform(libs.firebase.bom))
         implementation(libs.firebase.crashlytics.ktx)
         implementation(libs.firebase.analytics.ktx)
-        implementation(libs.kotlinx.coroutines.play.services)
-        implementation("com.google.mlkit:genai-prompt:1.0.0-beta2")
-        implementation("com.google.mlkit:genai-summarization:1.0.0-beta1")
     }
     // END Non-FOSS component
 

app/src/main/java/dev/dimension/flare/App.kt

@@ -16,7 +16,6 @@ import dev.dimension.flare.common.AnimatedPngDecoder
 import dev.dimension.flare.common.AnimatedWebPDecoder
 import dev.dimension.flare.data.network.ktorClient
 import dev.dimension.flare.di.KoinHelper
-import dev.dimension.flare.di.aiModule
 import dev.dimension.flare.di.androidModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
@@ -28,7 +27,7 @@ class App :
         super.onCreate()
         startKoin {
             androidContext(this@App)
-            modules(KoinHelper.modules() + androidModule + aiModule)
+            modules(KoinHelper.modules() + androidModule)
         }
     }
 

app/src/main/java/dev/dimension/flare/common/ComposeInAppNotification.kt

@@ -2,7 +2,7 @@ package dev.dimension.flare.common
 
 import androidx.annotation.StringRes
 import dev.dimension.flare.R
-import dev.dimension.flare.data.repository.LoginExpiredException
+import dev.dimension.flare.model.LoginExpiredException
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 

app/src/main/java/dev/dimension/flare/ui/route/Route.kt

@@ -3,6 +3,7 @@ package dev.dimension.flare.ui.route
 import androidx.compose.runtime.Immutable
 import androidx.navigation3.runtime.NavKey
 import dev.dimension.flare.data.model.tab.TimelineSourceRef
+import dev.dimension.flare.data.model.tab.xqtDeviceFollowTimelineSource
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import kotlinx.collections.immutable.ImmutableMap
@@ -470,7 +471,7 @@ internal sealed interface Route : NavKey {
                         (deeplinkRoute.accountType as? AccountType.Specific)?.accountKey
                             ?: return null
                     Route.Timeline(
-                        source = TimelineSourceRef.xqtDeviceFollow(accountKey),
+                        source = xqtDeviceFollowTimelineSource(accountKey),
                     )
                 }
 

app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt

@@ -89,7 +89,7 @@ import compose.icons.fontawesomeicons.solid.SquarePollHorizontal
 import compose.icons.fontawesomeicons.solid.TriangleExclamation
 import compose.icons.fontawesomeicons.solid.Xmark
 import dev.dimension.flare.R
-import dev.dimension.flare.common.FileItem
+import dev.dimension.flare.data.io.FileItem
 import dev.dimension.flare.data.datasource.microblog.ComposeConfig
 import dev.dimension.flare.data.datasource.microblog.ComposeData
 import dev.dimension.flare.data.model.PostActionStyle

app/src/main/java/dev/dimension/flare/ui/screen/home/ChangeLogState.kt

@@ -10,7 +10,7 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.fromHtml
 import dev.dimension.flare.BuildConfig
 import dev.dimension.flare.R
-import dev.dimension.flare.data.repository.SettingsRepository
+import dev.dimension.flare.data.datastore.AppDataStore
 import dev.dimension.flare.ui.model.UiState
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.map
@@ -20,7 +20,7 @@ import org.koin.compose.koinInject
 @Composable
 internal fun changeLogPresenter(
     context: Context = koinInject(),
-    repository: SettingsRepository = koinInject(),
+    repository: AppDataStore = koinInject(),
 ): ChangeLogState {
     val scope = rememberCoroutineScope()
     val appSettings by repository.appSettings.collectAsUiState()

app/src/main/java/dev/dimension/flare/ui/screen/list/CreateListDialog.kt

@@ -37,7 +37,7 @@ import compose.icons.FontAwesomeIcons
 import compose.icons.fontawesomeicons.Solid
 import compose.icons.fontawesomeicons.solid.Rss
 import dev.dimension.flare.R
-import dev.dimension.flare.common.FileItem
+import dev.dimension.flare.data.io.FileItem
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaData
 import dev.dimension.flare.data.datasource.microblog.list.ListMetaDataType
 import dev.dimension.flare.model.AccountType

app/src/main/java/dev/dimension/flare/ui/screen/list/EditListScreen.kt

@@ -48,7 +48,7 @@ import compose.icons.fontawesomeicons.solid.Rss
 import compose.icons.fontawesomeicons.solid.Trash
 import compose.icons.fontawesomeicons.solid.UserPen
 import dev.dimension.flare.R
-import dev.dimension.flare.common.FileItem
+import dev.dimension.flare.data.io.FileItem
 import dev.dimension.flare.common.onEmpty
 import dev.dimension.flare.common.onError
 import dev.dimension.flare.common.onLoading

app/src/main/java/dev/dimension/flare/ui/screen/list/ListEntryBuilder.kt

@@ -10,7 +10,7 @@ import dev.dimension.flare.data.model.IconType
 import dev.dimension.flare.data.model.tab.SourceTimelineTabItemV2
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiText
-import dev.dimension.flare.ui.presenter.list.ListTimelinePresenter
+import dev.dimension.flare.ui.presenter.list.createListTimeline
 import dev.dimension.flare.ui.route.Route
 import dev.dimension.flare.ui.screen.home.TimelineScreen
 
@@ -63,7 +63,7 @@ internal fun EntryProviderScope<NavKey>.listEntryBuilder(
                     title = UiText.Raw(args.title),
                     icon = IconType.Material(UiIcon.List),
                     createPresenter = {
-                        ListTimelinePresenter(
+                        createListTimeline(
                             accountType = args.accountType,
                             listId = args.listId,
                         )

app/src/main/java/dev/dimension/flare/ui/screen/misskey/MisskeyEntryBuilder.kt

@@ -25,8 +25,8 @@ import dev.dimension.flare.ui.component.FAIcon
 import dev.dimension.flare.ui.component.FlareScaffold
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiText
-import dev.dimension.flare.ui.presenter.list.AntennasTimelinePresenter
-import dev.dimension.flare.ui.presenter.list.ChannelTimelinePresenter
+import dev.dimension.flare.ui.presenter.list.createMisskeyAntennaTimeline
+import dev.dimension.flare.ui.presenter.list.createMisskeyChannelTimeline
 import dev.dimension.flare.ui.route.Route
 import dev.dimension.flare.ui.screen.home.TimelineScreen
 
@@ -64,7 +64,7 @@ internal fun EntryProviderScope<NavKey>.misskeyEntryBuilder(
                     title = UiText.Raw(args.title),
                     icon = IconType.Material(UiIcon.Rss),
                     createPresenter = {
-                        AntennasTimelinePresenter(
+                        createMisskeyAntennaTimeline(
                             accountType = args.accountType,
                             id = args.antennaId,
                         )
@@ -104,7 +104,7 @@ internal fun EntryProviderScope<NavKey>.misskeyEntryBuilder(
                     title = UiText.Raw(args.title),
                     icon = IconType.Material(UiIcon.List),
                     createPresenter = {
-                        ChannelTimelinePresenter(
+                        createMisskeyChannelTimeline(
                             accountType = args.accountType,
                             id = args.channelId,
                         )

app/src/main/java/dev/dimension/flare/ui/screen/rss/RssDetailScreen.kt

@@ -48,8 +48,8 @@ import compose.icons.fontawesomeicons.solid.Language
 import compose.icons.fontawesomeicons.solid.ShareNodes
 import dev.dimension.flare.R
 import dev.dimension.flare.common.encodeJson
+import dev.dimension.flare.data.datastore.AppDataStore
 import dev.dimension.flare.data.network.rss.DocumentData
-import dev.dimension.flare.data.repository.SettingsRepository
 import dev.dimension.flare.ui.component.BackButton
 import dev.dimension.flare.ui.component.DateTimeText
 import dev.dimension.flare.ui.component.FAIcon
@@ -362,7 +362,7 @@ private fun presenter(
     url: String,
     descriptionHtml: String? = null,
     descriptionTitle: String? = null,
-    settingsRepository: SettingsRepository = koinInject(),
+    appDataStore: AppDataStore = koinInject(),
 ) = run {
     val state =
         remember(url, descriptionHtml) {
@@ -377,10 +377,10 @@ private fun presenter(
             )
         }
     val enableTldr by remember {
-        settingsRepository.appSettings.map { it.aiConfig.tldr }
+        appDataStore.appSettings.map { it.aiConfig.tldr }
     }.collectAsUiState()
     val preTranslate by remember {
-        settingsRepository.appSettings.map { it.translateConfig.preTranslate }
+        appDataStore.appSettings.map { it.translateConfig.preTranslate }
     }.collectAsUiState()
     var showTldr by remember { mutableStateOf(false) }
     var tldrRefreshKey by remember { mutableIntStateOf(0) }

app/src/main/java/dev/dimension/flare/ui/screen/rss/RssEntryBuilder.kt

@@ -26,7 +26,7 @@ import dev.dimension.flare.ui.component.FAIcon
 import dev.dimension.flare.ui.component.FlareScaffold
 import dev.dimension.flare.ui.model.UiIcon
 import dev.dimension.flare.ui.model.UiText
-import dev.dimension.flare.ui.presenter.home.rss.RssTimelinePresenter
+import dev.dimension.flare.ui.presenter.home.rss.createRssTimeline
 import dev.dimension.flare.ui.route.Route
 import dev.dimension.flare.ui.screen.home.TimelineScreen
 
@@ -81,7 +81,7 @@ internal fun EntryProviderScope<NavKey>.rssEntryBuilder(
                             IconType.Url(args.favIcon)
                         } ?: IconType.Material(UiIcon.Rss),
                     createPresenter = {
-                        RssTimelinePresenter(args.url)
+                        createRssTimeline(args.url)
                     },
                 )
             },

app/src/main/java/dev/dimension/flare/ui/screen/rss/RssSourceEditSheet.kt

@@ -49,8 +49,8 @@ import compose.icons.fontawesomeicons.solid.CircleCheck
 import compose.icons.fontawesomeicons.solid.CircleChevronDown
 import compose.icons.fontawesomeicons.solid.CircleXmark
 import dev.dimension.flare.R
-import dev.dimension.flare.data.database.app.model.RssDisplayMode
 import dev.dimension.flare.data.database.app.model.SubscriptionType
+import dev.dimension.flare.model.RssDisplayMode
 import dev.dimension.flare.ui.component.FAIcon
 import dev.dimension.flare.ui.component.NetworkImage
 import dev.dimension.flare.ui.model.UiRssSource

app/src/main/java/dev/dimension/flare/ui/screen/settings/AccountsScreen.kt

@@ -56,7 +56,7 @@ import compose.icons.fontawesomeicons.solid.List
 import compose.icons.fontawesomeicons.solid.Plus
 import compose.icons.fontawesomeicons.solid.Trash
 import dev.dimension.flare.R
-import dev.dimension.flare.data.repository.LoginExpiredException
+import dev.dimension.flare.model.LoginExpiredException
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
 import dev.dimension.flare.ui.component.AvatarComponent

app/src/main/java/dev/dimension/flare/ui/screen/settings/AppearanceCommon.kt

@@ -17,9 +17,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import dev.dimension.flare.data.datastore.AppDataStore
 import dev.dimension.flare.data.model.appearance.AppearanceKey
 import dev.dimension.flare.data.model.appearance.AppearancePatch
-import dev.dimension.flare.data.repository.SettingsRepository
 import dev.dimension.flare.ui.component.FlareDropdownMenu
 import dev.dimension.flare.ui.component.platform.isBigScreen
 import dev.dimension.flare.ui.model.UiState
@@ -116,9 +116,9 @@ internal interface AppearanceSettingsUpdater : AppearanceState {
 internal fun appearancePresenter(): AppearanceSettingsUpdater =
     run {
         val scope = rememberCoroutineScope()
-        val settingsRepository = koinInject<SettingsRepository>()
+        val appDataStore = koinInject<AppDataStore>()
         val appearanceState = remember { AppearancePresenter() }.invoke()
-        val appearance by settingsRepository.appearancePatch.collectAsUiState()
+        val appearance by appDataStore.appearancePatch.collectAsUiState()
 
         object : AppearanceSettingsUpdater, AppearanceState by appearanceState {
             override val appearance: UiState<AppearancePatch> = appearance
@@ -128,19 +128,19 @@ internal fun appearancePresenter(): AppearanceSettingsUpdater =
                 value: T,
             ) {
                 scope.launch {
-                    settingsRepository.updateAppearance(key, value)
+                    appDataStore.updateAppearance(key, value)
                 }
             }
 
             override fun clear(key: AppearanceKey<*>) {
                 scope.launch {
-                    settingsRepository.clearAppearance(key)
+                    appDataStore.clearAppearance(key)
                 }
             }
 
             override fun updateFontScale(fontSizeDiff: Float) {
                 scope.launch {
-                    settingsRepository.updateAppearance {
+                    appDataStore.updateAppearance {
                         set(dev.dimension.flare.data.model.appearance.AppearanceKeys.FontSizeDiff, fontSizeDiff)
                             .set(dev.dimension.flare.data.model.appearance.AppearanceKeys.LineHeightDiff, fontSizeDiff * 2)
                     }

app/src/main/java/dev/dimension/flare/ui/screen/settings/ColorPickerDialog.kt

@@ -25,8 +25,8 @@ import com.github.skydoves.colorpicker.compose.ColorEnvelope
 import com.github.skydoves.colorpicker.compose.HsvColorPicker
 import com.github.skydoves.colorpicker.compose.rememberColorPickerController
 import dev.dimension.flare.R
+import dev.dimension.flare.data.datastore.AppDataStore
 import dev.dimension.flare.data.model.appearance.AppearanceKeys
-import dev.dimension.flare.data.repository.SettingsRepository
 import dev.dimension.flare.ui.component.LocalGlobalAppearance
 import dev.dimension.flare.ui.component.LocalTimelineAppearance
 import kotlinx.coroutines.CoroutineScope
@@ -100,7 +100,7 @@ internal fun ColorPickerDialog(onBack: () -> Unit) {
 @Composable
 private fun presenter(
     initialColor: ULong,
-    settingsRepository: SettingsRepository = koinInject(),
+    appDataStore: AppDataStore = koinInject(),
     coroutineScope: CoroutineScope = koinInject(),
 ) = run {
     var selectedColor by remember { mutableStateOf(Color(initialColor)) }
@@ -112,7 +112,7 @@ private fun presenter(
 
         fun confirm() {
             coroutineScope.launch {
-                settingsRepository.updateAppearance(AppearanceKeys.ColorSeed, selectedColor.value)
+                appDataStore.updateAppearance(AppearanceKeys.ColorSeed, selectedColor.value)
             }
         }
     }

app/src/main/java/dev/dimension/flare/ui/screen/status/action/StatusShareSheet.kt

@@ -78,6 +78,7 @@ import compose.icons.fontawesomeicons.solid.Download
 import compose.icons.fontawesomeicons.solid.Image
 import compose.icons.fontawesomeicons.solid.Link
 import dev.dimension.flare.R
+import dev.dimension.flare.data.io.sanitizeFileName
 import dev.dimension.flare.data.model.VideoAutoplay
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
@@ -539,8 +540,6 @@ private fun View.findCaptureHostView(): ViewGroup? =
         ?: rootView as? ViewGroup
         ?: parent as? ViewGroup
 
-private fun String.sanitizeForFileName(): String = replace(Regex("[^A-Za-z0-9._-]"), "_")
-
 private fun saveBitmapToDownloads(
     context: Context,
     bitmap: Bitmap,
@@ -551,7 +550,7 @@ private fun saveBitmapToDownloads(
             bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
             stream.toByteArray()
         }
-    val fileName = "status_${statusKey.sanitizeForFileName()}_${System.currentTimeMillis()}.png"
+    val fileName = "status_${statusKey.sanitizeFileName()}_${System.currentTimeMillis()}.png"
     saveByteArrayToDownloads(
         context = context,
         byteArray = bytes,
@@ -571,7 +570,11 @@ private fun shareBitmapAsImage(
     if (bitmap.width <= 0 || bitmap.height <= 0) {
         return null
     }
-    val file = File(context.cacheDir, "status_share_${statusKey.sanitizeForFileName()}_${System.currentTimeMillis()}.png")
+    val file =
+        File(
+            context.cacheDir,
+            "status_share_${statusKey.sanitizeFileName()}_${System.currentTimeMillis()}.png",
+        )
     FileOutputStream(file).use {
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
     }