diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59..37a7509 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 2ca5880..7107293 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.denizd.substitutionplan" minSdkVersion 21 targetSdkVersion 28 - versionCode 10 - versionName "1.2.5" + versionCode 11 + versionName "1.2.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java index c8c136b..8418a48 100644 --- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java +++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java @@ -1,5 +1,8 @@ package com.denizd.substitutionplan; +import android.content.SharedPreferences; +import android.graphics.PorterDuff; +import android.preference.PreferenceManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,6 +13,7 @@ import java.util.ArrayList; import java.util.List; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; public class CardAdapter extends RecyclerView.Adapter { @@ -50,6 +54,7 @@ public class CardAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.O) { - notification = new NotificationCompat.Builder(mContext) + notification = new NotificationCompat.Builder(mContext) // TODO switch out the deprecated notification delivery method // .setContentTitle(getString(R.string.subst)) // .setStyle(new NotificationCompat.BigTextStyle() // .bigText(notifText)) diff --git a/app/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml index 5c66acd..abb52e4 100644 --- a/app/src/main/res/layout/bottom_sheet.xml +++ b/app/src/main/res/layout/bottom_sheet.xml @@ -13,7 +13,8 @@ + android:layout_height="match_parent" + android:scrollbars="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml index 1c0322c..4d7e964 100644 --- a/app/src/main/res/layout/content_settings.xml +++ b/app/src/main/res/layout/content_settings.xml @@ -129,6 +129,43 @@ app:layout_constraintStart_toStartOf="@+id/txtDark" app:layout_constraintTop_toTopOf="@+id/txtDark" /> + + + + + + + app:layout_constraintTop_toBottomOf="@+id/txtCustomiseColours2" /> + app:cardCornerRadius="4dp" + android:clickable="true" + android:focusable="true" + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:layout_marginTop="1dp" + android:layout_marginBottom="1dp" + app:cardElevation="1dp"> + + + android:tint="?attr/colorText"/> + + diff --git a/app/src/main/res/layout/empty_dialog.xml b/app/src/main/res/layout/empty_dialog.xml new file mode 100644 index 0000000..8ecb08c --- /dev/null +++ b/app/src/main/res/layout/empty_dialog.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/forever_alone_button.xml b/app/src/main/res/layout/forever_alone_button.xml new file mode 100644 index 0000000..a4fd95b --- /dev/null +++ b/app/src/main/res/layout/forever_alone_button.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/just_a_card.xml b/app/src/main/res/layout/just_a_card.xml index 8726c2e..c51caff 100644 --- a/app/src/main/res/layout/just_a_card.xml +++ b/app/src/main/res/layout/just_a_card.xml @@ -1,37 +1,32 @@ - + android:backgroundTint="?attr/colorBackgroundCard" + app:cardCornerRadius="4dp" + android:clickable="true" + android:focusable="true" + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:layout_marginTop="1dp" + android:layout_marginBottom="1dp" + app:cardElevation="1dp" + xmlns:android="http://schemas.android.com/apk/res/android"> - + android:layout_height="wrap_content"> - + android:layout_height="wrap_content" + android:textColor="?attr/colorText" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp"/> - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml new file mode 100644 index 0000000..5a89d7f --- /dev/null +++ b/app/src/main/res/layout/list_item.xml @@ -0,0 +1,24 @@ + + + + + + + + \ 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 549ff21..a97f2c1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -92,4 +92,36 @@ Oder kauf dir ein gutes Smartphone Informationen bezüglich deines Gerätes Suche online + Benutzerdefinierte Farben + Farben für jedes Fach einstellen + Deutsch (+ DAZ) + Mathematik + Englisch (+ ENA) + Sport + Politik + Darstellendes Spiel + Physik + Biologie & Naturwissenschaften + Chemie + Philosophie + Latein + Spanisch + Französisch + Informatik + Geschichte + Religion + Geographie & WUK + Kunst + Musik + Türkisch + Chinesisch + GLL + WAT + Förderunterricht + WP & Methodenstunde + Neonfarben + Alle löschen + Farben für alle Kurse wurden gelöscht + Farbe löschen + Fertigstellen \ 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 cef6d6a..011b465 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -19,4 +19,27 @@ #42000000 + #e53935 + #E91E63 + #9C27B0 + #673AB7 + #AB47BC + #3F51B5 + #1976D2 + #2196F3 + #009688 + #43A047 + #FDD835 + #F4511E + + #ff1744 + #F50057 + #D500F9 + #651FFF + #2979FF + #00E676 + #FFEA00 + #FF3D00 + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 562c7ed..82091bc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -105,6 +105,43 @@ Search online + Customise colours + Customise every subject individually + + German (+ as a second language) + Mathematics + English (+ for beginners) + Physical Education + Politics + Theatre + Physics + Biology & Natural Sciences + Chemistry + Philosophy + Latin + Spanish + French + Computer Science + History + Religion + Geography & WUK + Arts + Music + Turkish + Chinese + GLL + WAT + Special Education + WP & "Methodenstunde" + + Neon colours + + Clear all + Clear colour + Colours for all courses have been cleared + Finish + +