From 15f1386b6e2e4361b7911125a36b20925b665af4 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Tue, 19 Mar 2019 19:51:58 +0100 Subject: [PATCH] some minor gui fixes * why was minifyEnabled = false ?????????? --- app/build.gradle | 22 ++++++++++++++----- .../mosad/seil0/projectlaogai/MainActivity.kt | 4 ++-- .../fragments/SettingsFragment.kt | 14 +++++++----- .../uicomponents/LessonTextView.kt | 3 ++- .../uicomponents/MensaDayCardView.kt | 3 ++- app/src/main/res/layout/fragment_settings.xml | 6 ++--- app/src/main/res/layout/nav_header_main.xml | 2 +- app/src/main/res/values-de-rDE/strings.xml | 2 +- app/src/main/res/values/colors.xml | 17 ++++++++++++++ app/src/main/res/values/strings.xml | 10 ++++----- 10 files changed, 57 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0fce1af..2587225 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,17 @@ android { targetSdkVersion 28 versionCode 11 versionName "0.3.96" + versionNameSuffix "-beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + resValue "string", "build_time", buildTime() } + buildTypes { release { - minifyEnabled false + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + versionNameSuffix "-release" } } compileOptions { @@ -29,17 +34,22 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'org.jetbrains.anko:anko-commons:0.10.8' implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' - implementation 'org.jetbrains.anko:anko-commons:0.10.8' - implementation 'com.afollestad:aesthetic:1.0.0-beta05' - implementation 'com.afollestad.material-dialogs:core:2.0.3' - implementation 'com.afollestad.material-dialogs:color:2.0.3' + implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.afollestad:aesthetic:1.0.0-beta05' + implementation 'com.afollestad.material-dialogs:core:2.2.0' + implementation 'com.afollestad.material-dialogs:color:2.2.0' + testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } + +static def buildTime() { + return new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC")) +} \ No newline at end of file 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 3e65409..19de5a2 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -35,14 +35,14 @@ import com.afollestad.aesthetic.Aesthetic import com.google.android.material.navigation.NavigationView import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.app_bar_main.* +import org.mosad.seil0.projectlaogai.controller.CacheController +import org.mosad.seil0.projectlaogai.controller.PreferencesController import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cColorAccent import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cColorPrimary import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cCourse import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.coursesCacheTime import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.mensaCacheTime import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.timetableCacheTime -import org.mosad.seil0.projectlaogai.controller.CacheController -import org.mosad.seil0.projectlaogai.controller.PreferencesController import org.mosad.seil0.projectlaogai.controller.TCoRAPIController import org.mosad.seil0.projectlaogai.fragments.* import java.sql.Date diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt index 4085230..d154279 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt @@ -38,6 +38,7 @@ import com.afollestad.materialdialogs.list.listItems import kotlinx.android.synthetic.main.fragment_settings.* import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread +import org.mosad.seil0.projectlaogai.BuildConfig import org.mosad.seil0.projectlaogai.controller.PreferencesController import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cColorAccent import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cColorPrimary @@ -58,7 +59,7 @@ class SettingsFragment : Fragment() { private lateinit var linLayoutUser: LinearLayout private lateinit var linLayoutCourse: LinearLayout - private lateinit var linLayoutInfo: LinearLayout + private lateinit var linLayoutAbout: LinearLayout private lateinit var linLayoutPrimaryColor: LinearLayout private lateinit var linLayoutAccentColor: LinearLayout private lateinit var switchBuffet: Switch @@ -69,7 +70,7 @@ class SettingsFragment : Fragment() { linLayoutUser = view.findViewById(R.id.linLayout_User) linLayoutCourse = view.findViewById(R.id.linLayout_Course) - linLayoutInfo = view.findViewById(R.id.linLayout_Info) + linLayoutAbout = view.findViewById(R.id.linLayout_About) linLayoutPrimaryColor = view.findViewById(R.id.linLayout_PrimaryColor) linLayoutAccentColor = view.findViewById(R.id.linLayout_AccentColor) switchBuffet = view.findViewById(R.id.switch_buffet) @@ -84,6 +85,7 @@ class SettingsFragment : Fragment() { super.onViewCreated(view, savedInstanceState) txtView_Course.text = cCourse.courseName + txtView_AboutDesc.text = resources.getString(R.string.about_version, BuildConfig.VERSION_NAME, getString(R.string.build_time)) switch_buffet.isChecked = cShowBuffet // init switch } @@ -100,11 +102,11 @@ class SettingsFragment : Fragment() { txtView_Course.text = cCourse.courseName // update txtView } - linLayoutInfo.setOnClickListener { + linLayoutAbout.setOnClickListener { // open a new info dialog MaterialDialog(context!!) - .title(R.string.about) - .message(R.string.about_text) + .title(R.string.about_dialog_heading) + .message(R.string.about_dialog_text) .show() } @@ -162,7 +164,7 @@ class SettingsFragment : Fragment() { // open a new dialog MaterialDialog(context) .title(R.string.select_course) - .listItems(items = courseNameList) { _, index, text -> + .listItems(items = courseNameList) { _, index, _ -> val dialog = MaterialDialog(context).cancelable(false) .cancelOnTouchOutside(false) diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonTextView.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonTextView.kt index 13b4063..9f8bb82 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonTextView.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonTextView.kt @@ -4,6 +4,7 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.widget.TextView +import org.mosad.seil0.projectlaogai.R import org.mosad.seil0.projectlaogai.hsoparser.Lesson class LessonTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : TextView(context, attrs) { @@ -15,7 +16,7 @@ class LessonTextView @JvmOverloads constructor(context: Context, attrs: Attribut } fun setLesson(lesson: Lesson) { - this.text = resources.getString(org.mosad.seil0.projectlaogai.R.string.string_new_line, lesson.lessonSubject) + this.text = resources.getString(R.string.string_new_line, lesson.lessonSubject) this.append(lesson.lessonTeacher + "\n") this.append(lesson.lessonRoom) } diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MensaDayCardView.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MensaDayCardView.kt index 2d5bfea..a39752c 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MensaDayCardView.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MensaDayCardView.kt @@ -23,6 +23,7 @@ package org.mosad.seil0.projectlaogai.uicomponents import android.content.Context +import android.graphics.Color import android.util.AttributeSet import android.widget.LinearLayout import android.widget.TextView @@ -40,7 +41,7 @@ class MensaDayCardView @JvmOverloads constructor(context: Context, attrs: Attrib txtViewDayHeading = findViewById(R.id.txtView_DayHeading) // workaround to prevent a white border - //this.setBackgroundColor(Color.TRANSPARENT) + this.setBackgroundColor(Color.TRANSPARENT) } fun getLinLayoutMensaDay(): LinearLayout { diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index aa3aecc..6429411 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -78,7 +78,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="7dp" - android:id="@+id/linLayout_Info"> + android:id="@+id/linLayout_About"> + android:layout_height="wrap_content" android:id="@+id/txtView_AboutDesc"/> diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 847f473..087f997 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/nav_header_vertical_spacing" android:text="@string/nav_header_title" - android:textAppearance="@style/TextAppearance.AppCompat.Body1"/> + android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:id="@+id/txtView_nav_header_title"/> Akzentfarbe Die Akzentfarbe, Standard ist indigo auswählen - über + Über lade Stundenplan … Navigationsleiste schließen Navigationsleiste öffnen diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7631f85..9b85180 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,4 +5,21 @@ #3F51B5 #ebe8e9 #FFFFFF + + + #FFFFFF + #F5F5F5 + #000000 + #818181 + + #000000 + #202020 + #424242 + + #FFFFFF + #202020 + #424242 + + #424242 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ebc8935..7f53880 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.3.96 + Project Laogai seil0@mosad.xyz Project Laogai @@ -34,16 +34,17 @@ Info User Tap to change course + Select your course primary color The primary color, default is black. accent color The accent color, default is indigo. always show buffet select - version 0.3.96 - 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-2019 seil0@mosad.xyz " + version %1$s (%2$s) + About + "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-2019 seil0@mosad.xyz " loading timetable … %1$s\n @@ -56,6 +57,5 @@ org.mosad.seil0.projectlaogai.coursesCacheTime org.mosad.seil0.projectlaogai.mensaCacheTime org.mosad.seil0.projectlaogai.timetableCacheTime - Select your course