diff --git a/app/build.gradle b/app/build.gradle index ff80d43..b6a153e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "org.mosad.seil0.projectlaogai" minSdkVersion 21 targetSdkVersion 28 - versionCode 7 - versionName "0.2.3" + versionCode 8 + versionName "0.3.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1ee1cb7..83f046f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ android:allowBackup="true" android:icon="@mipmap/ic_laogai_icon" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_laogai_icon_round" + android:roundIcon="@mipmap/ic_laogai_icon" android:supportsRtl="true" android:theme="@style/AppTheme"> diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt index 755c14e..5c8680e 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt @@ -70,7 +70,7 @@ class TimeTableParser { return courseTTLinkList } - + @Suppress("unused") fun printTimeTableWeek (timeTableWeek: Array>) { for (j in 0..5) print(days[j].padEnd(25 ,' ') + " | ") diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml index 0e968ff..856328b 100644 --- a/app/src/main/res/drawable/background_splash.xml +++ b/app/src/main/res/drawable/background_splash.xml @@ -4,10 +4,12 @@ - + + + + android:gravity="fill_horizontal|fill_vertical" + android:src="@mipmap/ic_laogai_icon_splash"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml index ace746c..0aafab0 100644 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml @@ -1,9 +1,9 @@ - + android:width="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index de0d212..3341c55 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -50,13 +50,12 @@ android:id="@+id/cardView2" android:layout_width="0dp" android:layout_height="125dp" - android:layout_marginStart="5dp" - android:layout_marginEnd="5dp" app:cardUseCompatPadding="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/cardView" android:elevation="5dp"> + app:layout_constraintTop_toBottomOf="@+id/cardView" android:elevation="5dp" + android:layout_marginEnd="5dp" android:layout_marginStart="5dp"> + android:background="@color/md_divider_dark_theme" android:paddingTop="6dp" + android:layout_marginTop="5dp"> + android:layout_height="wrap_content" android:id="@+id/linLayout_MensaDay" android:paddingBottom="5dp"> 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 deleted file mode 100644 index 036d09b..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon_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_round.png b/app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png deleted file mode 100644 index 51a9b20..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png and /dev/null 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 deleted file mode 100644 index 146265a..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_laogai_icon_round.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_laogai_icon_round.png b/app/src/main/res/mipmap-mdpi/ic_laogai_icon_splash.png similarity index 100% rename from app/src/main/res/drawable/ic_laogai_icon_round.png rename to app/src/main/res/mipmap-mdpi/ic_laogai_icon_splash.png 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 deleted file mode 100644 index 8644cf2..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_laogai_icon_round.png and /dev/null 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 deleted file mode 100644 index 4255977..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_laogai_icon_round.png and /dev/null 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 deleted file mode 100644 index 49ccb84..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon_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 85992d3..aeb46d4 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -23,7 +23,6 @@ auswählen über lade Stundenplan … - bald ™ Navigationsleiste schließen Navigationsleiste öffnen \ 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 7c918f0..01b62ab 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,4 +4,5 @@ #000000 #d81b60 #ebe8e9 + #FFFFFF diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 4ab4520..a445aca 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -4,5 +4,4 @@ 16dp 8dp 176dp - 16dp \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index c5d5899..0000000 --- a/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #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 9afd071..940f892 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ Project Laogai Open navigation drawer Close navigation drawer - hso App 0.2.3 + hso App 0.3.0 seil0@mosad.xyz Project Laogai @@ -36,14 +36,13 @@ primary color The primary color, default is indigo select - version 0.2.3 + version 0.3.0 about hso App by @Seil0 "This software is made by @Seil0 and is published under the terms and conditions of GPL 3. For further information visit \ngit.mosad.xyz/Seil0/ProjectLaogai \n\n© 2018 seil0@mosad.xyz " loading timetable … - soon ™ %1$s\n org.mosad.seil0.projectlaogai.course diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml deleted file mode 100644 index 6fd6103..0000000 --- a/app/src/main/res/xml/backup_descriptor.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -