From 78dd498a63d5ec01ec88f2ed196457bc6d3f241b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= <k.duezgoeren@gmail.com>
Date: Thu, 12 Sep 2019 16:55:49 +0200
Subject: [PATCH] Fixed computer science not being tinted due to a spelling
 mistake; fixed greeting text label not obeying the right margin and clipping
 near the right side of the toolbar

---
 .../com/denizd/substitutionplan/adapters/CardAdapter.kt    | 2 +-
 app/src/main/res/layout/app_bar_main.xml                   | 7 +++----
 app/src/main/res/values/styles.xml                         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/denizd/substitutionplan/adapters/CardAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/adapters/CardAdapter.kt
index ee7709b..038125b 100644
--- a/app/src/main/java/com/denizd/substitutionplan/adapters/CardAdapter.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/adapters/CardAdapter.kt
@@ -158,7 +158,7 @@ internal class CardAdapter(private var mSubst: List<Subst>, private val prefs: S
                 "laa", "laf", "lat" -> "Latin"
                 "spa", "spf" -> "Spanish"
                 "fra", "frf", "frz" -> "French"
-                "inf" -> "Compsci"
+                "inf" -> "CompSci"
                 "ges" -> "History"
                 "rel" -> "Religion"
                 "geg" -> "Geography"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 1ce41ad..1b875ff 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -22,8 +22,6 @@
             android:elevation="0dp"
             app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
 
-<!--            84dp-->
-
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -33,13 +31,14 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
-                    android:layout_marginTop="8dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_marginTop="8dp"
                     android:textColor="@color/colorAccent"
                     android:textSize="18sp"
                     android:fontFamily="@font/manrope_semibold"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
                 <TextView
                     android:id="@+id/toolbarTxt"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bda7912..4c557f0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,7 +40,7 @@
         <item name="colorControlHighlight">@color/colorAccent</item>
     </style>
 
-    <!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
+    <!-- Launch / splash screen -->
     <style name="AppTheme0.Launcher">
         <item name="android:windowBackground">@drawable/launch_screen</item>
         <item name="android:statusBarColor">@android:color/transparent</item>