Add ViewModel and basic setup for FlakerACtivity

RotBolt · Jul 10, 2023 · bd57c71 · bd57c71
1 parent c9b47cd
commit bd57c71
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 5 deletions.
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/flaker-android-retrofit/build.gradle.kts b/flaker-android-retrofit/build.gradle.kts
@@ -43,6 +43,7 @@ dependencies {
 
     implementation(project(":flaker-android-ui"))
     implementation(project(":flaker-retrofit-core"))
+    implementation(project(":flaker-domain"))
 
     implementation(libs.core.ktx)
     implementation(libs.lifecycle.runtime.ktx)

diff --git a/flaker-android-retrofit/src/main/AndroidManifest.xml b/flaker-android-retrofit/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:supportsRtl="true"
         tools:targetApi="33">
         <activity
-            android:name="io.rotlabs.flakerandroidretrofit.MainActivity"
+            android:name="io.rotlabs.flakerandroidretrofit.FlakerActivity"
             android:exported="true"
             android:icon="@mipmap/ic_flaker"
             android:label="@string/companion_app_name"

diff --git a/...abs/flakerandroidretrofit/MainActivity.kt → ...s/flakerandroidretrofit/FlakerActivity.kt b/...abs/flakerandroidretrofit/MainActivity.kt → ...s/flakerandroidretrofit/FlakerActivity.kt
@@ -3,21 +3,35 @@ package io.rotlabs.flakerandroidretrofit
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.viewModels
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import io.rotlabs.flakerandroidapp.ui.listitem.NetworkRequestItemPreview
 import io.rotlabs.flakerandroidapp.ui.theme.FlakerAndroidTheme
 
-class MainActivity : ComponentActivity() {
+class FlakerActivity : ComponentActivity() {
+
+    private val viewModel: FlakerViewModel by viewModels { FlakerViewModel.Factory }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         setContent {
+            val state by viewModel.viewStateFlow.collectAsState()
+
             FlakerAndroidTheme {
                 // A surface container using the 'background' color from the theme
                 Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
-                    NetworkRequestItemPreview()
+                    LazyColumn {
+                        items(state.networkRequests, key = null) {
+                            // Render Items
+                        }
+                    }
                 }
             }
         }

diff --git a/flaker-android-retrofit/src/main/java/io/rotlabs/flakerandroidretrofit/FlakerViewModel.kt b/flaker-android-retrofit/src/main/java/io/rotlabs/flakerandroidretrofit/FlakerViewModel.kt
@@ -0,0 +1,42 @@
+package io.rotlabs.flakerandroidretrofit
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
+import androidx.lifecycle.createSavedStateHandle
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
+import io.rotlabs.flakedomain.networkrequest.NetworkRequest
+import io.rotlabs.flakerretrofit.data.FlakerRepo
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class FlakerViewModel(
+    private val flakerRepo: FlakerRepo,
+    private val savedStateHandle: SavedStateHandle
+) : ViewModel() {
+
+    private val _viewStateFlow = MutableStateFlow<ViewState>(ViewState())
+    val viewStateFlow = _viewStateFlow.asStateFlow()
+
+    data class ViewState(
+        val isFlakerOn: Boolean = false,
+        val networkRequests: List<NetworkRequest> = emptyList()
+    )
+
+    suspend fun loadAllRequests() {
+        val list = flakerRepo.allRequests()
+        _viewStateFlow.emit(_viewStateFlow.value.copy(networkRequests = list))
+    }
+
+    companion object {
+        val Factory: ViewModelProvider.Factory = viewModelFactory {
+            initializer {
+                val savedStateHandle = createSavedStateHandle()
+                val flakerRepo = FlakerRepo(checkNotNull(this[APPLICATION_KEY]))
+                FlakerViewModel(flakerRepo, savedStateHandle)
+            }
+        }
+    }
+}
diff --git a/...er-android-ui/src/main/java/io/rotlabs/flakerandroidapp/ui/listitem/NetworkRequestItem.kt b/...er-android-ui/src/main/java/io/rotlabs/flakerandroidapp/ui/listitem/NetworkRequestItem.kt
@@ -131,9 +131,10 @@ fun getStatusCodeColor(statusCode: Long): Color {
     }
 }
 
+@Suppress("UnusedPrivateMember")
 @Composable
 @Preview
-fun NetworkRequestItemPreview() {
+private fun NetworkRequestItemPreview() {
     FlakerAndroidTheme {
         Column {
             repeat(4) {