[UI/#39] signin ui 수정 및 웹페이지 연결

presentation/src/main/java/com/going/presentation/auth/SignInActivity.kt

@@ -1,11 +1,13 @@
 package com.going.presentation.auth
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import com.going.presentation.R
-import com.going.presentation.databinding.ActivityLoginBinding
+import com.going.presentation.databinding.ActivitySigninBinding
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.UiState
 import com.going.ui.extension.setOnSingleClickListener
@@ -14,13 +16,14 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
-class SignInActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_login) {
+class SignInActivity : BaseActivity<ActivitySigninBinding>(R.layout.activity_signin) {
     private val viewModel by viewModels<SignInViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         initKakaoLoginBtnClickListener()
+        initTermsBtnClickListener()
         observeInfo()
     }
 
@@ -30,6 +33,14 @@ class SignInActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_logi
         }
     }
 
+    private fun initTermsBtnClickListener() {
+        binding.btnTerms.setOnSingleClickListener {
+            Intent(Intent.ACTION_VIEW, Uri.parse(TERMS_URL)).apply {
+                startActivity(this)
+            }
+        }
+    }
+
     private fun observeInfo() {
         observeIsAppLoginAvailable()
         observePostChangeTokenState()
@@ -62,4 +73,8 @@ class SignInActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_logi
             }
         }.launchIn(lifecycleScope)
     }
+
+    companion object{
+        const val TERMS_URL = "http://www.naver.com"
+    }
 }

presentation/src/main/java/com/going/presentation/splash/SplashActivity.kt

@@ -56,6 +56,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
 
     private fun navigateToSignInScreen() {
         Intent(this, SignInActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             startActivity(this)
         }
         finish()

presentation/src/main/res/drawable/ic_warning_mini.xml

@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <group>
+    <clip-path
+        android:pathData="M0,0h12v12h-12z"/>
+    <path
+        android:strokeWidth="1"
+        android:pathData="M6,11C8.761,11 11,8.761 11,6C11,3.239 8.761,1 6,1C3.239,1 1,3.239 1,6C1,8.761 3.239,11 6,11Z"
+        android:strokeLineJoin="round"
+        android:fillColor="#00000000"
+        android:strokeColor="#9093A8"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M6,3.5C6.276,3.5 6.5,3.724 6.5,4V6C6.5,6.276 6.276,6.5 6,6.5C5.724,6.5 5.5,6.276 5.5,6V4C5.5,3.724 5.724,3.5 6,3.5Z"
+        android:fillColor="#9093A8"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M5.5,8C5.5,7.724 5.726,7.5 6.002,7.5C6.279,7.5 6.505,7.724 6.505,8C6.505,8.276 6.279,8.5 6.002,8.5C5.726,8.5 5.5,8.276 5.5,8Z"
+        android:fillColor="#9093A8"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>

presentation/src/main/res/drawable/text_logo_doorip_red500.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="194dp"
+    android:height="66dp"
+    android:viewportWidth="194"
+    android:viewportHeight="66">
+  <path
+      android:pathData="M159.66,17.95V12.4H152.52L152.52,33.65C152.52,33.66 152.52,33.66 152.52,33.66C152.52,33.67 152.52,33.67 152.52,33.68L152.52,66H159.66L159.66,49.38C163.3,52.56 168.06,54.48 173.26,54.48C184.71,54.48 194,45.16 194,33.66C194,22.17 184.71,12.85 173.26,12.85C168.06,12.85 163.3,14.77 159.66,17.95ZM186.81,33.66C186.81,41.18 180.75,47.27 173.26,47.27C165.78,47.27 159.71,41.18 159.71,33.66C159.71,26.15 165.78,20.06 173.26,20.06C180.75,20.06 186.81,26.15 186.81,33.66Z"
+      android:fillColor="#FF4F17"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M34.34,48.55V53.6H41.48V33.01C41.48,33.01 41.48,33 41.48,33C41.48,33 41.48,32.99 41.48,32.99V0.44L34.34,0.44V17.45C30.7,14.31 25.94,12.4 20.74,12.4C9.28,12.4 0,21.62 0,33C0,44.38 9.28,53.6 20.74,53.6C25.94,53.6 30.7,51.69 34.34,48.55ZM7.19,33C7.19,25.57 13.25,19.54 20.74,19.54C28.22,19.54 34.29,25.57 34.29,33C34.29,40.43 28.22,46.46 20.74,46.46C13.25,46.46 7.19,40.43 7.19,33Z"
+      android:fillColor="#FF4F17"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M145.1,13.27V53.15H138.09V13.27H145.1ZM141.56,9.39C138.98,9.39 136.91,7.31 136.91,4.7C136.91,2.01 138.98,0 141.56,0C144.14,0 146.28,2.01 146.28,4.7C146.28,7.31 144.14,9.39 141.56,9.39Z"
+      android:fillColor="#FF4F17"/>
+  <path
+      android:pathData="M131.56,12.85V20.14H129.61C124.72,20.73 122.59,24.45 122.64,27.89V53.15H115.51V27.89C115.51,27.89 115.5,23.68 116.48,21.24C117.45,18.84 119.15,16.92 119.15,16.92C121.83,14.05 126.69,12.77 131.56,12.85Z"
+      android:fillColor="#FF4F17"/>
+  <path
+      android:pathData="M78.53,49.47C75.12,52.06 70.85,53.6 66.23,53.6C55.02,53.6 45.93,44.57 45.93,33.44C45.93,22.31 55.02,13.29 66.23,13.29C70.85,13.29 75.12,14.83 78.53,17.42C81.98,14.83 86.3,13.29 90.98,13.29C102.31,13.29 111.49,22.31 111.49,33.44C111.49,44.57 102.31,53.6 90.98,53.6C86.3,53.6 81.98,52.06 78.53,49.47ZM61.72,24.48C62.43,24.8 62.64,25.85 62.19,26.82C61.74,27.79 60.8,28.32 60.09,27.99C59.38,27.67 59.17,26.62 59.62,25.65C60.07,24.68 61.01,24.15 61.72,24.48ZM56.31,26.47C56.76,25.5 56.55,24.45 55.84,24.13C55.13,23.8 54.19,24.33 53.74,25.3C53.29,26.27 53.5,27.32 54.21,27.64C54.92,27.97 55.86,27.44 56.31,26.47ZM55.89,32.15C55.88,31.99 56,31.85 56.16,31.84L63.99,31.22C64.15,31.21 64.29,31.32 64.3,31.48L64.31,31.56C64.49,33.86 62.76,35.88 60.44,36.07C58.12,36.25 56.09,34.53 55.9,32.22L55.89,32.15Z"
+      android:fillColor="#FF4F17"
+      android:fillType="evenOdd"/>
+</vector>

presentation/src/main/res/layout/activity_signin.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/tv_sign_in_title"
+            style="@style/TextAppearance.Doorip.Head3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="17dp"
+            android:text="@string/sign_in_tv_title"
+            android:textColor="@color/gray_500"
+            app:layout_constraintBottom_toTopOf="@id/iv_sign_in"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <ImageView
+            android:id="@+id/iv_sign_in"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/text_logo_doorip_red500"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/btn_sign_in"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="30dp"
+            android:layout_marginBottom="12dp"
+            android:src="@drawable/img_sign_in_kakao_button"
+            app:layout_constraintBottom_toTopOf="@id/btn_terms"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/btn_terms"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/tv_sign_in_terms_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/ic_warning_mini"
+                app:layout_constraintBottom_toBottomOf="@id/tv_sign_in_terms_text"
+                app:layout_constraintEnd_toStartOf="@id/tv_sign_in_terms_text"
+                app:layout_constraintTop_toTopOf="@id/tv_sign_in_terms_text" />
+
+            <TextView
+                android:id="@+id/tv_sign_in_terms_text"
+                style="@style/TextAppearance.Doorip.Detail2.Regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="22dp"
+                android:text="@string/sign_in_tv_terms"
+                android:textColor="@color/gray_300"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                app:layout_constraintStart_toStartOf="@id/tv_sign_in_terms_icon"
+                app:layout_constraintTop_toBottomOf="@id/tv_sign_in_terms_text"
+                app:layout_constraintEnd_toEndOf="@id/tv_sign_in_terms_text"
+                android:background="@color/gray_300" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

presentation/src/main/res/layout/activity_splash.xml

@@ -12,7 +12,7 @@
         android:background="@color/red_500">
 
         <ImageView
-            android:src="@drawable/text_logo_doorip"
+            android:src="@drawable/text_logo_doorip_white000"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"

presentation/src/main/res/values/strings.xml

@@ -10,9 +10,9 @@
     <string name="name_blank_error">이름에는 공백만 입력할 수 없어요</string>
 
     <string name="sign_in_tv_title">여행을 시작해보세요</string>
-    <string name="sign_in_tv_terms"><u>개인정보처리방침</u></string>
+    <string name="sign_in_tv_terms">개인정보처리방침</string>
 
-    <string name="counter">%1$d/%2$d</string>제
+    <string name="counter">%1$d/%2$d</string>
 
     <string name="notice">안내</string>
     <string name="okay">확인</string>