feat: implemented navigation component in checker inbox task module (#…

…2197)
openMF · Aug 21, 2024 · e2b3338 · e2b3338
1 parent bd1948b
commit e2b3338
Show file tree

Hide file tree

Showing 17 changed files with 90 additions and 47 deletions.
diff --git a/...sk/checker_inbox/ui/CheckerInboxScreen.kt → ..._task/checker_inbox/CheckerInboxScreen.kt b/...sk/checker_inbox/ui/CheckerInboxScreen.kt → ..._task/checker_inbox/CheckerInboxScreen.kt
@@ -3,7 +3,7 @@
     ExperimentalFoundationApi::class
 )
 
-package com.mifos.feature.checker_inbox_task.checker_inbox.ui
+package com.mifos.feature.checker_inbox_task.checker_inbox
 
 import android.widget.Toast
 import androidx.activity.compose.BackHandler
@@ -70,7 +70,7 @@ import com.mifos.core.designsystem.theme.White
 import com.mifos.core.objects.checkerinboxandtasks.CheckerTask
 import com.mifos.core.ui.components.SelectionModeTopAppBar
 import com.mifos.feature.checker_inbox_task.R
-import com.mifos.feature.checker_inbox_task.dialog.CheckerInboxTasksFilterDialog
+import com.mifos.feature.checker_inbox_task.checker_inbox_dialog.CheckerInboxTasksFilterDialog
 import java.sql.Timestamp
 
 @Composable

diff --git a/...k/checker_inbox/ui/CheckerInboxUiState.kt → ...task/checker_inbox/CheckerInboxUiState.kt b/...k/checker_inbox/ui/CheckerInboxUiState.kt → ...task/checker_inbox/CheckerInboxUiState.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.checker_inbox_task.checker_inbox.ui
+package com.mifos.feature.checker_inbox_task.checker_inbox
 
 import com.mifos.core.objects.checkerinboxandtasks.CheckerInboxSearchTemplate
 import com.mifos.core.objects.checkerinboxandtasks.CheckerTask

diff --git a/...checker_inbox/ui/CheckerInboxViewModel.kt → ...sk/checker_inbox/CheckerInboxViewModel.kt b/...checker_inbox/ui/CheckerInboxViewModel.kt → ...sk/checker_inbox/CheckerInboxViewModel.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.checker_inbox_task.checker_inbox.ui
+package com.mifos.feature.checker_inbox_task.checker_inbox
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

diff --git a/...k/dialog/CheckerInboxTasksFilterDialog.kt → ...x_dialog/CheckerInboxTasksFilterDialog.kt b/...k/dialog/CheckerInboxTasksFilterDialog.kt → ...x_dialog/CheckerInboxTasksFilterDialog.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.checker_inbox_task.dialog
+package com.mifos.feature.checker_inbox_task.checker_inbox_dialog
 
 import android.annotation.SuppressLint
 import android.widget.Toast

diff --git a/...nbox_task/dialog/CheckerInboxViewModel.kt → ...ker_inbox_dialog/CheckerInboxViewModel.kt b/...nbox_task/dialog/CheckerInboxViewModel.kt → ...ker_inbox_dialog/CheckerInboxViewModel.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.checker_inbox_task.dialog
+package com.mifos.feature.checker_inbox_task.checker_inbox_dialog
 
 import android.util.Log
 import androidx.compose.runtime.mutableStateOf

diff --git a/...inbox_tasks/ui/CheckerInboxTasksScreen.kt → ...er_inbox_tasks/CheckerInboxTasksScreen.kt b/...inbox_tasks/ui/CheckerInboxTasksScreen.kt → ...er_inbox_tasks/CheckerInboxTasksScreen.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.checker_inbox_task.checker_inbox_tasks.ui
+package com.mifos.feature.checker_inbox_task.checker_inbox_tasks
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row

diff --git a/...nbox_tasks/ui/CheckerInboxTasksUiState.kt → ...r_inbox_tasks/CheckerInboxTasksUiState.kt b/...nbox_tasks/ui/CheckerInboxTasksUiState.kt → ...r_inbox_tasks/CheckerInboxTasksUiState.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.checker_inbox_task.checker_inbox_tasks.ui
+package com.mifos.feature.checker_inbox_task.checker_inbox_tasks
 
 
 /**

diff --git a/...ox_tasks/ui/CheckerInboxTasksViewModel.kt → ...inbox_tasks/CheckerInboxTasksViewModel.kt b/...ox_tasks/ui/CheckerInboxTasksViewModel.kt → ...inbox_tasks/CheckerInboxTasksViewModel.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.checker_inbox_task.checker_inbox_tasks.ui
+package com.mifos.feature.checker_inbox_task.checker_inbox_tasks
 
 import android.util.Log
 import androidx.lifecycle.ViewModel

diff --git a/...c/main/java/com/mifos/feature/checker_inbox_task/navigation/CheckerInboxTaskNavigation.kt b/...c/main/java/com/mifos/feature/checker_inbox_task/navigation/CheckerInboxTaskNavigation.kt
@@ -0,0 +1,55 @@
+package com.mifos.feature.checker_inbox_task.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import androidx.navigation.navigation
+import com.mifos.feature.checker_inbox_task.checker_inbox.CheckerInboxScreen
+import com.mifos.feature.checker_inbox_task.checker_inbox_tasks.CheckerInboxTasksScreen
+
+fun NavGraphBuilder.checkerInboxTaskGraph(
+    navController: NavController,
+) {
+    navigation(
+        startDestination = CheckerInboxTaskScreens.CheckerInboxTaskScreen.route,
+        route = CheckerInboxTaskScreens.CheckerInboxTaskScreenRoute.route
+    ) {
+        checkerInboxTaskRoute(
+            onBackPressed = navController::popBackStack,
+            checkerInbox = navController::navigateCheckerInbox
+        )
+        checkerInboxRoute(
+            onBackPressed = navController::popBackStack
+        )
+    }
+}
+
+fun NavGraphBuilder.checkerInboxTaskRoute(
+    onBackPressed: () -> Unit,
+    checkerInbox: () -> Unit
+) {
+    composable(
+        route = CheckerInboxTaskScreens.CheckerInboxTaskScreen.route
+    ) {
+        CheckerInboxTasksScreen(
+            onBackPressed = onBackPressed,
+            checkerInbox = checkerInbox
+        )
+    }
+}
+
+fun NavGraphBuilder.checkerInboxRoute(
+    onBackPressed: () -> Unit
+) {
+    composable(
+        route = CheckerInboxTaskScreens.CheckerInboxScreen.route
+    ) {
+        CheckerInboxScreen(
+            onBackPressed = onBackPressed
+        )
+    }
+}
+
+fun NavController.navigateCheckerInbox() {
+    navigate(CheckerInboxTaskScreens.CheckerInboxScreen.route)
+}
diff --git a/.../src/main/java/com/mifos/feature/checker_inbox_task/navigation/CheckerInboxTaskScreens.kt b/.../src/main/java/com/mifos/feature/checker_inbox_task/navigation/CheckerInboxTaskScreens.kt
@@ -0,0 +1,12 @@
+package com.mifos.feature.checker_inbox_task.navigation
+
+sealed class CheckerInboxTaskScreens(val route: String) {
+
+    data object CheckerInboxTaskScreenRoute :
+        CheckerInboxTaskScreens("checker_inbox_task_screen_route")
+
+    data object CheckerInboxTaskScreen : CheckerInboxTaskScreens("checker_inbox_task_screen")
+
+    data object CheckerInboxScreen : CheckerInboxTaskScreens("checker_inbox_screen")
+
+}
diff --git a/.../main/java/com/mifos/feature/checker_inbox_task/navigation/CheckerInboxTasksNavigation.kt b/.../main/java/com/mifos/feature/checker_inbox_task/navigation/CheckerInboxTasksNavigation.kt
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeDestinationsScreen.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeDestinationsScreen.kt
@@ -13,7 +13,12 @@ import androidx.compose.material.icons.rounded.PowerSettingsNew
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material.icons.rounded.Task
 import androidx.compose.ui.graphics.vector.ImageVector
-import com.mifos.feature.checker_inbox_task.navigation.CHECKER_INBOX_TASK_SCREEN_ROUTE
+
+import com.mifos.feature.about.navigation.ABOUT_SCREEN_ROUTE
+import com.mifos.feature.checker_inbox_task.navigation.CheckerInboxTaskScreens
+
+
+
 import com.mifos.feature.groups.navigation.GROUP_LIST_SCREEN_ROUTE
 import com.mifos.feature.path_tracking.navigation.PATH_TRACKING_SCREEN_ROUTE
 import com.mifos.feature.search.Navigation.SEARCH_SCREEN_ROUTE
@@ -50,7 +55,7 @@ sealed class HomeDestinationsScreen(
 
     data object CheckerInboxAndTasksScreen : HomeDestinationsScreen(
         title = "Checker Inbox & Tasks",
-        route = CHECKER_INBOX_TASK_SCREEN_ROUTE,
+        route = CheckerInboxTaskScreens.CheckerInboxTaskScreen.route,
         icon = Icons.Rounded.CheckBox
     )
 

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/components/Navigation.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/components/Navigation.kt
@@ -11,7 +11,7 @@ import com.mifos.feature.about.navigation.aboutScreen
 import com.mifos.feature.activate.navigation.activateScreen
 import com.mifos.feature.activate.navigation.navigateToActivateScreen
 import com.mifos.feature.center.navigation.centerNavGraph
-import com.mifos.feature.checker_inbox_task.navigation.checkerInboxTasksScreen
+import com.mifos.feature.checker_inbox_task.navigation.checkerInboxTaskGraph
 import com.mifos.feature.client.navigation.clientNavGraph
 import com.mifos.feature.document.navigation.documentListScreen
 import com.mifos.feature.document.navigation.navigateToDocumentListScreen
@@ -124,8 +124,8 @@ fun Navigation(
             }
         )
 
-        checkerInboxTasksScreen(
-            onBackPressed = { navController.popBackStack() },
+        checkerInboxTaskGraph(
+            navController = navController
         )
         pathTrackingScreen(
             onBackPressed = { navController.popBackStack() }

diff --git a/...os/mifosxdroid/dialogfragments/checkertaskfilterdialog/CheckerTaskFilterDialogFragment.kt b/...os/mifosxdroid/dialogfragments/checkertaskfilterdialog/CheckerTaskFilterDialogFragment.kt
@@ -14,7 +14,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.mifos.mifosxdroid.R
 import com.mifos.mifosxdroid.databinding.DialogFragmentCheckerTaskFilterBinding
-import com.mifos.feature.checker_inbox_task.dialog.CheckerInboxViewModel
+import com.mifos.feature.checker_inbox_task.checker_inbox_dialog.CheckerInboxViewModel
 import com.mifos.feature.checker_inbox_task.dialog.CheckerInboxViewModelFactory
 import com.mifos.mifosxdroid.uihelpers.MFDatePicker
 import com.mifos.utils.FragmentConstants

diff --git a/...g-android/src/main/java/com/mifos/mifosxdroid/online/checkerinbox/CheckerInboxFragment.kt b/...g-android/src/main/java/com/mifos/mifosxdroid/online/checkerinbox/CheckerInboxFragment.kt
@@ -7,12 +7,9 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import com.mifos.core.common.utils.Constants
-import com.mifos.core.objects.checkerinboxandtasks.CheckerTask
-import com.mifos.feature.checker_inbox_task.checker_inbox.ui.CheckerInboxScreen
+import com.mifos.feature.checker_inbox_task.checker_inbox.CheckerInboxScreen
 import com.mifos.mifosxdroid.core.MifosBaseFragment
 import dagger.hilt.android.AndroidEntryPoint
-import java.sql.Timestamp
 
 
 @AndroidEntryPoint

diff --git a/...roid/src/main/java/com/mifos/mifosxdroid/online/checkerinbox/CheckerInboxTasksFragment.kt b/...roid/src/main/java/com/mifos/mifosxdroid/online/checkerinbox/CheckerInboxTasksFragment.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.navigation.fragment.findNavController
-import com.mifos.feature.checker_inbox_task.checker_inbox_tasks.ui.CheckerInboxTasksScreen
+import com.mifos.feature.checker_inbox_task.checker_inbox_tasks.CheckerInboxTasksScreen
 import com.mifos.mifosxdroid.R
 import com.mifos.mifosxdroid.core.MifosBaseFragment
 import dagger.hilt.android.AndroidEntryPoint

diff --git a/...d/src/main/java/com/mifos/mifosxdroid/online/checkerinbox/CheckerInboxViewModelFactory.kt b/...d/src/main/java/com/mifos/mifosxdroid/online/checkerinbox/CheckerInboxViewModelFactory.kt
@@ -3,7 +3,7 @@ package com.mifos.mifosxdroid.online.checkerinbox
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.mifos.core.network.datamanager.DataManagerCheckerInbox
-import com.mifos.feature.checker_inbox_task.dialog.CheckerInboxViewModel
+import com.mifos.feature.checker_inbox_task.checker_inbox_dialog.CheckerInboxViewModel
 import rx.subscriptions.CompositeSubscription
 import javax.inject.Inject