From 47cbaaf53c6c141043e51d66044b8c6574a70679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= Date: Tue, 30 Jul 2019 22:48:13 +0200 Subject: [PATCH] Minor interface redesign, including First Time activity --- .../denizd/substitutionplan/DataFetcher.kt | 45 +---- .../com/denizd/substitutionplan/FirstTime.kt | 33 ++-- .../java/com/denizd/substitutionplan/Main.kt | 99 +++++------ .../substitutionplan/SettingsFragment.kt | 1 - app/src/main/res/drawable/check_mark.xml | 4 +- .../main/res/layout/activity_first_time.xml | 161 +++++++----------- app/src/main/res/layout/app_bar_main.xml | 43 ++--- app/src/main/res/layout/content_settings.xml | 6 +- app/src/main/res/layout/course_card.xml | 4 +- .../main/res/layout/diagnostics_dialog.xml | 7 +- app/src/main/res/layout/edittext_dialog.xml | 7 +- app/src/main/res/layout/empty_dialog.xml | 7 +- app/src/main/res/layout/just_a_card.xml | 4 +- app/src/main/res/layout/recycler_dialog.xml | 7 +- app/src/main/res/layout/secret_dialog.xml | 7 +- app/src/main/res/layout/simple_dialog.xml | 7 +- app/src/main/res/values-de/strings.xml | 48 ++++-- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/strings.xml | 51 ++++-- 19 files changed, 245 insertions(+), 298 deletions(-) diff --git a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt index 139451b..800e0b5 100644 --- a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt +++ b/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() val additionalS = ArrayList() - 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(R.id.coordination) diff --git a/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt b/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt index 6a0a705..4819c3f 100644 --- a/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt +++ b/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) - 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) + 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) + } + } + else -> { + window.navigationBarColor = ContextCompat.getColor(this, R.color.background) + window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE + } } - 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)) - setTaskDescription(taskDesc) context = this prefs = PreferenceManager.getDefaultSharedPreferences(context) as SharedPreferences val edit = prefs.edit() val fab = findViewById(R.id.efab) val start = Intent(this, Main::class.java) - val name = findViewById(R.id.txtName) - val grade = findViewById(R.id.txtClasses) - val courses = findViewById(R.id.txtCourses) + val name = findViewById(R.id.txtName) + val grade = findViewById(R.id.txtClasses) + val courses = findViewById(R.id.txtCourses) val notif = findViewById(R.id.cbNotif) val dark = findViewById(R.id.cbDark) val pers = findViewById(R.id.cbPersonalised) @@ -100,6 +100,7 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) { val colour = findViewById(R.id.colourLayout) linearInflation.visibility = View.VISIBLE anim.start() + fab.hide(true) handler.postDelayed({ colour.startAnimation(animOut) diff --git a/app/src/main/java/com/denizd/substitutionplan/Main.kt b/app/src/main/java/com/denizd/substitutionplan/Main.kt index 535d79d..1d3c4b8 100644 --- a/app/src/main/java/com/denizd/substitutionplan/Main.kt +++ b/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(R.id.text_greeting) + if (prefs.getBoolean("greeting", true)) { if ((prefs.getString("username", "") ?: "").isNotEmpty()) { - val animationIn = AnimationUtils.loadAnimation(context, R.anim.chip_slide_in) - val animationOut = AnimationUtils.loadAnimation(context, R.anim.chip_slide_out) - val generator = Random() - val greetings = resources.getStringArray(R.array.greeting8_array) - val rightNow = Calendar.getInstance() - val currentHour = rightNow.get(Calendar.HOUR_OF_DAY) - - chip.text = when (generator.nextInt(9)) { - 0 -> getString(R.string.greeting0, prefs.getString("username", "")) - 1 -> getString(R.string.greeting1, prefs.getString("username", "")) - 2 -> getString(R.string.greeting2, prefs.getString("username", "")) - 3 -> getString(R.string.greeting3, prefs.getString("username", "")) - 4 -> getString(R.string.greeting4, prefs.getString("username", "")) - 5 -> getString(R.string.greeting5, prefs.getString("username", "")) - 6 -> getString(R.string.greeting6, prefs.getString("username", "")) - 7 -> getString(R.string.greeting7, prefs.getString("username", "")) - 8 -> { - when { - currentHour < 11 -> greetings[0] + prefs.getString("username", "") + "." - currentHour in 11..17 -> greetings[1] + prefs.getString("username", "") + "." - else -> greetings[1] + prefs.getString("username", "") + "." - } - } - 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 - } - }) + textViewGreeting.text = getGreetingString() +// val generator = Random() +// val greetings = resources.getStringArray(R.array.greeting8_array) +// val rightNow = Calendar.getInstance() +// val currentHour = rightNow.get(Calendar.HOUR_OF_DAY) +// +// textViewGreeting.text = when (generator.nextInt(9)) { +// 0 -> getString(R.string.greeting0, prefs.getString("username", "")) +// 1 -> getString(R.string.greeting1, prefs.getString("username", "")) +// 2 -> getString(R.string.greeting2, prefs.getString("username", "")) +// 3 -> getString(R.string.greeting3, prefs.getString("username", "")) +// 4 -> getString(R.string.greeting4, prefs.getString("username", "")) +// 5 -> getString(R.string.greeting5, prefs.getString("username", "")) +// 6 -> getString(R.string.greeting6, prefs.getString("username", "")) +// 7 -> getString(R.string.greeting7, prefs.getString("username", "")) +// 8 -> { +// when { +// currentHour < 11 -> greetings[0] + prefs.getString("username", "") + "." +// currentHour in 11..17 -> greetings[1] + prefs.getString("username", "") + "." +// else -> greetings[1] + prefs.getString("username", "") + "." +// } +// } +// else -> ";)" // getString(R.string.error) +// } } + } 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) diff --git a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt index 6ac0e2d..b4adbcb 100644 --- a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt +++ b/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) diff --git a/app/src/main/res/drawable/check_mark.xml b/app/src/main/res/drawable/check_mark.xml index 6852473..babaadf 100644 --- a/app/src/main/res/drawable/check_mark.xml +++ b/app/src/main/res/drawable/check_mark.xml @@ -6,14 +6,14 @@ diff --git a/app/src/main/res/layout/activity_first_time.xml b/app/src/main/res/layout/activity_first_time.xml index 3414013..d99c890 100644 --- a/app/src/main/res/layout/activity_first_time.xml +++ b/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"> - + + + + + + + @@ -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="parent" + app:layout_constraintStart_toStartOf="@+id/txtWelcome" app:layout_constraintTop_toBottomOf="@+id/txtWelcome" /> - + android:textSize="16sp"/> - + android:textSize="16sp"/> @@ -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_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses" + app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses" app:layout_constraintTop_toBottomOf="@+id/txtLayoutClass" /> - @@ -232,85 +214,70 @@ - - + + + app:layout_constraintTop_toTopOf="parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 55bdb56..473e0ae 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -16,7 +16,7 @@ + app:layout_constraintStart_toStartOf="parent"/> - - - + android:layout_marginStart="16dp" + android:layout_marginBottom="4dp" + android:textColor="@color/accent" + android:textSize="18sp" + android:fontFamily="@font/manrope_semibold"/> diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml index 5147330..82b6305 100644 --- a/app/src/main/res/layout/content_settings.xml +++ b/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"> + app:cardCornerRadius="12dp"> + app:cardCornerRadius="12dp"> + app:cardElevation="2dp"> diff --git a/app/src/main/res/layout/edittext_dialog.xml b/app/src/main/res/layout/edittext_dialog.xml index 09b0757..c03c6db 100644 --- a/app/src/main/res/layout/edittext_dialog.xml +++ b/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_marginEnd="16dp" + android:layout_marginStart="24dp" + 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"/> diff --git a/app/src/main/res/layout/empty_dialog.xml b/app/src/main/res/layout/empty_dialog.xml index d08765e..d647d2b 100644 --- a/app/src/main/res/layout/empty_dialog.xml +++ b/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_marginEnd="16dp" + android:layout_marginStart="24dp" + 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"/> diff --git a/app/src/main/res/layout/just_a_card.xml b/app/src/main/res/layout/just_a_card.xml index f86b8df..4c19137 100644 --- a/app/src/main/res/layout/just_a_card.xml +++ b/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"> diff --git a/app/src/main/res/layout/secret_dialog.xml b/app/src/main/res/layout/secret_dialog.xml index 386d551..8c4f34e 100644 --- a/app/src/main/res/layout/secret_dialog.xml +++ b/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_marginEnd="16dp" + android:layout_marginStart="24dp" + 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"/> diff --git a/app/src/main/res/layout/simple_dialog.xml b/app/src/main/res/layout/simple_dialog.xml index 32bf25f..f627f31 100644 --- a/app/src/main/res/layout/simple_dialog.xml +++ b/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_marginEnd="16dp" + android:layout_marginStart="24dp" + 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"/> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 80f62a9..a1bb014 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,14 +9,14 @@ Vertretungsplan Persönlich Einstellungen - Plan + Allgemein Dunkler Hintergrund Aktiviere Benachrichtigungen Aktiviert ebenfalls Hintergrund-Sync Persönlicher Plan Personalisieren Diverses - Standardmäßig ansonsten normaler Plan + Standardmäßig ansonsten allgemeiner Plan Persönlicher Plan als Standard Besuche die Schulwebsite Falls nötig @@ -34,19 +34,6 @@ Nur noch ein paar weitere Einstellungen. Dunklen Hintergrund aktivieren Viel Spaß! - Hallo, %s! - Wie geht\'s dir, %s? - Tagchen, %s! - Hey, %s! - Wie ist dein Tag, %s? - Schön dich zu sehen, %s. - Grüß dich, %s! - Hallöchen, %s! - - "Guten Morgen, " - "Guten Tag, " - "Schönen Abend, " - Aktiviere Begrüßungen Falls du möchtest, dass ich nett bin :) s Plan @@ -119,4 +106,35 @@ Zeige Info-Tab in Navigationsleisete "Zuletzt aktualisiert: " Aktiviert den Nachtmodus + Dein Plan + + Guten Morgen, %s! + Hab einen schönen Tag, %s. + Wie geht\'s dir, %s? + Gut geschlafen, %s? + Hey, %s! + Hi, %s! + Schön dich zu sehen, %s. + Wie geht\'s dir so, %s? + + + Guten Tag, %s! + Einen schönen Tag noch, %s. + Wie geht\'s dir, %s? + Hoffe du hast einen schönen Tag, %s. + Hey, %s! + Hi, %s! + Schön dich zu sehen, %s. + Genieß\' deinen Tag, %s. + + + Good evening, %s! + Enjoy your evening, %s. + Wie geht\'s dir, %s? + Genieß\' deinen Abend, %s. + Hey, %s! + Hi, %s! + Schlaf\' gut, %s. + Bleib\' nicht zu lang wach, %s! + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index aa8bf5b..3ad73df 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,6 +8,8 @@ #757575 #bdbdbd + #f5f5f5 + #F28B82 #FBBC04 #FFF475 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 347b59a..722b188 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,7 +9,7 @@ Personal Settings - Plan + General Dark background @@ -20,7 +20,7 @@ Personalise Miscellaneous Set personalised plan as default - Defaults to normal plan otherwise + Defaults to general plan otherwise Visit the school\'s website In case you need to Menu @@ -39,19 +39,6 @@ Enable dark mode Have fun! - Hello, %s! - How are you, %s? - Greetings, %s. - Hey, %s! - How\'s your day, %s? - Nice to see you, %s. - You alright, %s? - What\'s up, %s? - - "Good morning, " - "Good day, " - "Good evening, " - Enable greeting If you want me to be nice :) \'s Plan @@ -123,6 +110,7 @@ WAT Special Education WP & "Methodenstunde" + Clear all Colours for all courses have been cleared No Chrome-compatible browser found @@ -131,4 +119,37 @@ Independent of swipe gesture "Last updated: " Enables night mode + Your Plan + + + Good morning, %s! + Have a nice day, %s. + How are you, %s? + Slept well, %s? + Hey, %s! + Hi, %s! + Nice to see you, %s. + How\'ve you been, %s? + + + Good day, %s! + Hope you\'re having a nice day, %s. + How are you, %s? + Enjoying your day, %s? + Hey, %s! + Hi, %s! + Nice to see you, %s. + Enjoy your day, %s! + + + Good evening, %s! + Enjoy your evening, %s. + How are you, %s? + Enjoying your evening, %s? + Hey, %s! + Hi, %s! + Sleep tight, %s. + Stayin\' up late, %s? + +