diff --git a/app/build.gradle b/app/build.gradle index 0dd0a94..fa9bb52 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,10 +20,12 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' @@ -31,7 +33,6 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' implementation 'org.jsoup:jsoup:1.11.3' implementation 'org.jetbrains.anko:anko-commons:0.10.7' - implementation 'com.afollestad.material-dialogs:core:2.0.0-beta4' implementation 'com.afollestad.material-dialogs:color:2.0.0-beta4' 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 22a7846..52aefed 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -30,17 +30,15 @@ import androidx.appcompat.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import androidx.fragment.app.FragmentTransaction -import com.afollestad.materialdialogs.MaterialDialog import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.app_bar_main.* +import org.jetbrains.anko.custom.async import org.jetbrains.anko.doAsync -import org.jetbrains.anko.uiThread import org.mosad.seil0.projectlaogai.fragments.HomeFragment import org.mosad.seil0.projectlaogai.fragments.MensaFragment import org.mosad.seil0.projectlaogai.fragments.SettingsFragment import org.mosad.seil0.projectlaogai.fragments.TimeTableFragment import org.mosad.seil0.projectlaogai.hsoparser.* -import java.util.* import kotlin.collections.ArrayList import kotlin.system.measureTimeMillis @@ -174,10 +172,16 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte courseTTLinkList = timeTableParser.getCourseTTLinks() } - doAsync { + val t1 = doAsync { weekMenus = mensaParser.getMensaMenu() + } + + val t2 = doAsync { timeTableWeek = timeTableParser.getTimeTable("https://www.hs-offenburg.de/index.php?id=6627&class=class&iddV=DA64F6FE-9DDB-429E-A677-05D0D40CB636&week=0") - }.get() + } + + t1.get() + t2.get() } println("Completed in $time ms") @@ -194,4 +198,5 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte fun getWeekMenu(): ArrayList{ return weekMenus } + }