-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into feature/feat-mypag…
…e-setting # Conflicts: # app/src/main/AndroidManifest.xml
- Loading branch information
Showing
61 changed files
with
658 additions
and
104 deletions.
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
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
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
32 changes: 32 additions & 0 deletions
32
app/src/main/java/org/go/sopt/winey/presentation/main/mypage/goal/GoalPathActivity.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 |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package org.go.sopt.winey.presentation.main.mypage.goal | ||
|
|
||
| import android.os.Bundle | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.replace | ||
| import org.go.sopt.winey.R | ||
| import org.go.sopt.winey.databinding.ActivityGoalPathBinding | ||
| import org.go.sopt.winey.util.binding.BindingActivity | ||
|
|
||
| class GoalPathActivity : BindingActivity<ActivityGoalPathBinding>(R.layout.activity_goal_path) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| setupDefaultFragment(savedInstanceState) | ||
|
|
||
| // todo: 황제 레벨에서는 배경 이미지 변경 | ||
| // todo: 목표 달성까지 남은 절약 금액, 피드 업로드 횟수 표시 | ||
| } | ||
|
|
||
| private fun setupDefaultFragment(savedInstanceState: Bundle?) { | ||
| if (savedInstanceState == null) { | ||
| navigateTo<GoalPathLevel1Fragment>() | ||
| } | ||
| } | ||
|
|
||
| private inline fun <reified T : Fragment> navigateTo() { | ||
| supportFragmentManager.commit { | ||
| replace<T>(R.id.fcv_goal_path, T::class.simpleName) | ||
| } | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
app/src/main/java/org/go/sopt/winey/presentation/main/mypage/goal/GoalPathLevel1Fragment.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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package org.go.sopt.winey.presentation.main.mypage.goal | ||
|
|
||
| import android.animation.Animator | ||
| import android.os.Bundle | ||
| import android.view.View | ||
| import androidx.core.view.isVisible | ||
| import org.go.sopt.winey.R | ||
| import org.go.sopt.winey.databinding.FragmentGoalPathLevel1Binding | ||
| import org.go.sopt.winey.util.binding.BindingFragment | ||
|
|
||
| class GoalPathLevel1Fragment : | ||
| BindingFragment<FragmentGoalPathLevel1Binding>(R.layout.fragment_goal_path_level1) { | ||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| initAnimatorListener() | ||
|
|
||
| // todo: 목표 달성 현황에 따라 체크박스 이미지 변경 | ||
| } | ||
|
|
||
| private fun initAnimatorListener() { | ||
| binding.lottieGoalPathStep1.addAnimatorListener(object : Animator.AnimatorListener { | ||
| override fun onAnimationStart(animation: Animator) { | ||
| with(binding) { | ||
| ivGoalPathLv1.isVisible = false | ||
| lottieGoalPathStep1.isVisible = true | ||
| } | ||
| } | ||
|
|
||
| override fun onAnimationEnd(animation: Animator) { | ||
| with(binding) { | ||
| lottieGoalPathStep1.isVisible = false | ||
| ivGoalPathLv2.isVisible = true | ||
| } | ||
| } | ||
|
|
||
| override fun onAnimationCancel(animation: Animator) { | ||
| } | ||
|
|
||
| override fun onAnimationRepeat(animation: Animator) { | ||
| } | ||
| }) | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
app/src/main/java/org/go/sopt/winey/presentation/main/mypage/goal/GoalPathLevel2Fragment.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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package org.go.sopt.winey.presentation.main.mypage.goal | ||
|
|
||
| import android.animation.Animator | ||
| import android.os.Bundle | ||
| import android.view.View | ||
| import androidx.core.view.isVisible | ||
| import org.go.sopt.winey.R | ||
| import org.go.sopt.winey.databinding.FragmentGoalPathLevel2Binding | ||
| import org.go.sopt.winey.util.binding.BindingFragment | ||
|
|
||
| class GoalPathLevel2Fragment : | ||
| BindingFragment<FragmentGoalPathLevel2Binding>(R.layout.fragment_goal_path_level2) { | ||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| initAnimatorListener() | ||
| } | ||
|
|
||
| private fun initAnimatorListener() { | ||
| binding.lottieGoalPathStep2.addAnimatorListener(object : Animator.AnimatorListener { | ||
| override fun onAnimationStart(animation: Animator) { | ||
| with(binding) { | ||
| ivGoalPathLv2.isVisible = false | ||
| lottieGoalPathStep2.isVisible = true | ||
| } | ||
| } | ||
|
|
||
| override fun onAnimationEnd(animation: Animator) { | ||
| with(binding) { | ||
| lottieGoalPathStep2.isVisible = false | ||
| ivGoalPathLv3.isVisible = true | ||
| } | ||
| } | ||
|
|
||
| override fun onAnimationCancel(animation: Animator) { | ||
| } | ||
|
|
||
| override fun onAnimationRepeat(animation: Animator) { | ||
| } | ||
| }) | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
app/src/main/java/org/go/sopt/winey/presentation/main/mypage/goal/GoalPathLevel3Fragment.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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package org.go.sopt.winey.presentation.main.mypage.goal | ||
|
|
||
| import android.animation.Animator | ||
| import android.os.Bundle | ||
| import android.view.View | ||
| import androidx.core.view.isVisible | ||
| import org.go.sopt.winey.R | ||
| import org.go.sopt.winey.databinding.FragmentGoalPathLevel3Binding | ||
| import org.go.sopt.winey.util.binding.BindingFragment | ||
|
|
||
| class GoalPathLevel3Fragment : | ||
| BindingFragment<FragmentGoalPathLevel3Binding>(R.layout.fragment_goal_path_level3) { | ||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| initAnimatorListener() | ||
| } | ||
|
|
||
| private fun initAnimatorListener() { | ||
| binding.lottieGoalPathStep3.addAnimatorListener(object : Animator.AnimatorListener { | ||
| override fun onAnimationStart(animation: Animator) { | ||
| with(binding) { | ||
| ivGoalPathLv3.isVisible = false | ||
| lottieGoalPathStep3.isVisible = true | ||
| } | ||
| } | ||
|
|
||
| override fun onAnimationEnd(animation: Animator) { | ||
| with(binding) { | ||
| lottieGoalPathStep3.isVisible = false | ||
| ivGoalPathLv4.isVisible = true | ||
| } | ||
| } | ||
|
|
||
| override fun onAnimationCancel(animation: Animator) { | ||
| } | ||
|
|
||
| override fun onAnimationRepeat(animation: Animator) { | ||
| } | ||
| }) | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
app/src/main/java/org/go/sopt/winey/presentation/main/mypage/goal/GoalPathLevel4Fragment.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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.go.sopt.winey.presentation.main.mypage.goal | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.View | ||
| import org.go.sopt.winey.R | ||
| import org.go.sopt.winey.databinding.FragmentGoalPathLevel4Binding | ||
| import org.go.sopt.winey.util.binding.BindingFragment | ||
|
|
||
| class GoalPathLevel4Fragment : | ||
| BindingFragment<FragmentGoalPathLevel4Binding>(R.layout.fragment_goal_path_level4) { | ||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
| } | ||
| } |
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
Oops, something went wrong.