Merge branch 'develop' of https://github.com/Keyneez/Keyneez-AOS-Release

into feature/#23-ui-signup-layout
Keyneez · May 18, 2023 · 7a61504 · 7a61504
2 parents 399c884 + fd9c19e
commit 7a61504
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 118 deletions.
diff --git a/.github/workflows/pr_checker.yml b/.github/workflows/pr_checker.yml
@@ -20,6 +20,7 @@ jobs:
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
+          
     - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
@@ -35,6 +36,7 @@ jobs:
         base_url: ${{ secrets.base_url }}
       run: |
         echo base_url=\"$base_url\" >> local.properties
+        
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -33,11 +33,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         viewBinding true
@@ -50,14 +50,12 @@ android {
 
 dependencies {
     // hilt
-    implementation "com.google.dagger:hilt-android:2.44.2"
+    implementation "com.google.dagger:hilt-android:2.46"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    kapt "com.google.dagger:hilt-compiler:2.44.2"
+    kapt "com.google.dagger:hilt-compiler:2.46"
 
     // ktx
-    implementation "androidx.activity:activity-ktx:1.7.0"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.6"
+    implementation "androidx.fragment:fragment-ktx:1.5.7"
 
     // recyclerview
     implementation "androidx.recyclerview:recyclerview:1.3.0"
@@ -67,16 +65,16 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
 
     // network
-    implementation "com.squareup.okhttp3:logging-interceptor:4.10.0"
-    implementation "com.google.code.gson:gson:2.9.1"
+    implementation "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11"
+    implementation "com.google.code.gson:gson:2.10.1"
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
 
     // coil
-    implementation "io.coil-kt:coil:2.2.2"
+    implementation "io.coil-kt:coil:2.3.0"
 
     // json
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
-    implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0'
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0'
 
     // timber
     implementation "com.jakewharton.timber:timber:5.0.1"
@@ -90,20 +88,26 @@ dependencies {
     implementation "com.kakao.sdk:v2-user:2.8.6"
 
     // shared preference
-    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
 
     // firebase
     implementation platform('com.google.firebase:firebase-bom:31.1.1')
     implementation 'com.google.firebase:firebase-analytics-ktx'
 
     // firebase storage
     implementation 'com.google.firebase:firebase-core:21.1.1'
-    implementation 'com.google.firebase:firebase-storage:20.1.0'
+    implementation 'com.google.firebase:firebase-storage:20.2.0'
 
-    implementation 'androidx.core:core-ktx:1.9.0'
+    // app compat
     implementation 'androidx.appcompat:appcompat:1.6.1'
+
+    // material
     implementation 'com.google.android.material:material:1.8.0'
+
+    // constraint layout
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+
+    // test
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/app/src/main/res/font/font_pretendard_bold.xml b/app/src/main/res/font/font_pretendard_bold.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/pretendard_bold"
+        android:fontStyle="normal"
+        android:fontWeight="700" />
+</font-family>
diff --git a/app/src/main/res/font/font_pretendard_medium.xml b/app/src/main/res/font/font_pretendard_medium.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/pretendard_medium"
+        android:fontStyle="normal"
+        android:fontWeight="500" />
+</font-family>
diff --git a/app/src/main/res/font/keyneez_font.xml → ...ain/res/font/font_pretendard_semibold.xml b/app/src/main/res/font/keyneez_font.xml → ...ain/res/font/font_pretendard_semibold.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <font-family xmlns:android="http://schemas.android.com/apk/res/android">
-    <font
-        android:font="@font/pretendard_medium"
-        android:fontStyle="normal"
-        android:fontWeight="500" />
     <font
         android:font="@font/pretendard_semibold"
         android:fontStyle="normal"
         android:fontWeight="600" />
-    <font
-        android:font="@font/pretendard_bold"
-        android:fontStyle="normal"
-        android:fontWeight="700" />
 </font-family>
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
@@ -24,7 +24,7 @@
 
         <EditText
             android:id="@+id/et_search_content"
-            style="@style/TextAppearance.Keyneez.SubtitleMedium18"
+            style="@style/SubtitleMedium18"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="-12dp"
@@ -57,15 +57,15 @@
 
         <TextView
             android:id="@+id/tv_search_after"
-            style="@style/TextAppearance.Keyneez.BodySemibold14"
+            style="@style/BodySemibold14"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/search_result"
             android:textColor="@color/gray900" />
 
         <TextView
             android:id="@+id/tv_search_count"
-            style="@style/TextAppearance.Keyneez.BodySemibold14"
+            style="@style/BodySemibold14"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/search_count"

diff --git a/app/src/main/res/layout/item_search_content.xml b/app/src/main/res/layout/item_search_content.xml
@@ -24,7 +24,7 @@
 
         <TextView
             android:id="@+id/tv_search_category"
-            style="@style/TextAppearance.Keyneez.CaptionBold10"
+            style="@style/CaptionBold10"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="9dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/tv_search_title"
-            style="@style/TextAppearance.Keyneez.BodyBold16"
+            style="@style/BodyBold16"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/search_title"
@@ -55,7 +55,7 @@
 
         <TextView
             android:id="@+id/tv_search_date"
-            style="@style/TextAppearance.Keyneez.CaptionBold10"
+            style="@style/CaptionBold10"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/search_period"
@@ -65,7 +65,7 @@
 
         <TextView
             android:id="@+id/tv_search_fee"
-            style="@style/TextAppearance.Keyneez.CaptionMedium10"
+            style="@style/CaptionMedium10"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/search_fee"

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml