Merge pull request #405 from teamterning/refactor/#402

[REFACTOR/#402] 유빈 뷰 / 리팩토링

Author: leeeyubin

core/designsystem/src/main/java/com/terning/core/designsystem/component/button/DeleteRoundButton.kt

@@ -70,7 +70,7 @@ fun DeleteRoundButton(
 
 @Preview(showBackground = true)
 @Composable
-fun DeleteRoundButtonPreview() {
+private fun DeleteRoundButtonPreview() {
     TerningPointTheme {
         DeleteRoundButton(
             style = TextStyle(),

core/designsystem/src/main/java/com/terning/core/designsystem/component/button/FilteringButton.kt

@@ -101,7 +101,7 @@ fun FilteringButton(
 
 @Preview(showBackground = true)
 @Composable
-fun FilteringButtonPreview() {
+private fun FilteringButtonPreview() {
     TerningPointTheme {
         Column {
             FilteringButton(

core/designsystem/src/main/java/com/terning/core/designsystem/component/image/TerningImage.kt

@@ -14,17 +14,24 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.R
+import com.terning.core.designsystem.extension.noRippleClickable
+import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.type.ProfileImage
 
 @Composable
 fun ProfileWithPlusButton(
     profileImage: String,
+    onClick: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val userProfile = ProfileImage.fromString(profileImage)
 
     Box(
-        modifier = modifier.wrapContentWidth()
+        modifier = modifier
+            .wrapContentWidth()
+            .noRippleClickable {
+                onClick(true)
+            }
     ) {
         Image(
             painterResource(id = userProfile.drawableResId),
@@ -44,6 +51,11 @@ fun ProfileWithPlusButton(
 
 @Preview(showBackground = true)
 @Composable
-fun ProfileWithPlusButtonPreview() {
-    ProfileWithPlusButton(profileImage = "basic")
+private fun ProfileWithPlusButtonPreview() {
+    TerningPointTheme {
+        ProfileWithPlusButton(
+            profileImage = "basic",
+            onClick = {}
+        )
+    }
 }

core/designsystem/src/main/java/com/terning/core/designsystem/component/item/ProfileWithPlusButton.kt

@@ -62,5 +62,4 @@ dependencies {
     implementation(libs.process.phoenix)
     implementation(libs.bundles.retrofit)
     implementation(libs.bundles.okhttp)
-    implementation(platform(libs.okhttp.bom))
 }

core/network/build.gradle.kts

@@ -31,7 +31,7 @@ import com.terning.feature.filtering.R
 import com.terning.feature.filtering.filteringone.component.StatusOneRadioGroup
 
 @Composable
-fun FilteringOneRoute(
+internal fun FilteringOneRoute(
     name: String,
     onNextClick: (String) -> Unit,
     navigateUp: () -> Unit,
@@ -73,7 +73,7 @@ fun FilteringOneRoute(
 }
 
 @Composable
-fun FilteringOneScreen(
+private fun FilteringOneScreen(
     name: String,
     onNextClick: (String) -> Unit,
     navigateUp: () -> Unit,
@@ -153,7 +153,7 @@ fun FilteringOneScreen(
 
 @Preview(showBackground = true)
 @Composable
-fun FilteringOneScreenPreview() {
+private fun FilteringOneScreenPreview() {
     TerningPointTheme {
         FilteringOneScreen(
             name = "터닝이",

feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt

@@ -16,7 +16,7 @@ import com.terning.core.designsystem.type.Grade
 import com.terning.feature.filtering.R
 
 @Composable
-fun StatusOneRadioGroup(
+internal fun StatusOneRadioGroup(
     onButtonClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {

feature/filtering/src/main/java/com/terning/feature/filtering/filteringone/component/StatusOneRadioGroup.kt

@@ -39,7 +39,7 @@ import com.terning.feature.filtering.filteringthree.component.FilteringYearMonth
 import java.util.Calendar
 
 @Composable
-fun FilteringThreeRoute(
+internal fun FilteringThreeRoute(
     grade: String,
     workingPeriod: String,
     navigateUp: () -> Unit,
@@ -101,7 +101,7 @@ fun FilteringThreeRoute(
 }
 
 @Composable
-fun FilteringThreeScreen(
+private fun FilteringThreeScreen(
     navigateUp: () -> Unit,
     chosenYear: Int,
     chosenMonth: Int,
@@ -167,7 +167,7 @@ fun FilteringThreeScreen(
 
 @Preview(showBackground = true)
 @Composable
-fun FilteringThreeScreenPreview() {
+private fun FilteringThreeScreenPreview() {
     TerningPointTheme {
         FilteringThreeScreen(
             navigateUp = { },

feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeRoute.kt

@@ -38,9 +38,10 @@ import com.terning.core.designsystem.util.CalendarDefaults.END_MONTH
 import com.terning.core.designsystem.util.CalendarDefaults.END_YEAR
 import com.terning.core.designsystem.util.CalendarDefaults.START_MONTH
 import com.terning.core.designsystem.util.CalendarDefaults.START_YEAR
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
-import okhttp3.internal.toImmutableList
 
 private val years =
     (START_YEAR..END_YEAR).map { "${it}년" }.toImmutableList()
@@ -107,7 +108,7 @@ fun FilteringYearMonthPicker(
 
 @Composable
 fun DatePicker(
-    items: List<String>,
+    items: ImmutableList<String>,
     modifier: Modifier = Modifier,
     pickerState: PickerState = rememberPickerState(),
     startIndex: Int = 0,

feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/component/FilteringYearMonthPicker.kt

@@ -31,7 +31,7 @@ import com.terning.feature.filtering.R
 import com.terning.feature.filtering.filteringtwo.component.StatusTwoRadioGroup
 
 @Composable
-fun FilteringTwoRoute(
+internal fun FilteringTwoRoute(
     grade: String,
     onNextClick: (String, String) -> Unit,
     navigateUp: () -> Unit,
@@ -76,7 +76,7 @@ fun FilteringTwoRoute(
 }
 
 @Composable
-fun FilteringTwoScreen(
+private fun FilteringTwoScreen(
     grade: String,
     onNextClick: (String, String) -> Unit,
     navigateUp: () -> Unit,
@@ -142,7 +142,7 @@ fun FilteringTwoScreen(
 
 @Preview(showBackground = true)
 @Composable
-fun FilteringTwoScreenPreview() {
+private fun FilteringTwoScreenPreview() {
     TerningPointTheme {
         FilteringTwoScreen(
             grade = "freshman",