diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 90b3833..1ee1cb7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,9 +5,9 @@ diff --git a/app/src/main/ic_laogai_icon-web.png b/app/src/main/ic_laogai_icon-web.png new file mode 100644 index 0000000..08c2458 Binary files /dev/null and b/app/src/main/ic_laogai_icon-web.png differ diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt index 1136863..6128533 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -130,9 +130,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte } R.id.nav_moodle -> { - } - R.id.nav_email -> { - } R.id.nav_settings -> { val settingsFragment = SettingsFragment() diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonCardView.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonCardView.kt index 56f7928..739d635 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonCardView.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonCardView.kt @@ -40,7 +40,7 @@ class LessonCardView @JvmOverloads constructor(context: Context, attrs: Attribu txtViewTime = findViewById(R.id.txtView_Time) // workaround to prevent a white border - this.setBackgroundColor(Color.parseColor("#3F51B5")) + this.setBackgroundColor(Color.TRANSPARENT) } fun getTxtViewLesson(): TextView { diff --git a/app/src/main/res/drawable-v24/ic_launcher.png b/app/src/main/res/drawable-v24/ic_launcher.png deleted file mode 100644 index b0907ca..0000000 Binary files a/app/src/main/res/drawable-v24/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 6348baa..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml index e9d26a3..0e968ff 100644 --- a/app/src/main/res/drawable/background_splash.xml +++ b/app/src/main/res/drawable/background_splash.xml @@ -7,7 +7,7 @@ + android:src="@drawable/ic_laogai_icon_round"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_laogai_icon_round.png b/app/src/main/res/drawable/ic_laogai_icon_round.png new file mode 100644 index 0000000..4255977 Binary files /dev/null and b/app/src/main/res/drawable/ic_laogai_icon_round.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index a0ad202..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_local_dining_black_24dp.xml b/app/src/main/res/drawable/ic_local_dining_black_24dp.xml new file mode 100644 index 0000000..7375ec3 --- /dev/null +++ b/app/src/main/res/drawable/ic_local_dining_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_menu_slideshow.xml b/app/src/main/res/drawable/ic_menu_slideshow.xml deleted file mode 100644 index ae51e49..0000000 --- a/app/src/main/res/drawable/ic_menu_slideshow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_free_breakfast_black_24dp.xml b/app/src/main/res/drawable/ic_school_black_24dp.xml similarity index 60% rename from app/src/main/res/drawable/ic_free_breakfast_black_24dp.xml rename to app/src/main/res/drawable/ic_school_black_24dp.xml index 3d0272a..30d83f8 100644 --- a/app/src/main/res/drawable/ic_free_breakfast_black_24dp.xml +++ b/app/src/main/res/drawable/ic_school_black_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:pathData="M5,13.18v4L12,21l7,-3.82v-4L12,17l-7,-3.82zM12,3L1,9l11,6 9,-4.91V17h2V9L12,3z"/> diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index f3a3e17..f99d9e0 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -20,7 +20,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/design_default_color_primary" + android:background="@color/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay"/> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 4206f37..de0d212 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -19,12 +19,11 @@ android:layout_marginEnd="5dp" android:clickable="false" android:maxHeight="125dp" - app:cardCornerRadius="15dp" app:cardUseCompatPadding="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" android:elevation="5dp"> + app:layout_constraintTop_toBottomOf="@+id/cardView" android:elevation="5dp"> + android:background="@color/md_divider_dark_theme" android:paddingTop="6dp"> + app:cardElevation="5dp" + app:cardUseCompatPadding="true" app:cardPreventCornerOverlap="false" app:contentPadding="5dp"> diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 70b33f2..ed094a0 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -7,7 +7,7 @@ - + app:showAsAction="never" android:visible="false"/> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon.xml b/app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index bbd3e02..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index bbd3e02..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_laogai_icon.png b/app/src/main/res/mipmap-hdpi/ic_laogai_icon.png new file mode 100644 index 0000000..51a9b20 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_laogai_icon.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png b/app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png new file mode 100644 index 0000000..51a9b20 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 898f3ed..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..11bc559 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index dffca36..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_laogai_icon.png b/app/src/main/res/mipmap-mdpi/ic_laogai_icon.png new file mode 100644 index 0000000..146265a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_laogai_icon.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_laogai_icon_round.png b/app/src/main/res/mipmap-mdpi/ic_laogai_icon_round.png new file mode 100644 index 0000000..146265a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_laogai_icon_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 64ba76f..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a5db2ba Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index dae5e08..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_laogai_icon.png b/app/src/main/res/mipmap-xhdpi/ic_laogai_icon.png new file mode 100644 index 0000000..8644cf2 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_laogai_icon.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_laogai_icon_round.png b/app/src/main/res/mipmap-xhdpi/ic_laogai_icon_round.png new file mode 100644 index 0000000..8644cf2 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_laogai_icon_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index e5ed465..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2b0c162 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 14ed0af..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_laogai_icon.png b/app/src/main/res/mipmap-xxhdpi/ic_laogai_icon.png new file mode 100644 index 0000000..4255977 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_laogai_icon.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_laogai_icon_round.png b/app/src/main/res/mipmap-xxhdpi/ic_laogai_icon_round.png new file mode 100644 index 0000000..4255977 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_laogai_icon_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index b0907ca..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..4d419b1 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index d8ae031..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon.png b/app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon.png new file mode 100644 index 0000000..49ccb84 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon_round.png new file mode 100644 index 0000000..49ccb84 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 2c18de9..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..8cb1cf1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index beed3cd..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index e6c3a4d..85992d3 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -4,7 +4,6 @@ Mensa Stundenplan Moodle - E-Mail Einstellungen Essen 1 Essen 2 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4a25680..7c918f0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ - @color/design_default_color_primary - @color/design_default_color_primary_dark + #000000 + #000000 #d81b60 #ebe8e9 diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ 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 002f805..9afd071 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,6 @@ Mensa Timetable Moodle - E-Mail Settings Meal 1