diff --git a/.drone.yml b/.drone.yml index cfb7155..0affa35 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ name: default steps: - name: assembleRelease - image: gradle:jdk8 + image: nextcloudci/android commands: - gradle assembleRelease diff --git a/app/build.gradle b/app/build.gradle index c63918f..1b6aa14 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.afollestad:aesthetic:1.0.0-beta05' implementation 'com.afollestad.material-dialogs:core:3.1.1' implementation 'com.afollestad.material-dialogs:color:3.1.1' 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 09c6aba..c88c1a5 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 @@ -28,7 +28,9 @@ import com.google.gson.GsonBuilder import com.google.gson.JsonParser import com.google.gson.reflect.TypeToken import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cCourse -import org.mosad.seil0.projectlaogai.hsoparser.* +import org.mosad.seil0.projectlaogai.hsoparser.Course +import org.mosad.seil0.projectlaogai.hsoparser.MensaMenu +import org.mosad.seil0.projectlaogai.hsoparser.TimetableCourseWeek import java.io.BufferedReader import java.io.File import java.io.FileReader diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt index d6a43fa..f32f6c6 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt @@ -24,7 +24,6 @@ package org.mosad.seil0.projectlaogai.controller import android.content.Context import android.graphics.Color -import org.jetbrains.anko.defaultSharedPreferences import org.mosad.seil0.projectlaogai.R import org.mosad.seil0.projectlaogai.hsoparser.Course @@ -46,7 +45,10 @@ class PreferencesController { // the save function fun save(context: Context) { - val sharedPref = context.defaultSharedPreferences + val sharedPref = context.getSharedPreferences( + context.getString(R.string.preference_file_key), + Context.MODE_PRIVATE + ) // save the update times (cache) with (sharedPref.edit()) { @@ -97,7 +99,10 @@ class PreferencesController { // the load function fun load(context: Context) { - val sharedPref = context.defaultSharedPreferences + val sharedPref = context.getSharedPreferences( + context.getString(R.string.preference_file_key), + Context.MODE_PRIVATE + ) // load the update times (cache) coursesCacheTime = sharedPref.getLong(context.getString( diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt index 2d03274..6f7c00d 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt @@ -37,6 +37,10 @@ import kotlin.Exception class TCoRAPIController { + /** + * TODO since anko seems dead, we should use coroutines here + */ + companion object { private const val className = "TCoRAPIController" private const val tcorBaseURL = "https://tcor.mosad.xyz" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57efb0b..17d7bf3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -60,6 +60,7 @@ Could not load timetable!" + org.mosad.seil0.projectlaogai_preferences org.mosad.seil0.projectlaogai.course org.mosad.seil0.projectlaogai.courseTTLink org.mosad.seil0.projectlaogai.colorPrimary