[FEAT/#64] 탐색 페이지 말 줄임표 추가

teamterning · Jul 13, 2024 · d7fe08b · d7fe08b
1 parent 988a5d0
commit d7fe08b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 41 deletions.
diff --git a/feature/src/main/java/com/terning/feature/intern/InternRoute.kt b/feature/src/main/java/com/terning/feature/intern/InternRoute.kt
@@ -4,37 +4,39 @@ import androidx.compose.foundation.border
 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.padding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 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.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
+import com.terning.core.designsystem.component.dialog.TerningBasicDialog
 import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar
 import com.terning.core.designsystem.theme.Black
 import com.terning.core.designsystem.theme.Grey200
-import com.terning.core.designsystem.theme.Grey300
 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.customShadow
-import com.terning.core.extension.noRippleClickable
 import com.terning.feature.R
 import com.terning.feature.intern.component.InternBottomBar
 import com.terning.feature.intern.component.InternCompanyInfo
 import com.terning.feature.intern.component.InternInfoRow
 import com.terning.feature.intern.component.InternPageTitle
+import com.terning.feature.intern.component.ScrapCancelDialogContent
+import com.terning.feature.intern.component.ScrapDialogContent
 import java.text.DecimalFormat
 
 @Composable
@@ -70,32 +72,15 @@ fun InternScreen(
                     offsetY = 2.dp
                 ),
                 onBackButtonClick = {},
-                listOf(
-                    {},
-                    {
-                        IconButton(onClick = {}) {
-                            Icon(
-                                painter = painterResource(id = R.drawable.ic_intern_share_22),
-                                contentDescription = stringResource(
-                                    id = R.string.intern_share_icon
-                                ),
-                                modifier = modifier
-                                    .noRippleClickable { },
-                                tint = Grey300
-                            )
-                        }
-                    },
-                    {
-                        Spacer(modifier = modifier.padding(end = 8.dp))
-                    }
-                )
             )
         },
         bottomBar = {
             InternBottomBar(
                 modifier = modifier,
                 isScrap = state.isScrapped,
-                onScrapClick = { viewModel.updateScrapDialogVisible(true) }
+                onScrapClick = {
+                    viewModel.updateScrapDialogVisible(true)
+                }
             )
         }
     ) { paddingValues ->
@@ -145,6 +130,7 @@ fun InternScreen(
                             bottom = 16.dp
                         )
                     )
+
                     Column(
                         modifier = modifier
                             .border(

diff --git a/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt b/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt
@@ -130,35 +130,29 @@ fun SearchProcessScreen(
                     )
                     Row(
                         modifier = Modifier
-                            .fillMaxWidth()
                             .padding(
                                 top = 16.dp,
                                 bottom = 6.dp
-                            ),
+                            )
+                            .fillMaxWidth(),
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.Center
                     ) {
-                        Row(
-                            modifier = modifier.wrapContentWidth(),
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.Center
-                        ) {
-                            Text(
-                                text = state.query,
-                                style = TerningTheme.typography.body1,
-                                color = TerningMain,
-                                maxLines = MAX_LINES,
-                                overflow = TextOverflow.Ellipsis,
-                            )
-                        }
+                        Text(
+                            text = state.query,
+                            style = TerningTheme.typography.body1,
+                            color = TerningMain,
+                            maxLines = MAX_LINES,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier = Modifier.weight(1f, false)
+                        )
                         Text(
                             text = stringResource(id = R.string.search_process_no_result_text_sub),
                             style = TerningTheme.typography.body1,
                             color = Grey400,
-                            modifier = modifier.weight(1f)
+                            modifier = Modifier.wrapContentWidth()
                         )
                     }
-
                     Text(
                         text = stringResource(
                             id = R.string.search_process_no_result_text_main