Migrated the whole app to Jetpack compose

app/build.gradle.kts

@@ -202,6 +202,8 @@ dependencies {
     implementation(composeBom)
     androidTestImplementation(composeBom)
     implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material:material:1.7.6")
+    implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.compose.ui:ui-tooling-preview")
     debugImplementation("androidx.compose.ui:ui-tooling")
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
@@ -210,6 +212,9 @@ dependencies {
     // Activity Compose
     implementation("androidx.activity:activity-compose")
 
+    // Navigation Compose
+    implementation("androidx.navigation:navigation-compose:$2.8.4")
+
     // Testing libraries
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version")
     testImplementation("io.mockk:mockk:$mockkVersion")

app/src/main/AndroidManifest.xml

@@ -11,7 +11,6 @@
         android:maxSdkVersion="28" />
 
     <application
-        android:name=".App"
         android:allowBackup="true"
         android:appCategory="productivity"
         android:icon="@mipmap/ic_launcher"
@@ -20,18 +19,17 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.Base">
-        <activity android:name=".activities.MainActivity"
+
+        <!-- Main Activity -->
+        <activity
+            android:name=".activities.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".fragments.MainFragment"
-            android:exported="false" />
-
         <service
             android:name=".services.EnglishKeyboardIME"
             android:exported="true"
@@ -136,21 +134,6 @@
                 android:name="android.view.im"
                 android:resource="@xml/method_swedish" />
         </service>
-
-        <activity
-            android:name=".fragments.SettingsFragment"
-            android:exported="true"
-            android:label="@string/app.settings.title"
-            android:parentActivityName=".fragments.MainFragment" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
     </application>
 
 </manifest>

app/src/main/java/be/scri/App.kt

@@ -19,19 +19,224 @@
 
 package be.scri
 
-import android.app.Application
-import androidx.appcompat.app.AppCompatDelegate
-import be.scri.extensions.config
-
-class App : Application() {
-    override fun onCreate() {
-        AppCompatDelegate.setDefaultNightMode(
-            if (config.darkTheme) {
-                AppCompatDelegate.MODE_NIGHT_YES
-            } else {
-                AppCompatDelegate.MODE_NIGHT_NO
+import android.annotation.SuppressLint
+import android.content.Context
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.PagerState
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
+import be.scri.navigation.Screen
+import be.scri.ui.common.appcomponents.HintDialog
+import be.scri.ui.common.bottombar.ScribeBottomBar
+import be.scri.ui.screens.InstallationScreen
+import be.scri.ui.screens.LanguageSettingsScreen
+import be.scri.ui.screens.PrivacyPolicyScreen
+import be.scri.ui.screens.ThirdPartyScreen
+import be.scri.ui.screens.WikimediaScreen
+import be.scri.ui.screens.about.AboutScreen
+import be.scri.ui.screens.settings.SettingsScreen
+import be.scri.ui.theme.ScribeTheme
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+@SuppressLint("ComposeModifierMissing")
+@Composable
+fun ScribeApp(
+    pagerState: PagerState,
+    navController: NavHostController,
+    onDarkModeChange: (Boolean) -> Unit,
+    resetHints: () -> Unit,
+    @SuppressLint("ComposeUnstableCollections") isHintChanged: Map<Int, Boolean>,
+    onDismiss: (Int) -> Unit,
+    context: Context,
+    isDarkTheme: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    val coroutineScope = rememberCoroutineScope()
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+
+    ScribeTheme(
+        useDarkTheme = isDarkTheme,
+    ) {
+        Scaffold(
+            bottomBar = {
+                ScribeBottomBar(
+                    onItemClick = {
+                        coroutineScope.launch {
+                            if (navBackStackEntry?.destination?.route != "pager") {
+                                navController.popBackStack()
+                            }
+                            pagerState.animateScrollToPage(it)
+                        }
+                    },
+                    pagerState = pagerState,
+                    modifier =
+                    Modifier,
+                )
             },
-        )
-        super.onCreate()
+            modifier = modifier.fillMaxSize(),
+        ) { innerPadding ->
+            NavHost(
+                navController = navController,
+                startDestination = "pager",
+            ) {
+                composable("pager") {
+                    HorizontalPager(
+                        state = pagerState,
+                        beyondViewportPageCount = 3,
+                        modifier = Modifier.padding(innerPadding),
+                    ) { page ->
+                        when (page) {
+                            0 -> {
+                                Box(
+                                    modifier = Modifier.fillMaxSize(),
+                                ) {
+                                    InstallationScreen(
+                                        isDark = isDarkTheme,
+                                        context = context,
+                                    )
+                                    HintDialog(
+                                        pagerState = pagerState,
+                                        currentPageIndex = 0,
+                                        sharedPrefsKey = "hint_shown_main",
+                                        hintMessageResId = R.string.app_installation_app_hint,
+                                        isHintChanged = isHintChanged[0] == true,
+                                        onDismiss = { onDismiss(it) },
+                                        modifier =
+                                            Modifier
+                                                .fillMaxWidth()
+                                                .padding(8.dp),
+                                    )
+                                }
+                                HandleBackPress(pagerState, coroutineScope)
+                            }
+                            1 -> {
+                                Box(
+                                    modifier = Modifier.fillMaxSize(),
+                                ) {
+                                    SettingsScreen(
+                                        onDarkModeChange = { isDarkMode ->
+                                            onDarkModeChange(isDarkMode)
+                                        },
+                                        onLanguageSettingsClick = { language ->
+                                            navController.navigate(
+                                                "${Screen.LanguageSettings.route}/$language",
+                                            )
+                                        },
+                                        context = context,
+                                    )
+                                    HintDialog(
+                                        pagerState = pagerState,
+                                        currentPageIndex = 1,
+                                        sharedPrefsKey = "hint_shown_settings",
+                                        hintMessageResId = R.string.app_settings_app_hint,
+                                        isHintChanged = isHintChanged[1] == true,
+                                        onDismiss = { onDismiss(it) },
+                                        modifier = Modifier.padding(8.dp),
+                                    )
+                                }
+                                HandleBackPress(pagerState, coroutineScope)
+                            }
+                            2 -> {
+                                Box(
+                                    modifier = Modifier.fillMaxSize(),
+                                ) {
+                                    AboutScreen(
+                                        onPrivacyPolicyClick = {
+                                            navController.navigate(Screen.PrivacyPolicy.route)
+                                        },
+                                        onThirdPartyLicensesClick = {
+                                            navController.navigate(Screen.ThirdParty.route)
+                                        },
+                                        onWikiClick = {
+                                            navController.navigate(Screen.WikimediaScribe.route)
+                                        },
+                                        resetHints = { resetHints() },
+                                        context = context,
+                                    )
+                                    HintDialog(
+                                        pagerState = pagerState,
+                                        currentPageIndex = 2,
+                                        sharedPrefsKey = "hint_shown_about",
+                                        hintMessageResId = R.string.app_about_app_hint,
+                                        isHintChanged = isHintChanged[2] == true,
+                                        onDismiss = { onDismiss(it) },
+                                        modifier = Modifier.padding(8.dp),
+                                    )
+                                }
+                                HandleBackPress(pagerState, coroutineScope)
+                            }
+                        }
+                    }
+                }
+
+                composable(
+                    route = "${Screen.LanguageSettings.route}/{languageName}",
+                ) {
+                    val language = it.arguments?.getString("languageName")
+                    if (language != null) {
+                        LanguageSettingsScreen(
+                            language = language,
+                            onBackNavigation = {
+                                navController.popBackStack()
+                            },
+                            modifier = Modifier.padding(innerPadding),
+                        )
+                    }
+                }
+
+                composable(Screen.WikimediaScribe.route) {
+                    WikimediaScreen(
+                        onBackNavigation = {
+                            navController.popBackStack()
+                        },
+                        modifier = Modifier.padding(innerPadding),
+                    )
+                }
+
+                composable(Screen.PrivacyPolicy.route) {
+                    PrivacyPolicyScreen(
+                        onBackNavigation = {
+                            navController.popBackStack()
+                        },
+                        modifier = Modifier.padding(innerPadding),
+                    )
+                }
+
+                composable(Screen.ThirdParty.route) {
+                    ThirdPartyScreen(
+                        onBackNavigation = {
+                            navController.popBackStack()
+                        },
+                        modifier = Modifier.padding(innerPadding),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun HandleBackPress(
+    pagerState: PagerState,
+    coroutineScope: CoroutineScope,
+) {
+    BackHandler(enabled = pagerState.currentPage > 0) {
+        coroutineScope.launch {
+            pagerState.animateScrollToPage(pagerState.currentPage - 1)
+        }
     }
 }