Bimba.git

commit 28d5a5852563299bccee7f37f639e89fc3066cc5

Author: Adam Pioterek <adam.pioterek@protonmail.ch>

new logo & thanks (closes #4)

 .idea/assetWizardSettings.xml | 54 ++
 README.md | 5 
 app/src/main/AndroidManifest.xml | 2 
 app/src/main/res/drawable-v24/ic_launcher_foreground.xml | 34 +
 app/src/main/res/drawable/ic_launcher_foreground.xml | 36 +
 app/src/main/res/drawable/logo_splash.xml | 34 
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 
 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 
 app/src/main/res/values/ic_launcher_background.xml | 4 
 research/svg/logo.svg | 260 ----------
 research/svg/low_floor.svg | 77 --


diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 072d5a0e7896948f1d78b77161ee6fdb792e3cbd..3e98d31b2010a19f1e681829d93ff2c472f4acee 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -3,6 +3,55 @@ 
   <component name="WizardSettings">
     <option name="children">
       <map>
+        <entry key="imageWizard">
+          <value>
+            <PersistentState>
+              <option name="children">
+                <map>
+                  <entry key="imageAssetPanel">
+                    <value>
+                      <PersistentState>
+                        <option name="children">
+                          <map>
+                            <entry key="launcher">
+                              <value>
+                                <PersistentState>
+                                  <option name="children">
+                                    <map>
+                                      <entry key="foregroundImage">
+                                        <value>
+                                          <PersistentState>
+                                            <option name="values">
+                                              <map>
+                                                <entry key="scalingPercent" value="75" />
+                                                <entry key="trimmed" value="true" />
+                                              </map>
+                                            </option>
+                                          </PersistentState>
+                                        </value>
+                                      </entry>
+                                    </map>
+                                  </option>
+                                  <option name="values">
+                                    <map>
+                                      <entry key="backgroundAssetType" value="COLOR" />
+                                      <entry key="backgroundColor" value="3a3a3b" />
+                                      <entry key="foregroundImage" value="$PROJECT_DIR$/research/localonly/newLogo/Bimba/Logo/#3.svg" />
+                                    </map>
+                                  </option>
+                                </PersistentState>
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </PersistentState>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </PersistentState>
+          </value>
+        </entry>
         <entry key="vectorWizard">
           <value>
             <PersistentState>
@@ -28,8 +77,9 @@                           
                         </option>
                         <option name="values">
                           <map>
-                            <entry key="outputName" value="ic_low_floor" />
-                            <entry key="sourceFile" value="$USER_HOME$" />
+                            <entry key="assetSourceType" value="FILE" />
+                            <entry key="outputName" value="logo_splash" />
+                            <entry key="sourceFile" value="$PROJECT_DIR$/research/localonly/newLogo/Bimba/Logo/fg.svg" />
                           </map>
                         </option>
                       </PersistentState>




diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 7ec50e8e551c320d324c16f1c16c13a7472db0ca..9b0222830be3ca4ce7a0ca94e509a1c5c3e7009a 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ




diff --git a/README.md b/README.md
index 4008012f7e6a1d594748966c1e099b81230c300c..4d73410bd1ac2e52853b33a547f77b21b5b68269 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,11 @@
 Also
 * efficiency
 
+## Thanks to…
+
+* @tebriz159 for new logo (#4)
+* @Vistaus for Dutch translation (#5)
+
 ---
 
     Bimba




diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 04aadcc614ade9069239738e5eeee7099ad1f8cb..b3e1c2f517a6689a15b881bf0a648e0a0bf8d6f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@     
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/logo"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">




diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a9bd078b1aed42188fe767423683c64a468312e
Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ




diff --git a/app/src/main/play/de-DE/listing/icon/logo.png b/app/src/main/play/de-DE/listing/icon/logo.png
index 8755208932a42a232f7773f8d9459bb018949e3e..7a9bd078b1aed42188fe767423683c64a468312e 100644
Binary files a/app/src/main/play/de-DE/listing/icon/logo.png and b/app/src/main/play/de-DE/listing/icon/logo.png differ




diff --git a/app/src/main/play/en-GB/listing/icon/logo.png b/app/src/main/play/en-GB/listing/icon/logo.png
index 8755208932a42a232f7773f8d9459bb018949e3e..7a9bd078b1aed42188fe767423683c64a468312e 100644
Binary files a/app/src/main/play/en-GB/listing/icon/logo.png and b/app/src/main/play/en-GB/listing/icon/logo.png differ




diff --git a/app/src/main/play/en-US/listing/icon/logo.png b/app/src/main/play/en-US/listing/icon/logo.png
index 8755208932a42a232f7773f8d9459bb018949e3e..7a9bd078b1aed42188fe767423683c64a468312e 100644
Binary files a/app/src/main/play/en-US/listing/icon/logo.png and b/app/src/main/play/en-US/listing/icon/logo.png differ




diff --git a/app/src/main/play/it-IT/listing/icon/logo.png b/app/src/main/play/it-IT/listing/icon/logo.png
index 8755208932a42a232f7773f8d9459bb018949e3e..7a9bd078b1aed42188fe767423683c64a468312e 100644
Binary files a/app/src/main/play/it-IT/listing/icon/logo.png and b/app/src/main/play/it-IT/listing/icon/logo.png differ




diff --git a/app/src/main/play/pl-PL/listing/icon/logo.png b/app/src/main/play/pl-PL/listing/icon/logo.png
index 8755208932a42a232f7773f8d9459bb018949e3e..7a9bd078b1aed42188fe767423683c64a468312e 100644
Binary files a/app/src/main/play/pl-PL/listing/icon/logo.png and b/app/src/main/play/pl-PL/listing/icon/logo.png differ




diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ea90121701967a2ab3c15a770b76def16c7a050
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="638.8894"
+        android:viewportHeight="638.8894">
+    <group android:translateX="173.03255"
+            android:translateY="173.03255">
+      <path
+          android:pathData="m62.962,292.5v0c-3.7,-0.9 -5.7,-3.8 -4.3,-6.5l32.3,-62.9c1.3,-2.6 5.5,-4 9.2,-3v0c3.7,0.9 5.7,3.8 4.3,6.5L72.162,289.5c-1.3,2.6 -5.4,4 -9.2,3z"
+          android:fillColor="#54AF39"/>
+      <path
+          android:pathData="m229.662,292.5v0c3.7,-0.9 5.7,-3.8 4.3,-6.5l-32.3,-62.9c-1.3,-2.6 -5.5,-4 -9.2,-3v0c-3.7,0.9 -5.7,3.8 -4.3,6.5l32.3,62.9c1.3,2.6 5.5,4 9.2,3z"
+          android:fillColor="#54AF39"/>
+      <path
+          android:pathData="m151.362,36.9 l-0.6,0.2c-1.8,0.7 -3.8,-0.3 -4.5,-2.1l-9.6,-26.7c-0.7,-1.8 0.3,-3.8 2.1,-4.5l0.6,-0.2c1.8,-0.7 3.8,0.3 4.5,2.1l9.6,26.7c0.7,1.9 -0.3,3.9 -2.1,4.5z"
+          android:fillColor="#54AF39"/>
+      <path
+          android:pathData="m180.662,3.8v0c0,2.1 -1.7,3.8 -3.8,3.8h-61c-2.1,0 -3.8,-1.7 -3.8,-3.8v0c0,-2.1 1.7,-3.8 3.8,-3.8h61c2.1,0 3.8,1.7 3.8,3.8z"
+          android:fillColor="#54AF39"/>
+      <path
+          android:pathData="M218.762,236.7L73.862,236.7c-13.3,0 -24,-10.8 -24,-24v-108C49.862,63.4 83.362,29.8 124.762,29.8h43.3c41.3,0 74.9,33.5 74.9,74.9v108c-0.1,13.2 -10.9,24 -24.2,24z"
+          android:fillColor="#54AF39"/>
+      <path
+          android:pathData="M212.562,146.2L80.062,146.2c-5.6,0 -10.2,-4.5 -10.2,-10.2v-34.9c0,-16.9 13.7,-30.6 30.6,-30.6L192.162,70.5c16.9,0 30.6,13.7 30.6,30.6v34.9c-0.1,5.7 -4.6,10.2 -10.2,10.2z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="M161.462,55.5L131.162,55.5c-3.2,0 -5.7,-2.6 -5.7,-5.7v0c0,-3.2 2.6,-5.7 5.7,-5.7h30.3c3.2,0 5.7,2.6 5.7,5.7v0c0,3.1 -2.6,5.7 -5.7,5.7z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="M87.062,191.9m-14.8,0a14.8,14.8 0,1 1,29.6 0a14.8,14.8 0,1 1,-29.6 0"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="M205.662,191.9m-14.8,0a14.8,14.8 0,1 1,29.6 0a14.8,14.8 0,1 1,-29.6 0"
+          android:fillColor="#FFFFFF"/>
+    </group>
+</vector>




diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
deleted file mode 100644
index 8755208932a42a232f7773f8d9459bb018949e3e..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/logo.png and /dev/null differ




diff --git a/app/src/main/res/drawable/logo_splash.xml b/app/src/main/res/drawable/logo_splash.xml
index 970a288a331fb976a44c357c3fdd2e27adaf6d83..d47ebc499c362c425b5022bc55fd47e9145e7e92 100644
--- a/app/src/main/res/drawable/logo_splash.xml
+++ b/app/src/main/res/drawable/logo_splash.xml
@@ -1,24 +1,12 @@
-<vector android:height="192dp" android:viewportHeight="200.0"
-    android:viewportWidth="200.0" android:width="192dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffeb3b"
-        android:pathData="M75.49,179.96h49.02v6.36h-49.02z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2.96499991"/>
-    <path android:fillAlpha="1" android:fillColor="#ffeb3b"
-        android:pathData="M77.11,181.55h45.54v8.07h-45.54z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2.96499991"/>
-    <path android:fillAlpha="1" android:fillColor="#ffeb3b"
-        android:pathData="M88.15,10.63l1.74,-0.26l2.42,16.38l-1.74,0.26z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2.96499991"/>
-    <path android:fillAlpha="1" android:fillColor="#ffeb3b"
-        android:pathData="M111.96,10.82l-1.74,-0.26l-2.42,16.38l1.74,0.26z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2.96499991"/>
-    <path android:fillAlpha="1" android:fillColor="#ffeb3b"
-        android:pathData="M83.3,23.61l33.41,0l0,4.33l-33.41,0z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2.96499991"/>
-    <path android:fillAlpha="1" android:fillColor="#ffeb3b"
-        android:pathData="M84.4,24.7l31.03,0l0,5.5l-31.03,0z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="2.96499991"/>
-    <path android:fillAlpha="1" android:fillColor="#ffeb3b"
-        android:pathData="M89.28,28.9 L7.53,110.64 79.26,182.36l20.7,0L28.24,110.64 100,38.88 171.76,110.64 100.04,182.36l20.7,0L192.47,110.64 110.73,28.9Z"
-        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="9.13763046"/>
+<vector android:height="192dp" android:viewportHeight="293"
+    android:viewportWidth="298" android:width="192dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#54AF39" android:pathData="m62.925,292.677l0,0c-3.69,-0.897 -5.684,-3.789 -4.288,-6.482l32.209,-62.723c1.296,-2.593 5.485,-3.989 9.174,-2.992l0,0c3.69,0.897 5.684,3.789 4.288,6.482L72.099,289.685c-1.296,2.593 -5.385,3.989 -9.174,2.992z"/>
+    <path android:fillColor="#54AF39" android:pathData="m229.156,292.677l0,0c3.69,-0.897 5.684,-3.789 4.288,-6.482l-32.209,-62.723c-1.296,-2.593 -5.485,-3.989 -9.174,-2.992l0,0c-3.69,0.897 -5.684,3.789 -4.288,6.482l32.209,62.723c1.296,2.593 5.485,3.989 9.174,2.992z"/>
+    <path android:fillColor="#54AF39" android:pathData="m151.076,37.797 l-0.598,0.199c-1.795,0.698 -3.789,-0.299 -4.487,-2.094l-9.573,-26.625c-0.698,-1.795 0.299,-3.789 2.094,-4.487l0.598,-0.199c1.795,-0.698 3.789,0.299 4.487,2.094l9.573,26.625c0.698,1.895 -0.299,3.889 -2.094,4.487z"/>
+    <path android:fillColor="#54AF39" android:pathData="m180.294,4.79l0,0c0,2.094 -1.695,3.789 -3.789,3.789l-60.828,0c-2.094,0 -3.789,-1.695 -3.789,-3.789l0,0c0,-2.094 1.695,-3.789 3.789,-3.789l60.828,0c2.094,0 3.789,1.695 3.789,3.789z"/>
+    <path android:fillColor="#54AF39" android:pathData="M218.286,237.034L73.795,237.034c-13.263,0 -23.932,-10.77 -23.932,-23.932l0,-107.696C49.862,64.222 83.268,30.717 124.551,30.717l43.178,0c41.184,0 74.689,33.406 74.689,74.689l0,107.696c-0.1,13.163 -10.869,23.932 -24.132,23.932z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M212.104,146.789L79.977,146.789c-5.584,0 -10.171,-4.487 -10.171,-10.171l0,-34.802c0,-16.852 13.661,-30.514 30.514,-30.514L191.761,71.302c16.852,0 30.514,13.661 30.514,30.514l0,34.802c-0.1,5.684 -4.587,10.171 -10.171,10.171z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M161.148,56.344L130.933,56.344c-3.191,0 -5.684,-2.593 -5.684,-5.684l0,0c0,-3.191 2.593,-5.684 5.684,-5.684l30.215,0c3.191,0 5.684,2.593 5.684,5.684l0,0c0,3.091 -2.593,5.684 -5.684,5.684z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M86.957,192.36m-14.758,0a14.758,14.758 0,1 1,29.517 0a14.758,14.758 0,1 1,-29.517 0"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M205.223,192.36m-14.758,0a14.758,14.758 0,1 1,29.517 0a14.758,14.758 0,1 1,-29.517 0"/>
 </vector>




diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7bd21dbd86990cde81fea8abd3bf904b4546749
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>




diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7353dbd1fd82487df2d06121f85f7994728f1070
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file




diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7353dbd1fd82487df2d06121f85f7994728f1070
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file




diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..f26e79972c16204e3c29ca8686c84c8e17047863
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ




diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ef879eb9735fc3de899f011625881cf535c711b
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ




diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..97892c1a73464d78ebaf32f6b008b36c92b85d38
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ




diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..201d7b04f97aed589ad7c6f6c53cb414a9504572
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ




diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..1754a35d58a6965a198441317a9f2bea4280f512
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ




diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce24ee2d42727940dcba4567849562839530a27b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ




diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..1029f94018ee1f94f43dc68e45ebdcca7ae67dbd
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ




diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..79dded633e2021ec81e58e7be6aa4bed5a564940
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ




diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3b73fa5e4376f81d9e7dc824cf87993fca770e8
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ




diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..1586dc63387afea8dcc76f31f0d51bab07308a12
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ




diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f056a9f2cd8befd72251e45b490170d8ae292819
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#3A3A3B</color>
+</resources>
\ No newline at end of file




diff --git a/research/svg/logo.png b/research/svg/logo.png
deleted file mode 100644
index 8755208932a42a232f7773f8d9459bb018949e3e..0000000000000000000000000000000000000000
Binary files a/research/svg/logo.png and /dev/null differ




diff --git a/research/svg/logo.svg b/research/svg/logo.svg
deleted file mode 100644
index be16739c5c15d36c1c385e0ab5c3130a9f06fa9a..0000000000000000000000000000000000000000
--- a/research/svg/logo.svg
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200mm"
-   height="200mm"
-   viewBox="0 0 200 200"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="logo.svg"
-   inkscape:export-filename="/home/adam/Code/AndroidstudioProjects/Bimba/research/svg/logo.svg.png"
-   inkscape:export-xdpi="24.383999"
-   inkscape:export-ydpi="24.383999">
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1361">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.09803922"
-         offset="0"
-         id="stop1357" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop1359" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter1280">
-      <feFlood
-         flood-opacity="0.392157"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1270" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1272" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="4"
-         result="blur"
-         id="feGaussianBlur1274" />
-      <feOffset
-         dx="0"
-         dy="4"
-         result="offset"
-         id="feOffset1276" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite1278" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1361"
-       id="radialGradient1365"
-       cx="4"
-       cy="101"
-       fx="4"
-       fy="101"
-       r="96"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0000001,2,-1.5695368,1.5695368,154.5232,-65.523216)" />
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter991">
-      <feFlood
-         flood-opacity="0.878431"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood981" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite983" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="4"
-         result="blur"
-         id="feGaussianBlur985" />
-      <feOffset
-         dx="0"
-         dy="4"
-         result="offset"
-         id="feOffset987" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite989" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter1170">
-      <feFlood
-         flood-opacity="0.878431"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1160" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1162" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="4"
-         result="blur"
-         id="feGaussianBlur1164" />
-      <feOffset
-         dx="0"
-         dy="4"
-         result="offset"
-         id="feOffset1166" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite1168" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.2636461"
-     inkscape:cx="743.36383"
-     inkscape:cy="240.48066"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1368"
-     inkscape:window-height="744"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0"
-     showguides="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-97)">
-    <g
-       id="g1158"
-       style="filter:url(#filter1170)"
-       transform="translate(-207.84451,6.0480813)">
-      <g
-         transform="translate(53.089061,14.198568)"
-         id="g889">
-        <rect
-           style="opacity:1;fill:#ffeb3b;fill-opacity:1;stroke:none;stroke-width:2.96499991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect883"
-           width="49.017162"
-           height="6.3608532"
-           x="230.24687"
-           y="256.711" />
-        <rect
-           style="opacity:1;fill:#ffeb3b;fill-opacity:1;stroke:none;stroke-width:2.96499991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect885"
-           width="45.535828"
-           height="8.0748444"
-           x="231.86546"
-           y="258.30765" />
-      </g>
-      <g
-         transform="translate(-34.585518,13.767788)"
-         id="g1099">
-        <g
-           id="g931"
-           transform="translate(87.267586,2.0209161)">
-          <rect
-             transform="rotate(-8.4179204)"
-             y="120.48581"
-             x="228.13066"
-             height="16.558657"
-             width="1.7562211"
-             id="rect912"
-             style="opacity:1;fill:#ffeb3b;fill-opacity:1;stroke:none;stroke-width:2.96499991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <rect
-             transform="matrix(-0.98922659,-0.14639244,-0.14639244,0.98922659,0,0)"
-             y="45.955666"
-             x="-276.83392"
-             height="16.558657"
-             width="1.7562211"
-             id="rect912-2"
-             style="opacity:1;fill:#ffeb3b;fill-opacity:1;stroke:none;stroke-width:2.96499991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           transform="matrix(0.68150644,0,0,0.68150644,168.81255,-74.159075)"
-           id="g889-3">
-          <rect
-             y="256.711"
-             x="230.24687"
-             height="6.3608532"
-             width="49.017162"
-             id="rect883-5"
-             style="opacity:1;fill:#ffeb3b;fill-opacity:1;stroke:none;stroke-width:2.96499991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <rect
-             y="258.30765"
-             x="231.86546"
-             height="8.0748444"
-             width="45.535828"
-             id="rect885-6"
-             style="opacity:1;fill:#ffeb3b;fill-opacity:1;stroke:none;stroke-width:2.96499991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-      </g>
-      <path
-         id="rect993"
-         transform="matrix(0.26458333,0,0,0.26458333,0,97)"
-         d="M 1122.9727,86.363281 814.02148,395.3125 1085.1016,666.39258 h 78.2519 L 892.27344,395.3125 1163.5078,124.08008 1434.7402,395.3125 1163.6621,666.39258 h 78.252 L 1512.9922,395.3125 1204.043,86.363281 Z"
-         style="opacity:1;fill:#ffeb3b;fill-opacity:1;stroke:none;stroke-width:9.13763046;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-    </g>
-    <rect
-       style="opacity:0.2;fill:url(#radialGradient1365);fill-opacity:1;stroke:none;stroke-width:2.96499991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1355"
-       width="192"
-       height="192"
-       x="4"
-       y="101" />
-  </g>
-</svg>




diff --git a/research/svg/low_floor.svg b/research/svg/low_floor.svg
deleted file mode 100644
index bf39c36bb0c27d5a19caaa1fa77a2e830f3b4655..0000000000000000000000000000000000000000
--- a/research/svg/low_floor.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="120mm"
-   height="120mm"
-   viewBox="0 0 120 120"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="low_floor.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="249.28691"
-     inkscape:cy="250.16946"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1368"
-     inkscape:window-height="744"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Igor Bredikhin</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>CC-BY</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:source>https://commons.wikimedia.org/wiki/File:Short-haired-Dachshund.jpg</dc:source>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-38.883767,-1.5298379)">
-    <path
-       style="fill:#000000;stroke-width:0.26458332"
-       d="m 73.864398,95.769338 c -2.557616,-0.26414 -2.762808,-0.35077 -3.176582,-1.34107 -0.534754,-1.27985 -0.519774,-1.34249 0.464603,-1.94268 0.681096,-0.41527 1.333863,-0.52449 3.139318,-0.52528 1.904455,-7.9e-4 2.394104,-0.0912 2.976563,-0.54936 0.383426,-0.3016 0.69714,-0.69451 0.69714,-0.87312 0,-0.17862 0.139049,-0.4638 0.309001,-0.63376 0.751369,-0.75137 1.279329,-3.48053 0.811427,-4.19447 -0.106913,-0.16313 -0.951513,-0.67742 -1.876888,-1.14286 -0.925377,-0.46544 -2.263608,-1.2547 -2.97385,-1.75392 -0.71024,-0.49921 -1.401577,-0.90766 -1.536306,-0.90766 -0.134726,0 -1.475399,-1.17571 -2.979274,-2.61268 -2.802324,-2.67766 -3.830987,-4.2257 -5.208519,-7.83837 -0.604099,-1.58428 -0.789112,-4.84837 -0.463846,-8.18341 0.22461,-2.303 -0.0241,-5.174173 -0.689218,-7.956173 -0.139163,-0.58208 -0.289849,-1.37155 -0.334857,-1.75437 -0.07973,-0.67815 -0.444336,-1.92831 -1.031632,-3.5373 -0.15935,-0.43656 -0.258355,-0.93487 -0.220009,-1.10735 0.03835,-0.17249 -0.345797,-0.96317 -0.853649,-1.75707 -0.818477,-1.27949 -1.067313,-1.47749 -2.19048,-1.74302 -1.538223,-0.36365 -8.161558,-0.21248 -9.866066,0.22519 -1.144864,0.29397 -1.777528,0.22133 -5.16742,-0.59329 -0.712691,-0.17126 -2.493051,-1.92196 -2.922089,-2.87339 l -0.480002,-1.06446 1.549948,-1.43106 c 0.852472,-0.78709 1.609262,-1.37175 1.681755,-1.29926 0.07249,0.0725 0.499484,-0.1464 0.948869,-0.48644 0.449386,-0.34003 1.173586,-0.70622 1.609335,-0.81375 0.435748,-0.10753 0.942986,-0.3206 1.127195,-0.47348 0.184209,-0.15288 1.192549,-0.70885 2.240754,-1.2355 1.54945,-0.77848 2.188482,-1.30727 3.417393,-2.82784 1.418204,-1.75479 1.69606,-1.95685 4.498647,-3.27142 2.137588,-1.00265 3.422285,-1.44058 4.51739,-1.53988 0.841669,-0.0763 1.530308,-0.24129 1.530308,-0.3666 0,-0.12531 0.178594,-0.22783 0.396875,-0.22783 0.218281,0 0.396875,0.1024 0.396875,0.22756 0,0.12517 0.638495,0.29347 1.418878,0.37401 1.674143,0.17279 3.859274,1.21037 4.640437,2.20346 0.305398,0.38825 0.555268,0.61575 0.555268,0.50554 0,-0.5813 0.767948,0.5537 0.943996,1.39521 0.113083,0.54052 0.229717,1.07205 0.259189,1.1812 0.02947,0.10914 0.06847,0.30011 0.08666,0.42438 0.01818,0.12427 0.330729,0.54713 0.694531,0.93967 0.363802,0.39255 0.661458,0.83364 0.661458,0.9802 0,0.23774 1.47071,2.28196 1.882569,2.61668 0.08953,0.0728 0.252648,0.42995 0.362495,0.79375 0.247478,0.81964 1.54722,3.47932 2.392013,4.89479 0.3474,0.58209 0.636802,1.35712 0.643115,1.7223 0.0063,0.368 0.247345,0.81126 0.540641,0.99443 0.375322,0.23439 0.529675,0.61827 0.530911,1.32041 0.0011,0.54447 0.238299,1.34713 0.527423,1.7837 0.289123,0.43656 0.526465,0.95326 0.527423,1.14821 0.0021,0.43165 1.052184,1.34437 1.560652,1.35653 0.202555,0.005 1.097849,0.46956 1.989542,1.03272 0.891691,0.56315 2.035652,1.10932 2.542133,1.21371 0.506481,0.10439 1.397124,0.39792 1.979207,0.65228 1.209157,0.52838 4.616257,1.67805 6.753217,2.27876 1.39789,0.39295 4.970975,0.78292 9.386375,1.02444 10.84152,0.593023 14.547,0.735713 21.43123,0.825263 10.5136,0.13676 14.02834,0.45259 16.21204,1.45679 3.15511,1.45092 5.73868,4.88218 6.56776,8.72266 0.20418,0.94583 0.37124,1.92511 0.37124,2.17618 0,0.47524 1.21319,3.36317 2.08683,4.96762 0.55411,1.01761 1.67763,1.80276 2.62267,1.83279 0.85893,0.0273 2.02863,0.68262 2.667,1.49417 0.60831,0.77334 0.57628,2.0588 -0.11159,4.4783 -0.49243,1.73207 -0.55693,4.8121 -0.1512,7.21993 0.3073,1.82367 0.29181,1.99894 -0.28553,3.23114 l -0.61047,1.30287 -1.78593,-0.037 c -1.01633,-0.021 -1.78594,-0.15354 -1.78594,-0.30749 0,-0.15823 -0.1318,-0.13873 -0.3175,0.047 -0.45417,0.45417 -2.45914,0.40062 -2.8549,-0.0763 -0.26458,-0.3188 -0.24586,-0.4248 0.0984,-0.55689 0.23384,-0.0897 0.35706,-0.27333 0.27382,-0.40801 -0.0832,-0.13467 0.51888,-0.92583 1.33802,-1.75814 1.12053,-1.13855 1.45062,-1.64435 1.33298,-2.04252 -0.086,-0.29108 -0.21581,-1.77665 -0.28846,-3.30127 -0.11233,-2.35734 -0.21661,-2.862 -0.69708,-3.37343 -0.31075,-0.33078 -0.76161,-0.60141 -1.00192,-0.60141 -0.53216,0 -1.46054,0.97258 -1.70843,1.78978 -0.1,0.32953 -0.28864,0.53309 -0.41928,0.45235 -0.30722,-0.18987 -1.02403,1.52434 -1.02865,2.45996 -0.006,1.14617 -0.31881,3.08321 -0.53601,3.31557 -0.3797,0.40623 -2.36153,0.434 -3.11002,0.0436 -0.40603,-0.21179 -1.05863,-0.38581 -1.45022,-0.38671 -0.3916,-7.9e-4 -0.77574,-0.10478 -0.85366,-0.23085 -0.16257,-0.26304 0.62933,-1.04055 1.50132,-1.47405 0.53444,-0.26569 0.60126,-0.51813 0.67156,-2.53703 0.0429,-1.23309 0.016,-2.48946 -0.0598,-2.79194 -0.21662,-0.86409 -1.29118,-1.16984 -4.11146,-1.16984 -2.37147,0 -2.68278,-0.0587 -3.36694,-0.63433 -0.94174,-0.79242 -2.72954,-1.73365 -3.85469,-2.0294 -0.47081,-0.12375 -1.51085,-0.41083 -2.31122,-0.63794 -1.53167,-0.43464 -7.42003,-0.51354 -8.20207,-0.1099 -0.21828,0.11266 -1.40891,0.3295 -2.64583,0.48187 -3.74098,0.46083 -6.7161,1.05976 -8.76808,1.76513 -1.07115,0.3682 -2.47064,0.78046 -3.10998,0.91612 -0.63933,0.13565 -1.29418,0.35473 -1.45521,0.48683 -0.16102,0.1321 -2.79309,0.91595 -5.849025,1.74188 -3.05594,0.82594 -6.09204,1.66293 -6.74688,1.85998 -0.654842,0.19706 -1.845467,0.48679 -2.645832,0.64386 -0.800364,0.15706 -1.842161,0.48963 -2.315104,0.73903 -0.851799,0.44919 -0.860007,0.47219 -0.871571,2.44381 -0.0064,1.09469 -0.167842,2.58336 -0.358709,3.30815 -0.311211,1.18178 -0.439719,1.33811 -1.245092,1.51471 -1.052701,0.23084 -9.938213,0.47543 -11.481398,0.31605 z"
-       id="path4515"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>