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

Fix setup issue

Browse source
This commit is contained in:
Phillip Thelen 2019-08-24 11:00:02 +02:00
parent aa626219bb
commit 23c93cebda
4 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/build.gradle
View file

@ -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 {

3
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
View file

@ -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
}
}

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

@ -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<String, Any>()
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<String, Any>()
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<String, Any>()
additionalData["status"] = "completed"
AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
}
private fun startMainActivity() {

23
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
View file

@ -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
}
}