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

Navigation 및 기초 Screen 추가 #24

Merged
merged 1 commit into from
Sep 23, 2024
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
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ androidx-hilt-navigation-compose = "1.2.0"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
navigationCompose = "2.7.6"



Expand All @@ -55,6 +56,7 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }

# test -----------
junit = { group = "junit", name = "junit", version.ref = "junit" }
Expand Down
1 change: 1 addition & 0 deletions presenter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies {
implementation(libs.androidx.hilt.compiler)
implementation(libs.androidx.hilt.navigation.compose)

implementation(libs.androidx.navigation.compose)
DokySp marked this conversation as resolved.
Show resolved Hide resolved
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand Down
26 changes: 11 additions & 15 deletions presenter/src/main/java/com/foke/together/presenter/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.navigation.compose.rememberNavController
import com.foke.together.presenter.navigation.NavGraph
import com.foke.together.presenter.ui.theme.FourCutTogetherTheme
import dagger.hilt.android.AndroidEntryPoint

Expand All @@ -20,30 +22,24 @@ class MainActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
FourCutTogetherTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
Greeting(
name = "FourCut Studio",
modifier = Modifier.padding(innerPadding)
)
}
}
MainScreen()
}
}
}

@Composable
fun Greeting(name: String, modifier: Modifier = Modifier) {
Text(
text = name,
modifier = modifier
)
private fun MainScreen() {
FourCutTogetherTheme {
val navController = rememberNavController()
NavGraph(navController)
}
DokySp marked this conversation as resolved.
Show resolved Hide resolved
}

@Preview(showBackground = true)
@Composable
fun GreetingPreview() {
fun MainPreview() {
FourCutTogetherTheme {
Greeting("Android")
val navController = rememberNavController()
NavGraph(navController)
DokySp marked this conversation as resolved.
Show resolved Hide resolved
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
package com.foke.together.presenter.navigation
import androidx.compose.runtime.Composable
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.NavType
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.navArgument
import com.foke.together.presenter.screen.CameraScreen
import com.foke.together.presenter.screen.FrameScreen
import com.foke.together.presenter.screen.HomeScreen
import com.foke.together.presenter.screen.SettingScreen
import com.foke.together.presenter.screen.ShareScreen

DokySp marked this conversation as resolved.
Show resolved Hide resolved
@Composable
fun NavGraph(navController: NavHostController) {

NavHost(
navController = navController,
startDestination = NavRoute.Home.path
) {
addHomeScreen(navController, this)
addSettingScreen(navController, this)
addCameraScreen(navController, this)
addFrameScreen(navController, this)
addShareScreen(navController, this)
}
}


private fun addHomeScreen(
navController: NavHostController,
navGraphBuilder: NavGraphBuilder
) {
navGraphBuilder.composable(route = NavRoute.Home.path) {
HomeScreen(
navigateToSetting = {
navController.navigate(NavRoute.Setting.path)
},
navigateToCamera = {
navController.navigate(NavRoute.Camera.path)
},
popBackStack = { navController.popBackStack() }
)
}
}

private fun addCameraScreen(
navController: NavHostController,
navGraphBuilder: NavGraphBuilder
) {
navGraphBuilder.composable(route = NavRoute.Camera.path) {
CameraScreen(
navigateToFrame = {
navController.navigate(NavRoute.Frame.path)
},
popBackStack = {
navController.popBackStack(NavRoute.Home.path, inclusive = false)
}
)
}
}

private fun addSettingScreen(
navController: NavHostController,
navGraphBuilder: NavGraphBuilder
) {
navGraphBuilder.composable(route = NavRoute.Setting.path) {
SettingScreen(
popBackStack = {
navController.popBackStack(NavRoute.Home.path, inclusive = false)
}
)
}
}

private fun addFrameScreen(
navController: NavHostController,
navGraphBuilder: NavGraphBuilder
) {
navGraphBuilder.composable(route = NavRoute.Frame.path) {
FrameScreen(
navigateShare = {
navController.navigate(NavRoute.Share.path)
},
popBackStack = {
navController.popBackStack(NavRoute.Home.path, inclusive = false)
}
)
}
}

private fun addShareScreen(
navController: NavHostController,
navGraphBuilder: NavGraphBuilder
) {
navGraphBuilder.composable(route = NavRoute.Frame.path) {
ShareScreen(
popBackStack = {
navController.popBackStack(NavRoute.Home.path, inclusive = false)
}
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.foke.together.presenter.navigation

sealed class NavRoute(val path: String) {

DokySp marked this conversation as resolved.
Show resolved Hide resolved
object Camera: NavRoute("camera")

object Home: NavRoute("home")

object Frame: NavRoute("frame")
object Share: NavRoute("share")
object Setting: NavRoute("setting")

// build navigation path (for screen navigation)
fun withArgs(vararg args: String): String {
return buildString {
append(path)
args.forEach{ arg ->
append("/$arg")
}
}
}
fetiu marked this conversation as resolved.
Show resolved Hide resolved
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.foke.together.presenter.screen

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import com.foke.together.presenter.ui.theme.FourCutTogetherTheme

@Composable
fun CameraScreen(
navigateToFrame: () -> Unit,
popBackStack: () -> Unit
) {
Column (
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally) {
Text("Camera Screen", fontSize = 40.sp)
Button(onClick = navigateToFrame){
Text("Frame")
}
}
}

@Preview(showBackground = true)
@Composable
private fun DefaultPreview() {
FourCutTogetherTheme() {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
CameraScreen(
navigateToFrame = { },
popBackStack = { }
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.foke.together.presenter.screen

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import com.foke.together.presenter.ui.theme.FourCutTogetherTheme

@Composable
fun FrameScreen(
navigateShare: () -> Unit,
popBackStack: () -> Unit
) {
Column (
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally) {
Text("Frame Screen", fontSize = 40.sp)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

사소하긴 하지만 여기도 Frame Screen 이 아니라 Share Screen 이어야 할 것 같습니다 😄
굳이 이번에 수정하지 않아도 될 것 같네요 ㅎㅎ

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

해당 내용은 단순 스크린 랜더링 테스트용 아이콘들이어서 삭제할 내용이었습니다.
Screen 작업시에 삭제하겠습니다


Button(onClick = navigateShare){
Text("Share")
}
}
}

@Preview(showBackground = true)
@Composable
private fun DefaultPreview() {
FourCutTogetherTheme() {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
FrameScreen(
navigateShare = {},
popBackStack = {}
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package com.foke.together.presenter.screen

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import com.foke.together.presenter.ui.theme.FourCutTogetherTheme

@Composable
fun HomeScreen(
navigateToCamera: (String) -> Unit,
navigateToSetting: (String) -> Unit,
popBackStack: () -> Unit
) {

Column (
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally) {
Text("Home Screen", fontSize = 40.sp)

Button(onClick = { navigateToCamera("camera") }){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

사소한 질문: 이 "camera"는 왜 소문자로 시작하나요? 아래의 "Setting"은 둘 모두 대문자로 시작하는데 이 경우만 일관되지 않길래 하는 가벼운 질문입니다!
아닐 가능성이 높지만, 안드로이드 시스템을 잘 몰라서 이게 혹시라도 버그가 될까 싶기도 해서요:)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오.. 예리한거 같네요 ㅎㅎ
동작상 문제는 없어보이지만, Settingsetting으로 바꿔야 할 것 같기는 합니다. 둘의 차이가 궁금하기는 하네요!
중요한 문제가 아니라면 굳이 이번에 수정하지 않아도 될 것 같네요 ㅎㅎ

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵 다음 Screen UI 구현부에서 수정하도록하겠습니다

Text("Camera")
}

Button(onClick = { navigateToSetting("Setting") }){
Text("Setting")
}
}
}

@Preview(showBackground = true)
@Composable
private fun DefaultPreview() {
FourCutTogetherTheme() {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
HomeScreen(
navigateToCamera = { },
DokySp marked this conversation as resolved.
Show resolved Hide resolved
navigateToSetting = {},
popBackStack = {}
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.foke.together.presenter.screen

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import com.foke.together.presenter.ui.theme.FourCutTogetherTheme

@Composable
fun SettingScreen(
popBackStack: () -> Unit
) {
Column (
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally) {
Text("Setting Screen", fontSize = 40.sp)
}
}

@Preview(showBackground = true)
@Composable
private fun DefaultPreview() {
FourCutTogetherTheme() {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
SettingScreen(
popBackStack = {}
)
}
}
}
Loading