Skip to content

Commit

Permalink
Merge pull request #17 from ondosee/feature/12-publishing-setting-page
Browse files Browse the repository at this point in the history
🔀  :: (#12) - publishing setting page
  • Loading branch information
minStone-dev authored Sep 26, 2024
2 parents b9fa031 + 6436867 commit 4999d98
Show file tree
Hide file tree
Showing 42 changed files with 1,288 additions and 12 deletions.
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependencies {
implementation(project(":core:model"))
implementation(project(":core:ui"))
implementation(project(":feature:main"))
implementation(project(":feature:setting"))

implementation(libs.junit)
androidTestImplementation(libs.androidx.test.ext)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import com.ohnalmwo.main.navigation.mainScreen
import com.ohnalmwo.model.enum.Route
import com.ohnalmwo.setting.navigation.navigateToSettingAlarm
import com.ohnalmwo.setting.navigation.navigateToSettingFont
import com.ohnalmwo.setting.navigation.navigateToSettingTheme
import com.ohnalmwo.setting.navigation.settingAlarmScreen
import com.ohnalmwo.setting.navigation.settingFontScreen
import com.ohnalmwo.setting.navigation.settingScreen
import com.ohnalmwo.setting.navigation.settingThemeScreen
import dev.chrisbanes.haze.HazeState

@Composable
Expand All @@ -23,10 +30,26 @@ fun OndoseeNavHost(
mainScreen(
hazeState = hazeState,
)
composable<Route.Weekly> {

}
composable<Route.Setting> {
settingScreen(
hazeState = hazeState,
onThemeClick = navController::navigateToSettingTheme,
onFontClick = navController::navigateToSettingFont,
onAlarmClick = navController::navigateToSettingAlarm
)

settingThemeScreen(
onBackClick = navController::popBackStack
)

settingFontScreen(
onBackClick = navController::popBackStack
)

settingAlarmScreen(
onBackClick = navController::popBackStack
)
composable<Route.Weekly> {

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ package com.ohnalmwo.design_system.component.button
sealed class ButtonState {
data object Normal : ButtonState()
data object Transparent : ButtonState()
data object Primary : ButtonState()
data object NormalDark : ButtonState()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.ohnalmwo.design_system.component.button

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import com.ohnalmwo.design_system.icons.ChevronLeftIcon
import com.ohnalmwo.design_system.theme.OndoseeTheme.colors
import com.ohnalmwo.design_system.theme.OndoseeTheme.typography

@Composable
fun OndoseeBackButton(
modifier: Modifier = Modifier.height(48.dp),
onClick: () -> Unit,
) {
Row(
modifier = modifier
.padding(start = 15.dp)
.clickable { onClick() },
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(7.dp)
) {
ChevronLeftIcon()
Text(
text = "돌아가기",
style = typography.textMedium,
fontWeight = FontWeight.Normal,
color = colors.PRIMARY
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,30 @@ fun OndoseeButton(
width = 1.dp,
color = when (state) {
ButtonState.Normal -> colors.WHITE.copy(.05f)
ButtonState.Transparent -> Color.Transparent
else -> Color.Transparent
}
),
colors = ButtonDefaults.buttonColors(
containerColor = when (state) {
ButtonState.Normal -> colors.WHITE.copy(.2f)
ButtonState.Transparent -> Color.Transparent
ButtonState.Primary -> colors.PRIMARY
ButtonState.NormalDark -> colors.THEME_BLACK.copy(.25f)
},
contentColor = when (state) {
ButtonState.Normal -> colors.WHITE
ButtonState.Transparent -> colors.SECONDARY
ButtonState.Primary -> colors.WHITE
ButtonState.NormalDark -> colors.THEME_BLACK.copy(.5f)
}
),
onClick = onClick
) {
Text(
text = text,
style = style,
fontWeight = fontWeight
fontWeight = fontWeight,
color = colors.WHITE
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
package com.ohnalmwo.design_system.component.button

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.wear.compose.material.ExperimentalWearMaterialApi
import androidx.wear.compose.material.FractionalThreshold
import androidx.wear.compose.material.rememberSwipeableState
import androidx.wear.compose.material.swipeable
import com.ohnalmwo.design_system.theme.OndoseeTheme.colors
import kotlinx.coroutines.launch
import kotlin.math.roundToInt

@OptIn(ExperimentalWearMaterialApi::class)
@Composable
fun OndoseeSwitchButton(
height: Dp = 32.dp,
width: Dp = 52.dp,
circleSize: Dp = 26.dp,
circleHorizontalButtonPadding: Dp = 3.dp,
circleVerticalButtonPadding: Dp = 2.dp,
switchOnBackground: Color = colors.ABLE,
switchOffBackground: Color = colors.DISABLE,
stateOn: Int,
stateOff: Int,
initialValue: Int,
onCheckedChanged: (checked: Boolean) -> Unit
) {
var clickListener by remember { mutableStateOf(false) }
var isActivation by remember { mutableStateOf(false) }

val swipeableState =
rememberSwipeableState(initialValue = initialValue, confirmStateChange = { true })

val sizePx = with(LocalDensity.current) { (width - height).toPx() }
val anchors = mapOf(0f to stateOff, sizePx to stateOn)
val scope = rememberCoroutineScope()

LaunchedEffect("init") {
if(initialValue == stateOn) {
clickListener = true
isActivation = true
}
}

LaunchedEffect(isActivation) {
if (isActivation) onCheckedChanged(true) else onCheckedChanged(false)
}

Box(
modifier = Modifier.clickable {
clickListener = !clickListener
scope.launch {
if (clickListener) {
swipeableState.animateTo(stateOn)
} else {
swipeableState.animateTo(stateOff)
}
}
}
) {
Row(
modifier = Modifier
.height(height)
.width(width)
.clip(RoundedCornerShape(height))
.background(
if (swipeableState.currentValue == stateOff) {
isActivation = false
switchOffBackground
} else {
isActivation = true
switchOnBackground
}
),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start
) {
Box(
modifier = Modifier
.offset { IntOffset(swipeableState.offset.value.roundToInt(), 0) }
.swipeable(
state = swipeableState,
anchors = anchors,
thresholds = { _, _ -> FractionalThreshold(0.3f) },
orientation = Orientation.Horizontal
)
.padding(
horizontal = circleHorizontalButtonPadding,
vertical = circleVerticalButtonPadding,
)
.clip(RoundedCornerShape(50))
.background(color = Color.White)
.size(circleSize)
)
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.ohnalmwo.design_system.component.topbar

import android.util.Log
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
Expand Down
Loading

0 comments on commit 4999d98

Please sign in to comment.