Skip to content

Commit d98df3e

Browse files
committed
[refactor]: 기타(주석, preview) 수정 (#44)
1 parent 93f91bb commit d98df3e

5 files changed

Lines changed: 24 additions & 19 deletions

File tree

app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoomSmall.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.texthip.thip.ui.common.cards
22

3-
import android.R.attr.onClick
43
import androidx.compose.foundation.Image
54
import androidx.compose.foundation.clickable
65
import androidx.compose.foundation.layout.Arrangement

app/src/main/java/com/texthip/thip/ui/common/forms/SearchBookTextField.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import androidx.compose.foundation.clickable
55
import androidx.compose.foundation.layout.*
66
import androidx.compose.foundation.shape.RoundedCornerShape
77
import androidx.compose.foundation.text.BasicTextField
8+
import androidx.compose.foundation.text.KeyboardActions
9+
import androidx.compose.foundation.text.KeyboardOptions
810
import androidx.compose.material3.Icon
911
import androidx.compose.material3.Text
1012
import androidx.compose.runtime.*
@@ -15,6 +17,7 @@ import androidx.compose.ui.draw.clip
1517
import androidx.compose.ui.graphics.Color
1618
import androidx.compose.ui.graphics.SolidColor
1719
import androidx.compose.ui.res.painterResource
20+
import androidx.compose.ui.text.input.ImeAction
1821
import androidx.compose.ui.tooling.preview.Preview
1922
import androidx.compose.ui.unit.dp
2023
import androidx.compose.ui.unit.sp
@@ -57,6 +60,10 @@ fun SearchBookTextField(
5760
singleLine = true,
5861
textStyle = myStyle,
5962
cursorBrush = SolidColor(colors.NeonGreen),
63+
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
64+
keyboardActions = KeyboardActions(
65+
onSearch = { onSearch(text) }
66+
),
6067
modifier = Modifier
6168
.weight(1f)
6269
.padding(start = 12.dp, end = 8.dp),

app/src/main/java/com/texthip/thip/ui/common/forms/SingleDigitTextBox.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ package com.texthip.thip.ui.common.forms
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.border
5-
import androidx.compose.foundation.clickable
65
import androidx.compose.foundation.layout.Box
76
import androidx.compose.foundation.layout.fillMaxSize
87
import androidx.compose.foundation.layout.size
98
import androidx.compose.foundation.shape.RoundedCornerShape
109
import androidx.compose.foundation.text.BasicTextField
1110
import androidx.compose.foundation.text.KeyboardOptions
12-
import androidx.compose.material3.OutlinedTextField
13-
import androidx.compose.material3.TextFieldDefaults
1411
import androidx.compose.runtime.Composable
1512
import androidx.compose.runtime.getValue
1613
import androidx.compose.runtime.mutableStateOf
@@ -27,6 +24,7 @@ import androidx.compose.ui.text.style.TextAlign
2724
import androidx.compose.ui.tooling.preview.Preview
2825
import androidx.compose.ui.unit.dp
2926
import androidx.compose.ui.unit.sp
27+
import com.texthip.thip.ui.theme.ThipTheme
3028
import com.texthip.thip.ui.theme.ThipTheme.colors
3129
import com.texthip.thip.ui.theme.ThipTheme.typography
3230

@@ -36,7 +34,7 @@ fun SingleDigitBox(
3634
value: String,
3735
onValueChange: (String) -> Unit,
3836
onBackspace: (() -> Unit)? = null,
39-
containerColor: Color = colors.Black,
37+
containerColor: Color = colors.darkGray01,
4038
borderColor: Color = Color.Transparent
4139
) {
4240
val myStyle = typography.smalltitle_sb600_s18_h24.copy(
@@ -89,17 +87,19 @@ fun SingleDigitBox(
8987
}
9088
}
9189

92-
@Preview(showBackground = true, backgroundColor = 0xFF000000)
90+
@Preview
9391
@Composable
9492
fun PreviewSingleDigitBox() {
95-
var digit by rememberSaveable { mutableStateOf("") }
96-
Box(
97-
modifier = Modifier.size(60.dp),
98-
contentAlignment = Alignment.Center
99-
) {
100-
SingleDigitBox(
101-
value = digit,
102-
onValueChange = { digit = it }
103-
)
93+
ThipTheme {
94+
var digit by rememberSaveable { mutableStateOf("") }
95+
Box(
96+
modifier = Modifier.size(60.dp),
97+
contentAlignment = Alignment.Center
98+
) {
99+
SingleDigitBox(
100+
value = digit,
101+
onValueChange = { digit = it }
102+
)
103+
}
104104
}
105-
}
105+
}

app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRoomScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.texthip.thip.ui.group.myroom.screen
22

33
import androidx.compose.foundation.Image
44
import androidx.compose.foundation.background
5-
import androidx.compose.foundation.border
65
import androidx.compose.foundation.layout.Arrangement
76
import androidx.compose.foundation.layout.Box
87
import androidx.compose.foundation.layout.Column
@@ -44,8 +43,8 @@ import com.texthip.thip.ui.common.modal.ToastWithDate
4443
import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
4544
import com.texthip.thip.ui.group.myroom.mock.GroupBookData
4645
import com.texthip.thip.ui.group.myroom.mock.GroupBottomButtonType
47-
import com.texthip.thip.ui.group.myroom.mock.GroupRoomData
4846
import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
47+
import com.texthip.thip.ui.group.myroom.mock.GroupRoomData
4948
import com.texthip.thip.ui.theme.ThipTheme
5049
import com.texthip.thip.ui.theme.ThipTheme.colors
5150
import com.texthip.thip.ui.theme.ThipTheme.typography

app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupSearchScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fun GroupSearchScreen(
8585
// 정렬
8686
when (selectedSortOption) {
8787
"마감임박순" -> filtered.sortedBy { it.endDate }
88-
"최신순" -> filtered // 아직 미구현
88+
"최신순" -> filtered // TODO: 생성일 기준 정렬 필요
8989
"참여많은순" -> filtered.sortedByDescending { it.participants }
9090
else -> filtered
9191
}

0 commit comments

Comments
 (0)