diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index dae53c1a..e52c73c9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,7 +6,7 @@
\ No newline at end of file
diff --git a/core/designsystem/src/main/res/drawable/ic_full_logo.xml b/core/designsystem/src/main/res/drawable/ic_full_logo.xml
new file mode 100644
index 00000000..92c9854e
--- /dev/null
+++ b/core/designsystem/src/main/res/drawable/ic_full_logo.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/core/designsystem/src/main/res/drawable/ic_splash_logo.xml b/core/designsystem/src/main/res/drawable/ic_splash_logo.xml
index 92c9854e..28bfb8ea 100644
--- 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 @@
-
-
-
-
+
+
+
+
+
\ No newline at end of file
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
deleted file mode 100644
index 3f1edf18..00000000
--- a/core/designsystem/src/main/res/drawable/ic_splash_logo_56.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
index a117baf3..c2d4d4cb 100644
--- a/core/designsystem/src/main/res/values/strings.xml
+++ b/core/designsystem/src/main/res/values/strings.xml
@@ -20,8 +20,8 @@
기프티콘을 한곳에서 관리해요
흩어져 있는 기프티콘을 한곳에서 확인하고\n만료 전 알림으로 유효기간을 관리해요
- 지도 어쩌구 문장
- 근처에서 사용 가능한 매장을 확인하고\n기프티콘을 사용해요
+ 사용처를 한눈에 확인
+ 지도를 통해 근처에서\n기프티콘 사용 가능한 매장을 확인해요
건너뛰기
다음
시작하기
@@ -46,6 +46,7 @@
완료!
버디콘의 소중한 회원이 되신 %s님,\n만나서 반가워요!
시작하기
+ 선물 모아, 마음모아\n모으면 더 배가 되는 선물 받는 기쁨
기프티콘
기프티콘 등록하기
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
index fd1603b8..0ef06817 100644
--- 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
index df28cea9..b49913be 100644
--- 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(