[MERGE] #156 -> develop

[FIX/#156] 로티 추가 및 카카오 버튼 수정
Team-Going · Jan 17, 2024 · 32bea83 · 32bea83
2 parents 2f1f90c + 71d52b5
commit 32bea83
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 21 deletions.
diff --git a/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt b/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt
@@ -51,7 +51,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
             } else {
                 navigateToSignInScreen()
             }
-        }, 3000)
+        }, 2200)
     }
 
     private fun observeUserState() {

diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt
@@ -293,4 +293,4 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
         const val debounceTime = 300L
     }
 
-}
+}
diff --git a/...ion/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt b/...ion/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt
@@ -98,4 +98,4 @@ class OurTodoCompleteFragment() :
         _adapter = null
     }
 
-}
+}
diff --git a/presentation/src/main/res/layout/activity_signin.xml b/presentation/src/main/res/layout/activity_signin.xml
@@ -34,21 +34,22 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/btn_sign_in"
-            android:layout_width="0dp"
             style="@style/TextAppearance.Doorip.Body2.Bold"
+            android:layout_width="0dp"
+            android:layout_height="45dp"
+            android:layout_marginHorizontal="37dp"
             android:layout_marginBottom="12dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="30dp"
             android:background="@drawable/shape_kakao_yellow_fill_8_rect"
+            app:layout_constraintBottom_toTopOf="@id/btn_terms"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/btn_terms">
+            app:layout_constraintStart_toStartOf="parent">
 
             <ImageView
                 android:id="@+id/iv_sign_in_kakao"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:padding="18dp"
+                android:padding="8dp"
+                android:layout_marginStart="10dp"
                 android:src="@drawable/ic_kakao"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintDimensionRatio="1"
@@ -60,6 +61,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="16dp"
+                android:textSize="15dp"
+                style="@style/TextAppearance.Doorip.Body2.Bold"
                 android:text="@string/sign_in_tv_btn"
                 android:textColor="#D9000000"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -73,9 +76,9 @@
             android:id="@+id/btn_terms"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintStart_toStartOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/tv_sign_in_terms_icon"
@@ -102,10 +105,10 @@
             <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"
+                android:background="@color/gray_300"
                 app:layout_constraintEnd_toEndOf="@id/tv_sign_in_terms_text"
-                android:background="@color/gray_300" />
+                app:layout_constraintStart_toStartOf="@id/tv_sign_in_terms_icon"
+                app:layout_constraintTop_toBottomOf="@id/tv_sign_in_terms_text" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/presentation/src/main/res/layout/activity_splash.xml b/presentation/src/main/res/layout/activity_splash.xml
@@ -11,14 +11,15 @@
         android:layout_height="match_parent"
         android:background="@color/red_500">
 
-        <ImageView
-            android:src="@drawable/text_logo_doorip_white000"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
+        <com.airbnb.lottie.LottieAnimationView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
+            app:lottie_autoPlay="true"
+            app:lottie_loop="false"
+            app:lottie_rawRes="@raw/doorip_splash" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
-Original file line number
+Diff line change
@@ Expand Up @@
             const val debounceTime = 300L
         }
-    }
+    }