Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bookmark] 북마크 모듈 및 탭 추가 #170

Merged
merged 3 commits into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions feature/bookmark/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
12 changes: 12 additions & 0 deletions feature/bookmark/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
}
Empty file.
2 changes: 2 additions & 0 deletions feature/bookmark/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest />
Original file line number Diff line number Diff line change
@@ -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"
}
1 change: 1 addition & 0 deletions feature/main/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
}

Expand All @@ -52,7 +53,7 @@ internal class MainNavigator(
fun navigateSession() {
navController.navigateSession()
}

fun navigateSessionDetail(sessionId: String) {
navController.navigateSessionDetail(sessionId)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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() }
)
Expand All @@ -78,8 +74,6 @@ internal fun MainScreen(navigator: MainNavigator = rememberMainNavigator()) {
onBackClick = { navigator.popBackStack() },
onSessionClick = { navigator.navigateSessionDetail(it.id) }
)

composable("temp") { content("temp") }
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -18,10 +19,10 @@ internal enum class MainTab(
contentDescription = "홈",
HomeRoute.route,
),
TEMP(
iconResId = R.drawable.ic_temp,
contentDescription = "임시",
"temp",
BOOKMARK(
iconResId = R.drawable.ic_bookmark,
contentDescription = "북마크",
BookmarkRoute.route,
);

companion object {
Expand Down
9 changes: 9 additions & 0 deletions feature/main/src/main/res/drawable/ic_bookmark.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:fillColor="#DCDCDC"
android:pathData="M23.2,4H12.4C11.923,4 11.465,4.194 11.127,4.541C10.79,4.887 10.6,5.357 10.6,5.846V7.692H8.8C8.323,7.692 7.865,7.887 7.527,8.233C7.19,8.579 7,9.049 7,9.538V27.077C7,27.247 7.046,27.413 7.132,27.558C7.218,27.702 7.341,27.82 7.488,27.898C7.635,27.975 7.8,28.01 7.965,27.998C8.13,27.985 8.289,27.927 8.423,27.828L14.2,23.596L19.978,27.828C20.113,27.926 20.271,27.985 20.436,27.997C20.6,28.009 20.765,27.974 20.912,27.897C21.059,27.819 21.182,27.702 21.268,27.557C21.354,27.412 21.4,27.246 21.4,27.077V22.541L23.577,24.136C23.711,24.234 23.87,24.293 24.035,24.305C24.2,24.318 24.365,24.283 24.512,24.205C24.659,24.128 24.782,24.01 24.868,23.865C24.954,23.721 25,23.554 25,23.385V5.846C25,5.357 24.81,4.887 24.473,4.541C24.135,4.194 23.677,4 23.2,4ZM19.6,25.284L14.722,21.707C14.569,21.595 14.387,21.535 14.199,21.535C14.011,21.535 13.828,21.595 13.676,21.707L8.8,25.283V9.538H19.6V25.284ZM23.2,21.591L21.4,20.269V9.538C21.4,9.049 21.21,8.579 20.873,8.233C20.535,7.887 20.077,7.692 19.6,7.692H12.4V5.846H23.2V21.591Z" />
</vector>
9 changes: 0 additions & 9 deletions feature/main/src/main/res/drawable/ic_temp.xml

This file was deleted.

1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ include(
":feature:session",
":feature:setting",
":feature:contributor",
":feature:bookmark",
)