Merge remote-tracking branch 'origin/develop' into ui/#12-home-view-ui

# Conflicts:
#	feature/src/main/java/com/terning/feature/home/HomeRoute.kt

core/src/main/java/com/terning/core/designsystem/component/bottomsheet/SortBy.kt

@@ -0,0 +1,12 @@
+package com.terning.core.designsystem.component.bottomsheet
+
+import androidx.annotation.StringRes
+import com.terning.core.R
+
+enum class SortBy(@StringRes val type: Int) {
+    EARLIEST(R.string.sort_by_earliest),
+    SHORTEST(R.string.sort_by_shortest),
+    LONGEST(R.string.sort_by_longest),
+    SCRAP(R.string.sort_by_scrap),
+    VIEW_COUNT(R.string.sort_by_view_count),
+}

core/src/main/java/com/terning/core/designsystem/component/bottomsheet/SortingBottomSheet.kt

@@ -0,0 +1,94 @@
+package com.terning.core.designsystem.component.bottomsheet
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+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.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.terning.core.R
+import com.terning.core.designsystem.theme.Black
+import com.terning.core.designsystem.theme.Grey200
+import com.terning.core.designsystem.theme.Grey400
+import com.terning.core.designsystem.theme.TerningMain
+import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.extension.noRippleClickable
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SortingBottomSheet(
+    onDismiss: () -> Unit,
+    currentSortBy: Int,
+    modifier: Modifier = Modifier,
+    newSortBy: MutableState<Int> = mutableStateOf(currentSortBy),
+) {
+    val scope = rememberCoroutineScope()
+    val sheetState = rememberModalBottomSheetState()
+    var currentSortBy by remember { mutableStateOf(currentSortBy) }
+
+    TerningBasicBottomSheet(
+        content = {
+            Text(
+                text = stringResource(id = R.string.sort_bottom_sheet_title),
+                style = TerningTheme.typography.title2,
+                color = Black,
+                modifier = modifier
+                    .padding(start = 27.dp, bottom = 16.dp)
+            )
+
+            HorizontalDivider(
+                thickness = 1.dp,
+                color = Grey200,
+                modifier = modifier.padding(horizontal = 24.dp)
+            )
+
+            LazyColumn(
+                modifier = modifier
+                    .padding(top = 12.dp, bottom = 19.dp)
+                    .padding(horizontal = 24.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                items(sortByCount) { sortIndex ->
+                    Text(
+                        text = stringResource(id = SortBy.entries[sortIndex].type),
+                        style = TerningTheme.typography.button3,
+                        color = if (currentSortBy == sortIndex) TerningMain else Grey400,
+                        textAlign = TextAlign.Start,
+                        modifier = modifier
+                            .fillMaxWidth()
+                            .padding(start = 3.dp)
+                            .padding(vertical = 12.dp)
+                            .noRippleClickable {
+                                newSortBy.value = sortIndex
+                                scope
+                                    .launch { sheetState.hide() }
+                                    .invokeOnCompletion {
+                                        if (!sheetState.isVisible) {
+                                            onDismiss()
+                                        }
+                                    }
+                            }
+                    )
+                }
+            }
+        },
+        onDismissRequest = { onDismiss() },
+        sheetState = sheetState
+    )
+}
+
+private const val sortByCount = 5

core/src/main/java/com/terning/core/designsystem/component/bottomsheet/TerningBasicBottomSheet.kt

@@ -1,27 +1,26 @@
 package com.terning.core.designsystem.component.bottomsheet
 
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import com.terning.core.designsystem.theme.White
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TerningBasicBottomSheet(
-    modifier: Modifier = Modifier,
     content: @Composable () -> Unit,
-    onDismissRequest: () -> Unit
+    onDismissRequest: () -> Unit,
+    sheetState: SheetState = rememberModalBottomSheetState()
 ) {
-    val sheetState = rememberModalBottomSheetState()
-
     ModalBottomSheet(
         onDismissRequest = {
             onDismissRequest()
         },
         sheetState = sheetState,
-        modifier = modifier.navigationBarsPadding()
+        containerColor = White,
     ) {
         content()
     }

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

@@ -0,0 +1,49 @@
+package com.terning.core.designsystem.component.button
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.terning.core.R
+import com.terning.core.designsystem.component.bottomsheet.SortBy
+import com.terning.core.designsystem.theme.Black
+import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.extension.noRippleClickable
+
+@Composable
+fun SortingButton(
+    sortBy: Int = 0,
+    modifier: Modifier = Modifier,
+    onCLick: () -> Unit,
+) {
+    Row(
+        modifier = modifier
+            .noRippleClickable { onCLick() }
+    ) {
+        Text(
+            text = stringResource(
+                id = SortBy.entries[sortBy].type
+            ),
+            style = TerningTheme.typography.button3,
+            color = Black,
+            modifier = modifier
+                .padding(
+                    top = 6.dp,
+                    bottom = 5.dp,
+                    start = 12.dp,
+                )
+        )
+        Image(
+            painter = painterResource(id = R.drawable.ic_down),
+            contentDescription = stringResource(id = R.string.sort_button_description),
+            modifier = modifier
+                .padding(vertical = 5.dp)
+                .padding(end = 2.dp)
+        )
+    }
+}

core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt

@@ -1,6 +1,7 @@
 package com.terning.core.designsystem.component.textfield
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import com.terning.core.designsystem.theme.Black
@@ -22,6 +23,7 @@ fun NameTextField(
     TerningBasicTextField(
         value = text,
         onValueChange = onValueChange,
+        modifier = Modifier,
         textStyle = TerningTheme.typography.detail1,
         textColor = Black,
         drawLineColor = Grey500,

core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt

@@ -1,6 +1,7 @@
 package com.terning.core.designsystem.component.textfield
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.SolidColor
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.Grey400
@@ -9,15 +10,19 @@ import com.terning.core.designsystem.theme.TerningTheme
 
 @Composable
 fun SearchTextField(
-    text: String,
-    onValueChange: (String) -> Unit,
+    text: String = "",
+    onValueChange: (String) -> Unit = {},
+    modifier: Modifier,
     hint: String,
     leftIcon: Int,
+    enabled: Boolean = true,
     readOnly: Boolean = false,
+    onDoneAction: (() -> Unit)? = null,
 ) {
     TerningBasicTextField(
         value = text,
         onValueChange = onValueChange,
+        modifier = modifier,
         textStyle = TerningTheme.typography.button3,
         textColor = Grey400,
         cursorBrush = SolidColor(Grey300),
@@ -27,6 +32,8 @@ fun SearchTextField(
         hintColor = Grey300,
         leftIcon = leftIcon,
         leftIconColor = TerningMain,
+        enabled = enabled,
         readOnly = readOnly,
+        onDoneAction = onDoneAction
     )
 }

core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt

@@ -35,8 +35,9 @@ import com.terning.core.designsystem.theme.White
 
 @Composable
 fun TerningBasicTextField(
-    value: String,
-    onValueChange: (String) -> Unit,
+    value: String = "",
+    onValueChange: (String) -> Unit = {},
+    modifier: Modifier,
     textStyle: TextStyle,
     textColor: Color,
     hintColor: Color,
@@ -51,7 +52,9 @@ fun TerningBasicTextField(
     helperMessage: String = "",
     helperIcon: Int? = null,
     helperColor: Color = TerningMain,
+    enabled: Boolean = true,
     readOnly: Boolean = false,
+    onDoneAction: (() -> Unit)? = null,
 ) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
@@ -67,10 +70,11 @@ fun TerningBasicTextField(
             onDone = {
                 keyboardController?.hide()
                 focusManager.clearFocus()
+                onDoneAction?.invoke()
             }
         ),
 
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .background(White)
             .drawWithContent {
@@ -124,6 +128,8 @@ fun TerningBasicTextField(
                 }
             }
         },
+
+        enabled = enabled,
         readOnly = readOnly,
     )
 

core/src/main/java/com/terning/core/designsystem/component/topappbar/BackButtonTopAppBar.kt

@@ -1,14 +1,18 @@
 package com.terning.core.designsystem.component.topappbar
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 
 @Composable
 fun BackButtonTopAppBar(
-    title: String, onBackButtonClick: (() -> Unit),
+    title: String,
+    modifier: Modifier,
+    onBackButtonClick: (() -> Unit),
 ) {
     TerningBasicTopAppBar(
         title = title,
         showBackButton = true,
+        modifier = modifier,
         onBackButtonClick = { onBackButtonClick.invoke() },
     )
 }

core/src/main/java/com/terning/core/designsystem/component/topappbar/LogoTopAppBar.kt

@@ -2,19 +2,23 @@ package com.terning.core.designsystem.component.topappbar
 
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import com.terning.core.R
 
 @Composable
-fun LogoTopAppBar() {
+fun LogoTopAppBar(
+    modifier: Modifier = Modifier
+) {
     TerningBasicTopAppBar(
         showBackButton = false,
         actions = listOf {
             Icon(
                 painter = painterResource(id = R.drawable.ic_logo),
                 contentDescription = stringResource(id = R.string.ic_logo),
             )
-        }
+        },
+        modifier = modifier
     )
 }

core/src/main/java/com/terning/core/designsystem/component/topappbar/MyPageTopAppBar.kt

@@ -6,14 +6,17 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import com.terning.core.R
 import com.terning.core.designsystem.theme.TerningTheme
 
 @Composable
-fun MyPageTopAppBar() {
+fun MyPageTopAppBar(
+    modifier: Modifier = Modifier,
+) {
     TerningBasicTopAppBar(
         showBackButton = false,
         actions = listOf(
@@ -36,6 +39,7 @@ fun MyPageTopAppBar() {
                     }
                 }
             }
-        )
+        ),
+        modifier = modifier,
     )
 }