[REFACTOR] QA 나머지 수정 #129
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,24 @@ | ||
| package com.texthip.thip.ui.common.buttons | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| 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.platform.LocalConfiguration | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.texthip.thip.ui.theme.ThipTheme | ||
|
|
||
| @SuppressLint("ConfigurationScreenWidthHeight") | ||
| @Composable | ||
| fun GenreChipRow( | ||
| modifier: Modifier = Modifier.width(4.dp), | ||
|
|
@@ -21,35 +27,95 @@ fun GenreChipRow( | |
| onSelect: (Int) -> Unit, | ||
| horizontalArrangement: Arrangement.Horizontal = Arrangement.Center | ||
| ) { | ||
| val configuration = LocalConfiguration.current | ||
| val screenWidthDp = configuration.screenWidthDp | ||
|
|
||
| if (screenWidthDp < 360) { | ||
|
There was a problem hiding this comment. The hardcoded value 360 should be extracted as a named constant to improve code readability and maintainability. |
||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| modifier = Modifier.fillMaxWidth() | ||
| ) { | ||
| Row( | ||
| horizontalArrangement = Arrangement.Center | ||
| ) { | ||
| genres.take(3).forEachIndexed { idx, genre -> | ||
| OptionChipButton( | ||
| modifier = Modifier | ||
| .clip(RoundedCornerShape(20.dp)), | ||
| text = genre, | ||
| isFilled = true, | ||
| isSelected = selectedIndex == idx, | ||
| onClick = { | ||
| if (selectedIndex == idx) { | ||
| onSelect(-1) | ||
| } else { | ||
| onSelect(idx) | ||
| } | ||
| } | ||
| ) | ||
| if (idx < 2) { | ||
| Spacer(modifier = modifier) | ||
| } | ||
| } | ||
| } | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
|
|
||
| Row( | ||
| horizontalArrangement = Arrangement.Center | ||
| ) { | ||
| genres.drop(3).forEachIndexed { relativeIdx, genre -> | ||
| val idx = relativeIdx + 3 | ||
| OptionChipButton( | ||
| modifier = Modifier | ||
| .clip(RoundedCornerShape(20.dp)), | ||
| text = genre, | ||
| isFilled = true, | ||
| isSelected = selectedIndex == idx, | ||
| onClick = { | ||
| if (selectedIndex == idx) { | ||
| onSelect(-1) | ||
| } else { | ||
| onSelect(idx) | ||
| } | ||
| } | ||
| ) | ||
| if (relativeIdx < genres.drop(3).size - 1) { | ||
| Spacer(modifier = modifier) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = horizontalArrangement | ||
| ) { | ||
| genres.forEachIndexed { idx, genre -> | ||
| OptionChipButton( | ||
| modifier = Modifier | ||
| .clip(RoundedCornerShape(20.dp)), | ||
| text = genre, | ||
| isFilled = true, | ||
| isSelected = selectedIndex == idx, | ||
| onClick = { | ||
| if (selectedIndex == idx) { | ||
| onSelect(-1) | ||
| } else { | ||
| onSelect(idx) | ||
| } | ||
| } | ||
| ) | ||
| if (idx < genres.size - 1) { | ||
| Spacer(modifier = modifier) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview(name = "Normal Screen (>=360dp)", widthDp = 400) | ||
| @Composable | ||
| fun PreviewGenreChipRowNormal() { | ||
| ThipTheme { | ||
| GenreChipRow( | ||
| genres = listOf("문학", "과학·IT", "사회과학", "인문학", "예술"), | ||
|
|
@@ -58,3 +124,15 @@ fun PreviewGenreChipRow() { | |
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(name = "Small Screen (<360dp)", widthDp = 320) | ||
| @Composable | ||
| fun PreviewGenreChipRowSmall() { | ||
| ThipTheme { | ||
| GenreChipRow( | ||
| genres = listOf("문학", "과학·IT", "사회과학", "인문학", "예술"), | ||
| selectedIndex = 2, | ||
| onSelect = {} | ||
| ) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using @SuppressLint for ConfigurationScreenWidthHeight should be avoided. Consider using LocalDensity or other Compose-native approaches to handle screen size detection instead of suppressing the lint warning.