wearos fix

HabitRPG · Sep 23, 2024 · 8c45c06 · 8c45c06
1 parent dd6577f
commit 8c45c06
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
@@ -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>

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
@@ -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")
+}
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
@@ -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
@@ -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>