Minor interface redesign, including First Time activity

app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt

@@ -45,27 +45,22 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
     private val prefs = PreferenceManager.getDefaultSharedPreferences(mContext)
     private val edit = prefs.edit()
     private lateinit var pullToRefresh: SwipeRefreshLayout
-    private lateinit var progressBar: ProgressBar
     private val fadeOut = AnimationUtils.loadAnimation(mContext, R.anim.fade_out)
     private val handler = Handler(Looper.getMainLooper())
     var currentTime = ""
+    val substUrl = "https://djd4rkn355.github.io/subst_test.html"
+    val foodUrl = "https://djd4rkn355.github.io/food_test.html"
 
     override fun doInBackground(vararg params: Void?): Void? {
         try {
             mView?.let { v: View ->
                 pullToRefresh = v.findViewById(R.id.pullToRefresh)
-                progressBar = v.findViewById(R.id.progressBar)
-                progressBar.progress = 0
             }
             if (menu) {
                 val foodViewModel = FoodViewModel(mApplication)
-                val docFood = Jsoup.connect("https://djd4rkn355.github.io/food.html").get()
+                val docFood = Jsoup.connect(foodUrl).get()
                 val foodElements = docFood.select("th")
 
-                mView?.let {
-                    progressBar.max = foodElements.size
-                }
-
                 var foodInt = 0
                 var priority = 0
                 foodViewModel.deleteAll()
@@ -115,27 +110,12 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                     }
                     foodInt++
                     priority++
-                    mView?.let {
-                        progressBar.progress = foodInt
-                    }
-                }
-
-                mView?.let {
-                    progressBar.progress = 100
-                    handler.postDelayed({ progressBar.startAnimation(fadeOut) }, 200)
-                    fadeOut.setAnimationListener(object: Animation.AnimationListener {
-                        override fun onAnimationStart(arg0: Animation) {}
-                        override fun onAnimationRepeat(arg0: Animation) {}
-                        override fun onAnimationEnd(arg0: Animation) {
-                            progressBar.progress = 0
-                        }
-                    })
                 }
             }
 
             if (plan) {
                 val substViewModel = SubstViewModel(mApplication)
-                val doc = Jsoup.connect("https://djd4rkn355.github.io/subst.html").get()
+                val doc = Jsoup.connect(substUrl).get()
                 currentTime = doc.select("h1")[0].text()
                 if (currentTime != prefs.getString("time", "")) {
                     val rows = doc.select("tr")
@@ -148,10 +128,6 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                     val roomS = ArrayList<String>()
                     val additionalS = ArrayList<String>()
 
-                    mView?.let {
-                        progressBar.max = rows.size
-                    }
-
                     for (i in 0 until paragraphs.size) {
                         if (i == 0) {
                             informational = paragraphs[i].text()
@@ -173,11 +149,6 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                         courseS.add(cols[3].text())
                         roomS.add(cols[4].text())
                         additionalS.add(cols[5].text())
-                        if (!jobservice) {
-                            mView?.let {
-                                progressBar.incrementProgressBy(1)
-                            }
-                        }
 
                         val drawable = MiscData.getIcon(courseS[i])
                         val subst = Subst(drawable, groupS[i], dateS[i], timeS[i], courseS[i],
@@ -255,14 +226,6 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
             }
             if (plan || menu) {
                 mView?.let { v: View ->
-                    handler.postDelayed({ progressBar.startAnimation(fadeOut) }, 200)
-                    fadeOut.setAnimationListener(object: Animation.AnimationListener {
-                        override fun onAnimationStart(arg0: Animation) {}
-                        override fun onAnimationRepeat(arg0: Animation) {}
-                        override fun onAnimationEnd(arg0: Animation) {
-                            progressBar.progress = 0
-                        }
-                    })
                     pullToRefresh.isRefreshing = false
                     if (plan) {
                         val snackBarView = v.findViewById<View>(R.id.coordination)

app/src/main/java/com/denizd/substitutionplan/FirstTime.kt

@@ -1,13 +1,9 @@
 package com.denizd.substitutionplan
 
-import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
-import android.graphics.BitmapFactory
-import android.graphics.drawable.Animatable
 import android.graphics.drawable.AnimatedVectorDrawable
-import android.graphics.drawable.AnimationDrawable
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -15,15 +11,16 @@ import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewAnimationUtils
-import android.view.WindowManager
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+import com.google.android.material.textfield.TextInputEditText
 import java.util.*
 
 class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
@@ -35,25 +32,28 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
         super.onCreate(savedInstanceState)
 
         val window = this.window
-        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-        window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
 
+        when (AppCompatDelegate.getDefaultNightMode()) {
+            AppCompatDelegate.MODE_NIGHT_NO -> {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
                     window.navigationBarColor = ContextCompat.getColor(this, R.color.background)
                 }
-        val bm = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
+            }
-        val taskDesc = ActivityManager.TaskDescription(getString(R.string.app_name), bm, ContextCompat.getColor(this, R.color.background))
+            else -> {
-        setTaskDescription(taskDesc)
+                window.navigationBarColor = ContextCompat.getColor(this, R.color.background)
+                window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+            }
+        }
 
         context = this
         prefs = PreferenceManager.getDefaultSharedPreferences(context) as SharedPreferences
         val edit = prefs.edit()
         val fab = findViewById<ExtendedFloatingActionButton>(R.id.efab)
         val start = Intent(this, Main::class.java)
-        val name = findViewById<EditText>(R.id.txtName)
+        val name = findViewById<TextInputEditText>(R.id.txtName)
-        val grade = findViewById<EditText>(R.id.txtClasses)
+        val grade = findViewById<TextInputEditText>(R.id.txtClasses)
-        val courses = findViewById<EditText>(R.id.txtCourses)
+        val courses = findViewById<TextInputEditText>(R.id.txtCourses)
         val notif = findViewById<CheckBox>(R.id.cbNotif)
         val dark = findViewById<CheckBox>(R.id.cbDark)
         val pers = findViewById<CheckBox>(R.id.cbPersonalised)
@@ -100,6 +100,7 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
             val colour = findViewById<LinearLayout>(R.id.colourLayout)
             linearInflation.visibility = View.VISIBLE
             anim.start()
+            fab.hide(true)
 
             handler.postDelayed({
                 colour.startAnimation(animOut)

app/src/main/java/com/denizd/substitutionplan/Main.kt

@@ -11,8 +11,6 @@ import android.os.Bundle
 import android.os.Handler
 import android.preference.PreferenceManager
 import android.view.*
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -24,7 +22,6 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import com.jaredrummler.android.device.DeviceName
@@ -33,7 +30,6 @@ import java.util.*
 
 class Main : AppCompatActivity(R.layout.app_bar_main) {
 
-    private lateinit var bottomSheetBehaviour: BottomSheetBehavior<*>
     private lateinit var context: Context
     private lateinit var prefs: SharedPreferences
 
@@ -45,6 +41,7 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
         val firstTime = Intent(context, FirstTime::class.java)
 
         if (prefs.getBoolean("firstTime", true)) {
+//        if (true) {
             startActivity(firstTime)
             finish()
         } else {
@@ -126,70 +123,47 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
                 }
             }
 
-            if (prefs.getBoolean("greeting", false)) {
+            val textViewGreeting = findViewById<TextView>(R.id.text_greeting)
+            if (prefs.getBoolean("greeting", true)) {
                 if ((prefs.getString("username", "") ?: "").isNotEmpty()) {
-                    val animationIn = AnimationUtils.loadAnimation(context, R.anim.chip_slide_in)
+                    textViewGreeting.text = getGreetingString()
-                    val animationOut = AnimationUtils.loadAnimation(context, R.anim.chip_slide_out)
+//                    val generator = Random()
-                    val generator = Random()
+//                    val greetings = resources.getStringArray(R.array.greeting8_array)
-                    val greetings = resources.getStringArray(R.array.greeting8_array)
+//                    val rightNow = Calendar.getInstance()
-                    val rightNow = Calendar.getInstance()
+//                    val currentHour = rightNow.get(Calendar.HOUR_OF_DAY)
-                    val currentHour = rightNow.get(Calendar.HOUR_OF_DAY)
+//
-
+//                    textViewGreeting.text = when (generator.nextInt(9)) {
-                    chip.text = when (generator.nextInt(9)) {
+//                        0 -> getString(R.string.greeting0, prefs.getString("username", ""))
-                        0 -> getString(R.string.greeting0, prefs.getString("username", ""))
+//                        1 -> getString(R.string.greeting1, prefs.getString("username", ""))
-                        1 -> getString(R.string.greeting1, prefs.getString("username", ""))
+//                        2 -> getString(R.string.greeting2, prefs.getString("username", ""))
-                        2 -> getString(R.string.greeting2, prefs.getString("username", ""))
+//                        3 -> getString(R.string.greeting3, prefs.getString("username", ""))
-                        3 -> getString(R.string.greeting3, prefs.getString("username", ""))
+//                        4 -> getString(R.string.greeting4, prefs.getString("username", ""))
-                        4 -> getString(R.string.greeting4, prefs.getString("username", ""))
+//                        5 -> getString(R.string.greeting5, prefs.getString("username", ""))
-                        5 -> getString(R.string.greeting5, prefs.getString("username", ""))
+//                        6 -> getString(R.string.greeting6, prefs.getString("username", ""))
-                        6 -> getString(R.string.greeting6, prefs.getString("username", ""))
+//                        7 -> getString(R.string.greeting7, prefs.getString("username", ""))
-                        7 -> getString(R.string.greeting7, prefs.getString("username", ""))
+//                        8 -> {
-                        8 -> {
+//                            when {
-                            when {
+//                                currentHour < 11 -> greetings[0] + prefs.getString("username", "") + "."
-                                currentHour < 11 -> greetings[0] + prefs.getString("username", "") + "."
+//                                currentHour in 11..17 -> greetings[1] + prefs.getString("username", "") + "."
-                                currentHour in 11..17 -> greetings[1] + prefs.getString("username", "") + "."
+//                                else -> greetings[1] + prefs.getString("username", "") + "."
-                                else -> greetings[1] + prefs.getString("username", "") + "."
+//                            }
-                            }
+//                        }
-                        }
+//                        else -> ";)" // getString(R.string.error)
-                        else -> ";)" // getString(R.string.error)
+//                    }
-                    }
-
-                    handler.postDelayed({
-                        chip.visibility = View.VISIBLE
-                        chip.startAnimation(animationIn)
-                    }, 500)
-
-                    handler.postDelayed({
-                        chip.startAnimation(animationOut)
-                    }, 3000)
-
-                    animationOut.setAnimationListener(object: Animation.AnimationListener {
-                        override fun onAnimationStart(animation: Animation?) {}
-                        override fun onAnimationRepeat(animation: Animation?) {}
-                        override fun onAnimationEnd(animation: Animation?) {
-                            chip.visibility = View.GONE
-                        }
-                    })
                 }
+            } else {
+                textViewGreeting.visibility = View.GONE
             }
 
             if (prefs.getInt("firstTimeOpening", 0) == 0) {
                 edit.putInt("firstTimeOpening", prefs.getInt("firstTimeOpening", 0) + 1).apply()
             }
 
-            val userPlan: String = if ((prefs.getString("username", "") ?: "").toString().isNotEmpty()) {
-                when ((prefs.getString("username", "") ?: "")[(prefs.getString("username", "") ?: "").length - 1].toString().toLowerCase()) {
-                    "s", "x", "z" -> (prefs.getString("username", "") ?: "") + getString(R.string.nosplan)
-                    else -> (prefs.getString("username", "") ?: "") + getString(R.string.splan)
-                }
-            } else {
-                getString(R.string.personalplan)
-            }
             lateinit var defaultFragment: Fragment
             if (prefs.getBoolean("defaultPersonalised", false)) {
                 defaultFragment = PersonalPlanFragment()
                 bottomNav.selectedItemId = R.id.personal
-                toolbarTxt.text = userPlan
+                toolbarTxt.text = getString(R.string.yourplan)
             } else {
                 defaultFragment = GeneralPlanFragment()
                 bottomNav.selectedItemId = R.id.plan
@@ -207,7 +181,7 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
                     }
                     R.id.personal -> {
                         fragment = PersonalPlanFragment()
-                        toolbarTxt.text = userPlan
+                        toolbarTxt.text = getString(R.string.yourplan)
                     }
                     R.id.menu -> {
                         fragment = FoodFragment()
@@ -264,6 +238,17 @@ 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.greetings_morning)
+            in 11..17 -> resources.getStringArray(R.array.greetings_noon)
+            else -> resources.getStringArray(R.array.greetings_evening)
+        }
+        return String.format(greetingArray[gen.nextInt(7)], prefs.getString("username", ""))
+    }
+
     private fun openInfoDialog() {
         val dialog = AlertDialog.Builder(context)
         val dialogView = LayoutInflater.from(context).inflate(R.layout.simple_dialog, null)

app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt

@@ -39,7 +39,6 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
     private var cs: Int = 7
     private var window: Window? = null
     private lateinit var colourRecycler: RecyclerView
-    private lateinit var colourAdapter: ColourAdapter
 
     override fun onAttach(context: Context) {
         super.onAttach(context)

app/src/main/res/drawable/check_mark.xml

@@ -6,14 +6,14 @@
     <group android:name="background">
         <path
             android:name="circle"
-            android:fillColor="#448aff"
+            android:fillColor="@color/accent"
             android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0" />
     </group>
     <group android:name="check">
         <path
             android:name="tick"
             android:pathData="M6.5,12 l0,0 l0,0"
-            android:strokeColor="#FFFFFF"
+            android:strokeColor="@color/background"
             android:strokeWidth="1" />
     </group>
 

app/src/main/res/layout/activity_first_time.xml

@@ -19,24 +19,25 @@
             android:layout_height="wrap_content"
             android:layoutAnimation="@anim/layout_animation_fall_down">
 
-            <LinearLayout
+<!--            <LinearLayout-->
-                android:layout_width="0px"
+<!--                android:layout_width="0dp"-->
-                android:layout_height="0px"
+<!--                android:layout_height="0dp"-->
-                android:focusable="true"
+<!--                android:focusable="true"-->
-                android:focusableInTouchMode="true"
+<!--                android:focusableInTouchMode="true"-->
-                app:layout_constraintStart_toStartOf="parent"
+<!--                app:layout_constraintStart_toStartOf="parent"-->
-                app:layout_constraintTop_toTopOf="parent" />
+<!--                app:layout_constraintTop_toTopOf="parent" />-->
 
             <TextView
                 android:id="@+id/txtWelcome"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="56dp"
+                android:layout_marginStart="16dp"
                 android:text="@string/welcome"
                 android:textAlignment="center"
                 android:textColor="@color/textcolor"
-                android:textSize="30sp"
+                android:fontFamily="@font/manrope_extrabold"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:textSize="24sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -44,115 +45,102 @@
                 android:id="@+id/txtsetupthings"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:text="@string/firstsomethings"
                 android:textAlignment="center"
                 android:textColor="@color/textcolor"
                 android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/txtWelcome"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txtWelcome" />
 
             <TextView
                 android:id="@+id/txttellmename"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="8dp"
                 android:text="@string/tellmename"
                 android:textAlignment="center"
                 android:textColor="@color/textcolor"
                 android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/txtsetupthings"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txtsetupthings" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/txtLayoutClasses"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                app:boxStrokeColor="@color/accent"
+                app:boxStrokeWidth="1dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="56dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="56dp"
+                android:layout_marginEnd="16dp"
                 android:hint="@string/yourname"
                 android:textColorHint="@color/hintcolor"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/txttellmename"
                 app:layout_constraintTop_toBottomOf="@+id/txttellmename"
                 android:importantForAutofill="no">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/txtName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="8dp"
                     android:animateLayoutChanges="true"
                     android:ems="10"
-                    android:gravity="center_horizontal"
+                    android:gravity="start"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textNoSuggestions"
                     android:singleLine="true"
-                    android:textAlignment="center"
-                    android:textAppearance="@style/TextAppearance.AppCompat"
                     android:textColor="@color/textcolor"
-                    android:textSize="16sp"
+                    android:textSize="16sp"/>
-                    android:theme="@style/EditTextTheme" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:id="@+id/txtNextClass"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
                 android:layout_marginTop="16dp"
-                android:layout_marginEnd="8dp"
+                android:gravity="start"
                 android:text="@string/nextclass"
-                android:textAlignment="center"
                 android:textColor="@color/textcolor"
                 android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
                 app:layout_constraintTop_toBottomOf="@+id/txtLayoutClasses" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/txtLayoutClass"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
+                app:boxStrokeColor="@color/accent"
+                app:boxStrokeWidth="1dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="56dp"
+                android:layout_width="0dp"
                 android:layout_marginTop="8dp"
                 android:hint="@string/yourclass"
                 android:textColorHint="@color/hintcolor"
                 app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
-                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/txtNextClass"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txtNextClass"
                 android:importantForAutofill="no">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/txtClasses"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="8dp"
                     android:animateLayoutChanges="true"
                     android:ems="10"
-                    android:gravity="center_horizontal"
+                    android:gravity="start"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textNoSuggestions"
                     android:singleLine="true"
-                    android:textAlignment="center"
-                    android:textAppearance="@style/TextAppearance.AppCompat"
                     android:textColor="@color/textcolor"
-                    android:textSize="16sp"
+                    android:textSize="16sp"/>
-                    android:theme="@style/EditTextTheme" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -172,48 +160,42 @@
                 android:id="@+id/txtSenior"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
                 android:layout_marginTop="16dp"
-                android:layout_marginEnd="32dp"
                 android:text="@string/seniorsetup"
-                android:textAlignment="center"
+                android:gravity="start"
                 android:textColor="@color/textcolor"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
                 app:layout_constraintTop_toBottomOf="@+id/txtLayoutClass" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/txtLayoutCourses"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
+                app:boxStrokeColor="@color/accent"
+                app:boxStrokeWidth="1dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="56dp"
+                android:layout_width="0dp"
                 android:layout_marginTop="8dp"
                 android:hint="@string/yourcourses"
                 android:textColorHint="@color/hintcolor"
                 app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
-                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/txtSenior"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txtSenior">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/txtCourses"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="8dp"
                     android:animateLayoutChanges="true"
                     android:ems="10"
-                    android:gravity="center_horizontal"
+                    android:gravity="start"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textNoSuggestions"
                     android:singleLine="true"
-                    android:textAlignment="center"
-                    android:textAppearance="@style/TextAppearance.AppCompat"
                     android:textColor="@color/textcolor"
                     android:textSize="16sp"
-                    android:theme="@style/EditTextTheme"
                     android:importantForAutofill="no"/>
 
             </com.google.android.material.textfield.TextInputLayout>
@@ -232,84 +214,69 @@
 
             <TextView
                 android:id="@+id/txtMore"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
                 android:layout_marginTop="16dp"
-                android:layout_marginEnd="8dp"
                 android:text="@string/moresettings"
                 android:textColor="@color/textcolor"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
                 app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
 
             <CheckBox
                 android:id="@+id/cbDark"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="32dp"
                 android:text="@string/enabledarkmode"
                 android:textAlignment="viewStart"
                 android:textColor="@color/textcolor"
                 android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
-                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txtMore" />
 
             <CheckBox
                 android:id="@+id/cbNotif"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginEnd="32dp"
                 android:text="@string/wantnotif"
                 android:textAlignment="viewStart"
                 android:textColor="@color/textcolor"
                 android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
-                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/cbDark" />
 
             <CheckBox
                 android:id="@+id/cbPersonalised"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginEnd="32dp"
                 android:text="@string/personalised"
                 android:textAlignment="viewStart"
                 android:textColor="@color/textcolor"
                 android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
-                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/cbNotif" />
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/efab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
+        android:layout_marginEnd="16dp"
-                android:layout_marginTop="32dp"
+        android:layout_marginBottom="16dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="32dp"
         android:backgroundTint="@color/accent"
         android:text="@string/letsgo"
         android:textColor="@color/background"
         app:icon="@drawable/ic_tick"
         app:iconTint="@color/background"
-                app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_gravity="bottom|end"
-                app:layout_constraintEnd_toEndOf="parent"
+        android:translationZ="-1dp"/>
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/cbPersonalised" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.core.widget.NestedScrollView>
 
     <LinearLayout
         android:id="@+id/linearInflation"
@@ -321,6 +288,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/app_bar_main.xml

@@ -16,7 +16,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="84dp"
             app:popupTheme="@style/AppThemeLight.PopupOverlay"
             app:titleTextColor="@color/accent"
             app:contentInsetStart="0dp"
@@ -31,43 +31,28 @@
                     android:id="@+id/toolbarTxt"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
+                    android:layout_gravity="start"
-                    android:animateLayoutChanges="true"
                     android:fontFamily="@font/manrope_extrabold"
-                    android:layoutAnimation="@anim/layout_animation_fall_down"
                     android:text="@string/app_name"
-                    android:textAlignment="center"
                     android:textColor="@color/accent"
-                    android:textSize="22sp"
+                    android:textSize="24sp"
                     android:singleLine="true"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginBottom="4dp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"/>
 
-                <ProgressBar
+                <TextView
-                    android:id="@+id/progressBar"
+                    android:id="@+id/text_greeting"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_width="0dp"
-                    android:layout_height="2dp"
-                    android:progressTint="@color/accent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    android:animateLayoutChanges="true"
-                    android:progressBackgroundTint="@android:color/transparent"/>
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    app:layout_constraintBottom_toTopOf="@+id/toolbarTxt"
-                    android:visibility="gone"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
+                    android:layout_marginStart="16dp"
-                    android:elevation="4dp"
+                    android:layout_marginBottom="4dp"
-                    android:background="@color/lightbackground"
+                    android:textColor="@color/accent"
-                    android:textColor="@color/textcolor"/>
+                    android:textSize="18sp"
+                    android:fontFamily="@font/manrope_semibold"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/content_settings.xml

@@ -30,7 +30,7 @@
                 android:layout_marginBottom="3dp"
                 app:cardElevation="2dp"
                 android:backgroundTint="@color/lightbackground"
-                app:cardCornerRadius="8dp">
+                app:cardCornerRadius="12dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -194,7 +194,7 @@
                 android:layout_marginBottom="3dp"
                 app:cardElevation="2dp"
                 android:backgroundTint="@color/lightbackground"
-                app:cardCornerRadius="8dp">
+                app:cardCornerRadius="12dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -347,7 +347,7 @@
                 android:layout_marginBottom="3dp"
                 app:cardElevation="2dp"
                 android:backgroundTint="@color/lightbackground"
-                app:cardCornerRadius="8dp">
+                app:cardCornerRadius="12dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"

app/src/main/res/layout/course_card.xml

@@ -6,14 +6,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:cardBackgroundColor="@color/lightbackground"
-    app:cardCornerRadius="8dp"
+    app:cardCornerRadius="12dp"
     android:clickable="true"
     android:focusable="true"
     android:layout_marginStart="8dp"
     android:layout_marginEnd="8dp"
     android:layout_marginTop="3dp"
     android:layout_marginBottom="3dp"
-    app:cardElevation="1dp">
+    app:cardElevation="2dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"

app/src/main/res/layout/diagnostics_dialog.xml

@@ -9,11 +9,12 @@
         android:id="@+id/textviewtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginTop="16dp"
         android:textSize="22sp"
-        android:layout_gravity="center_horizontal"
+        android:fontFamily="@font/manrope_semibold"
+        android:layout_gravity="start"
         android:textColor="@color/textcolor"
         android:textAlignment="center"/>
 

app/src/main/res/layout/edittext_dialog.xml

@@ -9,11 +9,12 @@
         android:id="@+id/textviewtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginTop="16dp"
         android:textSize="22sp"
-        android:layout_gravity="center_horizontal"
+        android:fontFamily="@font/manrope_semibold"
+        android:layout_gravity="start"
         android:textColor="@color/textcolor"
         android:textAlignment="center"/>
 

app/src/main/res/layout/empty_dialog.xml

@@ -7,11 +7,12 @@
         android:id="@+id/empty_textviewtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginTop="16dp"
         android:textSize="22sp"
-        android:layout_gravity="center_horizontal"
+        android:fontFamily="@font/manrope_semibold"
+        android:layout_gravity="start"
         android:textColor="@color/textcolor"
         android:textAlignment="center"/>
 

app/src/main/res/layout/just_a_card.xml

@@ -5,14 +5,14 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:backgroundTint="@color/lightbackground"
-    app:cardCornerRadius="8dp"
+    app:cardCornerRadius="12dp"
     android:clickable="true"
     android:focusable="true"
     android:layout_marginStart="8dp"
     android:layout_marginEnd="8dp"
     android:layout_marginTop="3dp"
     android:layout_marginBottom="3dp"
-    app:cardElevation="1dp">
+    app:cardElevation="2dp">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/recycler_dialog.xml

@@ -7,11 +7,12 @@
         android:id="@+id/empty_textviewtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginTop="16dp"
         android:textSize="22sp"
-        android:layout_gravity="center_horizontal"
+        android:fontFamily="@font/manrope_semibold"
+        android:layout_gravity="start"
         android:textColor="@color/textcolor"
         android:textAlignment="center"/>
 

app/src/main/res/layout/secret_dialog.xml

@@ -7,11 +7,12 @@
         android:id="@+id/textviewtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginTop="16dp"
+        android:fontFamily="@font/manrope_semibold"
         android:textSize="22sp"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="start"
         android:textColor="@color/textcolor"
         android:textAlignment="center"/>
 

app/src/main/res/layout/simple_dialog.xml

@@ -8,11 +8,12 @@
         android:id="@+id/textviewtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginTop="16dp"
+        android:fontFamily="@font/manrope_semibold"
         android:textSize="22sp"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="start"
         android:textColor="@color/textcolor"
         android:textAlignment="center"/>
 

app/src/main/res/values-de/strings.xml

@@ -9,14 +9,14 @@
     <string name="subst">Vertretungsplan</string>
     <string name="personal">Persönlich</string>
     <string name="settings">Einstellungen</string>
-    <string name="plan">Plan</string>
+    <string name="plan">Allgemein</string>
     <string name="darkbg">Dunkler Hintergrund</string>
     <string name="notifications">Aktiviere Benachrichtigungen</string>
     <string name="notifiedabout">Aktiviert ebenfalls Hintergrund-Sync</string>
     <string name="personalplan">Persönlicher Plan</string>
     <string name="personalise">Personalisieren</string>
     <string name="misc">Diverses</string>
-    <string name="defplan">Standardmäßig ansonsten normaler Plan</string>
+    <string name="defplan">Standardmäßig ansonsten allgemeiner Plan</string>
     <string name="personalised">Persönlicher Plan als Standard</string>
     <string name="visitweb">Besuche die Schulwebsite</string>
     <string name="butwhy">Falls nötig</string>
@@ -34,19 +34,6 @@
     <string name="moresettings">Nur noch ein paar weitere Einstellungen.</string>
     <string name="enabledarkmode">Dunklen Hintergrund aktivieren</string>
     <string name="havefun">Viel Spaß!</string>
-    <string name="greeting0">Hallo, %s!</string>
-    <string name="greeting1">Wie geht\'s dir, %s?</string>
-    <string name="greeting2">Tagchen, %s!</string>
-    <string name="greeting3">Hey, %s!</string>
-    <string name="greeting4">Wie ist dein Tag, %s?</string>
-    <string name="greeting5">Schön dich zu sehen, %s.</string>
-    <string name="greeting6">Grüß dich, %s!</string>
-    <string name="greeting7">Hallöchen, %s!</string>
-    <string-array name="greeting8_array">
-        <item>"Guten Morgen, "</item>
-        <item>"Guten Tag, "</item>
-        <item>"Schönen Abend, "</item>
-    </string-array>
     <string name="disablegreeting">Aktiviere Begrüßungen</string>
     <string name="justnice">Falls du möchtest, dass ich nett bin :)</string>
     <string name="splan">s Plan</string>
@@ -119,4 +106,35 @@
     <string name="showinfo">Zeige Info-Tab in Navigationsleisete</string>
     <string name="lastupdatedK">"Zuletzt aktualisiert: "</string>
     <string name="darkmode2">Aktiviert den Nachtmodus</string>
+    <string name="yourplan">Dein Plan</string>
+    <string-array name="greetings_morning">
+        <item>Guten Morgen, %s!</item>
+        <item>Hab einen schönen Tag, %s.</item>
+        <item>Wie geht\'s dir, %s?</item>
+        <item>Gut geschlafen, %s?</item>
+        <item>Hey, %s!</item>
+        <item>Hi, %s!</item>
+        <item>Schön dich zu sehen, %s.</item>
+        <item>Wie geht\'s dir so, %s?</item>
+    </string-array>
+    <string-array name="greetings_noon">
+        <item>Guten Tag, %s!</item>
+        <item>Einen schönen Tag noch, %s.</item>
+        <item>Wie geht\'s dir, %s?</item>
+        <item>Hoffe du hast einen schönen Tag, %s.</item>
+        <item>Hey, %s!</item>
+        <item>Hi, %s!</item>
+        <item>Schön dich zu sehen, %s.</item>
+        <item>Genieß\' deinen Tag, %s.</item>
+    </string-array>
+    <string-array name="greetings_evening">
+        <item>Good evening, %s!</item>
+        <item>Enjoy your evening, %s.</item>
+        <item>Wie geht\'s dir, %s?</item>
+        <item>Genieß\' deinen Abend, %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>

app/src/main/res/values/colors.xml

@@ -8,6 +8,8 @@
     <color name="hintcolor">#757575</color>
     <color name="lighthintcolor">#bdbdbd</color>
 
+    <color name="alwaysWhite">#f5f5f5</color>
+
     <color name="bgred">#F28B82</color>
     <color name="bgorange">#FBBC04</color>
     <color name="bgyellow">#FFF475</color>

app/src/main/res/values/strings.xml

@@ -9,7 +9,7 @@
 
     <string name="personal">Personal</string>
     <string name="settings">Settings</string>
-    <string name="plan">Plan</string>
+    <string name="plan">General</string>
 
     <!-- for Settings fragment -->
     <string name="darkbg">Dark background</string>
@@ -20,7 +20,7 @@
     <string name="personalise">Personalise</string>
     <string name="misc">Miscellaneous</string>
     <string name="personalised">Set personalised plan as default</string>
-    <string name="defplan">Defaults to normal plan otherwise</string>
+    <string name="defplan">Defaults to general plan otherwise</string>
     <string name="visitweb">Visit the school\'s website</string>
     <string name="butwhy">In case you need to</string>
     <string name="menu">Menu</string>
@@ -39,19 +39,6 @@
     <string name="enabledarkmode">Enable dark mode</string>
     <string name="havefun">Have fun!</string>
 
-    <string name="greeting0">Hello, %s!</string>
-    <string name="greeting1">How are you, %s?</string>
-    <string name="greeting2">Greetings, %s.</string>
-    <string name="greeting3">Hey, %s!</string>
-    <string name="greeting4">How\'s your day, %s?</string>
-    <string name="greeting5">Nice to see you, %s.</string>
-    <string name="greeting6">You alright, %s?</string>
-    <string name="greeting7">What\'s up, %s?</string>
-    <string-array name="greeting8_array">
-        <item>"Good morning, "</item>
-        <item>"Good day, "</item>
-        <item>"Good evening, "</item>
-    </string-array>
     <string name="disablegreeting">Enable greeting</string>
     <string name="justnice">If you want me to be nice :)</string>
     <string name="splan">\'s Plan</string>
@@ -123,6 +110,7 @@
     <string name="courseWat">WAT</string>
     <string name="courseFor">Special Education</string>
     <string name="courseWp">WP &amp; "Methodenstunde"</string>
+
     <string name="clearall">Clear all</string>
     <string name="allcolourscleared">Colours for all courses have been cleared</string>
     <string name="chromecompatible">No Chrome-compatible browser found</string>
@@ -131,4 +119,37 @@
     <string name="swipeindependent">Independent of swipe gesture</string>
     <string name="lastupdatedK">"Last updated: "</string>
     <string name="darkmode2">Enables night mode</string>
+    <string name="yourplan">Your Plan</string>
+
+    <string-array name="greetings_morning">
+        <item>Good morning, %s!</item>
+        <item>Have a nice day, %s.</item>
+        <item>How are you, %s?</item>
+        <item>Slept well, %s?</item>
+        <item>Hey, %s!</item>
+        <item>Hi, %s!</item>
+        <item>Nice to see you, %s.</item>
+        <item>How\'ve you been, %s?</item>
+    </string-array>
+    <string-array name="greetings_noon">
+        <item>Good day, %s!</item>
+        <item>Hope you\'re having a nice day, %s.</item>
+        <item>How are you, %s?</item>
+        <item>Enjoying your day, %s?</item>
+        <item>Hey, %s!</item>
+        <item>Hi, %s!</item>
+        <item>Nice to see you, %s.</item>
+        <item>Enjoy your day, %s!</item>
+    </string-array>
+    <string-array name="greetings_evening">
+        <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>Stayin\' up late, %s?</item>
+    </string-array>
+
 </resources>