Update the drawable state when drawable is updated (#3160)

MozillaReality · Apr 14, 2020 · 55edd67 · 55edd67
1 parent 1032ae4
commit 55edd67
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
@@ -370,6 +370,7 @@ public void setEnabled(boolean enabled) {
     public void setImageDrawable(@Nullable Drawable drawable) {
         super.setImageDrawable(drawable);
         mDrawable = drawable;
+        updateButtonColor();
     }
 
     public boolean setLevel(int level) {

diff --git a/app/src/main/res/drawable/ic_icon_media_pause.xml b/app/src/main/res/drawable/ic_icon_media_pause.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="200"
     android:viewportHeight="200">
     <path
-        android:fillColor="@color/void_color"
+        android:fillColor="@color/white"
         android:pathData="M140.37 177.89a8.25 8.25 0 0 1-8.24-8.26l.2-139.16a8.26 8.26 0 0 1 8.25-8.24 8.25 8.25 0 0 1 8.24 8.26l-.2 139.16a8.26 8.26 0 0 1-8.25 8.24zM59.43 177.77a8.25 8.25 0 0 1-8.24-8.26l.2-139.16a8.26 8.26 0 0 1 8.25-8.24 8.25 8.25 0 0 1 8.24 8.26l-.2 139.16a8.26 8.26 0 0 1-8.25 8.24z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_icon_media_play.xml b/app/src/main/res/drawable/ic_icon_media_play.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="200"
     android:viewportHeight="200">
     <path
-        android:fillColor="@color/void_color"
+        android:fillColor="@color/white"
         android:pathData="M165.3 87.78L48.81 20.53a14.11 14.11 0 0 0-21.16 12.22v134.5a14.11 14.11 0 0 0 21.16 12.22l116.49-67.25a14.12 14.12 0 0 0 0-24.44z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_icon_media_volume.xml b/app/src/main/res/drawable/ic_icon_media_volume.xml
@@ -5,9 +5,9 @@
     android:viewportWidth="200"
     android:viewportHeight="200">
     <path
-        android:fillColor="@color/void_color"
+        android:fillColor="@color/white"
         android:pathData="M160.59 38.76a8 8 0 1 0-12.66 9.79 84 84 0 0 1-.18 102.88 8 8 0 1 0 12.63 9.83 100.07 100.07 0 0 0 .21-122.5z"/>
     <path
-        android:fillColor="@color/void_color"
+        android:fillColor="@color/white"
         android:pathData="M138 63.44A8 8 0 0 0 125.17 73a43.91 43.91 0 0 1-1.17 53.75 8 8 0 1 0 12.42 10.08 60 60 0 0 0 13.37-37.72A59.44 59.44 0 0 0 138 63.44zM90.57 46.11L47 69.72a8.7 8.7 0 0 1-4.15 1H27.3a8.71 8.71 0 0 0-8.72 8.71v40.88a8.71 8.71 0 0 0 8.72 8.71h15.15a8.66 8.66 0 0 1 4.14 1.05l44 23.77a8.72 8.72 0 0 0 12.86-7.66V53.77a8.71 8.71 0 0 0-12.88-7.66z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_icon_media_volume_muted.xml b/app/src/main/res/drawable/ic_icon_media_volume_muted.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="200"
     android:viewportHeight="200">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="M90 153.77a8.71 8.71 0 0 0 12.85-7.67V96.52l-41.62 41.67zM127 56.59a8.25 8.25 0 0 0 0-11.67 8.26 8.26 0 0 0-11.66 0l-12.45 12.36v-3.63A8.71 8.71 0 0 0 90 46L46.49 69.59a8.66 8.66 0 0 1-4.16 1.06H26.76a8.71 8.71 0 0 0-8.71 8.71v40.88a8.71 8.71 0 0 0 8.71 8.76H31l-14.24 14.16a8.26 8.26 0 0 0 0 11.67 8.25 8.25 0 0 0 11.66 0l22.37-22.29.11.06 52-52z"/>
 </vector>
diff --git a/app/src/main/res/layout/media_controls.xml b/app/src/main/res/layout/media_controls.xml
@@ -27,7 +27,6 @@
                 android:id="@+id/mediaBackButton"
                 style="?attr/mediaControlsButtonStyle"
                 android:layout_weight="1"
-                android:tint="@color/midnight"
                 android:src="@drawable/ic_icon_back" />
 
             <org.mozilla.vrbrowser.ui.views.UIButton