From af39355b113b314e0fab4a929ac9dff95536beea Mon Sep 17 00:00:00 2001 From: chlgkdms Date: Mon, 4 Dec 2023 20:22:13 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20MyPage=20Profile?= =?UTF-8?q?=20Crop=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/signal/signal_android/feature/main/mypage/MyPage.kt | 2 ++ 1 file changed, 2 insertions(+) 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 index 2682a4c6..cf07a071 100644 --- 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 From f7d01f11a4432d8b5b57a6ba97b29aeb0b38eede Mon Sep 17 00:00:00 2001 From: chlgkdms Date: Mon, 4 Dec 2023 20:22:33 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20DiaryList=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signal/signal_android/feature/main/diary/DiaryState.kt | 6 ++++-- .../signal_android/feature/main/diary/DiaryViewModel.kt | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 index 2df3f7de..6edecfa6 100644 --- 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, + val diaries: SnapshotStateList, val monthDiaries: List, 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 index 613cca6a..944f365a 100644 --- 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(), ) ) From cbc432046cafe560e1acd6694b8a78ebd1c7dd69 Mon Sep 17 00:00:00 2001 From: chlgkdms Date: Mon, 4 Dec 2023 20:22:44 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20Diary=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20max=20length=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/signal/signal_android/feature/main/diary/CreateDiary.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b3dda57c..92cf186a 100644 --- 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 }, From 4c5ee1b002049f1fc20a4a2241294294d0e2a40d Mon Sep 17 00:00:00 2001 From: chlgkdms Date: Mon, 4 Dec 2023 20:26:26 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20AllDiary=20?= =?UTF-8?q?=ED=97=A4=EB=8D=94=20padding=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signal_android/feature/main/diary/AllDiary.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 index 723d4d5d..00a4c30d 100644 --- 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, From dd6ad81ff0f83e7751a8c281572696dfd131d71c Mon Sep 17 00:00:00 2001 From: chlgkdms Date: Mon, 4 Dec 2023 23:18:13 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20=EB=8C=93?= =?UTF-8?q?=EA=B8=80=20profile=20crop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signal/signal_android/feature/main/feed/CommentDialog.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 index 7d36c50e..6e9c0e6c 100644 --- 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 { From 67051b6da33e0f9b718c4256815a63e38aa72d4d Mon Sep 17 00:00:00 2001 From: chlgkdms Date: Tue, 5 Dec 2023 08:33:45 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20=ED=99=88=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=82=AC=EC=A7=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/signal/signal_android/feature/main/home/Home.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 index eeedad17..5d39a097 100644 --- 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 = state.profile ?: R.drawable.ic_profile_image, contentDescription = stringResource(id = R.string.my_page_profile_image), + contentScale = ContentScale.Crop, ) } Spacer(modifier = Modifier.height(34.dp))