DimensionDev · Tlaster · May 15, 2026 · May 15, 2026 · May 15, 2026 · May 21, 2026
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -100,4 +100,4 @@ jobs:
           sed -i -e '/START Non-FOSS component/,/END Non-FOSS component/d' app/build.gradle.kts
 
       - name: Build F-Droid variant
-        run: ./gradlew :app:assembleRelease :app:check :app:lint --stacktrace
+        run: ./gradlew :app:assembleRelease :app:check :app:lint --stacktrace
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ktorfit)
+    alias(libs.plugins.koin.compiler)
     alias(libs.plugins.google.services) apply false
     // START Non-FOSS component
     alias(libs.plugins.firebase.crashlytics) apply false
@@ -105,6 +106,7 @@ dependencies {
     implementation(libs.bundles.kotlinx)
     implementation(platform(libs.koin.bom))
     implementation(libs.bundles.koin)
+    implementation(libs.koin.annotations)
     implementation(libs.ktorfit.lib)
     ksp(libs.ktorfit.ksp)
     implementation(libs.bundles.coil3)
@@ -124,6 +126,15 @@ dependencies {
     coreLibraryDesugaring(libs.desugar.jdk.libs)
     implementation(libs.compose.webview)
     implementation(projects.shared)
+    implementation(projects.social.bluesky)
+    implementation(projects.social.mastodon)
+    implementation(projects.social.misskey)
+    implementation(projects.social.nostr)
+    implementation(projects.social.vvo)
+    implementation(projects.social.xqt)
+    implementation(projects.feature.login)
+    implementation(projects.feature.subscription)
+    implementation(projects.feature.tab)
     implementation(projects.composeUi)
     implementation(libs.androidx.splash)
     implementation(libs.materialKolor)

diff --git a/app/src/foss/java/dev/dimension/flare/common/FossOnDeviceAI.kt b/app/src/foss/java/dev/dimension/flare/common/FossOnDeviceAI.kt
@@ -1,9 +1,12 @@
 package dev.dimension.flare.common
 
 import android.content.Context
+import org.koin.core.annotation.Provided
+import org.koin.core.annotation.Single
 
+@Single(binds = [OnDeviceAI::class])
 internal class FossOnDeviceAI(
-    private val context: Context,
+    @Provided private val context: Context,
 ) : OnDeviceAI {
     override suspend fun isAvailable(): Boolean = false
 

diff --git a/app/src/foss/java/dev/dimension/flare/di/AiModule.kt b/app/src/foss/java/dev/dimension/flare/di/AiModule.kt
diff --git a/app/src/main/java/dev/dimension/flare/App.kt b/app/src/main/java/dev/dimension/flare/App.kt
@@ -15,20 +15,17 @@ import coil3.video.VideoFrameDecoder
 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 dev.dimension.flare.di.AndroidKoinApplication
 import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
+import org.koin.plugin.module.dsl.startKoin
 
 class App :
     Application(),
     SingletonImageLoader.Factory {
     override fun onCreate() {
         super.onCreate()
-        startKoin {
+        startKoin<AndroidKoinApplication> {
             androidContext(this@App)
-            modules(KoinHelper.modules() + androidModule + aiModule)
         }
     }
 

diff --git a/app/src/main/java/dev/dimension/flare/MainActivity.kt b/app/src/main/java/dev/dimension/flare/MainActivity.kt
@@ -1,6 +1,7 @@
 package dev.dimension.flare
 
 import android.content.Context
+import android.content.Intent
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
@@ -52,6 +53,11 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    override fun onNewIntent(intent: Intent) {
+        setIntent(intent)
+        super.onNewIntent(intent)
+    }
+
     override fun onResume() {
         super.onResume()
         videoDownloadHelper.onResume()

diff --git a/app/src/main/java/dev/dimension/flare/common/ComposeInAppNotification.kt b/app/src/main/java/dev/dimension/flare/common/ComposeInAppNotification.kt
@@ -5,6 +5,7 @@ import dev.dimension.flare.R
 import dev.dimension.flare.data.repository.LoginExpiredException
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import org.koin.core.annotation.Single
 
 internal sealed interface Notification {
     data class Progress(
@@ -24,6 +25,7 @@ internal sealed interface Notification {
     ) : Notification
 }
 
+@Single(binds = [InAppNotification::class])
 internal class ComposeInAppNotification : InAppNotification {
     private val _source = MutableStateFlow(Event<Notification>(null, initialHandled = true))
     val source

diff --git a/app/src/main/java/dev/dimension/flare/common/PodcastManager.kt b/app/src/main/java/dev/dimension/flare/common/PodcastManager.kt
@@ -20,10 +20,13 @@ import dev.dimension.flare.ui.model.UiPodcast
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import org.koin.core.annotation.Provided
+import org.koin.core.annotation.Single
 
 @Stable
+@Single
 internal class PodcastManager(
-    private val context: Context,
+    @Provided private val context: Context,
 ) : AutoCloseable {
     private var currentController: MediaController? = null
     private val _currentPodcast = MutableStateFlow<UiPodcast?>(null)

diff --git a/app/src/main/java/dev/dimension/flare/common/VideoDownloadHelper.kt b/app/src/main/java/dev/dimension/flare/common/VideoDownloadHelper.kt
@@ -11,14 +11,17 @@ import android.webkit.MimeTypeMap
 import androidx.compose.runtime.Stable
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
+import org.koin.core.annotation.Provided
+import org.koin.core.annotation.Single
 
 /**
  * Download Manager Helper - Simplified Version
  * Encapsulates Android's DownloadManager, provides simple video download functionality
  */
 @Stable
+@Single
 internal class VideoDownloadHelper(
-    private val context: Context,
+    @Provided private val context: Context,
 ) {
     companion object {
         private const val TAG = "VideoDownloadHelper"

diff --git a/app/src/main/java/dev/dimension/flare/di/AndroidKoinApplication.kt b/app/src/main/java/dev/dimension/flare/di/AndroidKoinApplication.kt
@@ -0,0 +1,38 @@
+package dev.dimension.flare.di
+
+import dev.dimension.flare.data.platform.BlueskyPlatformSpec
+import dev.dimension.flare.data.platform.MastodonPlatformSpec
+import dev.dimension.flare.data.platform.MisskeyPlatformSpec
+import dev.dimension.flare.data.platform.NostrPlatformSpec
+import dev.dimension.flare.data.platform.RssTimelineSpecs
+import dev.dimension.flare.data.platform.VvoPlatformSpec
+import dev.dimension.flare.data.platform.XqtPlatformSpec
+import dev.dimension.flare.model.PlatformRuntimeData
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Configuration
+import org.koin.core.annotation.KoinApplication
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Single
+
+@KoinApplication
+internal class AndroidKoinApplication
+
+@Module
+@Configuration
+@ComponentScan("dev.dimension.flare.common", "dev.dimension.flare.di")
+internal class AndroidKoinModule
+
+@Single
+internal fun runtimeData(): PlatformRuntimeData =
+    PlatformRuntimeData(
+        platformSpecs =
+            listOf(
+                NostrPlatformSpec,
+                MastodonPlatformSpec,
+                MisskeyPlatformSpec,
+                BlueskyPlatformSpec,
+                XqtPlatformSpec,
+                VvoPlatformSpec,
+            ),
+        extraTimelineSpecs = RssTimelineSpecs.timelineSpecs,
+    )
diff --git a/app/src/main/java/dev/dimension/flare/di/AndroidModule.kt b/app/src/main/java/dev/dimension/flare/di/AndroidModule.kt
diff --git a/app/src/main/java/dev/dimension/flare/ui/component/BottomSheetSceneStrategy.kt b/app/src/main/java/dev/dimension/flare/ui/component/BottomSheetSceneStrategy.kt
@@ -38,6 +38,31 @@ private class BottomSheetScene<T : Any>(
     override suspend fun onRemove() {
         sheetState.hide()
     }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as BottomSheetScene<*>
+
+        // Compare by contentKey values rather than NavEntry object identity (content ===).
+        // NavEntry wrappers are recreated with new closure instances on every recomposition
+        // (the lambda is passed to a constructor, not a @Composable function, so it is never
+        // a stable ComposableLambda). Using object identity would cause false inequality,
+        // causing LaunchedEffect(overlayScenes) to add a new scene on every recomposition
+        // while the old one is still animating → duplicate ModalBottomSheet dialogs sharing
+        // the same SaveableStateProvider key → crash.
+        return key == other.key &&
+            previousEntries.map { it.contentKey } == other.previousEntries.map { it.contentKey } &&
+            overlaidEntries.map { it.contentKey } == other.overlaidEntries.map { it.contentKey } &&
+            entry.contentKey == other.entry.contentKey
+    }
+
+    override fun hashCode(): Int =
+        key.hashCode() * 31 +
+            previousEntries.map { it.contentKey }.hashCode() * 31 +
+            overlaidEntries.map { it.contentKey }.hashCode() * 31 +
+            entry.contentKey.hashCode()
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/app/src/main/java/dev/dimension/flare/ui/route/Route.kt b/app/src/main/java/dev/dimension/flare/ui/route/Route.kt
@@ -2,15 +2,16 @@ 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.SourceTimelineTabItemV2
+import dev.dimension.flare.data.model.tab.TimelineTabItemV2
+import dev.dimension.flare.data.model.tab.xqtDeviceFollow
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.model.MicroBlogKey
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.serialization.Serializable
 
 @Immutable
-@Serializable
 internal sealed interface Route : NavKey {
     @Serializable
     sealed interface Status : Route {
@@ -174,9 +175,8 @@ internal sealed interface Route : NavKey {
     @Serializable
     data object Home : Route
 
-    @Serializable
     data class Timeline(
-        val source: TimelineSourceRef,
+        val tabItem: TimelineTabItemV2,
     ) : Route
 
     @Serializable
@@ -470,7 +470,7 @@ internal sealed interface Route : NavKey {
                         (deeplinkRoute.accountType as? AccountType.Specific)?.accountKey
                             ?: return null
                     Route.Timeline(
-                        source = TimelineSourceRef.xqtDeviceFollow(accountKey),
+                        tabItem = SourceTimelineTabItemV2.xqtDeviceFollow(accountKey),
                     )
                 }
 

diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/compose/ShortcutComposeActivity.kt b/app/src/main/java/dev/dimension/flare/ui/screen/compose/ShortcutComposeActivity.kt
@@ -5,13 +5,17 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.ui.ComposeUiFlags
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.core.content.IntentCompat
 import dev.dimension.flare.ui.FlareApp
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList
 
 class ShortcutComposeActivity : ComponentActivity() {
+    @OptIn(ExperimentalComposeUiApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
+        ComposeUiFlags.isMediaQueryIntegrationEnabled = true
         super.onCreate(savedInstanceState)
         val initialText =
             when {

diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeEntryBuilder.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeEntryBuilder.kt
@@ -40,7 +40,7 @@ internal fun EntryProviderScope<NavKey>.homeEntryBuilder(
     }
     entry<Route.Timeline> { args ->
         TimelineScreen(
-            source = args.source,
+            tabItem = args.tabItem,
             onBack = onBack,
         )
     }

diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/HomeScreen.kt
@@ -55,7 +55,6 @@ import compose.icons.fontawesomeicons.solid.Pen
 import compose.icons.fontawesomeicons.solid.PenToSquare
 import compose.icons.fontawesomeicons.solid.SquareRss
 import dev.dimension.flare.R
-import dev.dimension.flare.data.model.tab.SourceTimelineTabItemV2
 import dev.dimension.flare.model.AccountType
 import dev.dimension.flare.ui.common.OnNewIntent
 import dev.dimension.flare.ui.component.AvatarComponent
@@ -485,7 +484,7 @@ private fun getDirection(data: SecondaryTabsPresenter.Tab): Route? =
         }
 
         is SecondaryTabsPresenter.Destination.Timeline -> {
-            (target.tabItem as? SourceTimelineTabItemV2)?.source?.let { Route.Timeline(it) }
+            Route.Timeline(target.tabItem)
         }
     }
 

diff --git a/app/src/main/java/dev/dimension/flare/ui/screen/home/TimelineScreen.kt b/app/src/main/java/dev/dimension/flare/ui/screen/home/TimelineScreen.kt
@@ -21,8 +21,6 @@ import compose.icons.fontawesomeicons.Solid
 import compose.icons.fontawesomeicons.solid.Sliders
 import dev.dimension.flare.R
 import dev.dimension.flare.data.model.BottomBarBehavior
-import dev.dimension.flare.data.model.tab.TimelineResolver
-import dev.dimension.flare.data.model.tab.TimelineSourceRef
 import dev.dimension.flare.data.model.tab.TimelineTabItemV2
 import dev.dimension.flare.data.model.tab.resolveTimelineAppearance
 import dev.dimension.flare.ui.component.BackButton
@@ -41,7 +39,6 @@ import dev.dimension.flare.ui.presenter.home.LoggedInState
 import dev.dimension.flare.ui.presenter.invoke
 import kotlinx.coroutines.launch
 import moe.tlaster.precompose.molecule.producePresenter
-import org.koin.compose.koinInject
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -130,23 +127,6 @@ internal fun DeckTimelineScreen(
     }
 }
 
-@Composable
-internal fun TimelineScreen(
-    source: TimelineSourceRef,
-    onBack: () -> Unit,
-) {
-    val state by producePresenter("timeline-source:${source.id}") {
-        val resolver: TimelineResolver = koinInject()
-        remember {
-            resolver.toTabItem(source)
-        }
-    }
-    TimelineScreen(
-        tabItem = state,
-        onBack = onBack,
-    )
-}
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun TimelineScreen(