sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wearos fix

Browse source
This commit is contained in:
Phillip Thelen 2024-09-19 13:30:02 +02:00
parent dd6577fc1b
commit 8c45c06356
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/res/values/colors.xml
View file

@ -3,7 +3,7 @@
<color name="white">#ffffff</color>
<color name="black">#000000</color>
<color name="watch_white">#ffffff</color>
<color name="watch_black">#000000FF</color>
<color name="watch_black">#000000</color>
<color name="brand_50">#36205D</color>
<color name="brand_100">#432874</color>

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

@ -20,14 +20,14 @@ class TaskResultViewModel
exceptionBuilder: ExceptionHandlerBuilder,
appStateManager: AppStateManager,
) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
val user = userRepository.getUser().asLiveData()
val hasLeveledUp: Boolean
get() = result?.hasLeveledUp == true
val hasDied: Boolean
get() = result?.hasDied == true
val hasDrop: Boolean
get() {
return result?.drop?.key?.isNotBlank() == true // || (result?.questItemsFound ?: 0) > 0
}
val result = savedStateHandle.get<TaskScoringResult>("result")
}
val user = userRepository.getUser().asLiveData()
val hasLeveledUp: Boolean
get() = result?.hasLeveledUp == true
val hasDied: Boolean
get() = result?.hasDied == true
val hasDrop: Boolean
get() {
return result?.drop?.key?.isNotBlank() == true // || (result?.questItemsFound ?: 0) > 0
}
val result = savedStateHandle.get<TaskScoringResult>("result")
}

2
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt
View file

@ -21,7 +21,7 @@ class ConnectedActionChipView(context: Context, attrs: AttributeSet? = null) :
capabilityClient.addListener({
launch(Dispatchers.Main) {
isEnabled = it.nodes.firstOrNull { it.isNearby } != null
alpha = if (isEnabled) 1.0f else 0.7f
alpha = if (isEnabled) 1.0f else 0.5f
}
}, "open_activity")
}

6
wearos/src/main/res/anim/move_away.xml
View file

@ -2,9 +2,7 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/activity_transition_time"
>
<scale android:fromXScale="1" android:toXScale="0.8" android:pivotX="50%"
android:fromYScale="1" android:toYScale="0.8" android:pivotY="50%" />
<alpha
android:fromAlpha="1"
android:toAlpha="0.2"/>
</set>
android:toAlpha="0.0"/>
</set>