From 62a62049c31aaf750962733581603a566f664cc1 Mon Sep 17 00:00:00 2001 From: Jannik Seiler Date: Sun, 23 Aug 2020 14:27:41 +0200 Subject: [PATCH] code clean up --- app/build.gradle | 2 +- .../mosad/seil0/projectlaogai/MainActivity.kt | 2 +- .../projectlaogai/controller/QISPOSParser.kt | 8 ++++---- .../projectlaogai/fragments/MensaFragment.kt | 2 -- .../seil0/projectlaogai/util/DataTypes.kt | 4 ++-- .../activities/layout/activity_onboarding.xml | 20 +++++++++---------- .../fragments/layout/fragment_mensa.xml | 9 ++++----- .../fragments/layout/fragment_on_course.xml | 8 ++++---- .../fragments/layout/fragment_on_welcome.xml | 8 ++++---- 9 files changed, 30 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e587a5..b5de387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0' - implementation 'org.apache.commons:commons-lang3:3.10' + implementation 'org.apache.commons:commons-lang3:3.11' implementation 'org.jsoup:jsoup:1.13.1' testImplementation 'junit:junit:4.13' 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 78575fb..8f43194 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -88,7 +88,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte nav_view.setNavigationItemSelectedListener(this) - // based on the inent we get, call readBalance or open a Fragment + // based on the intent we get, call readBalance or open a Fragment when (intent.action) { NfcAdapter.ACTION_TECH_DISCOVERED -> NFCMensaCard.readBalance(intent, this) "org.mosad.seil0.projectlaogai.fragments.MensaFragment" -> activeFragment = MensaFragment() diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/QISPOSParser.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/QISPOSParser.kt index d4df974..ec62ae6 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/QISPOSParser.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/QISPOSParser.kt @@ -32,7 +32,7 @@ import org.jsoup.Jsoup import org.jsoup.nodes.Element import org.mosad.seil0.projectlaogai.R import org.mosad.seil0.projectlaogai.controller.preferences.EncryptedPreferences -import org.mosad.seil0.projectlaogai.util.gradeSubject +import org.mosad.seil0.projectlaogai.util.GradeSubject import java.security.KeyStore import java.security.cert.CertificateFactory import java.security.cert.X509Certificate @@ -84,8 +84,8 @@ class QISPOSParser(val context: Context) { * parse the html from readGrades() * @return a SortedMap, each entry is a semester, each semester has a ArrayList with subjects */ - fun parseGrades(): SortedMap> { - val gradesMap = HashMap>() + fun parseGrades(): SortedMap> { + val gradesMap = HashMap>() val gradesListHtml = readGrades() gradesListHtml?.select("table > tbody > tr")?.forEach { @@ -93,7 +93,7 @@ class QISPOSParser(val context: Context) { // only real subjects will be selected if(row.size >= 6 && row[0].text().length >=7) { - val subject = gradeSubject( + val subject = GradeSubject( id = row[0].text(), name = row[1].text(), semester = row[2].text(), diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt index 4a1d800..4d83cea 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt @@ -23,7 +23,6 @@ package org.mosad.seil0.projectlaogai.fragments import android.os.Bundle -import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -33,7 +32,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.mosad.seil0.projectlaogai.MainActivity import org.mosad.seil0.projectlaogai.R import org.mosad.seil0.projectlaogai.controller.cache.CacheController import org.mosad.seil0.projectlaogai.controller.cache.CacheController.Companion.mensaMenu diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/util/DataTypes.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/util/DataTypes.kt index 4e96851..23ad117 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/util/DataTypes.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/util/DataTypes.kt @@ -104,12 +104,12 @@ data class Lesson( val lessonRemark: String ) -data class TimetableDay(val timeslots: Array> = Array(6) { ArrayList() }) +data class TimetableDay(val timeslots: Array> = Array(6) { ArrayList() }) data class TimetableWeek(val weekIndex: Int = 0, val weekNumberYear: Int = 0, val days: Array = Array(6) { TimetableDay() }) // data classes for the qispos part -data class gradeSubject(val id: String = "", val name: String = "", val semester: String = "", val grade: String = "", val credits: String = "") +data class GradeSubject(val id: String = "", val name: String = "", val semester: String = "", val grade: String = "", val credits: String = "") // TCoR data class TimetableWeekTCoR(val days: Array = Array(6) { TimetableDay() }) diff --git a/app/src/main/res/layouts/activities/layout/activity_onboarding.xml b/app/src/main/res/layouts/activities/layout/activity_onboarding.xml index 5e14b73..ac637e9 100644 --- a/app/src/main/res/layouts/activities/layout/activity_onboarding.xml +++ b/app/src/main/res/layouts/activities/layout/activity_onboarding.xml @@ -1,8 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:id="@+id/linLayout_Dots" + android:layout_width="match_parent" + android:layout_height="30dp" + android:layout_alignParentBottom="true" + android:layout_marginBottom="20dp" + android:gravity="center" + android:orientation="horizontal" /> + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".fragments.MensaFragment" + android:background="?themePrimary"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent">