Update misc xml resources

wifi-tracing · Mar 28, 2021 · 7611ffb · 7611ffb
1 parent bb12558
commit 7611ffb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 23 deletions.
diff --git a/app/src/main/res/drawable/ic_coronavirus.xml b/app/src/main/res/drawable/ic_coronavirus.xml
@@ -3,25 +3,25 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-    <path
-        android:fillColor="#ff4a4a"
-        android:pathData="M256,256m-256,0a256,256 0,1 1,512 0a256,256 0,1 1,-512 0" />
-    <path
-        android:fillColor="#d01273"
-        android:pathData="m512,256c0,-22.504 -2.904,-44.329 -8.357,-65.123l-91.26,-91.26 -60.226,15.344 -64.544,-64.422 -58.748,52.922 23.278,23.292 -10.837,34.676c-6.075,1.209 -19.05,4.855 -19.05,4.855l-66.528,-66.666 -56.111,56.111 75.36,75.221c-2.251,5.626 0.01,24.969 -1.199,31.044l-48.714,-11.539 -21.08,-21.024 -56.953,55.182 73.093,72.707 -20.506,55.064 89.292,90.736c21.382,5.79 43.875,8.88 67.09,8.88 141.385,0 256,-114.615 256,-256z" />
-    <path
-        android:fillColor="#ffd845"
-        android:pathData="m437.482,216.324c-14.741,0 -27.605,8.039 -34.445,19.973h-48.566c-2.605,-13.092 -7.756,-25.267 -14.915,-35.987l34.348,-34.348c13.275,3.601 28.056,0.19 38.479,-10.234 15.495,-15.495 15.495,-40.616 0,-56.111s-40.616,-15.495 -56.111,0c-10.424,10.424 -13.835,25.204 -10.234,38.479l-34.348,34.348c-10.72,-7.159 -22.894,-12.31 -35.987,-14.915v-48.566c11.933,-6.841 19.972,-19.704 19.972,-34.445 0,-21.913 -17.764,-39.677 -39.676,-39.677 -21.913,0 -39.676,17.764 -39.676,39.677 0,14.741 8.039,27.604 19.973,34.445v48.566c-13.092,2.605 -25.267,7.756 -35.987,14.915l-34.348,-34.348c3.601,-13.275 0.19,-28.056 -10.234,-38.479 -15.495,-15.495 -40.616,-15.495 -56.111,0s-15.495,40.616 0,56.111c10.424,10.424 25.204,13.835 38.479,10.234l34.348,34.348c-7.159,10.72 -12.31,22.894 -14.915,35.987h-48.566c-6.841,-11.933 -19.704,-19.973 -34.445,-19.973 -21.913,0 -39.677,17.764 -39.677,39.676 0,21.913 17.764,39.676 39.677,39.676 14.741,0 27.604,-8.039 34.445,-19.973h48.566c2.605,13.092 7.756,25.267 14.915,35.987l-34.348,34.348c-13.275,-3.601 -28.056,-0.19 -38.479,10.234 -15.495,15.495 -15.495,40.616 0,56.111s40.616,15.495 56.111,0c10.424,-10.424 13.835,-25.204 10.234,-38.479l34.348,-34.348c10.72,7.159 22.894,12.31 35.987,14.915v48.566c-11.933,6.841 -19.973,19.704 -19.973,34.445 0,21.913 17.764,39.677 39.676,39.677 21.913,0 39.676,-17.764 39.676,-39.677 0,-14.741 -8.039,-27.604 -19.972,-34.445v-48.566c13.092,-2.605 25.267,-7.756 35.987,-14.915l34.348,34.348c-3.601,13.275 -0.19,28.056 10.234,38.479 15.495,15.495 40.616,15.495 56.111,0s15.495,-40.616 0,-56.111c-10.424,-10.424 -25.204,-13.835 -38.479,-10.234l-34.348,-34.348c7.159,-10.72 12.31,-22.894 14.915,-35.987h48.566c6.841,11.933 19.704,19.973 34.445,19.973 21.913,0 39.676,-17.764 39.676,-39.676 0.001,-21.913 -17.763,-39.676 -39.676,-39.676z" />
-    <path
-        android:fillColor="#ffb454"
-        android:pathData="m477.16,256c0,21.91 -17.76,39.68 -39.68,39.68 -14.74,0 -27.6,-8.04 -34.44,-19.98h-48.57c-2.6,13.1 -7.76,25.27 -14.91,35.99l34.34,34.35c13.28,-3.6 28.06,-0.19 38.48,10.23 15.5,15.5 15.5,40.62 0,56.11 -15.49,15.5 -40.61,15.5 -56.11,0 -10.42,-10.42 -13.83,-25.2 -10.23,-38.48l-34.35,-34.34c-10.72,7.15 -22.89,12.31 -35.99,14.91v48.57c11.94,6.84 19.98,19.7 19.98,34.44 0,21.91 -17.77,39.68 -39.68,39.68v-442.32c21.91,0 39.68,17.77 39.68,39.68 0,14.74 -8.04,27.6 -19.98,34.44v48.57c13.1,2.6 25.27,7.76 35.99,14.91l34.35,-34.34c-3.6,-13.28 -0.19,-28.06 10.23,-38.48 15.5,-15.5 40.62,-15.5 56.11,0 15.5,15.49 15.5,40.61 0,56.11 -10.42,10.42 -25.2,13.83 -38.48,10.23l-34.34,34.35c7.15,10.72 12.31,22.89 14.91,35.99h48.57c6.84,-11.94 19.7,-19.98 34.44,-19.98 21.92,0 39.68,17.77 39.68,39.68z" />
-    <path
-        android:fillColor="#ffb454"
-        android:pathData="M203.766,223.099a17.51,17.51 133.167,1 0,35.002 -1.12a17.51,17.51 133.167,1 0,-35.002 1.12z" />
-    <path
-        android:fillColor="#ffb454"
-        android:pathData="M218.629,305.68a15.601,15.601 54.208,1 0,4.993 -30.8a15.601,15.601 54.208,1 0,-4.993 30.8z" />
-    <path
-        android:fillColor="#ff936b"
-        android:pathData="M280.982,276.859a22.513,22.513 94.622,1 0,34.301 -29.169a22.513,22.513 94.622,1 0,-34.301 29.169z" />
+  <path
+      android:pathData="M256,256m-256,0a256,256 0,1 1,512 0a256,256 0,1 1,-512 0"
+      android:fillColor="#ff4a4a"/>
+  <path
+      android:pathData="m512,256c0,-22.504 -2.904,-44.329 -8.357,-65.123l-91.26,-91.26 -60.226,15.344 -64.544,-64.422 -58.748,52.922 23.278,23.292 -10.837,34.676c-6.075,1.209 -19.05,4.855 -19.05,4.855l-66.528,-66.666 -56.111,56.111 75.36,75.221c-2.251,5.626 0.01,24.969 -1.199,31.044l-48.714,-11.539 -21.08,-21.024 -56.953,55.182 73.093,72.707 -20.506,55.064 89.292,90.736c21.382,5.79 43.875,8.88 67.09,8.88 141.385,0 256,-114.615 256,-256z"
+      android:fillColor="#d01273"/>
+  <path
+      android:pathData="m437.482,216.324c-14.741,0 -27.605,8.039 -34.445,19.973h-48.566c-2.605,-13.092 -7.756,-25.267 -14.915,-35.987l34.348,-34.348c13.275,3.601 28.056,0.19 38.479,-10.234 15.495,-15.495 15.495,-40.616 0,-56.111s-40.616,-15.495 -56.111,0c-10.424,10.424 -13.835,25.204 -10.234,38.479l-34.348,34.348c-10.72,-7.159 -22.894,-12.31 -35.987,-14.915v-48.566c11.933,-6.841 19.972,-19.704 19.972,-34.445 0,-21.913 -17.764,-39.677 -39.676,-39.677 -21.913,0 -39.676,17.764 -39.676,39.677 0,14.741 8.039,27.604 19.973,34.445v48.566c-13.092,2.605 -25.267,7.756 -35.987,14.915l-34.348,-34.348c3.601,-13.275 0.19,-28.056 -10.234,-38.479 -15.495,-15.495 -40.616,-15.495 -56.111,0s-15.495,40.616 0,56.111c10.424,10.424 25.204,13.835 38.479,10.234l34.348,34.348c-7.159,10.72 -12.31,22.894 -14.915,35.987h-48.566c-6.841,-11.933 -19.704,-19.973 -34.445,-19.973 -21.913,0 -39.677,17.764 -39.677,39.676 0,21.913 17.764,39.676 39.677,39.676 14.741,0 27.604,-8.039 34.445,-19.973h48.566c2.605,13.092 7.756,25.267 14.915,35.987l-34.348,34.348c-13.275,-3.601 -28.056,-0.19 -38.479,10.234 -15.495,15.495 -15.495,40.616 0,56.111s40.616,15.495 56.111,0c10.424,-10.424 13.835,-25.204 10.234,-38.479l34.348,-34.348c10.72,7.159 22.894,12.31 35.987,14.915v48.566c-11.933,6.841 -19.973,19.704 -19.973,34.445 0,21.913 17.764,39.677 39.676,39.677 21.913,0 39.676,-17.764 39.676,-39.677 0,-14.741 -8.039,-27.604 -19.972,-34.445v-48.566c13.092,-2.605 25.267,-7.756 35.987,-14.915l34.348,34.348c-3.601,13.275 -0.19,28.056 10.234,38.479 15.495,15.495 40.616,15.495 56.111,0s15.495,-40.616 0,-56.111c-10.424,-10.424 -25.204,-13.835 -38.479,-10.234l-34.348,-34.348c7.159,-10.72 12.31,-22.894 14.915,-35.987h48.566c6.841,11.933 19.704,19.973 34.445,19.973 21.913,0 39.676,-17.764 39.676,-39.676 0.001,-21.913 -17.763,-39.676 -39.676,-39.676z"
+      android:fillColor="#ffd845"/>
+  <path
+      android:pathData="m477.16,256c0,21.91 -17.76,39.68 -39.68,39.68 -14.74,0 -27.6,-8.04 -34.44,-19.98h-48.57c-2.6,13.1 -7.76,25.27 -14.91,35.99l34.34,34.35c13.28,-3.6 28.06,-0.19 38.48,10.23 15.5,15.5 15.5,40.62 0,56.11 -15.49,15.5 -40.61,15.5 -56.11,0 -10.42,-10.42 -13.83,-25.2 -10.23,-38.48l-34.35,-34.34c-10.72,7.15 -22.89,12.31 -35.99,14.91v48.57c11.94,6.84 19.98,19.7 19.98,34.44 0,21.91 -17.77,39.68 -39.68,39.68v-442.32c21.91,0 39.68,17.77 39.68,39.68 0,14.74 -8.04,27.6 -19.98,34.44v48.57c13.1,2.6 25.27,7.76 35.99,14.91l34.35,-34.34c-3.6,-13.28 -0.19,-28.06 10.23,-38.48 15.5,-15.5 40.62,-15.5 56.11,0 15.5,15.49 15.5,40.61 0,56.11 -10.42,10.42 -25.2,13.83 -38.48,10.23l-34.34,34.35c7.15,10.72 12.31,22.89 14.91,35.99h48.57c6.84,-11.94 19.7,-19.98 34.44,-19.98 21.92,0 39.68,17.77 39.68,39.68z"
+      android:fillColor="#ffb454"/>
+  <path
+      android:pathData="M203.766,223.099a17.51,17.51 133.167,1 0,35.002 -1.12a17.51,17.51 133.167,1 0,-35.002 1.12z"
+      android:fillColor="#ffb454"/>
+  <path
+      android:pathData="M218.629,305.68a15.601,15.601 54.208,1 0,4.993 -30.8a15.601,15.601 54.208,1 0,-4.993 30.8z"
+      android:fillColor="#ffb454"/>
+  <path
+      android:pathData="M280.982,276.859a22.513,22.513 94.622,1 0,34.301 -29.169a22.513,22.513 94.622,1 0,-34.301 29.169z"
+      android:fillColor="#ff936b"/>
 </vector>
diff --git a/app/src/main/res/drawable/misc_coronavirus.xml b/app/src/main/res/drawable/misc_coronavirus.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#676767"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21.25,10.5c-0.41,0 -0.75,0.34 -0.75,0.75h-1.54c-0.15,-1.37 -0.69,-2.63 -1.52,-3.65l1.09,-1.09l0.01,0.01c0.29,0.29 0.77,0.29 1.06,0s0.29,-0.77 0,-1.06L18.54,4.4c-0.29,-0.29 -0.77,-0.29 -1.06,0c-0.29,0.29 -0.29,0.76 -0.01,1.05l-1.09,1.09c-1.02,-0.82 -2.27,-1.36 -3.64,-1.51V3.5h0.01c0.41,0 0.75,-0.34 0.75,-0.75C13.5,2.34 13.16,2 12.75,2h-1.5c-0.41,0 -0.75,0.34 -0.75,0.75c0,0.41 0.33,0.74 0.74,0.75v1.55C9.87,5.19 8.62,5.74 7.6,6.56L6.51,5.47l0.01,-0.01c0.29,-0.29 0.29,-0.77 0,-1.06c-0.29,-0.29 -0.77,-0.29 -1.06,0L4.4,5.46c-0.29,0.29 -0.29,0.77 0,1.06c0.29,0.29 0.76,0.29 1.05,0.01l1.09,1.09c-0.82,1.02 -1.36,2.26 -1.5,3.63H3.5c0,-0.41 -0.34,-0.75 -0.75,-0.75C2.34,10.5 2,10.84 2,11.25v1.5c0,0.41 0.34,0.75 0.75,0.75c0.41,0 0.75,-0.34 0.75,-0.75h1.54c0.15,1.37 0.69,2.61 1.5,3.63l-1.09,1.09c-0.29,-0.29 -0.76,-0.28 -1.05,0.01c-0.29,0.29 -0.29,0.77 0,1.06l1.06,1.06c0.29,0.29 0.77,0.29 1.06,0c0.29,-0.29 0.29,-0.77 0,-1.06l-0.01,-0.01l1.09,-1.09c1.02,0.82 2.26,1.36 3.63,1.51v1.55c-0.41,0.01 -0.74,0.34 -0.74,0.75c0,0.41 0.34,0.75 0.75,0.75h1.5c0.41,0 0.75,-0.34 0.75,-0.75c0,-0.41 -0.34,-0.75 -0.75,-0.75h-0.01v-1.54c1.37,-0.14 2.62,-0.69 3.64,-1.51l1.09,1.09c-0.29,0.29 -0.28,0.76 0.01,1.05c0.29,0.29 0.77,0.29 1.06,0l1.06,-1.06c0.29,-0.29 0.29,-0.77 0,-1.06c-0.29,-0.29 -0.77,-0.29 -1.06,0l-0.01,0.01l-1.09,-1.09c0.82,-1.02 1.37,-2.27 1.52,-3.65h1.54c0,0.41 0.34,0.75 0.75,0.75c0.41,0 0.75,-0.34 0.75,-0.75v-1.5C22,10.84 21.66,10.5 21.25,10.5zM13.75,8c0.55,0 1,0.45 1,1s-0.45,1 -1,1s-1,-0.45 -1,-1S13.2,8 13.75,8zM12,13c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1s1,0.45 1,1C13,12.55 12.55,13 12,13zM10.25,8c0.55,0 1,0.45 1,1s-0.45,1 -1,1s-1,-0.45 -1,-1S9.7,8 10.25,8zM8.5,13c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1s1,0.45 1,1C9.5,12.55 9.05,13 8.5,13zM10.25,16c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1s1,0.45 1,1C11.25,15.55 10.8,16 10.25,16zM13.75,16c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1s1,0.45 1,1C14.75,15.55 14.3,16 13.75,16zM14.5,12c0,-0.55 0.45,-1 1,-1s1,0.45 1,1c0,0.55 -0.45,1 -1,1S14.5,12.55 14.5,12z"/>
+</vector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="primary">#3D5A80</color>
-    <color name="primaryVariant">#98C1D9</color>
+    <color name="primaryVariant">#3D5A80</color>
     <color name="onPrimary">#E0FBFC</color>
     <color name="secondary">#EE6C4D</color>
     <color name="secondaryVariant">#EE6C4D</color>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -44,4 +44,6 @@
     <string name="C_min">C_min</string>
     <string name="H_min">H_min</string>
     <string name="rest_api_url">rest_api_url</string>
+    <string name="risk_analysis_info">The Risk Analysis will use default constants unless specified. <br/>To change these values go to:<br/><br/> <b>Preferences > Developer Options</b></string>
+    <string name="next">next</string>
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
@@ -22,7 +22,7 @@
             app:iconSpaceReserved="false">
 
             <EditTextPreference
-                android:defaultValue="localhost:4683"
+                android:defaultValue="192.168.1.138:4683"
                 android:key="@string/rest_api_url"
                 android:selectAllOnFocus="true"
                 android:singleLine="true"