Skip to content
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

Update agp to v8.7.3 #213

Merged
merged 4 commits into from
Jan 2, 2025
Merged

Update agp to v8.7.3 #213

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
41a8002
Update agp to v8.7.3
renovate[bot] Jan 1, 2025
a33b05d
Update agp to v8.7.3
renovate[bot] Jan 2, 2025
1a647ab
[fix]: string resource 이름 겹칠 시 lint error 발생. . .
kez-lab Jan 2, 2025
42d04db
Merge remote-tracking branch 'origin/renovate/agp' into renovate/agp
kez-lab Jan 2, 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
2 changes: 1 addition & 1 deletion core/designsystem/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<string name="use_time_goal_title">선택한 앱의 목표 이용 시간을\n설정해 주세요</string>
<string name="use_time_goal_description">목표 이용 시간은 최대 1시간 59분까지\n설정할 수 있어요</string>
<string name="delete_app_dialog_description">집계되고 있던 앱의 사용 시간은\n총 사용 시간에서도 차감돼요</string>
<string name="delete_app_dialog_title">정말 %1$s 을(를) 삭제하시겠어요?</string>
<string name="delete_app_dialog_title">정말 %s 을(를) 삭제하시겠어요?</string>

<string name="onboarding_request_permission_title">스크린타임 권한 허용이 필요해요</string>
<string name="onboarding_request_permission_description">언제든지 설정에서 스크린타임 권한을\n변경할 수 있어요</string>
Expand Down
6 changes: 3 additions & 3 deletions ...re/main/src/main/java/com/hmh/hamyeonham/feature/main/home/UsageStaticsTotalViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions feature/main/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<string name="my_usage_statics">내 이용시간</string>
<string name="my_page">마이페이지</string>
<string name="hmh">HMH</string>
<string name="total_goal_time">목표 사용 시간 %1$s 중</string>
<string name="total_used">%1$s 사용</string>
<string name="total_goal_time_format">목표 사용 시간 %s 중</string>
<string name="total_used">%s 사용</string>
<string name="all_left">남음</string>
<string name="item_usagestatic_appicon_description">image of app icon</string>
<string name="item_usagestatic_total_blackhole_description">image of black hole</string>
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading