From e6c409678798940c5a608682d99091dd85be6426 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sun, 18 Nov 2018 21:28:43 +0100 Subject: [PATCH] minor gui fixes, clean up --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- .../projectlaogai/hsoparser/TimeTableParser.kt | 2 +- app/src/main/res/drawable/background_splash.xml | 8 +++++--- .../res/drawable/ic_settings_black_24dp.xml | 12 ++++++------ app/src/main/res/layout/fragment_home.xml | 8 ++++---- app/src/main/res/layout/mensaday_cardview.xml | 2 +- app/src/main/res/layout/nav_header_main.xml | 2 +- .../mipmap-anydpi-v26/ic_laogai_icon_round.xml | 5 ----- .../res/mipmap-hdpi/ic_laogai_icon_round.png | Bin 3376 -> 0 bytes .../res/mipmap-mdpi/ic_laogai_icon_round.png | Bin 2105 -> 0 bytes .../ic_laogai_icon_splash.png} | Bin .../res/mipmap-xhdpi/ic_laogai_icon_round.png | Bin 4818 -> 0 bytes .../res/mipmap-xxhdpi/ic_laogai_icon_round.png | Bin 7860 -> 0 bytes .../res/mipmap-xxxhdpi/ic_laogai_icon_round.png | Bin 11661 -> 0 bytes app/src/main/res/values-de-rDE/strings.xml | 1 - app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/dimens.xml | 1 - .../main/res/values/ic_launcher_background.xml | 4 ---- app/src/main/res/values/strings.xml | 5 ++--- app/src/main/res/xml/backup_descriptor.xml | 4 ---- 21 files changed, 24 insertions(+), 37 deletions(-) delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon_round.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_laogai_icon_round.png rename app/src/main/res/{drawable/ic_laogai_icon_round.png => mipmap-mdpi/ic_laogai_icon_splash.png} (100%) delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_laogai_icon_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_laogai_icon_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon_round.png delete mode 100644 app/src/main/res/values/ic_launcher_background.xml delete mode 100644 app/src/main/res/xml/backup_descriptor.xml 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 51a9b20fd495c8afd4f5284626895e4f7c2fd8dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3376 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
  • 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 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 8644cf28355b683918a7ac38e3d1b67764697693..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4818 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 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 42559776f9be0880f2fd33595fb61031c5cb6954..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7860 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 UQY@T-*Q^0GC2hrOd8^m|11Grh6aWAK 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 @@ - - - -