refactor all! - done users list (#53)

* refactor all!

* done users list

* done users list

* done users list

* done users list

* add keystore

Author: hoc081098

.idea/deploymentTargetDropDown.xml

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
   androidApplication
   kotlinAndroid
@@ -23,6 +25,28 @@ android {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
+  signingConfigs {
+    create("release") {
+      val keystoreProperties = Properties().apply {
+        load(
+          rootProject.file("keystore/key.properties")
+            .apply { check(exists()) }
+            .reader()
+        )
+      }
+
+      keyAlias = keystoreProperties["keyAlias"] as String
+      keyPassword = keystoreProperties["keyPassword"] as String
+      storeFile = rootProject.file(keystoreProperties["storeFile"] as String)
+        .apply { check(exists()) }
+      storePassword = keystoreProperties["storePassword"] as String
+
+      // Optional, specify signing versions used
+      enableV1Signing = true
+      enableV2Signing = true
+    }
+  }
+
   buildTypes {
     getByName("release") {
       isMinifyEnabled = true
@@ -31,8 +55,18 @@ android {
         getDefaultProguardFile("proguard-android-optimize.txt"),
         "proguard-rules.pro"
       )
+
+      signingConfig = signingConfigs.getByName("release")
+      isDebuggable = false
     }
   }
+
+  buildFeatures {
+    compose = true
+  }
+  composeOptions {
+    kotlinCompilerExtensionVersion = deps.compose.androidxComposeCompiler
+  }
 }
 
 dependencies {
@@ -45,6 +79,10 @@ dependencies {
     )
   )
 
+  implementation(deps.androidx.appCompat)
+  implementationCompose()
+
+  implementation(uiTheme)
   implementation(domain)
   implementation(data)
   implementation(core)

.idea/gradle.xml

@@ -13,6 +13,16 @@
     android:supportsRtl="true"
     android:theme="@style/Theme.AppTheme.NoActionBar">
 
+    <activity
+      android:name=".MainActivity"
+      android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+
   </application>
 
 </manifest>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,58 @@
+package com.hoc.flowmvi
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
+import androidx.navigation.NavDestination
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import com.hoc.flowmvi.Screen.UsersList
+import com.hoc.flowmvi.ui.main.navigation.usersListNavigationRoute
+
+@Composable
+fun rememberJetpackComposeMVICoroutinesFlowApp(
+  navController: NavHostController = rememberNavController()
+): JetpackComposeMVICoroutinesFlowAppState = remember(navController) {
+  JetpackComposeMVICoroutinesFlowAppState(navController)
+}
+
+enum class Screen {
+  UsersList,
+  SearchUsers,
+  AddNewUser;
+
+  val route: String
+    get() = when (this) {
+      UsersList -> usersListNavigationRoute
+      SearchUsers -> TODO()
+      AddNewUser -> TODO()
+    }
+
+  companion object {
+    /**
+     * Use this instead of [values()] for more performant.
+     * See [KT-48872](https://youtrack.jetbrains.com/issue/KT-48872)
+     */
+    val VALUES = values().asList()
+  }
+}
+
+@Stable
+class JetpackComposeMVICoroutinesFlowAppState(
+  val navController: NavHostController,
+) {
+  private val currentDestination: NavDestination?
+    @Composable get() = navController
+      .currentBackStackEntryAsState().value?.destination
+
+  val currentScreen: Screen?
+    @Composable get() = when (currentDestination?.route) {
+      usersListNavigationRoute -> UsersList
+      else -> TODO()
+    }
+
+  fun onNavigateUp() {
+    navController.navigateUp()
+  }
+}

.idea/misc.xml

@@ -0,0 +1,101 @@
+package com.hoc.flowmvi
+
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.navigation.compose.NavHost
+import com.hoc.flowmvi.core_ui.AppBarState
+import com.hoc.flowmvi.core_ui.ProvideSnackbarHostState
+import com.hoc.flowmvi.ui.main.navigation.usersListScreen
+import com.hoc.flowmvi.ui.theme.AppTheme
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : AppCompatActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    setContent {
+      AppTheme {
+        Surface(
+          color = MaterialTheme.colorScheme.background,
+          modifier = Modifier.fillMaxSize(),
+        ) {
+          JetpackComposeMVICoroutinesFlowApp()
+        }
+      }
+    }
+  }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun JetpackComposeMVICoroutinesFlowAppBar(
+  title: String?,
+  navigationIcon: @Composable () -> Unit,
+  actions: @Composable RowScope.() -> Unit,
+  modifier: Modifier = Modifier
+) {
+  CenterAlignedTopAppBar(
+    title = {
+      if (title != null) {
+        Text(text = title)
+      }
+    },
+    modifier = modifier,
+    navigationIcon = navigationIcon,
+    actions = actions
+  )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun JetpackComposeMVICoroutinesFlowApp(
+  startScreen: Screen = Screen.UsersList,
+  modifier: Modifier = Modifier,
+  appState: JetpackComposeMVICoroutinesFlowAppState = rememberJetpackComposeMVICoroutinesFlowApp(),
+) {
+  val navController = appState.navController
+  val snackbarHostState = remember { SnackbarHostState() }
+  val (appBarState, setAppBarState) = remember { mutableStateOf<AppBarState?>(null) }
+
+  Scaffold(
+    snackbarHost = { SnackbarHost(snackbarHostState) },
+    topBar = {
+      appBarState?.let {
+        JetpackComposeMVICoroutinesFlowAppBar(
+          title = it.title,
+          actions = it.actions,
+          navigationIcon = it.navigationIcon,
+        )
+      }
+    }
+  ) { innerPadding ->
+    ProvideSnackbarHostState(snackbarHostState = snackbarHostState) {
+      NavHost(
+        navController = navController,
+        modifier = modifier.padding(innerPadding),
+        startDestination = startScreen.route
+      ) {
+        usersListScreen(
+          configAppBar = setAppBarState,
+        )
+      }
+    }
+  }
+}

.idea/vcs.xml

@@ -1,7 +1,6 @@
 package com.hoc.flowmvi.core
 
 import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
-import com.hoc.flowmvi.core_ui.navigator.Navigator
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,8 +13,4 @@ internal abstract class CoreModule {
   @Binds
   @Singleton
   abstract fun coroutineDispatchers(impl: DefaultCoroutineDispatchers): CoroutineDispatchers
-
-  @Binds
-  @Singleton
-  abstract fun navigator(impl: NavigatorImpl): Navigator
 }