Skip to content
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.paw.key.core.designsystem.component

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.SnackbarData
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
import com.paw.key.core.designsystem.theme.PawKeyTheme

@Composable
fun CustomSnackBar(
data: SnackbarData,
modifier: Modifier = Modifier
) {
Box(
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 36.dp)
.clip(RoundedCornerShape(12.dp))
.background(PawKeyTheme.colors.black.copy(alpha = 0.6f))
.padding(16.dp)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

이거 padding 2번 넣은건 무슨 의미에용?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

inner padding과 바깥쪽패딩입니당!

) {
Text(
text = data.visuals.message,
style = PawKeyTheme.typography.body14M,
color = PawKeyTheme.colors.white1,
modifier = Modifier
.align(Alignment.Center)
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.paw.key.domain.model.entity.region

import com.kakao.vectormap.LatLng

data class RegionResponse(
val code: String,
val message: String,
val data: RegionData
)

data class RegionData(
val regionName: String,
val geometryDto: GeometryDto
)

data class GeometryDto(
val type: String,
val coordinates: List<List<List<Pair<Double, Double>>>> // MultiPolygon은 여러 폴리곤의 리스트를 가짐
)
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.LocationOn
import androidx.compose.material3.Button
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fun courseMapView(

val routeLineStyle = RouteLineStyle.from(
12f,
ContextCompat.getColor(context, R.color.teal_200)
ContextCompat.getColor(context, R.color.green_500)
)

val routeStylesSet = RouteLineStylesSet.from(routeLineStyle)
Expand All @@ -110,12 +110,6 @@ fun courseMapView(

currentDrawnRouteLine = kakaoMap.routeLineManager?.layer?.addRouteLine(routeLineOptions)
currentDrawnRouteLine?.show()

/*kakaoMap.moveCamera(
CameraUpdateFactory.fitMapPoints(
pointsToDraw.toTypedArray(), 100
)
)*/
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : ComponentActivity() {
@RequiresApi(Build.VERSION_CODES.Q)
@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ import com.paw.key.presentation.ui.course.walkrecord.navigation.navigateWalkRevi
import com.paw.key.presentation.ui.dummy.next.navigateDummyNext
import com.paw.key.presentation.ui.home.navigation.navigateHome
import com.paw.key.presentation.ui.login.navigation.navigateLogin
import com.paw.key.presentation.ui.region.navigation.navigateRegional
import com.paw.key.presentation.ui.mypage.navigation.navigateMyPage
import com.paw.key.presentation.ui.owner.navigation.navigateOwner
import com.paw.key.presentation.ui.pet.navigation.navigatePet
import com.paw.key.presentation.ui.signup.navigation.navigateSignUp
//import com.paw.key.presentation.ui.signup.navigation.navigateSignUp
import com.paw.key.presentation.ui.splash.navigation.Splash
import com.paw.key.presentation.ui.splash.navigation.navigateSplash

Expand Down Expand Up @@ -61,10 +62,6 @@ class MainNavigator(
}
}

fun setOnVisibleRecord(visible: Boolean) {
isRecordVisible = visible
}

fun navigateMyPage(navOptions: NavOptions? = null) {
navController.navigateMyPage(navOptions = navOptions)
}
Expand Down Expand Up @@ -93,8 +90,6 @@ class MainNavigator(
navController.navigateWalkReview(navOptions = navOptions)
}



fun setOnVisibleRecord(visible: Boolean) {
isRecordVisible = visible
}
Expand All @@ -115,10 +110,11 @@ class MainNavigator(
navController.navigateLogin(navOptions = navOptions)
}

fun navigateSignUp(navOptions: NavOptions? = null) {
navController.navigateSignUp(navOptions = navOptions)
fun navigateRegional(navOptions: NavOptions? = null) {
navController.navigateRegional(navOptions = navOptions)
}


@Composable
fun showBottomBar() = MainTab.contains {
currentDestination?.hasRoute(it::class) == true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import androidx.compose.ui.Modifier
import com.paw.key.presentation.ui.main.component.MainBottomBar
import kotlinx.collections.immutable.toImmutableList

@RequiresApi(Build.VERSION_CODES.Q)

@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
@Composable
fun MainScreen(
navigator: MainNavigator = rememberMainNavigator(),
Expand All @@ -32,7 +33,7 @@ fun MainScreen(
)
}

@RequiresApi(Build.VERSION_CODES.Q)
@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
@Composable
private fun MainScreenContent(
navigator: MainNavigator,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ import com.paw.key.presentation.ui.dummy.navigation.dummyNavGraph
import com.paw.key.presentation.ui.dummy.next.dummyNextNavGraph
import com.paw.key.presentation.ui.home.navigation.homeNavGraph
import com.paw.key.presentation.ui.login.navigation.loginNavGraph
import com.paw.key.presentation.ui.region.navigation.regionalNavGraph
import com.paw.key.presentation.ui.mypage.navigation.myPageNavGraph
import com.paw.key.presentation.ui.owner.navigation.ownerNavGraph
import com.paw.key.presentation.ui.pet.navigation.petNavGraph
import com.paw.key.presentation.ui.signup.navigation.signupNavGraph
//import com.paw.key.presentation.ui.signup.navigation.signupNavGraph
import com.paw.key.presentation.ui.splash.navigation.splashNavGraph

@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
Expand Down Expand Up @@ -124,19 +125,27 @@ fun PawKeyNavHost(
)

loginNavGraph(
paddingValues = paddingValues,
navigateUp = navigator::navigateUp,
navigateNext = navigator::navigateRegional,
navigateSignUp = navigator::navigateRegional,
snackBarHostState = snackbarHostState
)

regionalNavGraph(
paddingValues = paddingValues,
navigateUp = navigator::navigateUp,
navigateNext = navigator::navigateDummyNext,
navigateSignUp = navigator::navigateSignUp,
navigateSignUp = navigator::navigateUp,
snackBarHostState = snackbarHostState
)

signupNavGraph(
/*signupNavGraph(
paddingValues = paddingValues,
navigateUp = navigator::navigateUp,
navigateNext = navigator::navigateDummyNext,
navigateLogin = navigator::navigateLogin,
snackBarHostState = snackbarHostState
)
)*/
}
}
Loading