[feat] #52 워크쓰루, 로그인 화면 디자인 변경

Team-BuddyCon · Feb 20, 2024 · e0ad5ce · e0ad5ce
1 parent 59b12be
commit e0ad5ce
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 43 deletions.
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -6,7 +6,7 @@
     <style name="Theme.BuddyCon.Splash" parent="Theme.SplashScreen">
         <item name="windowSplashScreenAnimationDuration">2000</item>
         <item name="windowSplashScreenBackground">@color/pink100</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_logo_56</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_logo</item>
         <item name="postSplashScreenTheme">@style/Theme.BuddyCon</item>
     </style>
 </resources>
diff --git a/core/designsystem/src/main/res/drawable/ic_full_logo.xml b/core/designsystem/src/main/res/drawable/ic_full_logo.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="97dp"
+    android:height="97dp"
+    android:viewportWidth="97"
+    android:viewportHeight="97">
+  <path
+      android:pathData="M41.389,32C44.297,32 46.878,30.604 48.5,28.445C50.122,30.604 52.703,32 55.611,32C60.52,32 64.5,28.02 64.5,23.111C64.5,20.203 63.104,17.622 60.945,16C63.104,14.378 64.5,11.797 64.5,8.889C64.5,3.98 60.52,0 55.611,0C52.703,0 50.122,1.396 48.5,3.555C46.878,1.396 44.297,0 41.389,0C36.48,0 32.5,3.98 32.5,8.889C32.5,11.797 33.896,14.378 36.055,16C33.896,17.622 32.5,20.203 32.5,23.111C32.5,28.02 36.48,32 41.389,32Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M1.778,75.786C1.778,69.8 3.254,57.09 4.812,51.555C5.673,48.521 7.805,47.619 10.306,47.619C12.889,47.619 14.652,49.136 15.677,51.145C17.03,53.769 18.588,58.32 20.433,64.47H20.597C22.442,58.32 24.205,53.646 25.394,51.145C26.378,49.095 28.141,47.619 30.724,47.619C33.225,47.619 35.357,48.521 36.218,51.555C37.776,57.09 39.252,69.8 39.252,75.786C39.252,78.779 38.268,81.075 35.316,81.403C32.364,81.731 31.011,80.337 30.314,77.467C29.781,75.294 29.166,70.005 28.797,64.552H28.592C27.239,70.128 25.763,75.171 24.656,77.795C23.836,79.763 22.606,80.624 20.515,80.624C18.424,80.624 17.194,79.763 16.374,77.795C15.308,75.294 13.75,69.882 12.438,64.552H12.233C11.864,70.005 11.249,75.294 10.716,77.467C10.019,80.337 8.666,81.731 5.714,81.403C2.762,81.075 1.778,78.779 1.778,75.786ZM53.115,81.444C44.259,81.444 37.207,75.54 37.207,64.552C37.207,53.523 44.259,47.619 53.115,47.619C61.971,47.619 69.023,53.523 69.023,64.552C69.023,75.54 61.971,81.444 53.115,81.444ZM53.115,71.563C56.477,71.563 58.568,68.816 58.568,64.552C58.568,60.247 56.518,57.5 53.115,57.5C49.712,57.5 47.662,60.206 47.662,64.552C47.662,68.857 49.712,71.563 53.115,71.563ZM65.535,75.335C66.683,69.226 70.619,57.418 72.833,52.662C74.227,49.71 75.826,48.111 78.245,47.742C80.049,47.455 81.443,47.455 83.247,47.742C85.666,48.111 87.019,49.751 88.577,52.662C90.955,57.131 94.973,69.226 95.916,75.13C96.408,78.328 95.506,80.46 92.595,81.239C89.725,82.018 87.552,80.583 86.404,77.877C86.035,77.016 85.584,75.376 85.297,74.064C82.632,74.474 78.778,74.474 76.195,74.105C75.949,75.294 75.457,77.016 75.129,77.836C73.858,80.993 71.644,82.018 68.733,81.239C65.863,80.46 64.961,78.287 65.535,75.335ZM78.286,65.167C79.434,65.126 82.14,65.126 83.288,65.167C82.509,62.338 81.443,58.648 80.828,56.229H80.664C80.09,58.689 79.065,62.338 78.286,65.167Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/designsystem/src/main/res/drawable/ic_splash_logo.xml b/core/designsystem/src/main/res/drawable/ic_splash_logo.xml
@@ -1,13 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="97dp"
-    android:height="97dp"
-    android:viewportWidth="97"
-    android:viewportHeight="97">
-  <path
-      android:pathData="M41.389,32C44.297,32 46.878,30.604 48.5,28.445C50.122,30.604 52.703,32 55.611,32C60.52,32 64.5,28.02 64.5,23.111C64.5,20.203 63.104,17.622 60.945,16C63.104,14.378 64.5,11.797 64.5,8.889C64.5,3.98 60.52,0 55.611,0C52.703,0 50.122,1.396 48.5,3.555C46.878,1.396 44.297,0 41.389,0C36.48,0 32.5,3.98 32.5,8.889C32.5,11.797 33.896,14.378 36.055,16C33.896,17.622 32.5,20.203 32.5,23.111C32.5,28.02 36.48,32 41.389,32Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M1.778,75.786C1.778,69.8 3.254,57.09 4.812,51.555C5.673,48.521 7.805,47.619 10.306,47.619C12.889,47.619 14.652,49.136 15.677,51.145C17.03,53.769 18.588,58.32 20.433,64.47H20.597C22.442,58.32 24.205,53.646 25.394,51.145C26.378,49.095 28.141,47.619 30.724,47.619C33.225,47.619 35.357,48.521 36.218,51.555C37.776,57.09 39.252,69.8 39.252,75.786C39.252,78.779 38.268,81.075 35.316,81.403C32.364,81.731 31.011,80.337 30.314,77.467C29.781,75.294 29.166,70.005 28.797,64.552H28.592C27.239,70.128 25.763,75.171 24.656,77.795C23.836,79.763 22.606,80.624 20.515,80.624C18.424,80.624 17.194,79.763 16.374,77.795C15.308,75.294 13.75,69.882 12.438,64.552H12.233C11.864,70.005 11.249,75.294 10.716,77.467C10.019,80.337 8.666,81.731 5.714,81.403C2.762,81.075 1.778,78.779 1.778,75.786ZM53.115,81.444C44.259,81.444 37.207,75.54 37.207,64.552C37.207,53.523 44.259,47.619 53.115,47.619C61.971,47.619 69.023,53.523 69.023,64.552C69.023,75.54 61.971,81.444 53.115,81.444ZM53.115,71.563C56.477,71.563 58.568,68.816 58.568,64.552C58.568,60.247 56.518,57.5 53.115,57.5C49.712,57.5 47.662,60.206 47.662,64.552C47.662,68.857 49.712,71.563 53.115,71.563ZM65.535,75.335C66.683,69.226 70.619,57.418 72.833,52.662C74.227,49.71 75.826,48.111 78.245,47.742C80.049,47.455 81.443,47.455 83.247,47.742C85.666,48.111 87.019,49.751 88.577,52.662C90.955,57.131 94.973,69.226 95.916,75.13C96.408,78.328 95.506,80.46 92.595,81.239C89.725,82.018 87.552,80.583 86.404,77.877C86.035,77.016 85.584,75.376 85.297,74.064C82.632,74.474 78.778,74.474 76.195,74.105C75.949,75.294 75.457,77.016 75.129,77.836C73.858,80.993 71.644,82.018 68.733,81.239C65.863,80.46 64.961,78.287 65.535,75.335ZM78.286,65.167C79.434,65.126 82.14,65.126 83.288,65.167C82.509,62.338 81.443,58.648 80.828,56.229H80.664C80.09,58.689 79.065,62.338 78.286,65.167Z"
-      android:fillColor="#000000"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="56dp"
+        android:height="56dp"
+        android:gravity="center"
+        android:drawable="@drawable/ic_full_logo" />
+
+</layer-list>
diff --git a/core/designsystem/src/main/res/drawable/ic_splash_logo_56.xml b/core/designsystem/src/main/res/drawable/ic_splash_logo_56.xml
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -20,8 +20,8 @@
 
     <string name="startup_onboarding_gifticon_title">기프티콘을 한곳에서 관리해요</string>
     <string name="startup_onboarding_gifticon_description">흩어져 있는 기프티콘을 한곳에서 확인하고\n만료 전 알림으로 유효기간을 관리해요</string>
-    <string name="startup_onboarding_map_title">지도 어쩌구 문장</string>
-    <string name="startup_onboarding_map_description">근처에서 사용 가능한 매장을 확인하고\n기프티콘을 사용해요</string>
+    <string name="startup_onboarding_map_title">사용처를 한눈에 확인</string>
+    <string name="startup_onboarding_map_description">지도를 통해 근처에서\n기프티콘 사용 가능한 매장을 확인해요</string>
     <string name="startup_onboarding_pager_skip">건너뛰기</string>
     <string name="startup_onboarding_pager_next">다음</string>
     <string name="startup_onboarding_start">시작하기</string>
@@ -46,6 +46,7 @@
     <string name="complete">완료!</string>
     <string name="welcome_greeting_format">버디콘의 소중한 회원이 되신 %s님,\n만나서 반가워요!</string>
     <string name="start">시작하기</string>
+    <string name="login_banner_description">선물 모아, 마음모아\n모으면 더 배가 되는 선물 받는 기쁨</string>
 
     <string name="gifticon">기프티콘</string>
     <string name="gifticon_register">기프티콘 등록하기</string>

diff --git a/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginScreen.kt b/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
@@ -17,6 +18,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
@@ -60,19 +63,19 @@ fun LoginScreen(
             .background(BuddyConTheme.colors.background),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Spacer(Modifier.weight(118f))
+        Spacer(Modifier.weight(279f))
         Image(
-            painter = painterResource(R.drawable.ic_login),
+            painter = painterResource(R.drawable.ic_full_logo),
             contentDescription = LoginBannerDescription,
-            modifier = Modifier.size(290.dp, 300.dp),
+            modifier = Modifier.size(97.dp),
             contentScale = ContentScale.FillBounds
         )
-        Spacer(Modifier.padding(top = Paddings.extra))
-        Image(
-            painter = painterResource(R.drawable.ic_logo),
-            contentDescription = BuddyConLogoDescription
+        Text(
+            text = stringResource(R.string.login_banner_description),
+            style = BuddyConTheme.typography.body03,
+            textAlign = TextAlign.Center
         )
-        Spacer(Modifier.weight(146f))
+        Spacer(Modifier.weight(238f))
         LoginButton(
             modifier = Modifier
                 .padding(bottom = Paddings.xlarge)

diff --git a/feature/startup/src/main/java/com/yapp/buddycon/startup/splash/SplashScreen.kt b/feature/startup/src/main/java/com/yapp/buddycon/startup/splash/SplashScreen.kt
@@ -33,16 +33,17 @@ fun SplashScreen(
 
     LaunchedEffect(Unit) {
         Timber.d("SplashScreen Token Info : ${splashViewModel.loginToken.value}, currentTime : ${System.currentTimeMillis()}")
-        if (splashViewModel.isFirstInstallation.value) {
-            splashViewModel.checkIsFirstInstallation()
-            onNavigateToOnBoarding()
-        } else {
-            if (System.currentTimeMillis() <= splashViewModel.loginToken.value.accessTokenExpiresIn) {
-                onNavigateToGifticon()
-            } else {
-                onNavigateToLogin()
-            }
-        }
+        onNavigateToLogin()
+//        if (splashViewModel.isFirstInstallation.value) {
+//            splashViewModel.checkIsFirstInstallation()
+//            onNavigateToOnBoarding()
+//        } else {
+//            if (System.currentTimeMillis() <= splashViewModel.loginToken.value.accessTokenExpiresIn) {
+//                onNavigateToGifticon()
+//            } else {
+//                onNavigateToLogin()
+//            }
+//        }
     }
 
     Spacer(