Bimba.git

commit 0b9f9bd852c4a283dc01a6b0d0869a025d6fc503

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

new colours


 .idea/misc.xml | 2 
 app/src/main/res/drawable/ic_delete.xml | 2 
 app/src/main/res/drawable/ic_departure_timetable.xml | 4 +-
 app/src/main/res/drawable/ic_departure_vm.xml | 2 
 app/src/main/res/drawable/ic_help.xml | 2 
 app/src/main/res/drawable/ic_home.xml | 2 
 app/src/main/res/drawable/ic_info.xml | 2 
 app/src/main/res/drawable/ic_low_floor.xml | 2 
 app/src/main/res/drawable/ic_more.xml | 2 
 app/src/main/res/drawable/ic_refresh.xml | 2 
 app/src/main/res/drawable/ic_split.xml | 2 
 app/src/main/res/values-night/colors.xml | 5 ++++
 app/src/main/res/values-notnight/colors.xml | 5 ++++
 app/src/main/res/values/colors.xml | 16 ++++++++++---
 build.gradle | 4 +-
 todo | 5 ++++


diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba7052b8197ddf8ba8756022d905d03055c7ad60..635999df1e86791ad3787e455b4524e4d8879b93 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@         
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">




diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 6710f2bdd72d4724f2e75b95d1ff6d4233d56c80..3775b0ea66b25b8cd834f6babf32f4a1ef4615f2 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -4,6 +4,6 @@         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>




diff --git a/app/src/main/res/drawable/ic_departure_timetable.xml b/app/src/main/res/drawable/ic_departure_timetable.xml
index 9bc7c27e0211036d690ea7a558cca46cc1031c3c..e91498fb185aafc77724e5a25c4a89f55c9e03cb 100644
--- a/app/src/main/res/drawable/ic_departure_timetable.xml
+++ b/app/src/main/res/drawable/ic_departure_timetable.xml
@@ -4,9 +4,9 @@     android:height="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="M19,3C12,2.48 12,2.482 5,3 3.89,3 3.01,3.9 3.01,5L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5C21,3.9 20.1,3 19,3ZM19,19L5,19L5,8h14z" />
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="m17,12h-5v5h5z" />
 </vector>




diff --git a/app/src/main/res/drawable/ic_departure_vm.xml b/app/src/main/res/drawable/ic_departure_vm.xml
index 33733d8937fc17b66ecbc3cf095c8a984dde21b1..c460a7a31588a447c614289fe52ebd2fcca24fa3 100644
--- a/app/src/main/res/drawable/ic_departure_vm.xml
+++ b/app/src/main/res/drawable/ic_departure_vm.xml
@@ -5,5 +5,5 @@         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
         android:pathData="M12,4C9.11,4 6.6,5.639 5.35,8.039C2.34,8.359 -0,10.91 0,14C0,17.31 2.69,20 6,20L19,20C21.76,20 24,17.76 24,15C24,12.36 21.95,10.219 19.35,10.039C18.67,6.589 15.64,4 12,4zM4.404,10.652L5.922,10.652L7.418,15.643L8.922,10.652L10.443,10.652L8.133,17.289L6.707,17.289L4.404,10.652zM11.072,10.652L12.859,10.652L14.563,15.465L16.258,10.652L18.055,10.652L18.055,17.289L16.682,17.289L16.682,15.475L16.818,12.344L15.027,17.289L14.09,17.289L12.303,12.348L12.439,15.475L12.439,17.289L11.072,17.289L11.072,10.652z"
-        android:fillColor="?attr/colorControlNormal" />
+        android:fillColor="@color/textDark" />
 </vector>




diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index f981188526665929fadcb98dd45d433847d55722..cd2b22d47887f6e146f303f750296cd7bee4c7f6 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -4,6 +4,6 @@         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
 </vector>




diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index 6a6a5fd2537cc70b5bed7347b27bf37585fbf252..9f17a8e8f3cef70da0b6573df691ffd762a6e78a 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -4,6 +4,6 @@         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
 </vector>




diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 8858b9bf5fdc478adfe08befe7fe830d902d7273..c7e6ec796e60cb7fd7c509d5dee88ad745ca0f1d 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -4,6 +4,6 @@         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
 </vector>




diff --git a/app/src/main/res/drawable/ic_low_floor.xml b/app/src/main/res/drawable/ic_low_floor.xml
index 5b8c1afa9709df4dd5c49ab26fca5f27505a9f1f..e56ffa07d492d131f60c8af662d6e180b3719f27 100644
--- a/app/src/main/res/drawable/ic_low_floor.xml
+++ b/app/src/main/res/drawable/ic_low_floor.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="120.0"
     android:viewportWidth="120.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/colorControlNormal"
+    <path android:fillColor="@color/textDark"
         android:pathData="m34.98,94.24c-2.56,-0.26 -2.76,-0.35 -3.18,-1.34 -0.53,-1.28 -0.52,-1.34 0.46,-1.94 0.68,-0.42 1.33,-0.52 3.14,-0.53 1.9,-0 2.39,-0.09 2.98,-0.55 0.38,-0.3 0.7,-0.69 0.7,-0.87 0,-0.18 0.14,-0.46 0.31,-0.63 0.75,-0.75 1.28,-3.48 0.81,-4.19 -0.11,-0.16 -0.95,-0.68 -1.88,-1.14 -0.93,-0.47 -2.26,-1.25 -2.97,-1.75 -0.71,-0.5 -1.4,-0.91 -1.54,-0.91 -0.13,0 -1.48,-1.18 -2.98,-2.61 -2.8,-2.68 -3.83,-4.23 -5.21,-7.84 -0.6,-1.58 -0.79,-4.85 -0.46,-8.18 0.22,-2.3 -0.02,-5.17 -0.69,-7.96 -0.14,-0.58 -0.29,-1.37 -0.33,-1.75 -0.08,-0.68 -0.44,-1.93 -1.03,-3.54 -0.16,-0.44 -0.26,-0.93 -0.22,-1.11 0.04,-0.17 -0.35,-0.96 -0.85,-1.76 -0.82,-1.28 -1.07,-1.48 -2.19,-1.74 -1.54,-0.36 -8.16,-0.21 -9.87,0.23 -1.14,0.29 -1.78,0.22 -5.17,-0.59 -0.71,-0.17 -2.49,-1.92 -2.92,-2.87l-0.48,-1.06 1.55,-1.43c0.85,-0.79 1.61,-1.37 1.68,-1.3 0.07,0.07 0.5,-0.15 0.95,-0.49 0.45,-0.34 1.17,-0.71 1.61,-0.81 0.44,-0.11 0.94,-0.32 1.13,-0.47 0.18,-0.15 1.19,-0.71 2.24,-1.24 1.55,-0.78 2.19,-1.31 3.42,-2.83 1.42,-1.75 1.7,-1.96 4.5,-3.27 2.14,-1 3.42,-1.44 4.52,-1.54 0.84,-0.08 1.53,-0.24 1.53,-0.37 0,-0.13 0.18,-0.23 0.4,-0.23 0.22,0 0.4,0.1 0.4,0.23 0,0.13 0.64,0.29 1.42,0.37 1.67,0.17 3.86,1.21 4.64,2.2 0.31,0.39 0.56,0.62 0.56,0.51 0,-0.58 0.77,0.55 0.94,1.4 0.11,0.54 0.23,1.07 0.26,1.18 0.03,0.11 0.07,0.3 0.09,0.42 0.02,0.12 0.33,0.55 0.69,0.94 0.36,0.39 0.66,0.83 0.66,0.98 0,0.24 1.47,2.28 1.88,2.62 0.09,0.07 0.25,0.43 0.36,0.79 0.25,0.82 1.55,3.48 2.39,4.89 0.35,0.58 0.64,1.36 0.64,1.72 0.01,0.37 0.25,0.81 0.54,0.99 0.38,0.23 0.53,0.62 0.53,1.32 0,0.54 0.24,1.35 0.53,1.78 0.29,0.44 0.53,0.95 0.53,1.15 0,0.43 1.05,1.34 1.56,1.36 0.2,0 1.1,0.47 1.99,1.03 0.89,0.56 2.04,1.11 2.54,1.21 0.51,0.1 1.4,0.4 1.98,0.65 1.21,0.53 4.62,1.68 6.75,2.28 1.4,0.39 4.97,0.78 9.39,1.02 10.84,0.59 14.55,0.74 21.43,0.83 10.51,0.14 14.03,0.45 16.21,1.46 3.16,1.45 5.74,4.88 6.57,8.72 0.2,0.95 0.37,1.93 0.37,2.18 0,0.48 1.21,3.36 2.09,4.97 0.55,1.02 1.68,1.8 2.62,1.83 0.86,0.03 2.03,0.68 2.67,1.49 0.61,0.77 0.58,2.06 -0.11,4.48 -0.49,1.73 -0.56,4.81 -0.15,7.22 0.31,1.82 0.29,2 -0.29,3.23l-0.61,1.3 -1.79,-0.04c-1.02,-0.02 -1.79,-0.15 -1.79,-0.31 0,-0.16 -0.13,-0.14 -0.32,0.05 -0.45,0.45 -2.46,0.4 -2.85,-0.08 -0.26,-0.32 -0.25,-0.42 0.1,-0.56 0.23,-0.09 0.36,-0.27 0.27,-0.41 -0.08,-0.13 0.52,-0.93 1.34,-1.76 1.12,-1.14 1.45,-1.64 1.33,-2.04 -0.09,-0.29 -0.22,-1.78 -0.29,-3.3 -0.11,-2.36 -0.22,-2.86 -0.7,-3.37 -0.31,-0.33 -0.76,-0.6 -1,-0.6 -0.53,0 -1.46,0.97 -1.71,1.79 -0.1,0.33 -0.29,0.53 -0.42,0.45 -0.31,-0.19 -1.02,1.52 -1.03,2.46 -0.01,1.15 -0.32,3.08 -0.54,3.32 -0.38,0.41 -2.36,0.43 -3.11,0.04 -0.41,-0.21 -1.06,-0.39 -1.45,-0.39 -0.39,-0 -0.78,-0.1 -0.85,-0.23 -0.16,-0.26 0.63,-1.04 1.5,-1.47 0.53,-0.27 0.6,-0.52 0.67,-2.54 0.04,-1.23 0.02,-2.49 -0.06,-2.79 -0.22,-0.86 -1.29,-1.17 -4.11,-1.17 -2.37,0 -2.68,-0.06 -3.37,-0.63 -0.94,-0.79 -2.73,-1.73 -3.85,-2.03 -0.47,-0.12 -1.51,-0.41 -2.31,-0.64 -1.53,-0.43 -7.42,-0.51 -8.2,-0.11 -0.22,0.11 -1.41,0.33 -2.65,0.48 -3.74,0.46 -6.72,1.06 -8.77,1.77 -1.07,0.37 -2.47,0.78 -3.11,0.92 -0.64,0.14 -1.29,0.35 -1.46,0.49 -0.16,0.13 -2.79,0.92 -5.85,1.74 -3.06,0.83 -6.09,1.66 -6.75,1.86 -0.65,0.2 -1.85,0.49 -2.65,0.64 -0.8,0.16 -1.84,0.49 -2.32,0.74 -0.85,0.45 -0.86,0.47 -0.87,2.44 -0.01,1.09 -0.17,2.58 -0.36,3.31 -0.31,1.18 -0.44,1.34 -1.25,1.51 -1.05,0.23 -9.94,0.48 -11.48,0.32z" android:strokeWidth="0.26458332"/>
 </vector>




diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml
index 6b9181cd8aa06a7397a477ae2bc040203b4af121..32698689639ff2e219056beced56019d70168b3e 100644
--- a/app/src/main/res/drawable/ic_more.xml
+++ b/app/src/main/res/drawable/ic_more.xml
@@ -5,5 +5,5 @@         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"
-        android:fillColor="?attr/colorControlNormal"/>
+        android:fillColor="@color/textDark"/>
 </vector>




diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index ceda60bb9a940982825f19ad436a3dedd708d25b..40184c4b85dc0e3eec059ec810bfb833490f47ce 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -4,6 +4,6 @@         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
 </vector>




diff --git a/app/src/main/res/drawable/ic_split.xml b/app/src/main/res/drawable/ic_split.xml
index bc49d952149fc8e785af02d8918b3b40c2ef3b8d..da15e8544ea4430fa1acbd866fb7470f5337d936 100644
--- a/app/src/main/res/drawable/ic_split.xml
+++ b/app/src/main/res/drawable/ic_split.xml
@@ -4,6 +4,6 @@         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@color/textDark"
         android:pathData="M14,4l2.29,2.29 -2.88,2.88 1.42,1.42 2.88,-2.88L20,10L20,4zM10,4L4,4v6l2.29,-2.29 4.71,4.7L11,20h2v-8.41l-5.29,-5.3z"/>
 </vector>




diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 19fdd7ec188945443a6e23bb7cfdd5f9536aba03..e6eff41ef25116d87efc95d937ec8414eba592bc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#4caf50</color>
-    <color name="colorPrimaryDark">#087f23</color>
-    <color name="colorAccent">#40c4ff</color>
-    <color name="colorAccentDark">#0094cc</color>
+    <color name="colorPrimary">#3a3a3b</color>
+    <color name="colorPrimaryDark">#141415</color>
+    <color name="colorAccent">#54af39</color>
+    <color name="colorAccentDark">#197f00</color>
+    <color name="colorAccent2">#be7e3e</color>
+
+    <color name="zoneA">#00a650</color>
+    <color name="zoneB">#ed1c24</color>
+    <color name="zoneC">#fff200</color>
+
+    <color name="tram">#00adef</color>
+    <color name="bus">#c4212a</color>
 </resources>
\ No newline at end of file




diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..67f11cd762f83c4392bd8172df01725ce99e4060
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="textDark">#ffffff</color>
+    <color name="textLight">#141415</color>
+</resources>
\ No newline at end of file




diff --git a/app/src/main/res/values-notnight/colors.xml b/app/src/main/res/values-notnight/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..10fc58768fe4bae6c2a4838b64968576fd538114
--- /dev/null
+++ b/app/src/main/res/values-notnight/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="textDark">#141415</color>
+    <color name="textLight">#ffffff</color>
+</resources>
\ No newline at end of file




diff --git a/build.gradle b/build.gradle
index 02877a16f9e22be3c03186d22d0e41e2ee0063c1..81e13e9ab03b829ca5bc9a57eec94049eb2a3005 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.2.21'
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
@@ -9,7 +9,7 @@         //maven { url 'https://dl.bintray.com/guardian/android' } // TooLargeTool
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-rc2'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong




diff --git a/todo b/todo
new file mode 100644
index 0000000000000000000000000000000000000000..f8a68f259c0210b56aa938e3aeb7907a2917b1c7
--- /dev/null
+++ b/todo
@@ -0,0 +1,5 @@
+v:2.0
+favourites:view:[selecting](https://enoent.fr/blog/2015/01/18/recyclerview-basics/)
+favourites:view:sort
+timetable:model:gtfs (#3)
+search:controller:lines