sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-24 14:45:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve task result display

Browse source
This commit is contained in:
Phillip Thelen 2022-08-01 11:33:50 +02:00
parent 37a307184c
commit d9ae29c939
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
View file

@ -98,7 +98,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
)
chips.add(chip)
}
if ((viewModel.result?.manaDelta ?: 0.0) != 0.0) {
if ((viewModel.result?.manaDelta ?: 0.0) != 0.0 && viewModel.user.value?.hasClass == true) {
val chip = TaskRewardChip(this)
chip.set(
viewModel.result?.manaDelta,

2
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt
View file

@ -1,6 +1,7 @@
package com.habitrpg.wearos.habitica.ui.viewmodels
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.asLiveData
import com.habitrpg.common.habitica.models.responses.TaskScoringResult
import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
import com.habitrpg.wearos.habitica.data.repositories.UserRepository
@ -16,6 +17,7 @@ class TaskResultViewModel @Inject constructor(
userRepository: UserRepository,
exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
val user = userRepository.getUser().asLiveData()
val hasLeveledUp: Boolean
get() = result?.hasLeveledUp == true
val hasDied: Boolean