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.

Sign up for GitHub

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

Jump to bottom

바텀바 디자인 수정 #44

Merged
merged 1 commit into from
Sep 20, 2023
Merged

바텀바 디자인 수정 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 24 additions & 16 deletions app/src/main/java/com/keyme/app/ui/KeymeApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package com.keyme.app.ui

import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.NavigationBarItemDefaults
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
Expand All @@ -26,6 +29,7 @@ import com.keyme.presentation.myprofile.ui.myProfileGraph
import com.keyme.presentation.onboarding.onboardingGraph
import com.keyme.presentation.takekeymetest.TakeKeymeTestDestination
import com.keyme.presentation.takekeymetest.takeKeymeTestGraph
import com.keyme.presentation.utils.topBorder

@Composable
fun KeymeApp() {
Expand Down Expand Up @@ -102,25 +106,29 @@ fun KeymeBottomBar(
onNavigateToDestination: (TopLevelDestination) -> Unit,
) {
NavigationBar(
modifier = Modifier.border(width = 1.dp, color = Color(0xFF363636)),
modifier = Modifier.topBorder(width = 1.dp, color = Color(0xFF363636)),
containerColor = Color(0x80232323),
tonalElevation = 4.dp,
) {
keymeTopLevelDestinations.forEach { destination ->
val isSelected = currentDestination?.hierarchy?.any { it.route == destination.route } == true

NavigationBarItem(
selected = isSelected,
onClick = {
onNavigateToDestination(destination)
},
icon = {
val iconResId =
if (isSelected) destination.selectedIconResId else destination.unselectedIconResId
Icon(painter = painterResource(id = iconResId), contentDescription = "")
},
colors = NavigationBarItemDefaults.colors(indicatorColor = Color.Transparent),
)
val iconResId =
if (isSelected) destination.selectedIconResId else destination.unselectedIconResId
Box(
modifier = Modifier
.align(Alignment.CenterVertically)
.fillMaxHeight()
.weight(1f)
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null,
onClick = { onNavigateToDestination(destination) },
),
contentAlignment = Alignment.Center,
) {
Icon(painter = painterResource(id = iconResId), contentDescription = "")
}
}
}
}
18 changes: 18 additions & 0 deletions presentation/src/main/java/com/keyme/presentation/utils/Modifiers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import androidx.compose.material.ripple.rememberRipple
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp

fun Modifier.clickableRippleEffect(bounded: Boolean = true, onClick: () -> Unit) = composed {
clickable(
Expand All @@ -14,3 +18,17 @@ fun Modifier.clickableRippleEffect(bounded: Boolean = true, onClick: () -> Unit)
onClick = { onClick() },
)
}

fun Modifier.topBorder(width: Dp, color: Color) = composed {
drawBehind {
val strokeWidth = width.value * density
val y = strokeWidth / 2

drawLine(
color,
Offset(0f, y),
Offset(size.width, y),
strokeWidth,
)
}
}