Refactor: state-aware ViewModel and app flow

app/build.gradle.kts

@@ -69,6 +69,7 @@ dependencies {
     implementation(libs.compose.material.icons.extended)
     implementation(libs.androidx.work.runtime.ktx)
     implementation(libs.snakeyaml)
+    implementation(libs.google.accompanist.permissions)
 
     // libadb-android and its dependency
     implementation(libs.libadb.android)

app/src/main/java/org/osservatorionessuno/bugbane/MainActivity.kt

@@ -7,7 +7,6 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.viewModels
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.pager.HorizontalPager
@@ -16,11 +15,10 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.launch
 import io.github.muntashirakon.adb.PRNGFixes
-import androidx.lifecycle.lifecycleScope
 import androidx.work.*
-import kotlinx.coroutines.Dispatchers
 import org.osservatorionessuno.libmvt.common.IndicatorsUpdates
 import org.osservatorionessuno.bugbane.workers.IndicatorsUpdateWorker
 import java.util.concurrent.TimeUnit
@@ -30,64 +28,53 @@ import org.osservatorionessuno.bugbane.components.NavigationTabs
 import org.osservatorionessuno.bugbane.screens.ScanScreen
 import org.osservatorionessuno.bugbane.screens.AcquisitionsScreen
 import org.osservatorionessuno.bugbane.ui.theme.Theme
+import org.osservatorionessuno.bugbane.utils.AppState
+import org.osservatorionessuno.bugbane.utils.ConfigurationViewModel
 import org.osservatorionessuno.bugbane.utils.SlideshowManager
-import org.osservatorionessuno.bugbane.utils.AdbViewModel
-import org.osservatorionessuno.bugbane.utils.AdbPairingService
-import org.osservatorionessuno.bugbane.utils.ConfigurationManager
+import org.osservatorionessuno.bugbane.utils.ViewModelFactory
 
+private const val TAG = "MainActivity"
 class MainActivity : ComponentActivity() {
-    private val viewModel: AdbViewModel by viewModels()
-    private var setLacksPermissionsCallback: ((Boolean) -> Unit)? = null
+
+    private val configViewModel : ConfigurationViewModel by lazy {
+        ViewModelFactory.get(application)
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         PRNGFixes.apply()
 
-        // Observers
-        viewModel.watchConnectAdb().observe(this) { isConnected ->
-            if (!isConnected) {
-                setLacksPermissionsCallback?.invoke(true)
-            }
-        }
-
-        viewModel.watchAskPairAdb().observe(this) { resetPairing ->
-            if (resetPairing) {
-                setLacksPermissionsCallback?.invoke(true)
-            }
-        }
-
-        viewModel.watchCommandOutput().observe(this) { output ->
-            // TODO: blibla
-            Toast.makeText(this@MainActivity, output.toString(), Toast.LENGTH_SHORT).show()
-            Log.d("COMMAND OUTPUT", output.toString())
-        }
-
-        // Try auto-connecting
-        viewModel.autoConnect()
-
         // Fetch indicators on first launch and schedule daily background updates
         setupIndicatorsUpdates()
 
-        if (!ConfigurationManager.isNotificationPermissionGranted(this) || !ConfigurationManager.isWirelessDebuggingEnabled(
-                this
-            )
-        ) {
-            setLacksPermissionsCallback?.invoke(true)
-        }
-
-        if (!SlideshowManager.hasSeenHomepage(this)) {
-            // On first start, run the SlideshowActivity manually
-            SlideshowActivity.start(this)
-        }
-
         enableEdgeToEdge()
         setContent {
             Theme {
-                MainContent { callback ->
-                    setLacksPermissionsCallback = callback
+                val appState = configViewModel.configurationState.collectAsStateWithLifecycle()
+                val appProgress: State<SlideshowManager.AppProgress> = configViewModel.appManager.appProgress.collectAsStateWithLifecycle()
+
+                if (appProgress.value.hasCompletedOnboarding) {
+                    MainContent()
+                } else {
+                    // Avoid flicker before the slideshow while compose is calculating the appstate
+                    Box(modifier = Modifier.fillMaxSize())
+
+                    LaunchedEffect(appState.value) {
+                        // Permissions slideshow
+                        val startPage = (appState.value.step)
+                        val intent = Intent(this@MainActivity, SlideshowActivity::class.java)
+                            .putExtra("startPage", startPage)
+                        startActivity(intent)
+                    }
                 }
             }
         }
+
+        configViewModel.adbManager.watchCommandOutput().observe(this) { output ->
+            // TODO
+            Toast.makeText(applicationContext, output, Toast.LENGTH_SHORT).show()
+            Log.d(TAG, "Command output: $output")
+        }
     }
 
     private fun setupIndicatorsUpdates() {
@@ -124,34 +111,20 @@ class MainActivity : ComponentActivity() {
         Log.i("MainActivity", "Scheduled daily indicator update worker")
     }
 }
-
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
-fun MainContent(onSetLacksPermissionsCallback: ((Boolean) -> Unit) -> Unit) {
+fun MainContent() {
     val context = androidx.compose.ui.platform.LocalContext.current
     val configuration = LocalConfiguration.current
     val pagerState = rememberPagerState(pageCount = { 2 })
     val coroutineScope = rememberCoroutineScope()
-    var lacksPermissions by remember { mutableStateOf(false) }
-
+
     // Detect if we're in landscape mode
     val isLandscape = configuration.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
 
     // Sync tab selection with pager
     val selectedTabIndex by remember { derivedStateOf { pagerState.currentPage } }
 
-    // Function to set lacks permissions state
-    fun setLacksPermissions(lacks: Boolean) {
-        lacksPermissions = lacks
-    }
-
-    // Provide the callback to the parent
-    LaunchedEffect(Unit) {
-        onSetLacksPermissionsCallback { lacks ->
-            setLacksPermissions(lacks)
-        }
-    }
-
     Scaffold(
         topBar = {
             if (isLandscape) {
@@ -200,13 +173,11 @@ fun MainContent(onSetLacksPermissionsCallback: ((Boolean) -> Unit) -> Unit) {
                 modifier = Modifier.fillMaxSize()
             ) { pageIndex ->
                 when (pageIndex) {
-                    0 -> ScanScreen(
-                        lacksPermissions = lacksPermissions,
-                        onLacksPermissionsChange = { setLacksPermissions(it) }
-                    )
+                    0 -> ScanScreen()
                     1 -> AcquisitionsScreen()
                 }
             }
         }
     }
-}
+}
+