Merge pull request #98 from PawWithU/feature/inter_setting

feature/inter setting: 중개자 홈에서 설정 화면으로 이동하는 로직 추가
PawWithU · Mar 24, 2024 · fb36ef4 · fb36ef4
2 parents d310726 + c6fe6a5
commit fb36ef4
Show file tree

Hide file tree

Showing 33 changed files with 5 additions and 3 deletions.
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$1.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$1.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$2.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$2.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$3.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$3.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$2.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$2.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3$1.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3$1.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3.class
diff --git a/...g/feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1.class b/...g/feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1.class
diff --git a/...hAsm/dirs/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity$1.class b/...hAsm/dirs/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity$1.class
diff --git a/...ithAsm/dirs/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity.class b/...ithAsm/dirs/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/IntermediatorActivity_GeneratedInjector.class b/...om/kusitms/connectdog/feature/intermediator/IntermediatorActivity_GeneratedInjector.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$1.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$1.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$2.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$2.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$3.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$3.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$2.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$2.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3$1.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3$1.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3.class
diff --git a/...g/feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1.class b/...g/feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1.class
diff --git a/...dir/debug/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity$1.class b/...dir/debug/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity$1.class
diff --git a/...s_dir/debug/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity.class b/...s_dir/debug/com/kusitms/connectdog/feature/intermediator/Hilt_IntermediatorActivity.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/IntermediatorActivity_GeneratedInjector.class b/...om/kusitms/connectdog/feature/intermediator/IntermediatorActivity_GeneratedInjector.class
diff --git a/feature/intermediator/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/feature/intermediator/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$1.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$1.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$2.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$2.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$3.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1$3.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$1.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$2.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$2.class
diff --git a/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3$1.class b/...ature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3$1.class
diff --git a/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3.class b/...feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1$3.class
diff --git a/...g/feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1.class b/...g/feature/intermediator/ComposableSingletons$IntermediatorActivityKt$lambda-1$1$1$1.class
diff --git a/...in/java/com/kusitms/connectdog/feature/intermediator/navigation/InermediatorNavigation.kt b/...in/java/com/kusitms/connectdog/feature/intermediator/navigation/InermediatorNavigation.kt
@@ -19,12 +19,13 @@ fun NavController.navigateInterManagement(tabIndex: Int) {
 }
 
 fun NavGraphBuilder.intermediatorNavGraph(
-    onBackClick: () -> Unit
+    onBackClick: () -> Unit,
+    onSettingClick: () -> Unit
 ) {
     composable(route = IntermediatorRoute.route) {
         IntermediatorHomeScreen(
             onNotificationClick = { },
-            onSettingClick = { },
+            onSettingClick = onSettingClick,
             onDataClick = { }
 //                    index -> navigator.navigateInterManagement(index)
         )

diff --git a/feature/main/src/main/java/com/kusitms/connectdog/feature/main/MainScreen.kt b/feature/main/src/main/java/com/kusitms/connectdog/feature/main/MainScreen.kt
@@ -130,7 +130,8 @@ internal fun MainScreen(
                         onShowErrorSnackbar = {}
                     )
                     intermediatorNavGraph(
-                        onBackClick = navigator::popBackStackIfNotHome
+                        onBackClick = navigator::popBackStackIfNotHome,
+                        onSettingClick = { navigator.navigateSetting() }
                     )
                 }
             }