Merge pull request #41 from ritwikshanker/issue/update-icons

Issue/update icons
ritwikshanker · Oct 10, 2020 · eecc282 · eecc282
2 parents 72c809e + 4d9e9a7
commit eecc282
Show file tree

Hide file tree

Showing 7 changed files with 13,914 additions and 20,586 deletions.
diff --git a/app/src/main/java/com/example/gocoronago/stayHome/StayHomeFragment.kt b/app/src/main/java/com/example/gocoronago/stayHome/StayHomeFragment.kt
@@ -70,7 +70,7 @@ class StayHomeFragment : DialogFragment() {
         )
         fragmentData.add(
             Pair(
-                R.raw.sneeze,
+                R.raw.sneeze_covid,
                 "Cover your nose and mouth with your bent elbow or a tissue when you cough or sneeze."
             )
         )

diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="m16.0058,5.9999c-4.9883,0 -9,4.0117 -9,9 0,4.9884 4.0117,9 9,9 4.9883,0 9,-4.0116 9,-9 0,-4.9883 -4.0117,-9 -9,-9z"
+      android:fillColor="#999" />
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m15.8085,4.0019c-3.4428,0.065 -6.7827,1.7445 -8.8574,4.7519 -3.1289,4.5353 -2.4049,10.6834 1.6582,14.3789 -0.3515,1.6475 -1.5863,2.9727 -3.2266,3.4121a0.5001,0.5001 0,0 0,-0.377 0.5996,0.5 0.5,0 0,0 0.3652,0.5059c2.8989,0.8578 6.0415,0.1113 8.209,-1.9317 5.3111,1.2029 10.7334,-1.6654 12.6953,-6.7753 1.9956,-5.1975 -0.2139,-11.0751 -5.1387,-13.6719 -1.2312,-0.6492 -2.5359,-1.0441 -3.8496,-1.1973 -0.4926,-0.057 -0.9867,-0.082 -1.4785,-0.072zM16.2714,4.9999c1.493,0.039 2.9972,0.4155 4.3984,1.1543 4.4838,2.3644 6.4888,7.6994 4.6719,12.4316 -1.8169,4.7321 -6.8751,7.3534 -11.7891,6.1094a0.5001,0.5001 0,0 0,-0.5645 0.2168c-1.5843,1.5454 -3.8081,2.2677 -6.0078,2.0293 1.406,-0.8192 2.4079,-2.2289 2.6699,-3.8848a0.5001,0.5001 0,0 0,-0.1758 -0.4726,0.5001 0.5001,0 0,0 -0.0019,-0 0.5001,0.5001 0,0 0,-0.0801 -0.08c-3.8023,-3.3521 -4.4957,-9.0072 -1.6172,-13.1796 1.979,-2.8686 5.2115,-4.4087 8.4961,-4.3223z" />
+  <path
+      android:pathData="m16.2421,5.9979c-2.9553,-0.079 -5.8602,1.3061 -7.6445,3.8926 -2.5955,3.7621 -1.9714,8.8388 1.457,11.8614a1.5001,1.5001 0,0 1,0.0078 0.01,1.5001 1.5001,0 0,1 0.5762,1.455c-0.1438,0.9087 -0.4801,1.7524 -0.9609,2.4981 0.9457,-0.2836 1.8229,-0.7726 2.5469,-1.459a1.5001,1.5001 0,0 1,1.5723 -0.5254c4.4308,1.1216 8.9731,-1.2332 10.6113,-5.5 1.6383,-4.2669 -0.1621,-9.0557 -4.2051,-11.1875 -1.2634,-0.6662 -2.6176,-1.0049 -3.9609,-1.041z"
+      android:fillColor="#b3b3b3" />
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m16,9.6902c-0.57,0 -1.005,0.435 -1.005,1.05 0,0.6 0.435,1.035 1.005,1.035 0.57,0 1.005,-0.435 1.005,-1.035 0,-0.615 -0.435,-1.05 -1.005,-1.05zM16.855,21.0003 L16.855,13.0203 15.145,13.0203 15.145,21.0003 16.855,21.0003z" />
+</vector>
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_height="100dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
-        android:src="@mipmap/ic_launcher_icon_round"
+        android:src="@drawable/ic_about"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
-        android:text="GoCoronaGo"
+        android:text="@string/gocoronago"
         android:textSize="28sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="4dp"
-        android:text="Worldwide Corona Tracker"
+        android:text="@string/app_name"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:text="Version"
+        android:text="@string/version"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -76,11 +76,11 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="16dp"
-        android:text="X.XX"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+        app:layout_constraintTop_toBottomOf="@+id/textView3"
+        tools:text="X.XX" />
 
     <TextView
         android:id="@+id/textView4"
@@ -90,7 +90,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:text="Contributors"
+        android:text="@string/contributors"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"