Merge pull request #67 from Team-Umbba/feat/#65

[Feat/#65] 온보딩 종료 뷰 애니메이션 추가
Team-Umbba · Jul 16, 2023 · 9bf2d78 · 9bf2d78
2 parents 68de91b + 5496c74
commit 9bf2d78
Show file tree

Hide file tree

Showing 13 changed files with 148 additions and 37 deletions.
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt
@@ -8,6 +8,7 @@ import android.view.View
 import androidx.activity.viewModels
 import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivityInputInfoBinding
+import com.sopt.umbba_android.presentation.onboarding.viewmodel.InputInfoViewModel
 import com.sopt.umbba_android.util.binding.BindingActivity
 import java.util.regex.Pattern
 

diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/OnboardingFinishActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/OnboardingFinishActivity.kt
@@ -1,12 +1,44 @@
 package com.sopt.umbba_android.presentation.onboarding
 
-import androidx.appcompat.app.AppCompatActivity
+import android.content.Intent
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.View
+import android.view.animation.AnimationUtils
 import com.sopt.umbba_android.R
+import com.sopt.umbba_android.databinding.ActivityOnboardingFinishBinding
+import com.sopt.umbba_android.presentation.MainActivity
+import com.sopt.umbba_android.util.binding.BindingActivity
 
-class OnboardingFinishActivity : AppCompatActivity() {
+class OnboardingFinishActivity : BindingActivity<ActivityOnboardingFinishBinding>(R.layout.activity_onboarding_finish) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_onboarding_finish)
+
+        animateFadeBackground()
+        goMainActivity()
+    }
+
+    private fun animateFadeBackground() {
+        Handler(Looper.getMainLooper()).postDelayed({
+            val fadeOutAnim = AnimationUtils.loadAnimation(this, R.anim.fadeout)
+            with(binding.clStart) {
+                startAnimation(fadeOutAnim)
+                visibility = View.INVISIBLE
+            }
+            val fadeInAnim = AnimationUtils.loadAnimation(this, R.anim.fadein)
+            binding.clArrive.startAnimation(fadeInAnim)
+            with(binding.clArrive) {
+                startAnimation(fadeInAnim)
+                visibility = View.VISIBLE
+            }
+        },2000)
+
+    }
+
+    private fun goMainActivity() {
+        binding.btnStart.setOnClickListener {
+            startActivity(Intent(this, MainActivity::class.java))
+        }
     }
 }
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SelectFamilyActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/SelectFamilyActivity.kt
@@ -6,6 +6,7 @@ import android.view.View
 import androidx.activity.viewModels
 import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivitySelectFamilyBinding
+import com.sopt.umbba_android.presentation.onboarding.viewmodel.SelectFamilyViewModel
 import com.sopt.umbba_android.util.binding.BindingActivity
 
 class SelectFamilyActivity :

diff --git a/...entation/onboarding/InputInfoViewModel.kt → ...nboarding/viewmodel/InputInfoViewModel.kt b/...entation/onboarding/InputInfoViewModel.kt → ...nboarding/viewmodel/InputInfoViewModel.kt
@@ -1,4 +1,4 @@
-package com.sopt.umbba_android.presentation.onboarding
+package com.sopt.umbba_android.presentation.onboarding.viewmodel
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel

diff --git a/...ation/onboarding/SelectFamilyViewModel.kt → ...arding/viewmodel/SelectFamilyViewModel.kt b/...ation/onboarding/SelectFamilyViewModel.kt → ...arding/viewmodel/SelectFamilyViewModel.kt
@@ -1,4 +1,4 @@
-package com.sopt.umbba_android.presentation.onboarding
+package com.sopt.umbba_android.presentation.onboarding.viewmodel
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel

diff --git a/app/src/main/res/anim/fadein.xml b/app/src/main/res/anim/fadein.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="3000"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:fromAlpha="0.0"
+    android:toAlpha="1.0">
+</alpha>
diff --git a/app/src/main/res/anim/fadeout.xml b/app/src/main/res/anim/fadeout.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="3000"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.0">
+</alpha>
diff --git a/app/src/main/res/drawable/ic_arrow_back_white.xml b/app/src/main/res/drawable/ic_arrow_back_white.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M16,24H32"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FCFAF8"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M22,18L16,24L22,30"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FCFAF8"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/img_past_trip_arrive.png b/app/src/main/res/drawable/img_past_trip_arrive.png
diff --git a/app/src/main/res/drawable/img_past_trip_start.png b/app/src/main/res/drawable/img_past_trip_start.png
diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml
@@ -15,7 +15,7 @@
 
         <variable
             name="viewmodel"
-            type="com.sopt.umbba_android.presentation.onboarding.InputInfoViewModel" />
+            type="com.sopt.umbba_android.presentation.onboarding.viewmodel.InputInfoViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/layout/activity_onboarding_finish.xml b/app/src/main/res/layout/activity_onboarding_finish.xml
@@ -10,38 +10,81 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/umbba_white"
         tools:context=".presentation.onboarding.OnboardingFinishActivity">
 
-        <include
-            android:id="@+id/layout_appbar"
-            layout="@layout/basic_appbar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_arrive_past"
-            style="@style/AndroidHead1SemiBold24"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/arrive_past"
-            android:textColor="@color/umbba_black"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/layout_appbar" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_start"
-            style="@style/AndroidBody1_1SemiBold16"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_start"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginVertical="24dp"
-            android:background="@drawable/sel_btn_next"
-            android:stateListAnimator="@null"
-            android:text="@string/btn_start"
-            android:textColor="@color/umbba_white"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            android:layout_height="match_parent"
+            android:background="@drawable/img_past_trip_start">
+
+            <ImageView
+                android:id="@+id/btn_back1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginStart="12dp"
+                android:src="@drawable/ic_arrow_back_white"
+                android:background="@android:color/transparent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
+
+            <TextView
+                android:id="@+id/tv_arrive_past1"
+                style="@style/AndroidHead1SemiBold24"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginStart="28dp"
+                android:text="@string/arrive_past"
+                android:textColor="@color/umbba_white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_back1" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_arrive"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/img_past_trip_arrive"
+            android:visibility="invisible"
+            tools:context=".presentation.onboarding.OnboardingFinishActivity">
+
+            <ImageView
+                android:id="@+id/btn_back2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginStart="24dp"
+                android:src="@drawable/ic_arrow_back"
+                android:background="@android:color/transparent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
+
+            <TextView
+                android:id="@+id/tv_arrive_past2"
+                style="@style/AndroidHead1SemiBold24"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp"
+                android:layout_marginStart="28dp"
+                android:text="@string/arrive_past"
+                android:textColor="@color/umbba_black"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_back2" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_start"
+                style="@style/AndroidBody1_1SemiBold16"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginVertical="24dp"
+                android:background="@drawable/sel_btn_next"
+                android:stateListAnimator="@null"
+                android:text="@string/btn_start"
+                android:textColor="@color/umbba_white"
+                app:layout_constraintBottom_toBottomOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/activity_select_family.xml b/app/src/main/res/layout/activity_select_family.xml
@@ -15,7 +15,7 @@
 
         <variable
             name="viewmodel"
-            type="com.sopt.umbba_android.presentation.onboarding.SelectFamilyViewModel" />
+            type="com.sopt.umbba_android.presentation.onboarding.viewmodel.SelectFamilyViewModel" />
 
     </data>