From b186a2e96e1d1381cd66a81a65a1c5d2b696af94 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Wed, 5 Feb 2020 14:10:45 +0100 Subject: [PATCH] release version 0.5.1 --- app/build.gradle | 2 +- .../org/mosad/seil0/projectlaogai/MainActivity.kt | 4 +++- .../seil0/projectlaogai/controller/CacheController.kt | 8 +++++--- .../seil0/projectlaogai/controller/NFCMensaCard.kt | 2 +- .../projectlaogai/fragments/TimeTableFragment.kt | 2 +- app/src/main/res/values-de-rDE/strings.xml | 11 +++++++---- app/src/main/res/values/strings.xml | 7 +++++-- fastlane/metadata/android/en-US/changelogs/15.txt | 2 +- 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 666963f..a634a62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdkVersion 23 targetSdkVersion 29 versionCode 15 - versionName "0.5.190" + versionName "0.5.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "build_time", buildTime() setProperty("archivesBaseName", "projectlaogai-$versionName") 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 c8a3b83..b4398ab 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -30,6 +30,7 @@ import android.nfc.NfcAdapter import android.nfc.NfcManager import android.nfc.tech.NfcA import android.os.Bundle +import android.util.Log import android.view.Menu import android.view.MenuItem import androidx.appcompat.app.ActionBarDrawerToggle @@ -56,6 +57,7 @@ import kotlin.system.measureTimeMillis class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener { private var activeFragment: Fragment = HomeFragment() // the currently active fragment, home at the start + private val className = "MainActivity" private lateinit var adapter: NfcAdapter private lateinit var pendingIntent: PendingIntent @@ -173,7 +175,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte PreferencesController.load(this) // load the settings, must be finished before doing anything else CacheController(this) // load the cache } - println("startup completed in $startupTime ms") + Log.i(className, "startup completed in $startupTime ms") } private fun initAesthetic() { diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt index 3c97140..ad9b047 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt @@ -23,6 +23,7 @@ package org.mosad.seil0.projectlaogai.controller import android.content.Context +import android.util.Log import com.google.gson.Gson import com.google.gson.GsonBuilder import com.google.gson.JsonParser @@ -43,6 +44,7 @@ import kotlin.collections.ArrayList class CacheController(cont: Context) { + private val className = "CacheController" private val context = cont init { @@ -56,7 +58,7 @@ class CacheController(cont: Context) { // if a) it's monday and the last cache update was on sunday or b) the cache is older than 24hr, update blocking if ((currentDay == Calendar.MONDAY && cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) || (currentTime - mensaMenu.meta.updateTime) > 86400) { - println("update mensa blocking") + Log.i(className, "update mensa blocking") GlobalScope.launch(Dispatchers.Default) { TCoRAPIController.getMensa(context).join() } } @@ -66,7 +68,7 @@ class CacheController(cont: Context) { // if a) it`s monday and the last cache update was not on a sunday or b) the cache is older than 24hr, update blocking if ((currentDay == Calendar.MONDAY && cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) || (currentTime - timetables[0].meta.updateTime) > 86400) { - println("updating timetable after sunday!") + Log.i(className, "updating timetable after sunday!") GlobalScope.launch(Dispatchers.Default) { val threads = listOf( @@ -171,7 +173,7 @@ class CacheController(cont: Context) { * read coursesList, mensa (current and next week), timetable (current and next week) * @param courseName the course name (e.g AI1) */ - fun readStartCache(courseName: String) { + private fun readStartCache(courseName: String) { readCoursesList(context) readMensa(context) readTimetable(courseName, 0, context) diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt index 73935d9..c19db0a 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt @@ -66,7 +66,7 @@ class NFCMensaCard { lookAtMe(context, data, settings.value).show() } } catch (ex: Exception) { - Log.i(className,"could not connect to tag", ex) + Log.w(className,"could not connect to tag", ex) } } diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt index fc1fb75..66b9148 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt @@ -82,7 +82,7 @@ class TimeTableFragment : Fragment() { faBtnAddLesson.setOnClickListener { MaterialDialog(context!!) - .title(text = "Vorlesung hinzufügen") + .title(text = resources.getString(R.string.add_lesson)) .message(text = "wähle einen Studiengang aus:\n\nWähle eine Vorlesung aus: \n\n Diese Funktion ist noch nicht verfügbar") .show() } diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 0abcc1d..1a787f2 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -18,20 +18,23 @@ Diese Woche keine weitere Essensausgabe heute keine Vorlesung! + + Eine Vorlesung hinzufügen + Info Benutzer - Tippen, um den Kurs zu ändern + Tippe um den Kurs zu ändern Über Lizenzen Design Hell Dunkel Schwarz - Hauptfarbe - Die Primärfarbe, Standard ist Schwarz. + Primärfarbe + Zum Ändern tippen, Standard ist Schwarz. Akzentfarbe - Die Akzentfarbe, Standard ist indigo + Zum Ändern tippen, Standard ist Indigo. Buffet immer anzeigen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 25f25ef..1a03827 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,6 +20,9 @@ No more Food this week "No lecture today!" + + Add a lesson + Info User @@ -34,9 +37,9 @@ Dark Black Primary color - The primary color, default is black. + Tap to change, default is black. Accent color - The accent color, default is indigo. + Tap to change, default is indigo. Always show buffet diff --git a/fastlane/metadata/android/en-US/changelogs/15.txt b/fastlane/metadata/android/en-US/changelogs/15.txt index 375d883..39a72bf 100644 --- a/fastlane/metadata/android/en-US/changelogs/15.txt +++ b/fastlane/metadata/android/en-US/changelogs/15.txt @@ -2,4 +2,4 @@ This release 0.5.1 is called "artistical Apollon". * new: it's now possible to use App shortcuts for the timetable, mensa and moodle screen * change: updated some libs, updated kotlin to 1.3.61 -* change: the app was updated to use kotlin coroutines instead of anko for asynchronous work loads +* change: the app was updated to use kotlin coroutines instead of anko for asynchronous workloads