Feat: Add Icon support for OONI Run v2 descriptors (#649)

## Proposed Changes - Add supported icons in project and track.
ooni · Feb 13, 2024 · 5feeaab · 5feeaab
1 parent 8375440
commit 5feeaab
Show file tree

Hide file tree

Showing 84 changed files with 762 additions and 3 deletions.
diff --git a/...c/main/java/org/openobservatory/ooniprobe/activity/adddescriptor/AddDescriptorActivity.kt b/...c/main/java/org/openobservatory/ooniprobe/activity/adddescriptor/AddDescriptorActivity.kt
@@ -25,6 +25,7 @@ import org.openobservatory.ooniprobe.activity.adddescriptor.adapter.AddDescripto
 import org.openobservatory.ooniprobe.activity.adddescriptor.adapter.GroupedItem
 import org.openobservatory.ooniprobe.common.PreferenceManager
 import org.openobservatory.ooniprobe.common.ReadMorePlugin
+import org.openobservatory.ooniprobe.common.StringUtils
 import org.openobservatory.ooniprobe.common.TestDescriptorManager
 import org.openobservatory.ooniprobe.databinding.ActivityAddDescriptorBinding
 import org.openobservatory.ooniprobe.model.database.TestDescriptor
@@ -87,7 +88,13 @@ class AddDescriptorActivity : AbstractActivity() {
         fun setImageViewResource(imageView: ImageView, iconName: String?) {
             /* TODO(aanorbel): Update to parse the icon name and set the correct icon.
             * Remember to ignore icons generated when generated doing this.*/
-            imageView.setImageResource(R.drawable.ooni_empty_state)
+            imageView.setImageResource(
+                imageView.context.resources.getIdentifier(
+                    StringUtils.camelToSnake(
+                        iconName
+                    ), "drawable", imageView.context.packageName
+                )
+            )
         }
 
     }

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/common/OONIDescriptor.kt b/app/src/main/java/org/openobservatory/ooniprobe/common/OONIDescriptor.kt
@@ -63,7 +63,11 @@ abstract class AbstractDescriptor<T : BaseNettest>(
      * @return Int representing the display icon for the current descriptor.
      */
     open fun getDisplayIcon(context: Context): Int {
-        return context.resources.getIdentifier(icon, "drawable", context.packageName).let {
+        return context.resources.getIdentifier(
+            StringUtils.camelToSnake(
+                icon
+            ), "drawable", context.packageName
+        ).let {
             if (it == 0) R.drawable.ooni_empty_state else it
         }
     }

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/common/StringUtils.java b/app/src/main/java/org/openobservatory/ooniprobe/common/StringUtils.java
@@ -0,0 +1,28 @@
+package org.openobservatory.ooniprobe.common;
+
+public class StringUtils {
+    public static String camelToSnake(String camelCase) {
+
+        try {
+            final char[] name = camelCase.toCharArray();
+            final StringBuilder builder = new StringBuilder();
+
+            for (int i = 0; i < name.length; i++) {
+                if (Character.isUpperCase(name[i]) || name[i] == '.' || name[i] == '$') {
+                    if (i != 0 && name[i - 1] != '.' && name[i - 1] != '$') {
+                        builder.append('_');
+                    }
+                    if (name[i] != '.' && name[i] != '$') {
+                        builder.append(Character.toLowerCase(name[i]));
+                    }
+                } else {
+                    builder.append(name[i]);
+                }
+            }
+
+            return builder.toString();
+        } catch (Exception e){
+            return "ooni_empty_state";
+        }
+    }
+}
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/model/database/Result.java b/app/src/main/java/org/openobservatory/ooniprobe/model/database/Result.java
@@ -251,7 +251,7 @@ public Optional<AbstractDescriptor<BaseNettest>> getDescriptor(Context context)
              * If there is an {@link IllegalArgumentException}
              * This should only happen when the test_group_name is not a valid {@link OONITests} value,
              * Which means the `test_group_name` is not an OONI provided test or an installed `Descriptor`.
-             * Orphan results for an uninstalled OONI Run v2 descriptor would fall into this category and thus should not exist.
+             * Orphan resulta for an uninstalled OONI Run v2 descriptor would fall into this category and thus should not exist.
              * We return an {@link Optional#absent()} object.
              */
             return Optional.absent();

diff --git a/app/src/main/res/drawable/fa_anchor.xml b/app/src/main/res/drawable/fa_anchor.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="576dp"
+    android:height="512dp"
+    android:viewportWidth="576"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.97 352h32.4C67.16 454.74 181.94 512 288 512c106.23 0 220.85-57.38 242.63-160h32.4c10.69 0 16.04-12.93 8.48-20.48l-67.02-67.03c-4.7-4.69-12.29-4.69-16.98 0L420.5 331.5c-7.56 7.56-2.21 20.49 8.48 20.49h35.15c-20.3 54.32-84.97 86.59-144.12 94.02V256h52c6.63 0 12-5.37 12-12v-40c0-6.63-5.37-12-12-12h-52v-5.47c37.28-13.18 64-48.73 64-90.52 0-52.24-42.4-95.27-94.63-96C235.72-0.74 192 42.53 192 96c0 41.8 26.72 77.35 64 90.53V192h-52c-6.63 0-12 5.37-12 12v40c0 6.63 5.37 12 12 12h52v190.01c-58.94-7.4-123.82-39.67-144.12-94.01h35.15c10.69 0 16.04-12.93 8.48-20.48L88.5 264.49c-4.7-4.69-12.29-4.69-16.98 0L4.48 331.5c-7.55 7.56-2.2 20.49 8.5 20.49zM288 64c17.64 0 32 14.36 32 32s-14.36 32-32 32-32-14.36-32-32 14.36-32 32-32z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_award.xml b/app/src/main/res/drawable/fa_award.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="384dp"
+    android:height="512dp"
+    android:viewportWidth="384"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M97.12 362.63c-8.69-8.69-4.16-6.24-25.12-11.85-9.51-2.55-17.87-7.45-25.43-13.32L1.2 448.7c-4.39 10.77 3.81 22.47 15.43 22.03l52.69-2.01L105.56 507c8 8.44 22.04 5.81 26.43-4.96l52.05-127.62c-10.84 6.04-22.87 9.58-35.31 9.58-19.5 0-37.82-7.59-51.61-21.37zM382.8 448.7l-45.37-111.24c-7.56 5.88-15.92 10.77-25.43 13.32-21.07 5.64-16.45 3.18-25.12 11.85-13.79 13.78-32.12 21.37-51.62 21.37-12.44 0-24.47-3.55-35.31-9.58L252 502.04c4.39 10.77 18.44 13.4 26.43 4.96l36.25-38.28 52.69 2.01c11.62 0.44 19.82-11.27 15.43-22.03zM263 340c15.28-15.55 17.03-14.21 38.79-20.14 13.89-3.79 24.75-14.84 28.47-28.98 7.48-28.4 5.54-24.97 25.95-45.75 10.17-10.35 14.14-25.44 10.42-39.58-7.47-28.38-7.48-24.42 0-52.83 3.72-14.14-0.25-29.23-10.42-39.58-20.41-20.78-18.47-17.36-25.95-45.75-3.72-14.14-14.58-25.19-28.47-28.98-27.88-7.61-24.52-5.62-44.95-26.41-10.17-10.35-25-14.4-38.89-10.61-27.87 7.6-23.98 7.61-51.9 0C152.16-2.4 137.33 1.64 127.16 12c-20.41 20.78-17.05 18.8-44.94 26.41-13.89 3.79-24.75 14.84-28.47 28.98-7.47 28.39-5.54 24.97-25.95 45.75-10.17 10.35-14.15 25.44-10.42 39.58 7.47 28.36 7.48 24.4 0 52.82-3.72 14.14 0.25 29.23 10.42 39.59 20.41 20.78 18.47 17.35 25.95 45.75 3.72 14.14 14.58 25.19 28.47 28.98C104.6 325.96 106.27 325 121 340c13.23 13.47 33.84 15.88 49.74 5.82a39.68 39.68 0 0 1 42.53 0c15.89 10.06 36.5 7.65 49.73-5.82zM97.66 175.96c0-53.03 42.24-96.02 94.34-96.02s94.34 42.99 94.34 96.02-42.24 96.02-94.34 96.02-94.34-42.99-94.34-96.02z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_bed.xml b/app/src/main/res/drawable/fa_bed.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="640dp"
+    android:height="512dp"
+    android:viewportWidth="640"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M176 256c44.11 0 80-35.89 80-80s-35.89-80-80-80-80 35.89-80 80 35.89 80 80 80z m352-128H304c-8.84 0-16 7.16-16 16v144H64V80c0-8.84-7.16-16-16-16H16C7.16 64 0 71.16 0 80v352c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16v-48h512v48c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16V240c0-61.86-50.14-112-112-112z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_bone.xml b/app/src/main/res/drawable/fa_bone.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="640dp"
+    android:height="512dp"
+    android:viewportWidth="640"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M598.88 244.56c25.2-12.6 41.12-38.36 41.12-66.53v-7.64C640 129.3 606.7 96 565.61 96c-32.02 0-60.44 20.49-70.57 50.86-7.68 23.03-11.6 45.14-38.11 45.14H183.06c-27.38 0-31.58-25.54-38.11-45.14C134.83 116.49 106.4 96 74.39 96 33.3 96 0 129.3 0 170.39v7.64c0 28.17 15.92 53.93 41.12 66.53 9.43 4.71 9.43 18.17 0 22.88C15.92 280.04 0 305.8 0 333.97v7.64C0 382.7 33.3 416 74.38 416c32.02 0 60.44-20.49 70.57-50.86 7.68-23.03 11.6-45.14 38.11-45.14h273.87c27.38 0 31.58 25.54 38.11 45.14C505.17 395.51 533.6 416 565.61 416c41.08 0 74.38-33.3 74.38-74.39v-7.64c0-28.18-15.92-53.93-41.12-66.53-9.42-4.71-9.42-18.17 0.01-22.88z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_book_reader.xml b/app/src/main/res/drawable/fa_book_reader.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M352 96c0-53.02-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.98 96-96zM233.59 241.1c-59.33-36.32-155.43-46.3-203.79-49.05C13.55 191.13 0 203.51 0 219.14v222.8c0 14.33 11.59 26.28 26.49 27.05 43.66 2.29 131.99 10.68 193.04 41.43 9.37 4.72 20.48-1.71 20.48-11.87V252.56c-0.01-4.67-2.32-8.95-6.42-11.46z m248.61-49.05c-48.35 2.74-144.46 12.73-203.78 49.05-4.1 2.51-6.41 6.96-6.41 11.63v245.79c0 10.19 11.14 16.63 20.54 11.9 61.04-30.72 149.32-39.11 192.97-41.4 14.9-0.78 26.49-12.73 26.49-27.06V219.14c-0.01-15.63-13.56-28.01-29.81-27.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_brush.xml b/app/src/main/res/drawable/fa_brush.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="384dp"
+    android:height="512dp"
+    android:viewportWidth="384"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M352 0H32C14.33 0 0 14.33 0 32v224h384V32c0-17.67-14.33-32-32-32zM0 320c0 35.35 28.66 64 64 64h64v64c0 35.35 28.66 64 64 64s64-28.65 64-64v-64h64c35.34 0 64-28.65 64-64v-32H0v32z m192 104c13.25 0 24 10.74 24 24 0 13.25-10.75 24-24 24s-24-10.75-24-24c0-13.26 10.75-24 24-24z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_building.xml b/app/src/main/res/drawable/fa_building.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="448dp"
+    android:height="512dp"
+    android:viewportWidth="448"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M436 480h-20V24c0-13.26-10.74-24-24-24H56C42.74 0 32 10.74 32 24v456H12c-6.63 0-12 5.37-12 12v20h448v-20c0-6.63-5.37-12-12-12zM128 76c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12V76z m0 96c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12v-40z m52 148h-40c-6.63 0-12-5.37-12-12v-40c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40c0 6.63-5.37 12-12 12z m76 160h-64v-84c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v84z m64-172c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12v-40c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40z m0-96c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12v-40c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40z m0-96c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12V76c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_cake_candles.xml b/app/src/main/res/drawable/fa_cake_candles.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M86.4,5.5L61.8,47.6C58,54.1 56,61.6 56,69.2L56,72c0,22.1 17.9,40 40,40s40,-17.9 40,-40L136,69.2c0,-7.6 -2,-15 -5.8,-21.6L105.6,5.5C103.6,2.1 100,0 96,0s-7.6,2.1 -9.6,5.5zM214.4,5.5L189.8,47.6c-3.8,6.5 -5.8,14 -5.8,21.6L184,72c0,22.1 17.9,40 40,40s40,-17.9 40,-40L264,69.2c0,-7.6 -2,-15 -5.8,-21.6L233.6,5.5C231.6,2.1 228,0 224,0s-7.6,2.1 -9.6,5.5zM317.8,47.6c-3.8,6.5 -5.8,14 -5.8,21.6L312,72c0,22.1 17.9,40 40,40s40,-17.9 40,-40L392,69.2c0,-7.6 -2,-15 -5.8,-21.6L361.6,5.5C359.6,2.1 356,0 352,0s-7.6,2.1 -9.6,5.5L317.8,47.6zM128,176c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32v48c-35.3,0 -64,28.7 -64,64v71c8.3,5.2 18.1,9 28.8,9c13.5,0 27.2,-6.1 38.4,-13.4c5.4,-3.5 9.9,-7.1 13,-9.7c1.5,-1.3 2.7,-2.4 3.5,-3.1c0.4,-0.4 0.7,-0.6 0.8,-0.8l0.1,-0.1 0,0 0,0s0,0 0,0s0,0 0,0c3.1,-3.2 7.4,-4.9 11.9,-4.8s8.6,2.1 11.6,5.4l0,0 0,0 0.1,0.1c0.1,0.1 0.4,0.4 0.7,0.7c0.7,0.7 1.7,1.7 3.1,3c2.8,2.6 6.8,6.1 11.8,9.5c10.2,7.1 23,13.1 36.3,13.1s26.1,-6 36.3,-13.1c5,-3.5 9,-6.9 11.8,-9.5c1.4,-1.3 2.4,-2.3 3.1,-3c0.3,-0.3 0.6,-0.6 0.7,-0.7l0.1,-0.1c3,-3.5 7.4,-5.4 12,-5.4s9,2 12,5.4l0.1,0.1c0.1,0.1 0.4,0.4 0.7,0.7c0.7,0.7 1.7,1.7 3.1,3c2.8,2.6 6.8,6.1 11.8,9.5c10.2,7.1 23,13.1 36.3,13.1s26.1,-6 36.3,-13.1c5,-3.5 9,-6.9 11.8,-9.5c1.4,-1.3 2.4,-2.3 3.1,-3c0.3,-0.3 0.6,-0.6 0.7,-0.7l0.1,-0.1c2.9,-3.4 7.1,-5.3 11.6,-5.4s8.7,1.6 11.9,4.8l0,0 0,0 0,0 0.1,0.1c0.2,0.2 0.4,0.4 0.8,0.8c0.8,0.7 1.9,1.8 3.5,3.1c3.1,2.6 7.5,6.2 13,9.7c11.2,7.3 24.9,13.4 38.4,13.4c10.7,0 20.5,-3.9 28.8,-9L448.2,288c0,-35.3 -28.7,-64 -64,-64L384.2,176c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32v48L256,224L256,176c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32v48L128,224L128,176zM448,394.6c-8.5,3.3 -18.2,5.4 -28.8,5.4c-22.5,0 -42.4,-9.9 -55.8,-18.6c-4.1,-2.7 -7.8,-5.4 -10.9,-7.8c-2.8,2.4 -6.1,5 -9.8,7.5C329.8,390 310.6,400 288,400s-41.8,-10 -54.6,-18.9c-3.5,-2.4 -6.7,-4.9 -9.4,-7.2c-2.7,2.3 -5.9,4.7 -9.4,7.2C201.8,390 182.6,400 160,400s-41.8,-10 -54.6,-18.9c-3.7,-2.6 -7,-5.2 -9.8,-7.5c-3.1,2.4 -6.8,5.1 -10.9,7.8C71.2,390.1 51.3,400 28.8,400c-10.6,0 -20.3,-2.2 -28.8,-5.4L0,480c0,17.7 14.3,32 32,32L416,512c17.7,0 32,-14.3 32,-32L448,394.6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_car.xml b/app/src/main/res/drawable/fa_car.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M499.99 176h-59.87l-16.64-41.6C406.38 91.63 365.57 64 319.5 64h-127c-46.06 0-86.88 27.63-103.99 70.4L71.87 176H12.01c-7.81 0-13.54 7.34-11.64 14.91l6 24C7.7 220.25 12.5 224 18.01 224h20.07C24.65 235.73 16 252.78 16 272v48c0 16.12 6.16 30.67 16 41.93V416c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-32h256v32c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-54.07c9.84-11.25 16-25.8 16-41.93v-48c0-19.22-8.65-36.27-22.07-48H494c5.51 0 10.31-3.75 11.64-9.09l6-24c1.89-7.57-3.84-14.91-11.65-14.91z m-352.06-17.83c7.29-18.22 24.94-30.17 44.57-30.17h127c19.63 0 37.28 11.95 44.57 30.17L384 208H128l19.93-49.83zM96 319.8c-19.2 0-32-12.76-32-31.9S76.8 256 96 256s48 28.71 48 47.85-28.8 15.95-48 15.95z m320 0c-19.2 0-48 3.19-48-15.95S396.8 256 416 256s32 12.76 32 31.9-12.8 31.9-32 31.9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_carrot.xml b/app/src/main/res/drawable/fa_carrot.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M298.2 156.6c-52.7-25.7-114.5-10.5-150.2 32.8l55.2 55.2c6.3 6.3 6.3 16.4 0 22.6-3.1 3.1-7.2 4.7-11.3 4.7s-8.2-1.6-11.3-4.7L130.4 217 2.3 479.7c-2.9 6-3.1 13.3 0 19.7 5.4 11.1 18.9 15.7 30 10.3l133.6-65.2-49.2-49.2c-6.3-6.2-6.3-16.4 0-22.6 6.3-6.2 16.4-6.2 22.6 0l57 57 102-49.8c24-11.7 44.5-31.3 57.1-57.1 30.1-61.7 4.5-136.1-57.2-166.2z m92.1-34.9C409.8 81 399.7 32.9 360 0c-50.3 41.7-52.5 107.5-7.9 151.9l8 8c44.4 44.6 110.3 42.4 151.9-7.9-32.9-39.7-81-49.8-121.7-30.3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_cloud_showers_heavy.xml b/app/src/main/res/drawable/fa_cloud_showers_heavy.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M96,320c-53,0 -96,-43 -96,-96c0,-42.5 27.6,-78.6 65.9,-91.2C64.7,126.1 64,119.1 64,112C64,50.1 114.1,0 176,0c43.1,0 80.5,24.3 99.2,60c14.7,-17.1 36.5,-28 60.8,-28c44.2,0 80,35.8 80,80c0,5.5 -0.6,10.8 -1.6,16c0.5,0 1.1,0 1.6,0c53,0 96,43 96,96s-43,96 -96,96L96,320zM81.5,353.9c12.2,5.2 17.8,19.3 12.6,31.5l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6S-3.3,490.7 1.9,478.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6zM201.5,353.9c12.2,5.2 17.8,19.3 12.6,31.5l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6s-17.8,-19.3 -12.6,-31.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6zM446.1,385.4l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6s-17.8,-19.3 -12.6,-31.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6s17.8,19.3 12.6,31.5zM313.5,353.9c12.2,5.2 17.8,19.3 12.6,31.5l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6s-17.8,-19.3 -12.6,-31.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_cloud_sun.xml b/app/src/main/res/drawable/fa_cloud_sun.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="640dp"
+    android:height="512dp"
+    android:viewportWidth="640"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M575.2 325.7c0.2-1.9 0.8-3.7 0.8-5.6 0-35.3-28.7-64-64-64-12.6 0-24.2 3.8-34.1 10-17.6-38.8-56.5-66-101.9-66-61.8 0-112 50.1-112 112 0 3 0.7 5.8 0.9 8.7-49.6 3.7-88.9 44.7-88.9 95.3 0 53 43 96 96 96h272c53 0 96-43 96-96 0-42.1-27.2-77.4-64.8-90.4z m-430.4-22.6c-43.7-43.7-43.7-114.7 0-158.3 43.7-43.7 114.7-43.7 158.4 0 9.7 9.7 16.9 20.9 22.3 32.7 9.8-3.7 20.1-6 30.7-7.5L386 81.1c4-11.9-7.3-23.1-19.2-19.2L279 91.2 237.5 8.4C232-2.8 216-2.8 210.4 8.4L169 91.2 81.1 61.9C69.3 58 58 69.3 61.9 81.1l29.3 87.8-82.8 41.5c-11.2 5.6-11.2 21.5 0 27.1l82.8 41.4-29.3 87.8c-4 11.9 7.3 23.1 19.2 19.2l76.1-25.3c6.1-12.4 14-23.7 23.6-33.5-13.1-5.4-25.4-13.4-36-24z m-4.8-79.2c0 40.8 29.3 74.8 67.9 82.3 8-4.7 16.3-8.8 25.2-11.7 5.4-44.3 31-82.5 67.4-105C287.3 160.4 258 140 224 140c-46.3 0-84 37.6-84 83.9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_compass.xml b/app/src/main/res/drawable/fa_compass.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="496dp"
+    android:height="512dp"
+    android:viewportWidth="496"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M225.38 233.37c-12.5 12.5-12.5 32.76 0 45.25 12.49 12.5 32.76 12.5 45.25 0 12.5-12.5 12.5-32.76 0-45.25-12.5-12.49-32.76-12.49-45.25 0zM248 8C111.03 8 0 119.03 0 256s111.03 248 248 248 248-111.03 248-248S384.97 8 248 8z m126.14 148.05L308.17 300.4a31.94 31.94 0 0 1-15.77 15.77l-144.34 65.97c-16.65 7.61-33.81-9.55-26.2-26.2l65.98-144.35a31.94 31.94 0 0 1 15.77-15.77l144.34-65.97c16.65-7.6 33.8 9.55 26.19 26.2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_computer.xml b/app/src/main/res/drawable/fa_computer.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="640dp"
+    android:height="512dp"
+    android:viewportWidth="640"
+    android:viewportHeight="512">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M384,96L384,320L64,320L64,96L384,96zM64,32C28.7,32 0,60.7 0,96L0,320c0,35.3 28.7,64 64,64L181.3,384l-10.7,32L96,416c-17.7,0 -32,14.3 -32,32s14.3,32 32,32L352,480c17.7,0 32,-14.3 32,-32s-14.3,-32 -32,-32L277.3,416l-10.7,-32L384,384c35.3,0 64,-28.7 64,-64L448,96c0,-35.3 -28.7,-64 -64,-64L64,32zM528,32c-26.5,0 -48,21.5 -48,48L480,432c0,26.5 21.5,48 48,48h64c26.5,0 48,-21.5 48,-48L640,80c0,-26.5 -21.5,-48 -48,-48L528,32zM544,96h32c8.8,0 16,7.2 16,16s-7.2,16 -16,16L544,128c-8.8,0 -16,-7.2 -16,-16s7.2,-16 16,-16zM528,176c0,-8.8 7.2,-16 16,-16h32c8.8,0 16,7.2 16,16s-7.2,16 -16,16L544,192c-8.8,0 -16,-7.2 -16,-16zM560,336a32,32 0,1 1,0 64,32 32,0 1,1 0,-64z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_crown.xml b/app/src/main/res/drawable/fa_crown.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="640dp"
+    android:height="512dp"
+    android:viewportWidth="640"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M528 448H112c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h416c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16z m64-320c-26.5 0-48 21.5-48 48 0 7.1 1.6 13.7 4.4 19.8L476 239.2c-15.4 9.2-35.3 4-44.2-11.6L350.3 85C361 76.2 368 63 368 48c0-26.5-21.5-48-48-48s-48 21.5-48 48c0 15 7 28.2 17.7 37l-81.5 142.6c-8.9 15.6-28.9 20.8-44.2 11.6l-72.3-43.4c2.7-6 4.4-12.7 4.4-19.8 0-26.5-21.5-48-48-48S0 149.5 0 176s21.5 48 48 48c2.6 0 5.2-0.4 7.7-0.8L128 416h384l72.3-192.8c2.5 0.4 5.1 0.8 7.7 0.8 26.5 0 48-21.5 48-48s-21.5-48-48-48z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_cube.xml b/app/src/main/res/drawable/fa_cube.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72z m32 356V275.5l160-65v133.9l-160 80z"/>
+</vector>