Merge pull request #241 from mash-up-kr/chore/home_tap

�홈 탭바 디자인 변경
mash-up-kr · Sep 30, 2024 · 611cb50 · 611cb50
2 parents cc75fa4 + b44e111
commit 611cb50
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 35 deletions.
diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
@@ -70,9 +70,6 @@ dependencies {
     // Image
     implementation(libs.coil)
 
-    // Blur
-    implementation(libs.haze)
-
     // Paging
     implementation(libs.paging.runtime)
     implementation(libs.paging.compose)

diff --git a/feature/home/src/main/java/com/mashup/dorabangs/feature/home/HomeScreen.kt b/feature/home/src/main/java/com/mashup/dorabangs/feature/home/HomeScreen.kt
@@ -57,10 +57,6 @@ import com.mashup.dorabangs.core.designsystem.theme.DoraColorTokens
 import com.mashup.dorabangs.core.designsystem.theme.DoraGradientToken
 import com.mashup.dorabangs.core.designsystem.theme.DoraRoundTokens
 import com.mashup.dorabangs.core.designsystem.theme.DoraTypoTokens
-import dev.chrisbanes.haze.HazeState
-import dev.chrisbanes.haze.HazeStyle
-import dev.chrisbanes.haze.haze
-import dev.chrisbanes.haze.hazeChild
 
 @Composable
 fun HomeScreen(
@@ -81,8 +77,6 @@ fun HomeScreen(
     Box(
         modifier = modifier.fillMaxSize(),
     ) {
-        val hazeState = remember { HazeState() }
-
         if (state.isLoading) {
             Box(
                 modifier = Modifier
@@ -141,9 +135,7 @@ fun HomeScreen(
             }
         } else {
             DoraInfinityLazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .haze(hazeState),
+                modifier = Modifier.fillMaxSize(),
                 scrollState = scrollState,
                 isLoadAvailable = state.isScrollLoading.not(),
                 onReachedBottom = onReachedBottom,
@@ -208,15 +200,13 @@ fun HomeScreen(
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(101.dp)
-                    .hazeChild(
-                        state = hazeState,
-                        style = HazeStyle(blurRadius = 12.dp),
-                    ),
+                    .height(101.dp),
             )
         }
 
-        Column {
+        Column(
+            modifier = Modifier.background(DoraColorTokens.White),
+        ) {
             DoraTopBar.HomeTopBar(
                 modifier = Modifier
                     .height(48.dp)
@@ -467,15 +457,12 @@ fun HomeScreenPreview() {
             tapElements = listOf(
                 FeedUiModel.DoraChipUiModel(
                     title = "전체",
-                    icon = R.drawable.ic_plus,
                 ),
                 FeedUiModel.DoraChipUiModel(
                     title = "즐겨찾기",
-                    icon = R.drawable.ic_plus,
                 ),
                 FeedUiModel.DoraChipUiModel(
                     title = "나중에 읽을 링크",
-                    icon = R.drawable.ic_plus,
                 ),
                 FeedUiModel.DoraChipUiModel(
                     title = "테스트",

diff --git a/feature/home/src/main/java/com/mashup/dorabangs/feature/home/HomeViewModel.kt b/feature/home/src/main/java/com/mashup/dorabangs/feature/home/HomeViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.mashup.dorabangs.core.coroutine.doraLaunch
-import com.mashup.dorabangs.core.designsystem.R
 import com.mashup.dorabangs.core.designsystem.component.chips.FeedUiModel.DoraChipUiModel
 import com.mashup.dorabangs.core.designsystem.component.chips.FeedUiModel.FeedCardUiModel
 import com.mashup.dorabangs.core.designsystem.component.toast.ToastStyle
@@ -171,25 +170,17 @@ class HomeViewModel @Inject constructor(
         intent {
             reduce {
                 state.copy(
-                    tapElements = folderList.mapIndexed { index, folder ->
+                    tapElements = folderList.map { folder ->
                         DoraChipUiModel(
                             id = folder.id.orEmpty(),
                             title = folder.name,
-                            icon = setDefaultFolderIcon(index),
                         )
                     },
                 )
             }
         }
     }
 
-    private fun setDefaultFolderIcon(index: Int) = when (index) {
-        0 -> R.drawable.ic_3d_all_small
-        1 -> R.drawable.ic_3d_bookmark_small
-        2 -> R.drawable.ic_3d_pin_small
-        else -> null
-    }
-
     private fun setTextHelperEnable(
         isEnable: Boolean,
         helperMsg: String,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -40,7 +40,6 @@ datastore = "1.1.1"
 jsoup = "1.14.3"
 gms = "4.4.2"
 firebase-bom = "33.1.1"
-haze = "0.7.2"
 lottie = "6.4.1"
 paging = "3.3.0"
 paging-common = "3.1.1"
@@ -112,9 +111,6 @@ coil = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 #html
 jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
 
-#blur
-haze = { group = "dev.chrisbanes.haze", name = "haze", version.ref = "haze" }
-
 #firebase
 firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebase-bom" }
 firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" }