sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 12:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix colors

Browse source
This commit is contained in:
Phillip Thelen 2022-06-22 10:53:24 +02:00
parent 1a829f58a0
commit b7742bb6c3
4 changed files with 11 additions and 10 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/AvatarActivity.kt
View file

@ -6,8 +6,8 @@ import android.view.Gravity
import android.view.ViewOutlineProvider
import android.widget.FrameLayout
import androidx.activity.viewModels
import com.habitrpg.common.habitica.extensions.dpToPx
import com.habitrpg.android.habitica.databinding.ActivityAvatarBinding
import com.habitrpg.common.habitica.extensions.dpToPx
import com.habitrpg.wearos.habitica.ui.viewmodels.AvatarViewModel
import dagger.hilt.android.AndroidEntryPoint
import java.lang.Integer.max

12
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
View file

@ -2,17 +2,13 @@ package com.habitrpg.wearos.habitica.ui.activities
import android.os.Bundle
import android.view.View
import android.view.ViewTreeObserver
import androidx.activity.viewModels
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.ActivityStatsBinding
import com.habitrpg.android.habitica.extensions.observeOnce
import com.habitrpg.common.habitica.views.HabiticaIconsHelper
import com.habitrpg.wearos.habitica.extensions.waitForLayout
import com.habitrpg.wearos.habitica.models.Stats
import com.habitrpg.wearos.habitica.models.User
import com.habitrpg.wearos.habitica.models.user.Stats
import com.habitrpg.wearos.habitica.models.user.User
import com.habitrpg.wearos.habitica.ui.viewmodels.StatsViewModel
import com.habitrpg.wearos.habitica.ui.views.StatValue
import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint
@ -48,7 +44,7 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
binding.expBar.setPercentageValues(stats.exp?.toInt() ?: 0, stats.toNextLevel ?: 0)
binding.expBar.animateProgress()
if (stats.lvl ?: 0 < 10) {
if ((stats.lvl ?: 0) < 10) {
binding.mpBar.visibility = View.GONE
} else {
binding.mpBar.setPercentageValues(stats.mp?.toInt() ?: 0, stats.maxMP ?: 0)
@ -59,7 +55,7 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
private fun updateStatViews(stats: Stats) {
binding.hpStatValue.setStatValue(stats.maxHealth ?: 0, stats.hp?.toInt() ?: 0)
binding.expStatValue.setStatValue(stats.toNextLevel ?: 0, stats.exp?.toInt() ?: 0)
if (stats.lvl ?: 0 < 10) {
if ((stats.lvl ?: 0) < 10) {
binding.mpStatValue.visibility = View.GONE
} else {
binding.mpStatValue.setStatValue(stats.maxMP ?: 0, stats.mp?.toInt() ?: 0)

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

@ -3,7 +3,7 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import com.habitrpg.wearos.habitica.data.repositories.UserRepository
import com.habitrpg.wearos.habitica.models.User
import com.habitrpg.wearos.habitica.models.user.User
import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject

5
wearos/src/main/res/values/colors.xml
View file

@ -51,4 +51,9 @@
<color name="ic_launcher_background">@color/brand_300</color>
<color name="surface">#23202A</color>
<color name="bar_background_color">#34313a</color>
<color name="exp_bar_color">@color/watch_yellow_100</color>
<color name="mp_bar_color">@color/watch_blue_100</color>
<color name="hp_bar_color">@color/watch_red_100</color>
</resources>