Skip to content
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
5 changes: 4 additions & 1 deletion feature/home/src/main/java/com/idiotfrogs/home/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ fun HomeScreen(
val menuList by remember {
mutableStateOf(
listOf(
MSMenuFabModel("μƒˆ ν‹°μΌ“ μƒμ„±ν•˜κΈ°") { navigateToCreate() },
MSMenuFabModel("μƒˆ ν‹°μΌ“ μƒμ„±ν•˜κΈ°") {
expanded = false
navigateToCreate()
},
MSMenuFabModel("μ°Έμ—¬μ½”λ“œλ‘œ ν•©λ₯˜ν•˜κΈ°") {
expanded = false
showJoinContainer = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.idiotfrogs.home.component

import androidx.compose.animation.core.animateDpAsState
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
Expand Down Expand Up @@ -31,6 +32,12 @@ fun HomeTabBar(
onClick: (HomeTab) -> Unit,
) {
val homeTabs = remember { HomeTab.entries }
val startInset by animateDpAsState(
targetValue = if (selectedTab.ordinal == 0) 20.dp else 0.dp
)
val endInset by animateDpAsState(
targetValue = if (selectedTab.ordinal == HomeTab.entries.lastIndex) 20.dp else 0.dp
)
CompositionLocalProvider(LocalRippleConfiguration provides null) {
TabRow(
selectedTabIndex = selectedTab.ordinal,
Expand All @@ -39,10 +46,7 @@ fun HomeTabBar(
TabRowDefaults.SecondaryIndicator(
modifier = Modifier
.tabIndicatorOffset(tabPositions[selectedTab.ordinal])
.padding(
start = if (selectedTab.ordinal == 0) 20.dp else 0.dp,
end = if (selectedTab.ordinal == tabPositions.lastIndex) 20.dp else 0.dp
),
.padding(start = startInset, end = endInset),
height = 2.dp,
color = MSTheme.color.black
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.input.rememberTextFieldState
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
Expand Down Expand Up @@ -40,14 +41,18 @@ fun ProfileScreen(
navigateToBack: () -> Unit,
navigateToLogin: () -> Unit,
) {
// TODO: μΆ”ν›„ κΈ°μ‘΄ ν”„λ‘œν•„κ³Ό 비ꡐ 둜직 μž‘μ„±
var isChanged by remember { mutableStateOf(false) }
var showLogoutDialog by remember { mutableStateOf(false) }
var showWithdrawDialog by remember { mutableStateOf(false) }

val (imageUri, launchImagePicker) = rememberPickerState()
val textFieldState = rememberTextFieldState()

LaunchedEffect(textFieldState.text) {
// TODO: μΆ”ν›„ κΈ°μ‘΄ ν”„λ‘œν•„κ³Ό 비ꡐ 둜직 μž‘μ„±
isChanged = textFieldState.text.isNotEmpty()
}

if (showLogoutDialog) {
MSDialog(
title = "λ‘œκ·Έμ•„μ›ƒ",
Expand Down Expand Up @@ -175,7 +180,6 @@ fun ProfileScreen(
)
Spacer(modifier = Modifier.height(16.dp))
}

}

@Preview
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ fun ProfileHeader(
color = MSTheme.color.black
)
MSText(
modifier = Modifier.noRippleClickable(onSave),
modifier = Modifier.noRippleClickable {
if (isChanged) onSave()
},
text = "μ €μž₯",
fontWeight = FontWeight.Bold,
fontSize = 14.dp,
Expand Down