From 41a8002fcd4ea21620604ee72b036a0b0c6d6a23 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 12:32:51 +0000 Subject: [PATCH 1/3] Update agp to v8.7.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8d06f5a..30a0fb3b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -61,7 +61,7 @@ espressoIntents = "3.5.1" runner = "1.5.2" # gradle -agp = "8.1.4" +agp = "8.7.3" kspplugin = "1.9.24-1.0.20" # third party From a33b05dda994335f605d35c9fe83f28b5ea50d74 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 02:40:41 +0000 Subject: [PATCH 2/3] Update agp to v8.7.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e1ea0d2f..a6d69a43 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -61,7 +61,7 @@ espressoIntents = "3.5.1" runner = "1.5.2" # gradle -agp = "8.1.4" +agp = "8.7.3" kspplugin = "1.9.24-1.0.20" # third party From 1a647ab4556109071a58443c407fced3a5b1bc17 Mon Sep 17 00:00:00 2001 From: KEZ Date: Thu, 2 Jan 2025 22:30:29 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[fix]:=20string=20resource=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EA=B2=B9=EC=B9=A0=20=EC=8B=9C=20lint=20error=20?= =?UTF-8?q?=EB=B0=9C=EC=83=9D.=20.=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/designsystem/src/main/res/values/strings.xml | 2 +- .../feature/main/home/UsageStaticsTotalViewHolder.kt | 6 +++--- feature/main/src/main/res/values/strings.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml index 3c6a563a..ad9a1dd6 100644 --- a/core/designsystem/src/main/res/values/strings.xml +++ b/core/designsystem/src/main/res/values/strings.xml @@ -20,7 +20,7 @@ 선택한 앱의 목표 이용 시간을\n설정해 주세요 목표 이용 시간은 최대 1시간 59분까지\n설정할 수 있어요 집계되고 있던 앱의 사용 시간은\n총 사용 시간에서도 차감돼요 - 정말 %1$s 을(를) 삭제하시겠어요? + 정말 %s 을(를) 삭제하시겠어요? 스크린타임 권한 허용이 필요해요 언제든지 설정에서 스크린타임 권한을\n변경할 수 있어요 diff --git a/feature/main/src/main/java/com/hmh/hamyeonham/feature/main/home/UsageStaticsTotalViewHolder.kt b/feature/main/src/main/java/com/hmh/hamyeonham/feature/main/home/UsageStaticsTotalViewHolder.kt index 48dcf77f..2f703442 100644 --- a/feature/main/src/main/java/com/hmh/hamyeonham/feature/main/home/UsageStaticsTotalViewHolder.kt +++ b/feature/main/src/main/java/com/hmh/hamyeonham/feature/main/home/UsageStaticsTotalViewHolder.kt @@ -33,13 +33,13 @@ class UsageStaticsTotalViewHolder( ) tvTotalGoal.text = context.getString( - R.string.total_goal_time, - convertMillisecondToString(totalModel.totalGoalTime), + R.string.total_goal_time_format, + convertMillisecondToString(totalModel.totalGoalTime) ) tvTotalUsage.text = context.getString( R.string.total_used, - convertMillisecondToString(totalModel.totalTimeInForeground), + convertMillisecondToString(totalModel.totalTimeInForeground) ) pbTotalUsage.progress = totalModel.totalPercentage } diff --git a/feature/main/src/main/res/values/strings.xml b/feature/main/src/main/res/values/strings.xml index 042f0a56..2b55a25f 100644 --- a/feature/main/src/main/res/values/strings.xml +++ b/feature/main/src/main/res/values/strings.xml @@ -4,8 +4,8 @@ 내 이용시간 마이페이지 HMH - 목표 사용 시간 %1$s 중 - %1$s 사용 + 목표 사용 시간 %s 중 + %s 사용 남음 image of app icon image of black hole