From 3f98cbc5df39bbb8e7282dc3b3ce3781e0d7f3b4 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Sun, 6 Aug 2023 13:20:16 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#168=20feature:bookmakr=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/bookmark/.gitignore | 1 + feature/bookmark/build.gradle.kts | 12 ++++++++++++ feature/bookmark/proguard-rules.pro | 0 .../droidknights/app2023/feature/bookmark/.gitkeep | 0 feature/bookmark/src/main/AndroidManifest.xml | 2 ++ .../droidknights/app2023/feature/bookmark/.gitkeep | 0 .../droidknights/app2023/feature/bookmark/.gitkeep | 0 settings.gradle.kts | 1 + 8 files changed, 16 insertions(+) create mode 100644 feature/bookmark/.gitignore create mode 100644 feature/bookmark/build.gradle.kts create mode 100644 feature/bookmark/proguard-rules.pro create mode 100644 feature/bookmark/src/androidTest/java/com/droidknights/app2023/feature/bookmark/.gitkeep create mode 100644 feature/bookmark/src/main/AndroidManifest.xml create mode 100644 feature/bookmark/src/main/java/com/droidknights/app2023/feature/bookmark/.gitkeep create mode 100644 feature/bookmark/src/test/java/com/droidknights/app2023/feature/bookmark/.gitkeep diff --git a/feature/bookmark/.gitignore b/feature/bookmark/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/feature/bookmark/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/feature/bookmark/build.gradle.kts b/feature/bookmark/build.gradle.kts new file mode 100644 index 00000000..7267b2c3 --- /dev/null +++ b/feature/bookmark/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("droidknights.android.feature") +} + +android { + namespace = "com.droidknights.app2023.feature.bookmark" +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.activity.compose) +} diff --git a/feature/bookmark/proguard-rules.pro b/feature/bookmark/proguard-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/feature/bookmark/src/androidTest/java/com/droidknights/app2023/feature/bookmark/.gitkeep b/feature/bookmark/src/androidTest/java/com/droidknights/app2023/feature/bookmark/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/feature/bookmark/src/main/AndroidManifest.xml b/feature/bookmark/src/main/AndroidManifest.xml new file mode 100644 index 00000000..8072ee00 --- /dev/null +++ b/feature/bookmark/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/feature/bookmark/src/main/java/com/droidknights/app2023/feature/bookmark/.gitkeep b/feature/bookmark/src/main/java/com/droidknights/app2023/feature/bookmark/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/feature/bookmark/src/test/java/com/droidknights/app2023/feature/bookmark/.gitkeep b/feature/bookmark/src/test/java/com/droidknights/app2023/feature/bookmark/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/settings.gradle.kts b/settings.gradle.kts index a91b8826..39e5e9e4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,4 +32,5 @@ include( ":feature:session", ":feature:setting", ":feature:contributor", + ":feature:bookmark", ) From 0a8935b5060ed77b6d0b747dcf5828738e8a38a3 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Sun, 6 Aug 2023 13:25:58 +0900 Subject: [PATCH 2/3] =?UTF-8?q?#168=20=EB=B6=81=EB=A7=88=ED=81=AC=20?= =?UTF-8?q?=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bookmark/navigation/BookmarkNavigation.kt | 20 +++++++++++++++++++ feature/main/build.gradle.kts | 1 + .../app2023/feature/main/MainNavigator.kt | 5 +++-- .../app2023/feature/main/MainScreen.kt | 18 ++++++----------- .../app2023/feature/main/MainTab.kt | 8 ++++---- .../src/main/res/drawable/ic_bookmark.xml | 9 +++++++++ .../main/src/main/res/drawable/ic_temp.xml | 9 --------- 7 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 feature/bookmark/src/main/java/com/droidknights/app2023/feature/bookmark/navigation/BookmarkNavigation.kt create mode 100644 feature/main/src/main/res/drawable/ic_bookmark.xml delete mode 100644 feature/main/src/main/res/drawable/ic_temp.xml diff --git a/feature/bookmark/src/main/java/com/droidknights/app2023/feature/bookmark/navigation/BookmarkNavigation.kt b/feature/bookmark/src/main/java/com/droidknights/app2023/feature/bookmark/navigation/BookmarkNavigation.kt new file mode 100644 index 00000000..49d1fcb6 --- /dev/null +++ b/feature/bookmark/src/main/java/com/droidknights/app2023/feature/bookmark/navigation/BookmarkNavigation.kt @@ -0,0 +1,20 @@ +package com.droidknights.app2023.feature.bookmark.navigation + +import androidx.navigation.NavController +import androidx.navigation.NavGraphBuilder +import androidx.navigation.NavOptions +import androidx.navigation.compose.composable + +fun NavController.navigateBookmark(navOptions: NavOptions) { + navigate(BookmarkRoute.route, navOptions) +} + +fun NavGraphBuilder.bookmarkNavGraph(onBackClick: () -> Unit) { + composable(route = BookmarkRoute.route) { + + } +} + +object BookmarkRoute { + const val route = "bookmark" +} diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts index bd12e572..d838dbf9 100644 --- a/feature/main/build.gradle.kts +++ b/feature/main/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { implementation(project(":feature:setting")) implementation(project(":feature:contributor")) implementation(project(":feature:session")) + implementation(project(":feature:bookmark")) implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt index 93ecff9e..74d0946c 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainNavigator.kt @@ -8,6 +8,7 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import androidx.navigation.navOptions +import com.droidknights.app2023.feature.bookmark.navigation.navigateBookmark import com.droidknights.app2023.feature.contributor.navigation.navigateContributor import com.droidknights.app2023.feature.home.navigation.navigateHome import com.droidknights.app2023.feature.session.navigation.navigateSession @@ -41,7 +42,7 @@ internal class MainNavigator( when (tab) { MainTab.SETTING -> navController.navigateSetting(navOptions) MainTab.HOME -> navController.navigateHome(navOptions) - MainTab.TEMP -> navController.navigate("temp", navOptions) // TODO: ??? + MainTab.BOOKMARK -> navController.navigateBookmark(navOptions) } } @@ -52,7 +53,7 @@ internal class MainNavigator( fun navigateSession() { navController.navigateSession() } - + fun navigateSessionDetail(sessionId: String) { navController.navigateSessionDetail(sessionId) } diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index 4611fb26..6a347602 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -33,9 +32,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.navigation.compose.NavHost -import androidx.navigation.compose.composable import com.droidknights.app2023.core.designsystem.theme.Neon01 import com.droidknights.app2023.core.designsystem.theme.surfaceDim +import com.droidknights.app2023.feature.bookmark.navigation.bookmarkNavGraph import com.droidknights.app2023.feature.contributor.navigation.contributorNavGraph import com.droidknights.app2023.feature.home.navigation.homeNavGraph import com.droidknights.app2023.feature.session.navigation.sessionNavGraph @@ -62,14 +61,11 @@ internal fun MainScreen(navigator: MainNavigator = rememberMainNavigator()) { settingNavGraph( padding = padding, ) - // TODO: 각 모듈로 이동 - val content: @Composable (String) -> Unit = { - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center, - content = { Text(text = it) } - ) - } + + bookmarkNavGraph( + onBackClick = { navigator.popBackStack() } + ) + contributorNavGraph( onBackClick = { navigator.popBackStack() } ) @@ -78,8 +74,6 @@ internal fun MainScreen(navigator: MainNavigator = rememberMainNavigator()) { onBackClick = { navigator.popBackStack() }, onSessionClick = { navigator.navigateSessionDetail(it.id) } ) - - composable("temp") { content("temp") } } } }, diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt index 0b93a5a6..4bbddd24 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt @@ -18,10 +18,10 @@ internal enum class MainTab( contentDescription = "홈", HomeRoute.route, ), - TEMP( - iconResId = R.drawable.ic_temp, - contentDescription = "임시", - "temp", + BOOKMARK( + iconResId = R.drawable.ic_bookmark, + contentDescription = "북마크", + "bookmark", ); companion object { diff --git a/feature/main/src/main/res/drawable/ic_bookmark.xml b/feature/main/src/main/res/drawable/ic_bookmark.xml new file mode 100644 index 00000000..84f5d403 --- /dev/null +++ b/feature/main/src/main/res/drawable/ic_bookmark.xml @@ -0,0 +1,9 @@ + + + diff --git a/feature/main/src/main/res/drawable/ic_temp.xml b/feature/main/src/main/res/drawable/ic_temp.xml deleted file mode 100644 index 20bf3e1d..00000000 --- a/feature/main/src/main/res/drawable/ic_temp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - From 853b516ab5cfa9b3aa33ddd2db272aab6f997e81 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Sun, 6 Aug 2023 13:39:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?#168=20=ED=95=98=EB=93=9C=EC=BD=94=EB=94=A9?= =?UTF-8?q?=20=EB=8C=80=EC=8B=A0=20BookmarkRoute=EB=A5=BC=20=EC=B0=B8?= =?UTF-8?q?=EC=A1=B0=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/droidknights/app2023/feature/main/MainTab.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt index 4bbddd24..f6817a36 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt @@ -1,5 +1,6 @@ package com.droidknights.app2023.feature.main +import com.droidknights.app2023.feature.bookmark.navigation.BookmarkRoute import com.droidknights.app2023.feature.home.navigation.HomeRoute import com.droidknights.app2023.feature.setting.navigation.SettingRoute @@ -21,7 +22,7 @@ internal enum class MainTab( BOOKMARK( iconResId = R.drawable.ic_bookmark, contentDescription = "북마크", - "bookmark", + BookmarkRoute.route, ); companion object {