feat: promote internal topic-reading baseline #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

XaaT merged 2 commits into main from pr-69-promote-internal-baseline

Apr 24, 2026

.github/workflows/ci.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,4 @@ jobs: @@
             uses: gradle/actions/setup-gradle@v5
           - name: Verify
-            run: ./gradlew detektAll lintDebug testDebugUnitTest :app:assembleDebug
+            run: ./gradlew detektAll lintDebug test testDebugUnitTest :app:assembleDebug

app/build.gradle.kts

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ android { @@
     dependencies {
         implementation(project(":core:data"))
+        implementation(project(":core:domain"))
         implementation(project(":core:ui"))
         implementation(project(":feature:forum"))
@@ Expand Down @@

app/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,11 @@ @@
             android:name=".RedfaceApplication"
             android:allowBackup="true"
             android:enableOnBackInvokedCallback="true"
+            android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:supportsRtl="true">
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:supportsRtl="true"
+            android:theme="@style/Theme.Redface2">
             <activity
                 android:name=".MainActivity"
                 android:exported="true"
@@ Expand Down @@

app/src/main/java/fr/forumhfr/redface2/MainActivity.kt

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,10 +9,15 @@ import androidx.compose.runtime.getValue @@
     import androidx.compose.runtime.mutableStateOf
     import androidx.compose.runtime.setValue
     import dagger.hilt.android.AndroidEntryPoint
+    import fr.forumhfr.redface2.core.domain.fixtures.TopicFixtureRepository
     import fr.forumhfr.redface2.navigation.RedfaceApp
+    import javax.inject.Inject
     @AndroidEntryPoint
     class MainActivity : ComponentActivity() {
+        @Inject
+        lateinit var topicFixtureRepository: TopicFixtureRepository
         private var latestIntent by mutableStateOf<Intent?>(null)
         override fun onCreate(savedInstanceState: Bundle?) {
@@ Expand All / @@ -21,7 +26,10 @@ class MainActivity : ComponentActivity() { @@
             latestIntent = intent
             setContent {
-                RedfaceApp(intent = latestIntent)
+                RedfaceApp(
+                    intent = latestIntent,
+                    topicFixtureRepository = topicFixtureRepository,
+                )
             }
         }
@@ Expand Down @@

app/src/main/java/fr/forumhfr/redface2/navigation/RedfaceNavigation.kt

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,8 @@ import androidx.navigation3.runtime.NavKey @@
     import androidx.navigation3.runtime.entryProvider
     import androidx.navigation3.runtime.rememberNavBackStack
     import androidx.navigation3.ui.NavDisplay
+    import fr.forumhfr.redface2.core.domain.fixtures.FixedTopicFixtures
+    import fr.forumhfr.redface2.core.domain.fixtures.TopicFixtureRepository
     import fr.forumhfr.redface2.FlagsScreen
     import fr.forumhfr.redface2.R
     import fr.forumhfr.redface2.core.ui.RedfaceTheme
@@ Expand All / @@ -29,6 +31,7 @@ import fr.forumhfr.redface2.feature.forum.CategoryScreen @@
     import fr.forumhfr.redface2.feature.forum.ForumScreen
     import fr.forumhfr.redface2.feature.messages.MessagesScreen
     import fr.forumhfr.redface2.feature.search.SearchScreen
+    import fr.forumhfr.redface2.feature.topic.TopicRequest
     import fr.forumhfr.redface2.feature.topic.TopicScreen
     import kotlinx.serialization.Serializable
@@ Expand Down Expand Up / @@ -91,7 +94,10 @@ private data class ParsedDeepLink( @@
     )
     @Composable
-    fun RedfaceApp(intent: Intent?) {
+    fun RedfaceApp(
+        intent: Intent?,
+        topicFixtureRepository: TopicFixtureRepository,
+    ) {
         RedfaceTheme {
             val flagsBackStack = rememberNavBackStack(FlagsListRoute)
             val forumBackStack = rememberNavBackStack(ForumRoute)
@@ Expand Down Expand Up / @@ -133,7 +139,10 @@ fun RedfaceApp(intent: Intent?) { @@
             ) {
                 Surface(modifier = Modifier.padding(horizontal = 8.dp)) {
                     val activeBackStack = backStacks.getValue(currentDestination)
-                    RedfaceNavHost(backStack = activeBackStack)
+                    RedfaceNavHost(
+                        backStack = activeBackStack,
+                        topicFixtureRepository = topicFixtureRepository,
+                    )
                 }
             }
         }
@@ Expand All / @@ -142,6 +151,7 @@ fun RedfaceApp(intent: Intent?) { @@
     @Composable
     private fun RedfaceNavHost(
         backStack: NavBackStack<NavKey>,
+        topicFixtureRepository: TopicFixtureRepository,
     ) {
         NavDisplay(
             backStack = backStack,
@@ Expand All / @@ -154,7 +164,13 @@ private fun RedfaceNavHost( @@
                 entry<FlagsListRoute> {
                     FlagsScreen(
                         onOpenUnreadTopic = {
-                            backStack.add(TopicRoute(cat = 23, post = 35395, page = 3))
+                            backStack.add(
+                                TopicRoute(
+                                    cat = FixedTopicFixtures.cat,
+                                    post = FixedTopicFixtures.post,
+                                    page = 1,
+                                ),
+                            )
                         },
                         onOpenTrackedCategory = {
                             backStack.add(CategoryRoute(cat = 23, subcat = 0))
@@ Expand All / @@ -167,21 +183,40 @@ private fun RedfaceNavHost( @@
                             backStack.add(CategoryRoute(cat = 23, subcat = 0))
                         },
                         onOpenTopic = {
-                            backStack.add(TopicRoute(cat = 23, post = 35395, page = 1))
+                            backStack.add(
+                                TopicRoute(
+                                    cat = FixedTopicFixtures.cat,
+                                    post = FixedTopicFixtures.post,
+                                    page = 1,
+                                ),
+                            )
                         },
                     )
                 }
                 entry<SearchRoute> {
                     SearchScreen(
                         onOpenResult = {
-                            backStack.add(TopicRoute(cat = 23, post = 35395, page = 5, scrollTo = 12345))
+                            backStack.add(
+                                TopicRoute(
+                                    cat = FixedTopicFixtures.cat,
+                                    post = FixedTopicFixtures.post,
+                                    page = 146,
+                                    scrollTo = 18085119,
+                                ),
+                            )
                         },
                     )
                 }
                 entry<MessagesRoute> {
                     MessagesScreen(
                         onOpenTopic = {
-                            backStack.add(TopicRoute(cat = 23, post = 35395, page = 2))
+                            backStack.add(
+                                TopicRoute(
+                                    cat = FixedTopicFixtures.cat,
+                                    post = FixedTopicFixtures.post,
+                                    page = 2,
+                                ),
+                            )
                         },
                     )
                 }
@@ Expand All / @@ -190,16 +225,25 @@ private fun RedfaceNavHost( @@
                         cat = route.cat,
                         subcat = route.subcat,
                         onOpenTopic = {
-                            backStack.add(TopicRoute(cat = route.cat, post = 35395, page = 1))
+                            backStack.add(
+                                TopicRoute(
+                                    cat = FixedTopicFixtures.cat,
+                                    post = FixedTopicFixtures.post,
+                                    page = 1,
+                                ),
+                            )
                         },
                     )
                 }
                 entry<TopicRoute> { route ->
                     TopicScreen(
-                        cat = route.cat,
-                        post = route.post,
-                        page = route.page,
-                        scrollTo = route.scrollTo,
+                        request = TopicRequest(
+                            cat = route.cat,
+                            post = route.post,
+                            page = route.page,
+                            scrollTo = route.scrollTo,
+                        ),
+                        topicFixtureRepository = topicFixtureRepository,
                         onReply = { postId ->
                             backStack.add(
                                 EditorRoute(
@@ Expand All / @@ -209,6 +253,17 @@ private fun RedfaceNavHost( @@
                                 ),
                             )
                         },
+                        onOpenPage = { targetPage ->
+                            backStack.removeAt(backStack.lastIndex)
+                            backStack.add(
+                                TopicRoute(
+                                    cat = route.cat,
+                                    post = route.post,
+                                    page = targetPage,
+                                    scrollTo = null,
+                                ),
+                            )
+                        },
                     )
                 }
                 entry<EditorRoute> { route ->
@@ Expand Down @@

app/src/main/res/drawable/ic_launcher_background.xml

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    <?xml version="1.0" encoding="utf-8"?>
+    <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <solid android:color="#FFFFFF" />
+    </shape>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    <?xml version="1.0" encoding="utf-8"?>
+    <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+        <background android:drawable="@drawable/ic_launcher_background" />
+        <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    <?xml version="1.0" encoding="utf-8"?>
+    <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+        <background android:drawable="@drawable/ic_launcher_background" />
+        <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    </adaptive-icon>

app/src/main/res/mipmap-hdpi/ic_launcher.png

Sorry, something went wrong. Reload?