Merge pull request #18 from pseudoankit/refactor

Refactor

Author: ankitk77

app/build.gradle.kts

@@ -41,7 +41,6 @@ dependencies {
         implementation(project(Core))
         implementation(project(CoreUi))
         implementation(project(DataBaseManager))
-        implementation(project(Navigation))
         implementation(project(AgendaManager))
         implementation(project(AlarmManager))
         implementation(project(NotificationManager))
@@ -51,14 +50,20 @@ dependencies {
     }
 
     with(Modules.Feature) {
+        implementation(project(Authentication))
+        implementation(project(Home))
+        implementation(project(Event))
+        implementation(project(Reminder))
+        implementation(project(Task))
         implementation(project(DeveloperTools))
     }
 
-    implementation("io.insert-koin:koin-androidx-compose:3.2.1")
-
     with(Dependencies.Compose) {
         implementation(ComposeDestinations)
+        implementation(OrbitMvi)
     }
-    implementation("androidx.core:core-splashscreen:1.0.0-beta02")
+
+    implementation(Dependencies.Koin.Compose)
+    implementation(Dependencies.AndroidX.SplashScreen)
     implementation(Dependencies.ProfilerInstaller)
 }

app/src/main/AndroidManifest.xml

@@ -15,18 +15,17 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Tasky"
+        android:theme="@style/Theme.Launcher"
         android:usesCleartextTraffic="false"
         tools:targetApi="31">
         <profileable
             android:shell="true"
             tools:targetApi="29" />
 
         <activity
-            android:name=".MainActivity"
+            android:name=".launcher.MainActivity"
             android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/Theme.Launcher">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/pseudoankit/droid/tasky/di/AppModule.kt

@@ -6,8 +6,8 @@ import pseudoankit.droid.core.di.CoreModule
 import pseudoankit.droid.dbmanager.di.DataBaseModule
 import pseudoankit.droid.di.PreferencesModule
 import pseudoankit.droid.di.WidgetsNShortcutsModule
-import pseudoankit.droid.navigation.di.NavigationModule
 import pseudoankit.droid.notification_manager.di.NotifierModule
+import pseudoankit.droid.tasky.navigation.di.NavigationModule
 
 internal val AppModule = listOf(
     DataBaseModule(),

app/src/main/java/pseudoankit/droid/tasky/MainActivity.kt renamed to app/src/main/java/pseudoankit/droid/tasky/launcher/MainActivity.kt

@@ -1,8 +1,7 @@
-package pseudoankit.droid.tasky
+package pseudoankit.droid.tasky.launcher
 
 import android.Manifest
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
 import androidx.activity.ComponentActivity
@@ -12,29 +11,24 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.navigation.NavHostController
-import com.example.permission_manager.taskyStatus
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.google.accompanist.permissions.rememberPermissionState
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.animations.rememberAnimatedNavHostEngine
 import com.ramcosta.composedestinations.navigation.dependency
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.runBlocking
-import org.koin.android.ext.android.inject
+import kotlinx.coroutines.flow.collectLatest
+import org.koin.androidx.viewmodel.ext.android.getViewModel
+import org.orbitmvi.orbit.compose.collectAsState
 import pseudoankit.droid.core.deeplink.TaskyDeeplink
-import pseudoankit.droid.core.logger.logInfo
 import pseudoankit.droid.coreui.deeplink.navigateViaDeepLink
 import pseudoankit.droid.coreui.util.extension.clearStack
-import pseudoankit.droid.navigation.navgraph.mainNavGraph
-import pseudoankit.droid.navigation.navigator.CoreFeatureNavigator
-import pseudoankit.droid.preferencesmanager.PreferenceRepository
+import pseudoankit.droid.tasky.navigation.navgraph.mainNavGraph
+import pseudoankit.droid.tasky.navigation.navigator.CoreFeatureNavigator
 import pseudoankit.droid.tasky.util.hide
 import pseudoankit.droid.tasky.util.show
 import pseudoankit.droid.unify.token.UnifyColors
@@ -44,14 +38,14 @@ import pseudoankit.droid.unify.utils.enableTestTagAsResourceId
 @OptIn(ExperimentalAnimationApi::class, ExperimentalMaterialNavigationApi::class)
 internal class MainActivity : ComponentActivity() {
 
-    private val preferenceRepository: PreferenceRepository by inject()
     private var navController: NavHostController? = null
     private val splashScreen: SplashScreen by lazy { installSplashScreen() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         splashScreen.show()
         super.onCreate(savedInstanceState)
 
+        MainActivityModule.loadModules()
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
         setContent {
@@ -60,26 +54,30 @@ internal class MainActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     color = UnifyColors.White
                 ) {
-                    InitializeNavigation()
-                    HandlePermissions()
-                    ObserveLoginStatus()
+                    val viewModel = getViewModel<MainActivityViewModel>()
+                    val state = viewModel.collectAsState().value
+
+                    InitializeNavigation(
+                        isUserLoggedIn = state.isUserLoggedIn
+                    )
+                    viewModel.HandleSideEffect()
                     HideSplashScreenAfterNavigation()
                 }
             }
         }
     }
 
     @Composable
-    private fun InitializeNavigation() {
+    private fun InitializeNavigation(
+        isUserLoggedIn: Boolean
+    ) {
         val context = LocalContext.current
 
         val engine = rememberAnimatedNavHostEngine()
         navController = engine.rememberNavController()
 
-        val isUserLoggedIn = runBlocking { preferenceRepository.isLoggedIn().firstOrNull() }
-
         DestinationsNavHost(
-            navGraph = mainNavGraph(isUserLoggedIn = isUserLoggedIn ?: true),
+            navGraph = mainNavGraph(isUserLoggedIn = isUserLoggedIn),
             navController = navController!!,
             engine = engine,
             dependenciesContainerBuilder = {
@@ -89,31 +87,6 @@ internal class MainActivity : ComponentActivity() {
         )
     }
 
-    @Composable
-    private fun ObserveLoginStatus() {
-        val isLoggedIn by preferenceRepository.isLoggedIn().collectAsState(initial = true)
-
-        if (isLoggedIn.not()) {
-            navController?.apply {
-                clearStack()
-                navigateViaDeepLink(TaskyDeeplink.login)
-            }
-        }
-    }
-
-    @Composable
-    private fun HandlePermissions() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
-
-        val launcher = rememberPermissionState(permission = Manifest.permission.POST_NOTIFICATIONS)
-
-        logInfo("Notification Permission Status", launcher.taskyStatus.name)
-
-        LaunchedEffect(key1 = Unit) {
-            launcher.launchPermissionRequest()
-        }
-    }
-
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         navController?.navigateViaDeepLink(intent?.data.toString())
@@ -127,4 +100,26 @@ internal class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    @Composable
+    private fun MainActivityViewModel.HandleSideEffect() {
+        val launcher = rememberPermissionState(permission = Manifest.permission.POST_NOTIFICATIONS)
+
+        LaunchedEffect(Unit) {
+            container.sideEffectFlow.collectLatest { effect ->
+                when (effect) {
+                    MainActivityViewModel.SideEffect.ClearBackStackAndNavigateToLogin -> {
+                        navController?.apply {
+                            clearStack()
+                            navigateViaDeepLink(TaskyDeeplink.login)
+                        }
+                    }
+
+                    MainActivityViewModel.SideEffect.LaunchNotificationPermissionRequest -> {
+                        launcher.launchPermissionRequest()
+                    }
+                }
+            }
+        }
+    }
 }

app/src/main/java/pseudoankit/droid/tasky/launcher/MainActivityModule.kt

@@ -0,0 +1,14 @@
+package pseudoankit.droid.tasky.launcher
+
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.Module
+import org.koin.dsl.module
+import pseudoankit.droid.core.koin.BaseKoinModule
+
+object MainActivityModule : BaseKoinModule() {
+
+    override val modules: Module
+        get() = module {
+            viewModel { MainActivityViewModel(get()) }
+        }
+}

app/src/main/java/pseudoankit/droid/tasky/launcher/MainActivityViewModel.kt

@@ -0,0 +1,61 @@
+package pseudoankit.droid.tasky.launcher
+
+import android.os.Build
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.runBlocking
+import org.orbitmvi.orbit.Container
+import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.container
+import pseudoankit.droid.core.util.extension.orFalse
+import pseudoankit.droid.coreui.util.extension.postSideEffect
+import pseudoankit.droid.coreui.util.extension.state
+import pseudoankit.droid.preferencesmanager.PreferenceRepository
+
+class MainActivityViewModel(
+    private val preferenceRepository: PreferenceRepository
+) : ViewModel(),
+    ContainerHost<MainActivityViewModel.State, MainActivityViewModel.SideEffect> {
+
+    override val container: Container<State, SideEffect> = viewModelScope.container(
+        initialState = State(
+            isUserLoggedIn = runBlocking { preferenceRepository.isLoggedIn().orFalse }
+        )
+    )
+
+    init {
+        observeLoggedInStatus()
+        handleNotificationPermission()
+    }
+
+    private fun observeLoggedInStatus() {
+        preferenceRepository.isLoggedInFlow()
+            .onEach { isLoggedIn ->
+                if (!isLoggedIn && !state.isUserLoggedIn) {
+                    postSideEffect {
+                        SideEffect.ClearBackStackAndNavigateToLogin
+                    }
+                }
+            }
+            .launchIn(viewModelScope)
+    }
+
+    private fun handleNotificationPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
+        postSideEffect {
+            SideEffect.LaunchNotificationPermissionRequest
+        }
+    }
+
+
+    data class State(
+        val isUserLoggedIn: Boolean = true
+    )
+
+    sealed interface SideEffect {
+        object ClearBackStackAndNavigateToLogin : SideEffect
+        object LaunchNotificationPermissionRequest : SideEffect
+    }
+}

core/navigation/src/main/java/pseudoankit/droid/navigation/deeplink/DeepLinkProvider.kt renamed to app/src/main/java/pseudoankit/droid/tasky/navigation/deeplink/DeepLinkProvider.kt

@@ -1,4 +1,4 @@
-package pseudoankit.droid.navigation.deeplink
+package pseudoankit.droid.tasky.navigation.deeplink
 
 import pseudoankit.droid.agendamanger.domain.model.AgendaTypes
 import pseudoankit.droid.app_widgets.util.WidgetDeeplinkProvider
@@ -20,10 +20,6 @@ internal class DeepLinkProvider : ReminderDeepLinkProvider, HomeDeepLinkProvider
         is AgendaTypes.Task -> TODO()
     }
 
-    override fun homeScreenRoute(): String {
-        return TaskyDeeplink.home
-    }
-
     override fun reminderScreenRoute(action: AgendaTypes.Action): String {
         return TaskyDeeplink.reminder.replace(
             TaskyDeeplink.Path.Reminder.action,

core/navigation/src/main/java/pseudoankit/droid/navigation/di/NavigationModule.kt renamed to app/src/main/java/pseudoankit/droid/tasky/navigation/di/NavigationModule.kt

@@ -1,9 +1,9 @@
-package pseudoankit.droid.navigation.di
+package pseudoankit.droid.tasky.navigation.di
 
 import org.koin.dsl.module
 import pseudoankit.droid.app_widgets.util.WidgetDeeplinkProvider
-import pseudoankit.droid.navigation.deeplink.DeepLinkProvider
 import pseudoankit.droid.tasky.home.navigator.HomeDeepLinkProvider
+import pseudoankit.droid.tasky.navigation.deeplink.DeepLinkProvider
 import pseudoankit.droid.tasky.reminder.navigator.ReminderDeepLinkProvider
 
 object NavigationModule {

core/navigation/src/main/java/pseudoankit/droid/navigation/navgraph/MainNavGraph.kt renamed to app/src/main/java/pseudoankit/droid/tasky/navigation/navgraph/MainNavGraph.kt

@@ -1,4 +1,4 @@
-package pseudoankit.droid.navigation.navgraph
+package pseudoankit.droid.tasky.navigation.navgraph
 
 import com.ramcosta.composedestinations.spec.DestinationSpec
 import com.ramcosta.composedestinations.spec.NavGraphSpec

core/navigation/src/main/java/pseudoankit/droid/navigation/navigator/CoreFeatureNavigator.kt renamed to app/src/main/java/pseudoankit/droid/tasky/navigation/navigator/CoreFeatureNavigator.kt

@@ -1,15 +1,15 @@
-package pseudoankit.droid.navigation.navigator
+package pseudoankit.droid.tasky.navigation.navigator
 
 import android.content.Context
 import androidx.navigation.NavController
 import com.ramcosta.composedestinations.navigation.navigate
 import pseudoankit.droid.authentication.navigator.AuthNavigator
 import pseudoankit.droid.coreui.util.extension.clearStack
 import pseudoankit.droid.coreui.util.extension.finish
-import pseudoankit.droid.navigation.navigator.feature.AuthNavigatorImpl
-import pseudoankit.droid.navigation.navigator.feature.HomeScreenNavigatorImpl
 import pseudoankit.droid.tasky.home.navigator.HomeScreenNavigator
 import pseudoankit.droid.tasky.home.presentation.destinations.HomeScreenDestination
+import pseudoankit.droid.tasky.navigation.navigator.feature.AuthNavigatorImpl
+import pseudoankit.droid.tasky.navigation.navigator.feature.HomeScreenNavigatorImpl
 import pseudoankit.droid.tasky.reminder.navigator.ReminderNavigator
 
 class CoreFeatureNavigator(