diff --git a/app/src/main/java/com/sopt/clody/di/AppUpdateModule.kt b/app/src/main/java/com/sopt/clody/di/AppUpdateModule.kt index f584941f..98fd28c3 100644 --- a/app/src/main/java/com/sopt/clody/di/AppUpdateModule.kt +++ b/app/src/main/java/com/sopt/clody/di/AppUpdateModule.kt @@ -1,6 +1,7 @@ package com.sopt.clody.di import com.google.firebase.remoteconfig.FirebaseRemoteConfig +import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings import com.sopt.clody.data.remote.appupdate.AppUpdateCheckerImpl import com.sopt.clody.data.remote.datasource.RemoteConfigDataSource import com.sopt.clody.domain.appupdate.AppUpdateChecker @@ -16,8 +17,14 @@ object AppUpdateModule { @Provides @Singleton - fun provideFirebaseRemoteConfig(): FirebaseRemoteConfig = - FirebaseRemoteConfig.getInstance() + fun provideFirebaseRemoteConfig(): FirebaseRemoteConfig { + val remoteConfig = FirebaseRemoteConfig.getInstance() + val configSettings = FirebaseRemoteConfigSettings.Builder() + .setMinimumFetchIntervalInSeconds(600L) + .build() + remoteConfig.setConfigSettingsAsync(configSettings) + return remoteConfig + } @Provides @Singleton diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/auth/timereminder/TimeReminderScreen.kt b/app/src/main/java/com/sopt/clody/presentation/ui/auth/timereminder/TimeReminderScreen.kt index e9f9f399..c9c3186b 100644 --- a/app/src/main/java/com/sopt/clody/presentation/ui/auth/timereminder/TimeReminderScreen.kt +++ b/app/src/main/java/com/sopt/clody/presentation/ui/auth/timereminder/TimeReminderScreen.kt @@ -102,7 +102,7 @@ fun TimeReminderRoute( TimeReminderScreen( onStartClick = { - viewModel.setFixedTime(TimePeriod.PM, "21", "30") + viewModel.setFixedTime(TimePeriod.PM, "9", "30") viewModel.sendNotification(context, isNotificationPermissionGranted.value) }, onTimeSelected = { period, hour, minute -> diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/home/calendar/component/DailyDiaryListItem.kt b/app/src/main/java/com/sopt/clody/presentation/ui/home/calendar/component/DailyDiaryListItem.kt index 21192e99..d2bf1dc2 100644 --- a/app/src/main/java/com/sopt/clody/presentation/ui/home/calendar/component/DailyDiaryListItem.kt +++ b/app/src/main/java/com/sopt/clody/presentation/ui/home/calendar/component/DailyDiaryListItem.kt @@ -62,13 +62,15 @@ fun DailyDiaryListItem( modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp), ) Spacer(modifier = Modifier.weight(1f)) - Image( - painter = painterResource(id = R.drawable.ic_home_kebab), - contentDescription = "go to delete", - modifier = Modifier - .clip(RoundedCornerShape(12.dp)) - .clickable(onClick = { onShowDiaryDeleteStateChange(true) }), - ) + if (dailyDiary.diaries.isNotEmpty()) { + Image( + painter = painterResource(id = R.drawable.ic_home_kebab), + contentDescription = "go to delete", + modifier = Modifier + .clip(RoundedCornerShape(12.dp)) + .clickable(onClick = { onShowDiaryDeleteStateChange(true) }), + ) + } } when { diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt index 7ce2e175..5507e409 100644 --- a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt +++ b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.WindowInsets @@ -14,10 +15,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.ime import androidx.compose.foundation.layout.imePadding -import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.union -import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material3.Scaffold @@ -252,10 +250,12 @@ fun WriteDiaryScreen( Spacer(modifier = Modifier.heightForScreenPercentage(0.02f)) LazyColumn( modifier = Modifier - .fillMaxSize() - .windowInsetsPadding( - WindowInsets.navigationBars.union(WindowInsets.ime), - ), + .fillMaxSize(), + contentPadding = PaddingValues( + bottom = with(density) { + (imeBottom - innerPadding.calculateBottomPadding().toPx()).coerceAtLeast(0f).toDp() + }, + ), verticalArrangement = Arrangement.spacedBy(12.dp), ) { itemsIndexed(entries, key = { index, _ -> index }) { index, text ->