black to gray9

ooni · Nov 17, 2018 · 8a573cf · 8a573cf
1 parent 50ab963
commit 8a573cf
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/item/InstantMessagingItem.java b/app/src/main/java/org/openobservatory/ooniprobe/item/InstantMessagingItem.java
@@ -44,8 +44,8 @@ public InstantMessagingItem(Result extra, View.OnClickListener onClickListener,
 		Long available = extra.countOkMeasurements();
 		viewHolder.failedMeasurements.setText(viewHolder.failedMeasurements.getContext().getResources().getQuantityString(R.plurals.TestResults_Overview_InstantMessaging_Blocked, blocked.intValue(), blocked.toString()));
 		viewHolder.okMeasurements.setText(viewHolder.failedMeasurements.getContext().getResources().getQuantityString(R.plurals.TestResults_Overview_InstantMessaging_Available, available.intValue(), available.toString()));
-		viewHolder.failedMeasurements.setTextColor(ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_black : R.color.color_yellow9));
-		DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.failedMeasurements.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_black : R.color.color_yellow9));
+		viewHolder.failedMeasurements.setTextColor(ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_gray9 : R.color.color_yellow9));
+		DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.failedMeasurements.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_gray9 : R.color.color_yellow9));
 	}
 
 	class ViewHolder extends RecyclerView.ViewHolder {

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/item/MiddleboxesItem.java b/app/src/main/java/org/openobservatory/ooniprobe/item/MiddleboxesItem.java
@@ -47,11 +47,11 @@ public MiddleboxesItem(Result extra, View.OnClickListener onClickListener, View.
 		} else if (extra.countCompletedMeasurements() == 0) {
 			viewHolder.status.setText(R.string.TestResults_Overview_MiddleBoxes_Failed);
 			viewHolder.status.setTextColor(ContextCompat.getColor(viewHolder.status.getContext(), R.color.color_gray9));
-			DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.status.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.status.getContext(), R.color.color_black));
+			DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.status.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.status.getContext(), R.color.color_gray9));
 		} else {
 			viewHolder.status.setText(R.string.TestResults_Overview_MiddleBoxes_NotFound);
-			viewHolder.status.setTextColor(ContextCompat.getColor(viewHolder.status.getContext(), R.color.color_black));
-			DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.status.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.status.getContext(), R.color.color_black));
+			viewHolder.status.setTextColor(ContextCompat.getColor(viewHolder.status.getContext(), R.color.color_gray9));
+			DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.status.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.status.getContext(), R.color.color_gray9));
 		}
 	}
 

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/item/WebsiteItem.java b/app/src/main/java/org/openobservatory/ooniprobe/item/WebsiteItem.java
@@ -44,8 +44,8 @@ public WebsiteItem(Result extra, View.OnClickListener onClickListener, View.OnLo
 		Long available = extra.countOkMeasurements();
 		viewHolder.failedMeasurements.setText(viewHolder.failedMeasurements.getContext().getResources().getQuantityString(R.plurals.TestResults_Overview_Websites_Blocked, blocked.intValue(), blocked.toString()));
 		viewHolder.okMeasurements.setText(viewHolder.failedMeasurements.getContext().getResources().getQuantityString(R.plurals.TestResults_Overview_Websites_Tested, available.intValue(), available.toString()));
-		viewHolder.failedMeasurements.setTextColor(ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_black : R.color.color_yellow9));
-		DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.failedMeasurements.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_black : R.color.color_yellow9));
+		viewHolder.failedMeasurements.setTextColor(ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_gray9 : R.color.color_yellow9));
+		DrawableCompat.setTint(DrawableCompat.wrap(viewHolder.failedMeasurements.getCompoundDrawablesRelative()[0]).mutate(), ContextCompat.getColor(viewHolder.failedMeasurements.getContext(), blocked == 0 ? R.color.color_gray9 : R.color.color_yellow9));
 	}
 
 	class ViewHolder extends RecyclerView.ViewHolder {

diff --git a/app/src/main/res/drawable/download_black.xml b/app/src/main/res/drawable/download_black.xml
@@ -9,7 +9,7 @@
         <path
             android:name="path"
             android:pathData="M 13.664 1.529 L 13.664 10.051 L 17.5 10.051 L 9.5 18.051 L 1.5 10.051 L 5.476 10.051 L 5.476 1.526 Z"
-            android:fillColor="#000"
+            android:fillColor="#212529"
             android:strokeWidth="1"/>
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/globe.xml b/app/src/main/res/drawable/globe.xml
@@ -7,7 +7,7 @@
 	<group android:name="group">
 		<path
 			android:name="path"
-			android:fillColor="#000"
+			android:fillColor="#212529"
 			android:pathData="M 4.22 4.32 C 4.954 3.56 5.838 2.961 6.816 2.562 C 7.794 2.162 8.844 1.971 9.9 2 C 10.953 1.989 11.999 2.189 12.974 2.587 C 13.949 2.986 14.835 3.575 15.58 4.32 C 16.346 5.049 16.949 5.932 17.349 6.911 C 17.749 7.89 17.937 8.943 17.9 10 C 17.911 11.053 17.711 12.099 17.313 13.074 C 16.914 14.049 16.325 14.935 15.58 15.68 C 14.851 16.446 13.968 17.049 12.989 17.449 C 12.01 17.849 10.957 18.037 9.9 18 C 8.847 18.011 7.801 17.811 6.826 17.413 C 5.851 17.014 4.965 16.425 4.22 15.68 C 2.733 14.164 1.9 12.123 1.9 10 C 1.9 7.877 2.733 5.836 4.22 4.32 Z M 9.02 16.24 L 9.02 14.72 C 8.599 14.71 8.198 14.538 7.9 14.24 C 7.602 13.942 7.43 13.541 7.42 13.12 L 7.42 12.32 L 3.58 8.48 C 3.448 8.948 3.394 9.434 3.42 9.92 C 3.414 11.482 3.984 12.992 5.02 14.16 C 6.041 15.335 7.472 16.079 9.02 16.24 Z M 14.54 14.24 C 15.645 13.077 16.249 11.524 16.22 9.92 C 16.229 8.633 15.838 7.374 15.1 6.32 C 14.393 5.277 13.39 4.469 12.22 4 L 12.22 4.32 C 12.21 4.741 12.038 5.142 11.74 5.44 C 11.442 5.738 11.041 5.91 10.62 5.92 L 9.02 5.92 L 9.02 7.52 C 9.015 7.731 8.929 7.931 8.78 8.08 C 8.631 8.229 8.431 8.315 8.22 8.32 L 6.62 8.32 L 6.62 9.92 L 11.42 9.92 C 11.63 9.925 11.831 10.011 11.98 10.16 C 12.129 10.309 12.215 10.51 12.22 10.72 L 12.22 13.12 L 13.02 13.12 C 13.362 13.111 13.697 13.216 13.972 13.419 C 14.248 13.622 14.448 13.911 14.54 14.24 Z"
 			android:strokeWidth="1" />
 	</group>

diff --git a/app/src/main/res/drawable/tick_black_18dp.xml b/app/src/main/res/drawable/tick_black_18dp.xml
@@ -7,7 +7,7 @@
 	<group android:name="group">
 		<path
 			android:name="path"
-			android:fillColor="#000"
+			android:fillColor="#212529"
 			android:pathData="M 1.264 9.71 L 3.944 6.854 L 7.325 10.454 L 14.564 2.747 L 17.264 5.622 L 7.34 16.183 Z"
 			android:strokeWidth="1" />
 	</group>

diff --git a/app/src/main/res/drawable/upload_black.xml b/app/src/main/res/drawable/upload_black.xml
@@ -7,7 +7,7 @@
 	<group android:name="group">
 		<path
 			android:name="path"
-			android:fillColor="#000"
+			android:fillColor="#212529"
 			android:pathData="M 5.336 17.471 L 5.336 8.949 L 1.5 8.949 L 9.5 0.949 L 17.5 8.949 L 13.524 8.949 L 13.524 17.474 Z"
 			android:strokeWidth="1" />
 	</group>

diff --git a/app/src/main/res/drawable/video_quality.xml b/app/src/main/res/drawable/video_quality.xml
@@ -6,7 +6,7 @@
 	android:viewportHeight="19">
 	<path
 		android:name="path"
-		android:fillColor="#000"
+		android:fillColor="#212529"
 		android:pathData="M 2.8 5 L 2.8 16.2 L 14 16.2 L 14 17.8 L 2.8 17.8 C 2.379 17.79 1.978 17.618 1.68 17.32 C 1.382 17.022 1.21 16.621 1.2 16.2 L 1.2 5 Z M 15.6 1.8 C 16.021 1.81 16.422 1.982 16.72 2.28 C 17.018 2.578 17.19 2.979 17.2 3.4 L 17.2 13 C 17.19 13.421 17.018 13.822 16.72 14.12 C 16.422 14.418 16.021 14.59 15.6 14.6 L 6 14.6 C 5.579 14.59 5.178 14.418 4.88 14.12 C 4.582 13.822 4.41 13.421 4.4 13 L 4.4 3.4 C 4.41 2.979 4.582 2.578 4.88 2.28 C 5.178 1.982 5.579 1.81 6 1.8 Z M 9.2 11.8 L 14 8.2 L 9.2 4.6 Z"
 		android:strokeWidth="1" />
 </vector>