From 6ed3257ca1a33176926fa462ac7ffc7ee74057f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= <k.duezgoeren@gmail.com>
Date: Fri, 2 Aug 2019 13:35:54 +0200
Subject: [PATCH] Edited greetings and course card layout in preparation for
 release 2.1.0

---
 .../java/com/denizd/substitutionplan/Main.kt  | 11 ++-
 .../substitutionplan/SettingsFragment.kt      |  1 +
 app/src/main/res/layout/course_card.xml       | 72 +++++++++----------
 app/src/main/res/values-de/strings.xml        | 12 ++--
 app/src/main/res/values/strings.xml           |  6 +-
 5 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/com/denizd/substitutionplan/Main.kt b/app/src/main/java/com/denizd/substitutionplan/Main.kt
index 5c0eb49..827ac6b 100644
--- a/app/src/main/java/com/denizd/substitutionplan/Main.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/Main.kt
@@ -215,12 +215,11 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
     private fun getGreetingString(): String {
         val gen = Random()
 
-        val greetingArray = when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) {
-            in 5..10 -> resources.getStringArray(R.array.greetingsMorning)
-            in 11..17 -> resources.getStringArray(R.array.greetingsNoon)
-            else -> resources.getStringArray(R.array.greetingsEvening)
-        }
-        return String.format(greetingArray[gen.nextInt(7)], prefs.getString("username", ""))
+        return String.format(when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) {
+            in 5..10 -> resources.getStringArray(R.array.greetingsMorning)[gen.nextInt(resources.getStringArray(R.array.greetingsMorning).size)]
+            in 11..17 -> resources.getStringArray(R.array.greetingsNoon)[gen.nextInt(resources.getStringArray(R.array.greetingsNoon).size)]
+            else -> resources.getStringArray(R.array.greetingsEvening)[gen.nextInt(resources.getStringArray(R.array.greetingsEvening).size)]
+        }, prefs.getString("username", ""))
     }
 
     private fun openInfoDialog() {
diff --git a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
index 730e43e..1fe4fcb 100644
--- a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
@@ -25,6 +25,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.textfield.TextInputEditText
 import com.jaredrummler.android.device.DeviceName
+import kotlin.collections.ArrayList
 
 class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListener, CompoundButton.OnCheckedChangeListener, ColourAdapter.OnClickListener {
 
diff --git a/app/src/main/res/layout/course_card.xml b/app/src/main/res/layout/course_card.xml
index 4467eea..fadb3aa 100644
--- a/app/src/main/res/layout/course_card.xml
+++ b/app/src/main/res/layout/course_card.xml
@@ -31,6 +31,42 @@
             app:layout_constraintTop_toTopOf="parent"
             android:textColor="@color/colorText"/>
 
+        <ImageView
+            android:id="@+id/iconView"
+            android:layout_width="0dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="16dp"
+            android:tint="@color/colorText"
+            app:layout_constraintBottom_toBottomOf="@+id/course"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/course" />
+
+        <TextView
+            android:id="@+id/course"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:textColor="@color/colorText"
+            app:layout_constraintEnd_toStartOf="@+id/time"
+            app:layout_constraintStart_toEndOf="@+id/iconView"
+            app:layout_constraintTop_toBottomOf="@+id/group" />
+
+        <TextView
+            android:id="@+id/additional"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="16dp"
+            android:textColor="@color/colorText"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/room"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/course" />
+
         <TextView
             android:id="@+id/date"
             android:layout_height="wrap_content"
@@ -54,18 +90,6 @@
             app:layout_constraintTop_toBottomOf="@+id/date"
             app:layout_constraintWidth_max="200dp" />
 
-        <TextView
-            android:id="@+id/course"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:textColor="@color/colorText"
-            app:layout_constraintEnd_toStartOf="@+id/time"
-            app:layout_constraintStart_toEndOf="@+id/iconView"
-            app:layout_constraintTop_toBottomOf="@+id/group" />
-
         <TextView
             android:id="@+id/room"
             android:layout_width="0dp"
@@ -79,30 +103,6 @@
             app:layout_constraintTop_toBottomOf="@+id/time"
             app:layout_constraintWidth_max="200dp" />
 
-        <TextView
-            android:id="@+id/additional"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="16dp"
-            android:textColor="@color/colorText"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/room"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/course" />
-
-        <ImageView
-            android:id="@+id/iconView"
-            android:layout_width="20dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:tint="@color/colorText"
-            app:layout_constraintBottom_toBottomOf="@+id/course"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/course" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7727929..d41c8f6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -38,7 +38,7 @@
     <string name="splan">s Plan</string>
     <string name="nosplan">\' Plan</string>
     <string name="licences">Lizenzen</string>
-    <string name="whatItTook">Was die App ausmacht</string>
+    <string name="whatItTook">Was die App ausmacht (Englisch)</string>
     <string name="version">Versionsnummer</string>
     <string name="privacy">Datenschutzerklärung</string>
     <string name="tac">AGB</string>
@@ -98,6 +98,7 @@
     <string name="nightMode">Aktiviert den Nachtmodus</string>
     <string name="yourPlan">Dein Plan</string>
     <string-array name="greetingsMorning">
+        <item>Hallo, %s!</item>
         <item>Guten Morgen, %s!</item>
         <item>Hab einen schönen Tag, %s.</item>
         <item>Wie geht\'s dir, %s?</item>
@@ -108,6 +109,7 @@
         <item>Wie geht\'s dir so, %s?</item>
     </string-array>
     <string-array name="greetingsNoon">
+        <item>Hallo, %s!</item>
         <item>Guten Tag, %s!</item>
         <item>Einen schönen Tag noch, %s.</item>
         <item>Wie geht\'s dir, %s?</item>
@@ -118,13 +120,11 @@
         <item>Genieß\' deinen Tag, %s.</item>
     </string-array>
     <string-array name="greetingsEvening">
-        <item>Good evening, %s!</item>
-        <item>Enjoy your evening, %s.</item>
-        <item>Wie geht\'s dir, %s?</item>
+        <item>Hallo, %s!</item>
+        <item>Schönen Abend, %s!</item>
         <item>Genieß\' deinen Abend, %s.</item>
+        <item>Wie geht\'s dir, %s?</item>
         <item>Hey, %s!</item>
         <item>Hi %s!</item>
-        <item>Schlaf\' gut, %s.</item>
-        <item>Bleib\' nicht zu lang wach, %s!</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8bc928b..7a71f0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,6 +112,7 @@
     <string name="yourPlan">Your Plan</string>
 
     <string-array name="greetingsMorning">
+        <item>Hello, %s!</item>
         <item>Good morning, %s!</item>
         <item>Have a nice day, %s.</item>
         <item>How are you, %s?</item>
@@ -122,6 +123,7 @@
         <item>How\'ve you been, %s?</item>
     </string-array>
     <string-array name="greetingsNoon">
+        <item>Hello, %s!</item>
         <item>Good day, %s!</item>
         <item>Have a nice day, %s.</item>
         <item>How are you, %s?</item>
@@ -132,13 +134,11 @@
         <item>Enjoy your day, %s!</item>
     </string-array>
     <string-array name="greetingsEvening">
+        <item>Hello, %s!</item>
         <item>Good evening, %s!</item>
         <item>Enjoy your evening, %s.</item>
         <item>How are you, %s?</item>
-        <item>Enjoying your evening, %s?</item>
         <item>Hey, %s!</item>
         <item>Hi %s!</item>
-        <item>Sleep tight, %s.</item>
-        <item>Staying up late, %s?</item>
     </string-array>
 </resources>