Fix opening Settings

mvvm-android · Mar 25, 2021 · 0bbe94b · 0bbe94b
1 parent c7cfe70
commit 0bbe94b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/app/src/main/java/app/tivi/home/Home.kt b/app/src/main/java/app/tivi/home/Home.kt
@@ -60,7 +60,9 @@ import app.tivi.showdetails.details.ShowDetails
 import com.google.accompanist.insets.navigationBarsPadding
 
 @Composable
-internal fun Home() {
+internal fun Home(
+    onOpenSettings: () -> Unit,
+) {
     Column {
         var currentSelectedItem by remember { mutableStateOf(Screen.Discover) }
         val navController = rememberNavController()
@@ -104,9 +106,8 @@ internal fun Home() {
                 composable(Screen.Account.route) {
                     // This should really be a dialog, but we're waiting on:
                     // https://issuetracker.google.com/179608120
-                    AccountUi(navController)
+                    AccountUi(navController, onOpenSettings)
                 }
-                // TODO: Settings
             }
         }
 

diff --git a/app/src/main/java/app/tivi/home/MainActivity.kt b/app/src/main/java/app/tivi/home/MainActivity.kt
@@ -16,6 +16,7 @@
 
 package app.tivi.home
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.CompositionLocalProvider
@@ -26,6 +27,7 @@ import app.tivi.common.compose.LocalTiviDateFormatter
 import app.tivi.common.compose.LocalTiviTextCreator
 import app.tivi.common.compose.shouldUseDarkColors
 import app.tivi.common.compose.theme.TiviTheme
+import app.tivi.settings.SettingsActivity
 import app.tivi.settings.TiviPreferences
 import app.tivi.util.TiviDateFormatter
 import app.tivi.util.TiviTextCreator
@@ -55,10 +57,14 @@ class MainActivity : TiviActivity() {
             ) {
                 ProvideWindowInsets(consumeWindowInsets = false) {
                     TiviTheme(useDarkColors = preferences.shouldUseDarkColors()) {
-                        Home()
+                        Home(onOpenSettings = ::openSettings)
                     }
                 }
             }
         }
     }
+
+    private fun openSettings() {
+        startActivity(Intent(this, SettingsActivity::class.java))
+    }
 }
diff --git a/ui-account/src/main/java/app/tivi/account/AccountUi.kt b/ui-account/src/main/java/app/tivi/account/AccountUi.kt
@@ -65,17 +65,22 @@ import org.threeten.bp.OffsetDateTime
 import org.threeten.bp.ZoneOffset
 
 @Composable
-fun AccountUi(navController: NavController) {
+fun AccountUi(
+    navController: NavController,
+    onOpenSettings: () -> Unit,
+) {
     AccountUi(
         navController = navController,
-        viewModel = hiltNavGraphViewModel()
+        viewModel = hiltNavGraphViewModel(),
+        onOpenSettings = onOpenSettings,
     )
 }
 
 @Composable
 internal fun AccountUi(
     navController: NavController,
-    viewModel: AccountUiViewModel = hiltNavGraphViewModel(),
+    viewModel: AccountUiViewModel,
+    onOpenSettings: () -> Unit,
 ) {
     val viewState by viewModel.state.collectAsState()
 
@@ -88,10 +93,7 @@ internal fun AccountUi(
     AccountUi(viewState) { action ->
         when (action) {
             is AccountUiAction.Close -> navController.popBackStack()
-            is AccountUiAction.OpenSettings -> {
-                // TODO: sort out Settings navigation (Activity)
-                // view.findNavController().navigateToNavDestination(R.id.navigation_settings)
-            }
+            is AccountUiAction.OpenSettings -> onOpenSettings()
             is AccountUiAction.Login -> loginLauncher.launch(Unit)
             is AccountUiAction.Logout -> viewModel.logout()
         }