Merge branch 'develop' into release/1000301

Author: kez-lab

.github/workflows/develop_PR_builder.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Gradle cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

README.md

@@ -42,7 +42,7 @@
 <table align="center">
   <tbody>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KwakEuiJin"><img src="https://github.com/Team-HMH/HMH-Android/assets/84266681/887eb00f-69de-4618-9a1c-07b2e1665da4" width="200px;" alt="Kwak EuiJin"/><br/><sub><b>KwakEuiJin</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=KwakEuiJin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kez-lab"><img src="https://avatars.githubusercontent.com/u/93872496?v=4" width="200px;" alt="Kez"/><br/><sub><b>kez</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/commits?author=kez-lab" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/kangyuri1114"><img src="https://github.com/Team-HMH/HMH-Android/assets/84266681/f1d5e563-74c8-4f16-a105-96a639a20f52" width="200px;" alt="Kang Yuri"/><br/><sub><b>KangYuri</b></sub></a><br /><a href="https://github.com/Team-HMH/HMH-Android/assets/84266681/eead72e1-a883-4ed0-a282-12deea8e3782" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jihyun0v0"><img src="https://github.com/Team-HMH/HMH-Android/assets/84266681/3c1e14bd-be7e-435c-9af1-315a73aab13f" width="200px;" alt="Kyoung JiHyun"/><br /><sub><b>JiHyun Kyoung</b></sub></a><br/><a href="https://github.com/Team-HMH/HMH-Android/commits?author=jihyun0v0" title="Code">💻</a></td>
     </tr>

core/common/src/main/res/layout/dialog_common_one_button.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_background_radius100"
+    android:background="@drawable/shape_gray7_radius10"
     android:paddingHorizontal="16dp"
     android:paddingTop="36dp"
     android:paddingBottom="24dp">

core/common/src/main/res/layout/dialog_common_two_button.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_background_radius100"
+    android:background="@drawable/shape_gray7_radius10"
     android:paddingHorizontal="16dp"
     android:paddingTop="36dp"
     android:paddingBottom="24dp">

…/drawable/shape_background_radius100.xml …le/shape_background_radius100_alpha0.xmlcore/designsystem/src/main/res/drawable/shape_background_radius100.xml renamed to core/designsystem/src/main/res/drawable/shape_background_radius100_alpha0.xml core/designsystem/src/main/res/drawable/shape_background_radius100.xml renamed to core/designsystem/src/main/res/drawable/shape_background_radius100_alpha0.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/gray7" />
+    <corners android:radius="10dp" />
+
+</shape>

core/designsystem/src/main/res/drawable/shape_gray7_radius10.xml

@@ -342,7 +342,7 @@ class ChallengeFragment : Fragment() {
         TwoButtonCommonDialog.newInstance(
             title = getString(R.string.delete_app_dialog_title, clickedAppNameToDialog),
             description = getString(R.string.delete_app_dialog_description),
-            confirmButtonText = getString(R.string.all_okay),
+            confirmButtonText = getString(R.string.all_delete),
             dismissButtonText = getString(R.string.all_cancel),
         ).apply {
             setConfirmButtonClickListener {

feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt

@@ -12,7 +12,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="12dp"
-        app:background="@drawable/shape_background_radius100"
+        app:background="@drawable/shape_background_radius100_alpha0"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

feature/main/src/main/res/layout/item_banner.xml

@@ -10,7 +10,7 @@ kotlin = "2.1.0"
 kotlinx-serialization-json = "1.7.3"
 kotlinx-serialization-converter = "1.0.0"
 kotlinx-coroutines = "1.10.1"
-kotlinx-datetime = "0.6.1"
+kotlinx-datetime = "0.6.2"
 ksp = "2.1.0-1.0.29"
 
 # android
@@ -25,7 +25,7 @@ compose-bom = "2025.01.01"
 desugarJdk = "2.1.4"
 dagger-hilt = "2.54"
 flexbox = "3.0.0"
-fragment-ktx = "1.8.5"
+fragment-ktx = "1.8.6"
 activity-compose = "1.7.2"
 exifInterface = "1.3.7"
 zxing-core = "3.3.0"