Skip to content

[BUGFIX/#294] 발견한 오류들을 개선합니다. #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MoonsuKang merged 4 commits into from
Jul 12, 2025
Merged

[BUGFIX/#294] 발견한 오류들을 개선합니다. #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3aee4b5
[REFACTOR/#294] Firebase Remote Config 업데이트 간격 변경
MoonsuKang Jul 10, 2025
0261de0
[REFACTOR/#294] 알림 고정 시간 21시 30분을 9시 30분으로 변경
MoonsuKang Jul 10, 2025
e256a02
[REFACTOR/#294] 삭제 케밥 버튼이 일기가 있을 때만 보이도록 수정
MoonsuKang Jul 10, 2025
c1389fc
[REFACTOR/#294] LazyColumn 패딩을 레이아웃 처리에 더 적합하도록 개선
MoonsuKang Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions app/src/main/java/com/sopt/clody/di/AppUpdateModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/sopt/clody/presentation/ui/auth/timereminder/TimeReminderScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
16 changes: 9 additions & 7 deletions ...rc/main/java/com/sopt/clody/presentation/ui/home/calendar/component/DailyDiaryListItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ 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
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
Expand Down Expand Up @@ -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 ->
Expand Down