[MERGE #264 -> develop

[FIX/#264] 온보딩 뷰 / 2차 QA 반영
teamterning · Sep 27, 2024 · 96e03d6 · 96e03d6
2 parents f6f7dc7 + 6c11a7e
commit 96e03d6
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 280 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,4 +1,4 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
@@ -8,7 +8,20 @@ plugins {
     alias(libs.plugins.ksp)
 }
 
+val properties = Properties().apply {
+    load(rootProject.file("local.properties").inputStream())
+}
+
 android {
+    signingConfigs {
+        create("release") {
+            keyAlias = properties.getProperty("release.keyAlias")
+            keyPassword = properties.getProperty("release.keyPassword")
+            storeFile = file(properties.getProperty("release.storeFile") + "/terning/terning.jks")
+            storePassword = properties.getProperty("release.storePassword")
+        }
+    }
+
     namespace = "com.terning.point"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
@@ -27,31 +40,32 @@ android {
         buildConfigField(
             "String",
             "NATIVE_APP_KEY",
-            gradleLocalProperties(rootDir, providers).getProperty("native.app.key"),
+            properties.getProperty("native.app.key"),
         )
         manifestPlaceholders["NATIVE_APP_KEY"] =
-            gradleLocalProperties(rootDir, providers).getProperty("nativeAppKey")
+            properties.getProperty("nativeAppKey")
     }
 
     buildTypes {
         debug {
             buildConfigField(
                 "String",
                 "BASE_URL",
-                gradleLocalProperties(rootDir, providers).getProperty("test.base.url")
+                properties.getProperty("test.base.url")
             )
         }
         release {
             buildConfigField(
                 "String",
                 "BASE_URL",
-                gradleLocalProperties(rootDir, providers).getProperty("base.url")
+                properties.getProperty("base.url")
             )
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            signingConfig = signingConfigs.getByName("release")
         }
     }
     compileOptions {

diff --git a/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt
@@ -45,7 +45,7 @@ fun NameTextField(
     val trimmedName: String
     var isNameOutOfBounds = false
     if (value.length > MAX_LENGTH) {
-        trimmedName = value.substring(0, MAX_LENGTH + 1)
+        trimmedName = value.substring(0, MAX_LENGTH)
         isNameOutOfBounds = true
     } else {
         trimmedName = value

diff --git a/feature/build.gradle.kts b/feature/build.gradle.kts
@@ -16,6 +16,8 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
+
+        buildConfigField("String", "VERSION_NAME", "\"${libs.versions.versionName.get()}\"")
     }
 
     buildTypes {
@@ -92,8 +94,8 @@ dependencies {
     implementation(libs.lottie)
     implementation(libs.process.phoenix)
     implementation(libs.accompanist.systemuicontroller)
-    implementation (libs.androidx.core.splashscreen)
-    implementation (libs.androidx.browser)
+    implementation(libs.androidx.core.splashscreen)
+    implementation(libs.androidx.browser)
 
     // Compose Preview
     implementation(libs.compose.ui.tooling)

diff --git a/feature/src/main/assets/terning_sign_in.json b/feature/src/main/assets/terning_sign_in.json
diff --git a/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt
@@ -47,6 +47,7 @@ import com.terning.core.designsystem.theme.White
 import com.terning.core.extension.noRippleClickable
 import com.terning.core.extension.toast
 import com.terning.core.state.UiState
+import com.terning.feature.BuildConfig
 import com.terning.feature.R
 import com.terning.feature.main.MainActivity
 import com.terning.feature.mypage.component.MyPageProfile
@@ -55,7 +56,6 @@ import com.terning.feature.mypage.mypage.util.MyPageDefaults.NOTICE_URL
 import com.terning.feature.mypage.mypage.util.MyPageDefaults.OPINION_URL
 import com.terning.feature.mypage.mypage.util.MyPageDefaults.PERSONAL_URL
 import com.terning.feature.mypage.mypage.util.MyPageDefaults.SERVICE_URL
-import com.terning.feature.mypage.mypage.util.MyPageDefaults.VERSION
 
 @Composable
 fun MyPageRoute(
@@ -386,7 +386,7 @@ fun ServiceInfo(
             )
             MyPageItem(
                 text = stringResource(id = R.string.my_page_version),
-                version = VERSION,
+                version = BuildConfig.VERSION_NAME,
                 icon = R.drawable.ic_my_page_version
             )
         }

diff --git a/feature/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt b/feature/src/main/java/com/terning/feature/mypage/mypage/util/MyPageDefaults.kt
@@ -1,7 +1,6 @@
 package com.terning.feature.mypage.mypage.util
 
 object MyPageDefaults {
-    const val VERSION = "1.1.0"
     const val NOTICE_URL =
         "https://abundant-quiver-13f.notion.site/Android-49b3cc2390ee4dc389e25a5097736944"
     const val OPINION_URL = "https://forms.gle/AaLpVptfg6cATYWa7"

diff --git a/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt b/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt
@@ -2,8 +2,10 @@ package com.terning.feature.onboarding.signin
 
 import android.content.Context
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
@@ -12,6 +14,7 @@ import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -21,10 +24,12 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.flowWithLifecycle
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.rememberLottieComposition
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.user.UserApiClient
-import com.terning.core.designsystem.component.image.TerningImage
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.White
 import com.terning.core.extension.toast
@@ -39,6 +44,7 @@ fun SignInRoute(
 ) {
 
     val systemUiController = rememberSystemUiController()
+
     SideEffect {
         systemUiController.setStatusBarColor(
             color = White
@@ -47,6 +53,7 @@ fun SignInRoute(
             color = White
         )
     }
+
     val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
 
@@ -66,7 +73,8 @@ fun SignInRoute(
                     }
 
                     is SignInSideEffect.SignInFailure ->
-                        signInFailure(context = context,
+                        signInFailure(
+                            context = context,
                             error = sideEffect.error,
                             signInResult = { token, error ->
                                 viewModel.signInResult(token = token, error = error)
@@ -83,9 +91,7 @@ fun SignInRoute(
     SignInScreen(
         onSignInClick = {
             viewModel.startKakaoLogIn(
-                isKakaoAvailable = UserApiClient.instance.isKakaoTalkLoginAvailable(
-                    context
-                )
+                isKakaoAvailable = UserApiClient.instance.isKakaoTalkLoginAvailable(context)
             )
         }
     )
@@ -101,23 +107,37 @@ fun SignInScreen(
             .background(color = White)
             .statusBarsPadding()
             .navigationBarsPadding()
-            .padding(horizontal = 20.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+            .padding(horizontal = 20.dp)
+            .padding(bottom = 82.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Bottom
     ) {
         Spacer(modifier = Modifier.weight(1f))
-        TerningImage(
-            painter = R.drawable.ic_terning_login,
-            modifier = Modifier.fillMaxWidth()
-        )
+        SignInLottie()
         Spacer(modifier = Modifier.weight(1f))
         KakaoButton(
             title = stringResource(id = R.string.sign_in_kakao_button),
-            onSignInClick = onSignInClick
+            onSignInClick = onSignInClick,
         )
-        Spacer(modifier = Modifier.weight(1f))
     }
 }
 
+@Composable
+private fun SignInLottie() {
+    val lottieComposition by rememberLottieComposition(LottieCompositionSpec.Asset("terning_sign_in.json"))
+    LottieAnimation(
+        modifier = Modifier
+            .fillMaxWidth()
+            .aspectRatio(
+                (lottieComposition?.bounds
+                    ?.width()
+                    ?.toFloat()
+                    ?: 1f) / (lottieComposition?.bounds?.height() ?: 1)
+            ),
+        composition = lottieComposition,
+    )
+}
+
 private fun startKakoTalkLogIn(
     context: Context,
     signInResult: (OAuthToken?, Throwable?) -> Unit,

diff --git a/feature/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt b/feature/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt
@@ -1,5 +1,6 @@
 package com.terning.feature.onboarding.signin.component
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -10,9 +11,9 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.terning.core.designsystem.component.image.TerningImage
 import com.terning.core.designsystem.theme.KakaoYellow
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
@@ -37,9 +38,10 @@ fun KakaoButton(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.Center
     ) {
-        TerningImage(
-            painter = R.drawable.ic_signin_kakao,
-            modifier = Modifier.padding(horizontal = 8.dp)
+        Image(
+            painter = painterResource(R.drawable.ic_signin_kakao),
+            modifier = Modifier.padding(horizontal = 8.dp),
+            contentDescription = "kakao login icon"
         )
         Text(
             text = title,