Merge pull request #885 from TeamHavit/release

[RELEASE] v1.0.8 배포
TeamHavit · Jul 18, 2023 · 5981969 · 5981969
2 parents d6ee80b + 992dda3
commit 5981969
Show file tree

Hide file tree

Showing 43 changed files with 628 additions and 376 deletions.
diff --git a/.github/ISSUE_TEMPLATE/havit-custom-issue-template.md b/.github/ISSUE_TEMPLATE/havit-custom-issue-template.md
@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **📝 DESCRIPTION**
-- Date : 2022.05.
+- Date : 2023.05.
 
 **☑ TODO**
 - [ ]
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId "org.sopt.havit"
         minSdk 23
         targetSdk 31
-        versionCode 106
-        versionName "1.0.6"
+        versionCode 108
+        versionName "1.0.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "HAVIT_BASE_URL_DEV", properties["HAVIT_BASE_URL_DEV"])
         buildConfigField("String", "HAVIT_BASE_URL_PROD", properties["HAVIT_BASE_URL_PROD"])
@@ -99,11 +99,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.4.0'
 
     //kakao
-    implementation "com.kakao.sdk:v2-user:2.5.0" // 카카오 로그인
-    implementation "com.kakao.sdk:v2-talk:2.3.0" // 친구, 메시지(카카오톡)
-    implementation "com.kakao.sdk:v2-story:2.3.0" // 카카오스토리
-    implementation "com.kakao.sdk:v2-link:2.3.0" // 메시지(카카오링크)
-    implementation "com.kakao.sdk:v2-navi:2.3.0" // 카카오내비
+    implementation "com.kakao.sdk:v2-user:2.11.0" // 카카오 로그인
     implementation 'com.kakao.sdk:usermgmt:1.27.0' // 카카오 로그인 버튼 만들 때 사용
 
     // Retrofit
@@ -137,12 +133,11 @@ dependencies {
      *  bom 이외의 sdk에 버전 지정을 하지 않게 주의
      * */
 
-    implementation platform('com.google.firebase:firebase-bom:31.5.0')
-    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation platform('com.google.firebase:firebase-bom:32.0.0')
     implementation 'com.google.firebase:firebase-messaging'
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.firebase:firebase-crashlytics-ktx'
-
+    implementation 'com.google.firebase:firebase-analytics-ktx'
     // Jsoup
     implementation 'org.jsoup:jsoup:1.13.1'
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -23,4 +23,13 @@
 -keep class com.kakao.sdk.**.model.* { <fields>; }
 -keep class * extends com.google.gson.TypeAdapter
 -keep class org.sopt.havit.data.remote.** { *; }
--keep class org.sopt.havit.domain.entity.** { *; }
+-keep class org.sopt.havit.domain.entity.** { *; }
+
+-assumenosideeffects class android.util.Log {
+    public static boolean isLoggable(java.lang.String, int);
+    public static int v(...);
+    public static int d(...);
+    public static int i(...);
+    public static int w(...);
+    public static int e(...);
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,7 @@
         <activity
             android:name=".ui.setting.SettingModifyNicknameActivity"
             android:configChanges="orientation"
+            android:windowSoftInputMode="stateVisible"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
@@ -76,9 +77,9 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.category.CategoryAddActivity"
-            android:configChanges="orientation"
+            android:configChanges="orientation|screenSize"
             android:exported="false"
-            android:screenOrientation="portrait"
+            android:screenOrientation="unspecified"
             android:theme="@style/Theme.AppCompat.Transparent.NoActionBar" />
 
         <service
@@ -133,9 +134,9 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.share.ShareActivity"
-            android:configChanges="orientation"
+            android:configChanges="orientation|screenSize"
             android:exported="true"
-            android:screenOrientation="portrait"
+            android:screenOrientation="unspecified"
             android:theme="@style/Theme.AppCompat.Transparent.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -152,9 +153,9 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
-            android:configChanges="orientation"
+            android:configChanges="orientation|screenSize"
             android:exported="true"
-            android:screenOrientation="portrait">
+            android:screenOrientation="unspecified">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -178,10 +179,10 @@
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.sign.SplashWithSignActivity"
-            android:configChanges="orientation"
+            android:configChanges="orientation|screenSize"
             android:exported="true"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="unspecified"
             android:theme="@style/Theme.RemoveSplash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -192,7 +193,7 @@
 
         <meta-data
             android:name="com.kakao.sdk.AppKey"
-            android:value="@string/kakao_app_key" />
+            android:value="${KAKAO_NATIVE_APP_KEY}" />
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/org/sopt/havit/data/RetrofitObject.kt b/app/src/main/java/org/sopt/havit/data/RetrofitObject.kt
@@ -21,8 +21,11 @@ object RetrofitObject {
         readTimeout(20, TimeUnit.SECONDS)
         connectTimeout(20, TimeUnit.SECONDS)
         writeTimeout(5, TimeUnit.SECONDS)
-        addInterceptor(getLoggingInterceptor())
         addInterceptor(getTokenInterceptor(jwt))
+
+        if (DEBUG) {
+            addInterceptor(getLoggingInterceptor())
+        }
     }.build()
 
     private fun getTokenInterceptor(jwt: String) = Interceptor {

diff --git a/app/src/main/java/org/sopt/havit/data/local/HavitAuthLocalPreferences.kt b/app/src/main/java/org/sopt/havit/data/local/HavitAuthLocalPreferences.kt
@@ -2,7 +2,6 @@ package org.sopt.havit.data.local
 
 import android.content.Context
 import android.content.SharedPreferences
-import com.kakao.sdk.navi.Constants.USER_ID
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 

diff --git a/app/src/main/java/org/sopt/havit/di/RetrofitModule.kt b/app/src/main/java/org/sopt/havit/di/RetrofitModule.kt
@@ -38,15 +38,18 @@ object RetrofitModule {
 
     @Provides
     @Singleton
-    fun provideOkHttpInterceptor(
+    fun provideOkHttpClient(
         interceptor: Interceptor
     ): OkHttpClient {
-        return OkHttpClient.Builder()
-            .addInterceptor(
-                HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY }
-            )
-            .addInterceptor(interceptor)
-            .build()
+        return OkHttpClient.Builder().apply {
+            addInterceptor(interceptor)
+
+            if (DEBUG) {
+                addInterceptor(HttpLoggingInterceptor().apply {
+                    level = HttpLoggingInterceptor.Level.BODY
+                })
+            }
+        }.build()
     }
 
     @Provides

diff --git a/app/src/main/java/org/sopt/havit/domain/entity/Category.kt b/app/src/main/java/org/sopt/havit/domain/entity/Category.kt
@@ -11,6 +11,6 @@ data class Category(
     var imageId: Int,
     @SerializedName("imageUrl")
     var url: String,
-    val orderIndex: Int,
+    var orderIndex: Int,
     var title: String
 ) : Parcelable
diff --git a/app/src/main/java/org/sopt/havit/ui/category/CategoryAdapter.kt b/app/src/main/java/org/sopt/havit/ui/category/CategoryAdapter.kt
@@ -30,6 +30,8 @@ class CategoryAdapter(
     }
 
     override fun onBindViewHolder(holder: CategoryViewHolder, position: Int) {
+        // 서버에서 불러온 orderIndex 값이 항상 update 되지 않기 때문에 adapterPosition으로 변경
+        categoryList[position].orderIndex = holder.adapterPosition
         holder.onBind(categoryList[position])
     }
 

diff --git a/app/src/main/java/org/sopt/havit/ui/category/CategoryAddActivity.kt b/app/src/main/java/org/sopt/havit/ui/category/CategoryAddActivity.kt
@@ -1,5 +1,7 @@
 package org.sopt.havit.ui.category
 
+import android.content.pm.ActivityInfo
+import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
@@ -13,11 +15,18 @@ class CategoryAddActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityCategoryAddBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         startShareProcess()
     }
 
     private fun startShareProcess() {
         val bottomSheet = DialogCategoryAddFragment()
         bottomSheet.show(supportFragmentManager, bottomSheet.tag)
     }
+
+    override fun setRequestedOrientation(requestedOrientation: Int) {
+        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            super.setRequestedOrientation(requestedOrientation)
+        }
+    }
 }