-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feat/#65] 온보딩 종료 뷰 애니메이션 추가 #67
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
13e6a8d
[Chore/#65] 폴더링
yeoncheong ac95c26
[Design/#65] fadein & fadeout animate 생성
yeoncheong 4b40a2e
[Add/#65] 아이콘 및 이미지 추가
yeoncheong f538353
[Design/#65] 레이아웃 두개 생성
yeoncheong 6849678
[Feat/#65] fade in & fade out 애니메이션 적용
yeoncheong 092ab90
[Chore/#65] 이미지 변경
yeoncheong 4ba3d7e
[Feat/#65] 이미지 홀드 1초 딜레이 주기
yeoncheong 5496c74
[Feat/#65] MainActivity 연결
yeoncheong File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 35 additions & 3 deletions
38
app/src/main/java/com/sopt/umbba_android/presentation/onboarding/OnboardingFinishActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 이게 반전이군.. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 화면이 두개가 동시에 교차돼서 그래요!!!! |
||
} | ||
},2000) | ||
|
||
} | ||
|
||
private fun goMainActivity() { | ||
binding.btnStart.setOnClickListener { | ||
startActivity(Intent(this, MainActivity::class.java)) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...entation/onboarding/InputInfoViewModel.kt → ...nboarding/viewmodel/InputInfoViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ation/onboarding/SelectFamilyViewModel.kt → ...arding/viewmodel/SelectFamilyViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
오 우와아아 언젠가 이 애니메이션 쇽샥 할게요