[Redesign/login] 로그인 화면 리디자인 적용 (#222)

* chore: delete firebase version

* chore: delete default splash (android 12)

* chore: set new splash

* redesign: login activity

* chore: delete unused logo files

* chore: dark mode

app/build.gradle.kts

@@ -140,10 +140,11 @@ dependencies {
     implementation(libs.lifecycle.viewmodel)
     implementation(libs.lifecycle.livedata)
 
-    // Firebase
     implementation(libs.play.services.base)
-    implementation(libs.firebase.config)
+
+    // Firebase
     implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.config)
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics)
 

app/src/main/java/com/eatssu/android/ui/login/LoginActivity.kt

@@ -5,7 +5,7 @@ import android.view.View
 import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.eatssu.android.base.BaseActivity
-import com.eatssu.android.databinding.ActivitySocialLoginBinding
+import com.eatssu.android.databinding.ActivityLoginBinding
 import com.eatssu.android.ui.main.MainActivity
 import com.eatssu.android.util.extension.showToast
 import com.eatssu.android.util.extension.startActivity
@@ -20,7 +20,7 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class LoginActivity :
-    BaseActivity<ActivitySocialLoginBinding>(ActivitySocialLoginBinding::inflate) {
+    BaseActivity<ActivityLoginBinding>(ActivityLoginBinding::inflate) {
 
     private val loginViewModel: LoginViewModel by viewModels()
 

app/src/main/res/layout/activity_intro.xml

@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/primary"
     tools:context=".ui.login.IntroActivity">
 
     <ImageView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:scaleType="centerInside"
-        android:src="@drawable/img_logo1_44"
+        android:layout_margin="65dp"
+        android:src="@drawable/img_new_logo_white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/activity_social_login.xml → app/src/main/res/layout/activity_login.xml

@@ -10,51 +10,54 @@
 
     <ImageView
         android:id="@+id/iv_logo"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:src="@drawable/image_logo_none"
+        android:layout_width="match_parent"
+        android:layout_height="75dp"
+        android:layout_margin="65dp"
+        android:src="@drawable/img_new_logo_primary"
         app:layout_constraintBottom_toTopOf="@+id/mcv_kakao_login"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_title_for_eatssu"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/eat_ssu"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_logo" />
+        app:layout_constraintTop_toBottomOf="@+id/iv_logo">
 
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/login_for_service"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title_for_eatssu" />
+        <TextView
+            android:id="@+id/tv_title_for_ssu"
+            style="@style/H2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="숭실대에서 "
+            android:textColor="@color/black" />
+
+        <TextView
+            android:id="@+id/tv_title_for_eat"
+            style="@style/H2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="먹자"
+            android:textColor="@color/primary" />
+
+    </LinearLayout>
 
-    <com.google.android.material.card.MaterialCardView
+    <ImageButton
         android:id="@+id/mcv_kakao_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:layout_margin="30dp"
+        android:layout_marginBottom="120dp"
+        android:background="?attr/selectableItemBackground"
         android:clickable="true"
-        app:cardElevation="0dp"
-        android:layout_marginBottom="30dp"
+        android:focusable="true"
+        android:scaleType="fitCenter"
+        android:src="@drawable/img_kakao_login_btn"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:rippleColor="@color/gray100"
-        android:focusable="true">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:src="@drawable/img_kakao_login_large_wide" />
+        app:layout_constraintStart_toStartOf="parent" />
 
-    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_main.xml

@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="28dp"
             android:background="@color/white"
-            android:src="@drawable/img_logo2"
+            android:src="@drawable/img_new_logo_primary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

app/src/main/res/values-night/themes.xml

@@ -21,6 +21,7 @@
 
         <item name="actionMenuTextColor">@color/secondary</item> <!--액션 메뉴의 텍스트 색상-->
         <item name="colorControlNormal">@color/secondary</item> <!--홈/뒤로가기 버튼의 색상-->
+        <item name="android:windowIsTranslucent">true</item>  <!--기본 스플래쉬 제거-->
     </style>
 
     <!-- bottom sheet   -->
@@ -210,12 +211,4 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <!-- 토글   -->
-    <style name="category_toggle">
-        <item name="thumbTint">@color/white</item>
-        <item name="track">@drawable/selector_toggle</item>
-        <item name="android:thumb">@drawable/shape_toggle</item>
-        <item name="android:enabled">true</item>
-    </style>
-
 </resources>

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

@@ -119,6 +119,7 @@
     <string name="menu">메뉴</string>
 
     <string name="eat_ssu">EAT SSU</string>
+    <string name="e_at_ssu">숭실대에서 먹자!</string>
     <string name="recomented">\'를 추천하시겠어요?</string>
     <string name="max_300">최대 300자</string>
     <string name="max_150">최대 150</string>

app/src/main/res/values/themes.xml

@@ -21,6 +21,7 @@
 
         <item name="actionMenuTextColor">@color/secondary</item> <!--액션 메뉴의 텍스트 색상-->
         <item name="colorControlNormal">@color/secondary</item> <!--홈/뒤로가기 버튼의 색상-->
+        <item name="android:windowIsTranslucent">true</item>  <!--기본 스플래쉬 제거-->
     </style>
 
     <!-- bottom sheet   -->
@@ -210,12 +211,4 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <!-- 토글   -->
-    <style name="category_toggle">
-        <item name="thumbTint">@color/white</item>
-        <item name="track">@drawable/selector_toggle</item>
-        <item name="android:thumb">@drawable/shape_toggle</item>
-        <item name="android:enabled">true</item>
-    </style>
-
 </resources>

gradle/libs.versions.toml

@@ -28,8 +28,7 @@ lifecycle-livedata = "2.7.0"
 kakao-login = "2.8.6"
 hilt = "2.50"
 play-services-base = "18.0.1"
-firebase-config = "21.4.1"
-firebase-bom = "32.2.2"
+firebase-bom = "32.6.0"
 firebase-crashlytics = "2.9.9"
 timber = "5.0.1"
 google-services = "4.4.2"
@@ -76,10 +75,11 @@ hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt
 hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
 
 play_services_base = { group = "com.google.android.gms", name = "play-services-base", version.ref = "play-services-base" }
-firebase-config = { group = "com.google.firebase", name = "firebase-config-ktx", version.ref = "firebase-config" }
-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebase-bom" }
-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" }
-firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
+
+firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
+firebase-config = { module = "com.google.firebase:firebase-config" }
+firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
+firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 
 timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity-version" }