🔀 :: (#145) qa 버그

Team-SIGNAL · Dec 5, 2023 · 9e73490 · 9e73490
2 parents 061e6f8 + 67051b6
commit 9e73490
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/AllDiary.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/AllDiary.kt
@@ -51,16 +51,16 @@ internal fun AllDiary(
         diaryViewModel.fetchAllDiary()
     }
 
-    Column {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp),
+    ) {
         Header(
             title = stringResource(id = R.string.diary_all_diary),
             onLeadingClicked = moveToBack,
         )
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(horizontal = 16.dp),
-        ) {
+        Column {
             Row(modifier = Modifier.fillMaxSize()) {
                 Diaries(
                     moveToDiaryDetails = moveToDiaryDetails,

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/CreateDiary.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/CreateDiary.kt
@@ -238,7 +238,7 @@ private fun DiaryField(
             alignment = Alignment.Top,
             showLength = true,
             singleLine = false,
-            maxLength = 100,
+            maxLength = 2000,
         )
         PostImage(
             uri = { imagePreview },

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryState.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryState.kt
@@ -1,5 +1,7 @@
 package com.signal.signal_android.feature.main.diary
 
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import com.signal.domain.entity.DiariesEntity
 import com.signal.domain.entity.DiaryDetailsEntity
 import com.signal.domain.entity.MonthDiaryEntity
@@ -8,7 +10,7 @@ import java.time.LocalDate
 import java.util.UUID
 
 data class DiaryState(
-    val diaries: List<DiariesEntity.DiaryEntity>,
+    val diaries: SnapshotStateList<DiariesEntity.DiaryEntity>,
     val monthDiaries: List<MonthDiaryEntity.MonthDiaryEntity>,
     val diaryDetailsEntity: DiaryDetailsEntity,
     val isAllDiariesEmpty: Boolean,
@@ -23,7 +25,7 @@ data class DiaryState(
 ) {
     companion object {
         fun getDefaultState() = DiaryState(
-            diaries = listOf(),
+            diaries = mutableStateListOf(),
             monthDiaries = listOf(),
             diaryDetailsEntity = DiaryDetailsEntity(
                 date = "",

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryViewModel.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryViewModel.kt
@@ -29,7 +29,7 @@ class DiaryViewModel(
                     _diaries.addAll(it.diaryEntity)
                     setState(
                         copy(
-                            diaries = _diaries,
+                            diaries = _diaries.toMutableStateList(),
                             isAllDiariesEmpty = _diaries.isEmpty(),
                         )
                     )
@@ -71,7 +71,7 @@ class DiaryViewModel(
                     _diaries.addAll(it.diaryEntity)
                     setState(
                         copy(
-                            diaries = _diaries,
+                            diaries = _diaries.toMutableStateList(),
                             isDayDiariesEmpty = _diaries.isEmpty(),
                         )
                     )

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/feed/CommentDialog.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/feed/CommentDialog.kt
@@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -42,10 +43,10 @@ import com.signal.signal_android.designsystem.foundation.BodyLarge2
 import com.signal.signal_android.designsystem.foundation.SignalColor
 import com.signal.signal_android.designsystem.foundation.SubTitle
 import com.signal.signal_android.designsystem.textfield.SignalTextField
-import java.time.LocalDateTime
 import com.signal.signal_android.feature.coin.CoinDialog
 import com.signal.signal_android.feature.coin.CoinSideEffect
 import com.signal.signal_android.feature.coin.CoinViewModel
+import java.time.LocalDateTime
 
 @Composable
 internal fun CommentDialog(
@@ -215,6 +216,7 @@ private fun Comment(
                 .clip(CircleShape),
             model = profileImageUrl ?: R.drawable.ic_profile_image,
             contentDescription = stringResource(id = R.string.my_page_profile_image),
+            contentScale = ContentScale.Crop,
         )
         Spacer(modifier = Modifier.width(8.dp))
         Column {

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/home/Home.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/home/Home.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -85,11 +86,12 @@ internal fun Home(
                         .size(30.dp)
                         .clip(CircleShape)
                         .signalClickable(
-                            rippleEnabled = true,
+                            rippleEnabled = false,
                             onClick = {},
                         ),
                     model = myPageState.profile ?: R.drawable.ic_profile_image,
                     contentDescription = stringResource(id = R.string.my_page_profile_image),
+                    contentScale = ContentScale.Crop,
                 )
             }
             Spacer(modifier = Modifier.height(34.dp))

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/mypage/MyPage.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/mypage/MyPage.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -378,6 +379,7 @@ private fun ProfileImage(
                 .clip(CircleShape),
             model = profileImageUrl ?: R.drawable.ic_profile_image,
             contentDescription = stringResource(id = R.string.my_page_profile_image),
+            contentScale = ContentScale.Crop,
         )
         Image(
             modifier = Modifier