From a19173b4997a9a40fb03a5e121d3289f0bbc2527 Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Thu, 2 Apr 2020 17:15:34 +0200
Subject: [PATCH] update kotlin

* kotlin 1.3.70 -> 1.3.71
* gradle-plugin 3.6.1 -> 3.6.2
---
 .../main/res/drawable/ic_settings_black_24dp.xml    | 13 +++++++------
 .../activities/layout/linearlayout_lesson.xml       |  2 +-
 .../layouts/dialogs/layout/dialog_mensa_credit.xml  |  2 +-
 app/src/main/res/values/colors.xml                  |  6 ------
 build.gradle                                        |  4 ++--
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml
index 0aafab0..e2a8f5f 100644
--- a/app/src/main/res/drawable/ic_settings_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:height="24dp"
         android:width="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path android:fillColor="#FF000000"
-          android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+        android:height="24dp"
+        android:autoMirrored="true"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
 </vector>
diff --git a/app/src/main/res/layouts/activities/layout/linearlayout_lesson.xml b/app/src/main/res/layouts/activities/layout/linearlayout_lesson.xml
index 591ce3f..9b73dde 100644
--- a/app/src/main/res/layouts/activities/layout/linearlayout_lesson.xml
+++ b/app/src/main/res/layouts/activities/layout/linearlayout_lesson.xml
@@ -28,7 +28,7 @@
                 android:layout_weight="1"
                 android:gravity="end"
                 android:text="@string/a_time"
-                android:textColor="@color/textSecondary" />
+                android:textColor="@color/textSecondaryLight" />
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/layouts/dialogs/layout/dialog_mensa_credit.xml b/app/src/main/res/layouts/dialogs/layout/dialog_mensa_credit.xml
index 9eeee12..60b973f 100644
--- a/app/src/main/res/layouts/dialogs/layout/dialog_mensa_credit.xml
+++ b/app/src/main/res/layouts/dialogs/layout/dialog_mensa_credit.xml
@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="7dp"
             android:layout_marginBottom="7dp"
-            android:text="16,95 €"
+            android:text="@string/mensa_current"
             android:textAlignment="center"
             android:textSize="20sp" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 92bab79..9cf92ff 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,15 +5,9 @@
     <color name="colorAccent">#3f51b5</color>
     <color name="ic_launcher_background">#ffffff</color>
 
-    <color name="themePrimary">#ffffff</color>
-    <color name="themeSecondary">#ffffff</color>
-    <color name="textPrimary">#000000</color>
-    <color name="textSecondary">#818181</color>
-
     <!--theme color section, not the working colors-->
     <color name="themePrimaryDark">#000000</color>
     <color name="themeSecondaryDark">#303030</color>
-    <color name="themeTertiaryDark">#424242</color>
     <color name="textPrimaryDark">#ffffff</color>
     <color name="textSecondaryDark">#e0e0e0</color>
     <color name="dividerDark">#232323</color>
diff --git a/build.gradle b/build.gradle
index 11a7ff9..0d7c95a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.70'
+    ext.kotlin_version = '1.3.71'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong