sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for setup flow

Browse source
This commit is contained in:
Phillip Thelen 2023-01-31 17:22:10 +01:00
parent 2af7eb2fcb
commit 6db679993b
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
View file

@ -31,10 +31,13 @@ import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment
import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
import com.viewpagerindicator.IconPagerAdapter import com.viewpagerindicator.IconPagerAdapter
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.flow.debounce
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.util.Calendar import java.util.Calendar
import java.util.Locale import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
import kotlin.time.Duration.Companion.milliseconds
class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener { class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
@ -66,10 +69,13 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
return binding.root return binding.root
} }
@OptIn(FlowPreview::class)
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
lifecycleScope.launch(ExceptionHandler.coroutine()) { lifecycleScope.launch(ExceptionHandler.coroutine()) {
userRepository.getUser().collect { onUserReceived(it) } userRepository.getUser()
.debounce(500.milliseconds)
.collect { onUserReceived(it) }
} }
lifecycleScope.launch(ExceptionHandler.coroutine()) { lifecycleScope.launch(ExceptionHandler.coroutine()) {
userRepository.retrieveUser(true, true) userRepository.retrieveUser(true, true)
@ -142,7 +148,6 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
} }
} }
} else if (binding.viewPager.currentItem == 0) { } else if (binding.viewPager.currentItem == 0) {
confirmNames(welcomeFragment?.displayName ?: "", welcomeFragment?.username ?: "") confirmNames(welcomeFragment?.displayName ?: "", welcomeFragment?.username ?: "")
val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
@ -201,13 +206,15 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
override fun onPageScrollStateChanged(state: Int) = Unit override fun onPageScrollStateChanged(state: Int) = Unit
private var hasCompleted = false
private fun onUserReceived(user: User?) { private fun onUserReceived(user: User?) {
if (completedSetup) { if (completedSetup && !hasCompleted) {
val additionalData = HashMap<String, Any>() val additionalData = HashMap<String, Any>()
additionalData["status"] = "completed" additionalData["status"] = "completed"
AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData) AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
hasCompleted = true
lifecycleScope.launch(ExceptionHandler.coroutine()) { lifecycleScope.launchCatching {
userRepository.updateUser("flags.welcomed", true) userRepository.updateUser("flags.welcomed", true)
startMainActivity() startMainActivity()
} }

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.1.3 NAME=4.1.3
CODE=5221 CODE=5231