Browse Source

minor gui fixes, clean up

pull/20/head 0.3.0
Jannik 4 years ago
parent
commit
e6c4096787
  1. 4
      app/build.gradle
  2. 2
      app/src/main/AndroidManifest.xml
  3. 2
      app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt
  4. 8
      app/src/main/res/drawable/background_splash.xml
  5. 12
      app/src/main/res/drawable/ic_settings_black_24dp.xml
  6. 8
      app/src/main/res/layout/fragment_home.xml
  7. 2
      app/src/main/res/layout/mensaday_cardview.xml
  8. 2
      app/src/main/res/layout/nav_header_main.xml
  9. 5
      app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon_round.xml
  10. BIN
      app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png
  11. BIN
      app/src/main/res/mipmap-mdpi/ic_laogai_icon_round.png
  12. 0
      app/src/main/res/mipmap-mdpi/ic_laogai_icon_splash.png
  13. BIN
      app/src/main/res/mipmap-xhdpi/ic_laogai_icon_round.png
  14. BIN
      app/src/main/res/mipmap-xxhdpi/ic_laogai_icon_round.png
  15. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon_round.png
  16. 1
      app/src/main/res/values-de-rDE/strings.xml
  17. 1
      app/src/main/res/values/colors.xml
  18. 1
      app/src/main/res/values/dimens.xml
  19. 4
      app/src/main/res/values/ic_launcher_background.xml
  20. 5
      app/src/main/res/values/strings.xml
  21. 4
      app/src/main/res/xml/backup_descriptor.xml

4
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 {

2
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">

2
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<Array<Lesson>>) {
for (j in 0..5) print(days[j].padEnd(25 ,' ') + " | ")

8
app/src/main/res/drawable/background_splash.xml

@ -4,10 +4,12 @@
<item
android:drawable="@color/colorPrimary"/>
<item>
<!--TODO when minAPI is 23 use this-->
<!--<item android:gravity="center" android:width="144dp" android:height="144dp">-->
<item android:gravity="center">
<bitmap
android:gravity="center"
android:src="@drawable/ic_laogai_icon_round"/>
android:gravity="fill_horizontal|fill_vertical"
android:src="@mipmap/ic_laogai_icon_splash"/>
</item>
</layer-list>

12
app/src/main/res/drawable/ic_settings_black_24dp.xml

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:autoMirrored="true"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
android:width="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path android:fillColor="#FF000000"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
</vector>

8
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">
<LinearLayout
android:orientation="vertical"
@ -86,7 +85,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cardView2" android:id="@+id/scrollViewTimeTable"
android:background="@color/md_divider_dark_theme" android:paddingTop="6dp">
android:background="@color/md_divider_dark_theme" android:paddingTop="6dp"
android:layout_marginTop="5dp">
<LinearLayout
android:id="@+id/linLayoutTimeTable"

2
app/src/main/res/layout/mensaday_cardview.xml

@ -12,7 +12,7 @@
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:id="@+id/linLayout_MensaDay">
android:layout_height="wrap_content" android:id="@+id/linLayout_MensaDay" android:paddingBottom="5dp">
<TextView
android:text="@string/sample_date"
android:layout_width="match_parent"

2
app/src/main/res/layout/nav_header_main.xml

@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
app:srcCompat="@mipmap/ic_laogai_icon_round"
app:srcCompat="@mipmap/ic_laogai_icon"
android:contentDescription="@string/nav_header_desc"
android:id="@+id/imageView"/>

5
app/src/main/res/mipmap-anydpi-v26/ic_laogai_icon_round.xml

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_laogai_icon_round.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_laogai_icon_round.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

0
app/src/main/res/drawable/ic_laogai_icon_round.png → app/src/main/res/mipmap-mdpi/ic_laogai_icon_splash.png

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_laogai_icon_round.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_laogai_icon_round.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_laogai_icon_round.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

1
app/src/main/res/values-de-rDE/strings.xml

@ -23,7 +23,6 @@
<string name="select">auswählen</string>
<string name="about">über</string>
<string name="loading_timetable">lade Stundenplan …</string>
<string name="hello_blank_fragment">bald ™</string>
<string name="navigation_drawer_close">Navigationsleiste schließen</string>
<string name="navigation_drawer_open">Navigationsleiste öffnen</string>
</resources>

1
app/src/main/res/values/colors.xml

@ -4,4 +4,5 @@
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#d81b60</color>
<color name="colorMensaDay">#ebe8e9</color>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

1
app/src/main/res/values/dimens.xml

@ -4,5 +4,4 @@
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="nav_header_vertical_spacing">8dp</dimen>
<dimen name="nav_header_height">176dp</dimen>
<dimen name="fab_margin">16dp</dimen>
</resources>

4
app/src/main/res/values/ic_launcher_background.xml

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

5
app/src/main/res/values/strings.xml

@ -2,7 +2,7 @@
<string name="app_name" translatable="false">Project Laogai</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="nav_header_title" translatable="false">hso App 0.2.3</string>
<string name="nav_header_title" translatable="false">hso App 0.3.0</string>
<string name="nav_header_subtitle" translatable="false">seil0@mosad.xyz</string>
<string name="nav_header_desc" translatable="false">Project Laogai</string>
@ -36,14 +36,13 @@
<string name="primary_color">primary color</string>
<string name="main_color_desc">The primary color, default is indigo</string>
<string name="select">select</string>
<string name="version" translatable="false">version 0.2.3</string>
<string name="version" translatable="false">version 0.3.0</string>
<string name="about">about</string>
<string name="about_txtView" translatable="false">hso App by @Seil0</string>
<string name="about_text" translatable="false">"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 "</string>
<string name="loading_timetable">loading timetable …</string>
<string name="hello_blank_fragment">soon ™</string>
<string name="string_new_line" translatable="false">%1$s\n</string>
<string name="save_key_course" translatable="false">org.mosad.seil0.projectlaogai.course</string>

4
app/src/main/res/xml/backup_descriptor.xml

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
<!-- Exclude specific shared preferences that contain GCM registration Id -->
</full-backup-content>
Loading…
Cancel
Save

Du besuchst diese Seite mit einem veralteten IPv4-Internetzugang. Möglicherweise treten in Zukunft Probleme mit der Erreichbarkeit und Performance auf. Bitte frage deinen Internetanbieter oder Netzwerkadministrator nach IPv6-Unterstützung.
You are visiting this site with an outdated IPv4 internet access. You may experience problems with accessibility and performance in the future. Please ask your ISP or network administrator for IPv6 support.
Weitere Infos | More Information
Klicke zum schließen | Click to close