Updated DRM icons

MozillaReality · Apr 3, 2020 · 202b062 · 202b062
1 parent 1c9a1fb
commit 202b062
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/app/src/main/res/drawable/ic_icon_drm_allowed.xml b/app/src/main/res/drawable/ic_icon_drm_allowed.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="200"
+    android:viewportHeight="200">
+  <path
+      android:fillColor="@color/white"
+      android:pathData="M168.28,48.2 L151.8,31.72a22.72,22.72 0,0 0,-32.06 0L96.37,55.09a22.69,22.69 0,0 0,0 32.06l2.4,2.41 -8.21,8.21 -2.27,-2.26h0a22.89,22.89 0,0 0,-32.34 0L31.78,119.68a22.89,22.89 0,0 0,0 32.34L48,168.22a22.92,22.92 0,0 0,32.35 0l24.16,-24.17a22.9,22.9 0,0 0,0 -32.35l-2.26,-2.26 8.22,-8.22 2.41,2.41h0a22.72,22.72 0,0 0,32.06 0l23.37,-23.37A22.69,22.69 0,0 0,168.28 48.2ZM92.82,123.37a6.41,6.41 0,0 1,0 9L68.65,156.55a6.39,6.39 0,0 1,-9 0L43.45,140.36a6.38,6.38 0,0 1,0 -9l24.16,-24.16a6.4,6.4 0,0 1,9 0h0l2.26,2.26 -10,10a8.25,8.25 0,1 0,11.66 11.67l10,-10ZM156.61,68.59L133.24,92a6.22,6.22 0,0 1,-8.73 0h0l-2.4,-2.4 9,-9A8.25,8.25 0,0 0,119.43 68.9l-9,9L108,75.48a6.2,6.2 0,0 1,0 -8.72l23.38,-23.37a6.2,6.2 0,0 1,8.72 0l16.48,16.47A6.17,6.17 0,0 1,156.61 68.59Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_icon_drm_blocked.xml b/app/src/main/res/drawable/ic_icon_drm_blocked.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="200"
+    android:viewportHeight="200">
+  <path
+      android:fillColor="@color/white"
+      android:pathData="M63.58,174.9a22.79,22.79 0,0 0,16.17 -6.69l24.17,-24.16a22.7,22.7 0,0 0,6.68 -16.17,22.94 22.94,0 0,0 -1.71,-8.73l-54,54A22.82,22.82 0,0 0,63.58 174.9Z"/>
+  <path
+      android:fillColor="@color/white"
+      android:pathData="M119.54,108.5a22.76,22.76 0,0 0,24.8 -4.87l23.37,-23.37a22.72,22.72 0,0 0,4.87 -24.8Z"/>
+  <path
+      android:fillColor="@color/white"
+      android:pathData="M169.35,41.72A8.24,8.24 0,0 0,157.4 30.37l-3.76,3.75 -2.41,-2.4a22.69,22.69 0,0 0,-32.06 0L95.8,55.09a22.72,22.72 0,0 0,0 32.06l2.41,2.4L90,97.77l-2.26,-2.26a22.9,22.9 0,0 0,-32.35 0L31.21,119.67a22.92,22.92 0,0 0,0 32.35l2.27,2.27L29.8,158a8.25,8.25 0,0 0,11.35 12ZM107.47,66.72 L130.84,43.34a6.22,6.22 0,0 1,8.73 0l2.4,2.41L118.89,68.87l0,0 -9,9 -2.4,-2.41a6.2,6.2 0,0 1,0 -8.72ZM42.88,140.32a6.4,6.4 0,0 1,0 -9l24.17,-24.16a6.36,6.36 0,0 1,9 0l2.26,2.26 -10,10 0,0L45.14,142.62Z"/>
+</vector>
diff --git a/app/src/main/res/layout/navigation_url.xml b/app/src/main/res/layout/navigation_url.xml
@@ -60,7 +60,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:orientation="horizontal"
-                    app:visibleGone="@{settingsViewmodel.isDrmEnabled &amp;&amp; viewmodel.isDrmUsed}">
+                    app:visibleGone="@{viewmodel.isDrmUsed}">
                     <LinearLayout
                         android:layout_width="1dp"
                         android:layout_height="match_parent"
@@ -78,7 +78,7 @@
                         app:privateModeBackground="@{!settingsViewmodel.isTrackingProtectionEnabled ? @drawable/url_button_start_private : @drawable/url_button_private}"
                         android:paddingStart="@{settingsViewmodel.isTrackingProtectionEnabled ? @dimen/navigation_bar_icon_padding_small : @dimen/navigation_bar_icon_padding_big}"
                         android:paddingEnd="2dp"
-                        android:src="@drawable/ic_icon_clear"
+                        android:src="@{settingsViewmodel.isDrmEnabled ? @drawable/ic_icon_drm_allowed : @drawable/ic_icon_drm_blocked}"
                         android:tint="@color/fog"
                         android:tooltipText="@{settingsViewmodel.isTrackingProtectionEnabled ? @string/drm_enabled_tooltip : @string/drm_disabled_tooltip}"
                         app:privateMode="@{viewmodel.isPrivateSession}" />