From 23c93cebda7ec609c1f58fee1703c676400c644e Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Sat, 24 Aug 2019 11:00:02 +0200 Subject: [PATCH] Fix setup issue --- Habitica/build.gradle | 4 ++-- .../data/implementation/UserRepositoryImpl.kt | 3 ++- .../habitica/ui/activities/SetupActivity.kt | 16 +++++++------ .../ui/fragments/setup/AvatarSetupFragment.kt | 23 +++++-------------- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index cf390706e..23fbae181 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -149,8 +149,8 @@ android { buildConfigField "String", "TESTING_LEVEL", "\"production\"" multiDexEnabled true - versionCode 2189 - versionName "2.0.3" + versionCode 2207 + versionName "2.0.4" } lintOptions { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt index 13c779ac5..a453b1aae 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt @@ -352,8 +352,9 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli if (newUser.profile != null) { copiedUser.profile = newUser.profile } + copiedUser.versionNumber = newUser.versionNumber localRepository.saveUser(copiedUser) - return oldUser + return copiedUser } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt index 6e9a15de9..5d6853c97 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt @@ -23,6 +23,7 @@ import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.UserRepository +import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User @@ -31,6 +32,8 @@ import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.views.FadingViewPager +import com.habitrpg.shared.habitica.LogLevel +import com.habitrpg.shared.habitica.Logger import com.viewpagerindicator.IconPageIndicator import com.viewpagerindicator.IconPagerAdapter import io.reactivex.BackpressureStrategy @@ -71,9 +74,8 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - compositeSubscription.add(userRepository.getUser(hostConfig.userID) - .subscribe(Consumer { this.onUserReceived(it) }, RxErrorHandler.handleEmptyError())) - + compositeSubscription.add(userRepository.getUser().subscribe({ this.onUserReceived(it) }, { Logger.log(LogLevel.DEBUG, "USERERROR", it.localizedMessage) })) + compositeSubscription.add(userRepository.retrieveUser().subscribeWithErrorHandler(Consumer {})) val additionalData = HashMap() additionalData["status"] = "displayed" AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData) @@ -202,6 +204,10 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener { if (!compositeSubscription.isDisposed) { compositeSubscription.dispose() } + val additionalData = HashMap() + additionalData["status"] = "completed" + AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData) + this.startMainActivity() return } @@ -212,10 +218,6 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener { this.avatarSetupFragment?.setUser(user) this.taskSetupFragment?.setUser(user) } - - val additionalData = HashMap() - additionalData["status"] = "completed" - AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData) } private fun startMainActivity() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt index 6d428e8d9..ed3a75a9d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt @@ -1,6 +1,5 @@ package com.habitrpg.android.habitica.ui.fragments.setup -import android.os.Build import android.os.Bundle import android.util.TypedValue import android.view.LayoutInflater @@ -95,13 +94,9 @@ class AvatarSetupFragment : BaseFragment() { loadCustomizations() } - override fun onTabUnselected(tab: TabLayout.Tab) { + override fun onTabUnselected(tab: TabLayout.Tab) {} - } - - override fun onTabReselected(tab: TabLayout.Tab) { - - } + override fun onTabReselected(tab: TabLayout.Tab) {} }) bodyButton?.setOnClickListener { selectedBodyCategory() } @@ -152,7 +147,6 @@ class AvatarSetupFragment : BaseFragment() { } } - private fun selectedBodyCategory() { activateButton(bodyButton) this.activeCategory = "body" @@ -230,14 +224,9 @@ class AvatarSetupFragment : BaseFragment() { val location = IntArray(2) val params = this.caretView?.layoutParams as? RelativeLayout.LayoutParams this.activeButton?.getLocationOnScreen(location) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - val r = resources - val px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, r.displayMetrics).toInt() - params?.marginStart = location[0] + px - this.caretView?.layoutParams = params - } else { - caretView?.visibility = View.GONE - } - + val r = resources + val px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, r.displayMetrics).toInt() + params?.marginStart = location[0] + px + this.caretView?.layoutParams = params } }