diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml index 5155e7f5ee..86f6dce959 100644 --- a/common/src/main/res/values/colors.xml +++ b/common/src/main/res/values/colors.xml @@ -3,7 +3,7 @@ #ffffff #000000 #ffffff - #000000FF + #000000 #36205D #432874 diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt index 4580240f2d..e6780e8730 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt @@ -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("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("result") +} diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt index 1d4a8d01cf..57ab38c251 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt @@ -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") } diff --git a/wearos/src/main/res/anim/move_away.xml b/wearos/src/main/res/anim/move_away.xml index e077b23bb2..146a953e93 100644 --- a/wearos/src/main/res/anim/move_away.xml +++ b/wearos/src/main/res/anim/move_away.xml @@ -2,9 +2,7 @@ - - \ No newline at end of file + android:toAlpha="0.0"/> +