Merge pull request #467 from BCSDLab/develop

[Update] BusinessApp v1.0.1

.github/workflows/firebase_cd.yml

@@ -8,11 +8,11 @@ jobs:
     steps:
      - uses: actions/checkout@v4
 
-     - name: set up JDK 11
+     - name: set up JDK 17
        uses: actions/setup-java@v4
        with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
      - name: Make gradlew executable
        run: chmod +x ./gradlew
@@ -90,4 +90,4 @@ jobs:
          fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
        env:
          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-       if: always()
+       if: always()

.github/workflows/playstore_cd.yml

@@ -8,11 +8,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Make gradlew executable
         run: chmod +x ./gradlew
@@ -88,11 +88,11 @@ jobs:
     steps:
      - uses: actions/checkout@v4
 
-     - name: set up JDK 11
+     - name: set up JDK 17
        uses: actions/setup-java@v4
        with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
      - name: Make gradlew executable
        run: chmod +x ./gradlew
@@ -162,4 +162,4 @@ jobs:
          fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
        env:
          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-       if: always()
+       if: always()

build-logic/convention/build.gradle.kts

@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

build-logic/convention/src/main/java/in/koreatech/convention/AndroidCompose.kt

@@ -6,7 +6,7 @@ import org.gradle.kotlin.dsl.dependencies
 
 
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures.compose = true

build-logic/convention/src/main/java/in/koreatech/convention/AndroidLibrary.kt

@@ -6,7 +6,7 @@ import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
 internal fun Project.configureAndroidLibrary(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     (commonExtension as? LibraryExtension)?.let {
         it.defaultConfig.targetSdk = 34
@@ -26,12 +26,12 @@ internal fun Project.configureAndroidLibrary(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
 
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
 
         packagingOptions {

build-logic/convention/src/main/java/in/koreatech/convention/AndroidOrbit.kt

@@ -5,7 +5,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureAndroidOrbit(
-    commonExtension: CommonExtension<*, *, *, *>
+    commonExtension: CommonExtension<*, *, *, *, *, *>
 ){
     dependencies {
         implementation(libs.findBundle("orbit").get())

build-logic/convention/src/main/java/in/koreatech/convention/AndroidProject.kt

@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
 
 internal fun configureAndroidProject(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     (commonExtension as? ApplicationExtension)?.let {
         it.defaultConfig.targetSdk = 34
@@ -26,17 +26,17 @@ internal fun configureAndroidProject(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
 
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
     }
 
 }
 
-fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }

build-logic/convention/src/main/java/in/koreatech/convention/KotlinAndroid.kt

@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 
 internal fun Project.configureKotlinJvm() {
     extensions.configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }

build.gradle.kts

@@ -11,8 +11,8 @@ buildscript {
         set("versionCode", 40005)
         // 코인 버전 관리
 
-        set("versionBusinessName", "1.0.0")
-        set("versionBusinessCode", 10000)
+        set("versionBusinessName", "1.0.1")
+        set("versionBusinessCode", 1000002)
         //코안 사장님 버전 관리
     }
 

business/proguard-rules.pro

@@ -1,21 +1,95 @@
 # Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# By default, the flags in this file are appended to flags specified
+# in /Users/namhoonkim/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+# Add any project specific keep options here:
+
+# Begin: Common Proguard rules
+-dontwarn com.google.**
+# End: Common Proguard rules
+
+# 에러 발생시 라인 표시
+-keepattributes SourceFile,LineNumberTable
+
+# jdk 컴파일할 때 발생하는 오류 메시지 방지
+-keepattributes EnclosingMethod
+
+# 최적화 X
+-dontoptimize
+
+# 사용하지 않는 변수 남김
+-dontshrink
+
+#public 클래스 난독 시 메서드 호출 문제 발생 가능
+-keep public class *
+
+# Begin : lib
+-keep class com.jakewharton.** { *; }
+-keep class com.jpardogo.materialtabstrip.** { *; }
+-keep interface com.jakewharton.** { *; }
+-keep interface com.jpardogo.materialtabstrip.** { *; }
+-keep class com.crashlytics.** { *; }
+# End
+
+
+# Begin : material, androidx
+-dontwarn com.google.android.material.**
+-keep class com.google.android.material.** { *; }
 
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-dontwarn androidx.**
+-keep class androidx.** { *; }
+-keep interface androidx.** { *; }
+#End
+
+
+# Begin: Proguard rules for retrofit2
+-dontwarn java.lang.invoke.**
+# Platform calls Class.forName on types which do not exist on Android to determine platform.
+-dontnote retrofit2.Platform
+# Platform used when running on RoboVM on iOS. Will not be used at runtime.
+-dontnote retrofit2.Platform$IOS$MainThreadExecutor
+# Platform used when running on Java 8 VMs. Will not be used at runtime.
+-dontwarn retrofit2.Platform$Java8
+
+# retrofit2 POJO model error
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+#-keep class com.bcsdlab.kap.community.networks.models.** { *; }
+#-keepclassmembers class com.bcsdlab.kap.community.networks.models.** { *; }
+
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+# End: Proguard rules for retrofit2
+
+# Begin: Proguard rules for okhttp3
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-dontwarn okio.**
+# End: Proguard rules for okhttp3
+
+# Begin: Proguard rules for Firebase
+# Authentication
+-keepattributes *Annotation*
+# Realtime database
+-keepattributes Signature
+# End: Proguard rules for Firebase
+
+# Proguard rules for BottomNavigationHelper
+#-keepclassmembers class android.support.design.internal.BottomNavigationMenuView {
+#    boolean mShiftingMode;
+#}
+-keep class com.kakao.sdk.**.model.* { <fields>; }
+-keep class * extends com.google.gson.TypeAdapter
+#}
 
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-dontwarn org.jspecify.annotations.NullMarked
+-dontwarn top.defaults.checkerboarddrawable.CheckerboardDrawable

business/src/main/java/in/koreatech/business/feature/findpassword/changepassword/ChangePasswordScreen.kt

@@ -210,9 +210,9 @@ fun ChangePasswordScreen(
                     color = if (fillAllPasswords && buttonEnabled) Color.White else Gray1
                 )
             }
+            Spacer(modifier = Modifier.height(20.dp))
         }
     }
-
 }
 
 @Composable

business/src/main/java/in/koreatech/business/feature/findpassword/changepassword/ChangePasswordViewModel.kt

@@ -52,7 +52,7 @@ class ChangePasswordViewModel  @Inject constructor(
         fillAllPasswords()
     }
 
-    fun insertPasswordChecked(passwordChecked: String) = intent{
+    fun insertPasswordChecked(passwordChecked: String) = blockingIntent{
         reduce { state.copy(passwordChecked = passwordChecked) }
         coincidePasswordReset()
         fillAllPasswords()

business/src/main/java/in/koreatech/business/feature/findpassword/finishchangepassword/FinishChangePasswordScreen.kt

@@ -150,6 +150,7 @@ fun FinishChangePasswordScreen(
                         color = Color.White,
                     )
                 }
+                Spacer(modifier = Modifier.height(20.dp))
             }
         }
     }

business/src/main/java/in/koreatech/business/feature/findpassword/passwordauthentication/PasswordAuthenticationScreen.kt

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.ButtonDefaults.buttonColors
@@ -30,6 +31,7 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -194,6 +196,7 @@ fun PasswordAuthenticationScreen(
                 },
                 isSuccess = accountState == ChangePasswordContinuationState.SendAuthCode,
                 successText = stringResource(R.string.success_send_sms_code),
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
             )
 
             Text(
@@ -208,12 +211,13 @@ fun PasswordAuthenticationScreen(
                 horizontalArrangement = Arrangement.SpaceBetween,
             ) {
                 LinedTextField(
-                    modifier = Modifier.widthIn(max = 230.dp),
+                    modifier = Modifier.widthIn(max = 220.dp),
                     value = authCode,
                     onValueChange = insertAuthCode,
                     label = stringResource(R.string.input_auth_code),
                     errorText = stringResource(R.string.auth_code_not_equal),
                     isError = authState is ChangePasswordContinuationState.Failed,
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
                 )
                 Spacer(modifier = Modifier.width(8.dp))
                 Button(
@@ -222,7 +226,7 @@ fun PasswordAuthenticationScreen(
                         ColorAccent
                     ) else buttonColors(ColorPrimary),
                     modifier = modifier
-                        .width(124.dp)
+                        .width(135.dp)
                         .height(41.dp)
                         .clickableOnce { }
                 ) {
@@ -256,6 +260,7 @@ fun PasswordAuthenticationScreen(
                     fontWeight = FontWeight.Bold
                 )
             }
+            Spacer(modifier = Modifier.height(20.dp))
         }
     }
 }