diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts index c769adf..2b959fd 100644 --- a/mobile/app/build.gradle.kts +++ b/mobile/app/build.gradle.kts @@ -12,7 +12,7 @@ android { minSdk = 28 targetSdk = 34 versionCode = 1 - versionName = "1.0.5" + versionName = "1.0.6" } buildTypes { diff --git a/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt b/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt index 98e6fa0..dff9692 100644 --- a/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt @@ -168,12 +168,11 @@ class MainFragment : Fragment() { toolbar.text = text delay(delayTime) } - for (text in loadingArray.reversedArray()) { - if (loadingArray.indexOf(text) != 0) { - toolbar.text = text - delay(delayTime) - } + for (text in loadingArray.reversedArray().slice(1.. { @@ -78,13 +76,18 @@ class Parsing { for (obj in jsonObjectList) { // for each day - val dateRAW = obj.get("date").toString() - var dayStr = dateRAW.split("T")[0].split("-")[2] - var monthStr = dateRAW.split("T")[0].split("-")[1] - if (dayStr[0] == '0') { dayStr = dayStr.slice(1.. = mutableListOf() var prevSubject: Subject = Subject.empty() @@ -339,17 +341,11 @@ class Parsing { for (markJSON in marksList) { val mark = Mark() - mark.grade = markJSON.getString("markText") - mark.weight = markJSON.getString("weight") - mark.subject = subjectMap[markJSON.getString("subjectId")].toString() - mark.date = markJSON.getString("markDate") - mark.theme = markJSON.getString("theme") - marks[mark.subject]?.add(mark) } diff --git a/release/solon.apk b/release/solon.apk index dd97f7a..5b8b9c2 100644 Binary files a/release/solon.apk and b/release/solon.apk differ