diff --git a/.gitignore b/.gitignore
index 0419708..5d18272 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,84 +1,89 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-
-# Created by https://www.gitignore.io/api/jetbrains
-# Edit at https://www.gitignore.io/?templates=jetbrains
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
 
-### JetBrains ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# Files for the ART/Dalvik VM
+*.dex
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
+# Java class files
+*.class
 
 # Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# File-based project format
-*.iws
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### JetBrains Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Markdown Navigator plugin
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator/
-
-# End of https://www.gitignore.io/api/jetbrains
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
 
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/jarRepositories.xml
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+# Android Profiling
+*.hprof
diff --git a/.idea/vcs.xml b/.idea/compiler.xml
similarity index 50%
rename from .idea/vcs.xml
rename to .idea/compiler.xml
index 35eb1dd..fb7f4a8 100644
--- a/.idea/vcs.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
index 59b11d1..a04e4e5 100644
--- a/.idea/discord.xml
+++ b/.idea/discord.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DiscordProjectSettings">
-    <option name="show" value="true" />
+    <option name="show" value="PROJECT_FILES" />
   </component>
   <component name="ProjectNotificationSettings">
     <option name="askShowProject" value="false" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index a5f05cd..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..860da66 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/README.md b/README.md
index e42713e..eccf4ec 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Project Sarona
-## View Grades More Simple.
+## Viewing Grades Made Simple.
 --- 
 ### Summary 
 An Android grade-fetching app made with Kotlin. The app fetches student grades from the HomeAccessCenter (HAC) and displays them in a simple format.
diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/app/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 6aabde8..8ddf1fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,16 +1,15 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "com.phytal.sarona"
         minSdkVersion 26
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -48,21 +47,20 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.5.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
+    implementation 'com.google.android.material:material:1.4.0-rc01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    def room_version = "2.3.0-alpha02"
+    def room_version = "2.4.0-alpha03"
 
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
@@ -76,7 +74,7 @@ dependencies {
     // Test helpers
     testImplementation "androidx.room:room-testing:$room_version"
 
-    def lifecycle_version = "2.2.0"
+    def lifecycle_version = "2.3.1"
     def arch_version = "2.1.0"
 
     // ViewModel
@@ -109,12 +107,6 @@ dependencies {
     implementation 'org.kodein.di:kodein-di-framework-android-x:6.5.5'
     implementation 'com.jakewharton.threetenabp:threetenabp:1.2.4'
 
-    //KMongo
-    implementation 'org.litote.kmongo:kmongo:4.0.2'
-    implementation 'org.litote.kmongo:kmongo-async:4.0.2'
-    implementation 'org.litote.kmongo:kmongo-coroutine:4.0.2'
-    implementation 'org.litote.kmongo:kmongo-rxjava2:4.0.2'
-
     // Glide
     implementation "com.github.bumptech.glide:glide:4.9.0"
 }
diff --git a/app/local.properties b/app/local.properties
deleted file mode 100644
index ee31c99..0000000
--- a/app/local.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Sun Mar 22 00:36:19 CDT 2020
-sdk.dir=C\:\\Users\\Phytal\\AppData\\Local\\Android\\Sdk
diff --git a/app/src/main/java/com/phytal/sarona/data/db/CurrentCourseDao.kt b/app/src/main/java/com/phytal/sarona/data/db/CourseDao.kt
similarity index 55%
rename from app/src/main/java/com/phytal/sarona/data/db/CurrentCourseDao.kt
rename to app/src/main/java/com/phytal/sarona/data/db/CourseDao.kt
index 955568b..3ce5d0f 100644
--- a/app/src/main/java/com/phytal/sarona/data/db/CurrentCourseDao.kt
+++ b/app/src/main/java/com/phytal/sarona/data/db/CourseDao.kt
@@ -2,22 +2,22 @@ package com.phytal.sarona.data.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
-import com.phytal.sarona.data.db.entities.CurrentCourseList
+import com.phytal.sarona.data.db.entities.CourseList
 
 @Dao
-interface CurrentCourseDao {
+interface CourseDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun upsert(course: CurrentCourseList)
+    fun upsert(course: CourseList)
 
     @Delete
-    fun delete(course: CurrentCourseList)
+    fun delete(course: CourseList)
 
     @Query("DELETE FROM course_table")
     fun deleteAllCourses()
 
     @Query("SELECT * FROM course_table")
-    fun getAllCourses(): LiveData<CurrentCourseList>
+    fun getAllCourses(): LiveData<CourseList>
 
     @Query("SELECT * FROM course_table WHERE id LIKE :cid LIMIT 1")
-    fun findById(cid: String): CurrentCourseList
+    fun findById(cid: String): CourseList
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/phytal/sarona/data/db/CourseDatabase.kt b/app/src/main/java/com/phytal/sarona/data/db/CourseDatabase.kt
index 0f052cd..c2efb03 100644
--- a/app/src/main/java/com/phytal/sarona/data/db/CourseDatabase.kt
+++ b/app/src/main/java/com/phytal/sarona/data/db/CourseDatabase.kt
@@ -5,16 +5,16 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.phytal.sarona.data.db.entities.CurrentCourseList
+import com.phytal.sarona.data.db.entities.CourseList
 import com.phytal.sarona.data.db.entities.DataConverter
 import com.phytal.sarona.internal.helpers.SingletonHolder
 
 
-@Database(entities = [CurrentCourseList::class], version = 1)
+@Database(entities = [CourseList::class], version = 1)
 @TypeConverters(DataConverter::class)
 abstract class CourseDatabase: RoomDatabase() {
 
-    abstract fun courseDao(): CurrentCourseDao
+    abstract fun courseDao(): CourseDao
 
     companion object : SingletonHolder<CourseDatabase, Context>({
         Room.databaseBuilder(it.applicationContext, CourseDatabase::class.java, "course_table.db")
diff --git a/app/src/main/java/com/phytal/sarona/data/db/entities/CurrentCourseList.kt b/app/src/main/java/com/phytal/sarona/data/db/entities/CourseList.kt
similarity index 59%
rename from app/src/main/java/com/phytal/sarona/data/db/entities/CurrentCourseList.kt
rename to app/src/main/java/com/phytal/sarona/data/db/entities/CourseList.kt
index 5d7ef9c..f472c56 100644
--- a/app/src/main/java/com/phytal/sarona/data/db/entities/CurrentCourseList.kt
+++ b/app/src/main/java/com/phytal/sarona/data/db/entities/CourseList.kt
@@ -1,17 +1,16 @@
 package com.phytal.sarona.data.db.entities
 
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverters
 
-const val CURRENT_COURSE_LIST_ID = 0
+const val COURSE_LIST_ID = 0
 
 @Entity(tableName = "course_table")
-data class CurrentCourseList(
+data class CourseList(
     @TypeConverters(DataConverter::class)
-    val yearCourses: List<List<Course>>
+    val yearCourses: ArrayList<ArrayList<Course>>
 ) {
     @PrimaryKey(autoGenerate = false)
-    var id: Int = CURRENT_COURSE_LIST_ID
+    var id: Int = COURSE_LIST_ID
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/phytal/sarona/data/db/entities/DataConverter.kt b/app/src/main/java/com/phytal/sarona/data/db/entities/DataConverter.kt
index 91b3cb1..d5790e7 100644
--- a/app/src/main/java/com/phytal/sarona/data/db/entities/DataConverter.kt
+++ b/app/src/main/java/com/phytal/sarona/data/db/entities/DataConverter.kt
@@ -7,66 +7,65 @@ import java.lang.reflect.Type
 
 class DataConverter {
     @TypeConverter
-    fun fromAssignmentList(assignmentList: List<Assignment>): String? {
-        if (assignmentList == null) {
-            return null
-        }
+    fun fromAssignmentList(jsonString: List<Assignment>): String? {
         val gson = Gson()
         val type: Type = object :
             TypeToken<List<Assignment>>() {}.type
-        return gson.toJson(assignmentList, type)
+        return gson.toJson(jsonString, type)
     }
 
     @TypeConverter
-    fun toCourses(coursesString: String): List<Course>? {
-        if (coursesString == null) {
-            return null
-        }
+    fun toCourses(jsonString: String): List<Course>? {
         val gson = Gson()
         val type: Type = object :
             TypeToken<List<Course>>() {}.type
-        return gson.fromJson<List<Course>>(coursesString, type)
+        return gson.fromJson<List<Course>>(jsonString, type)
     }
     @TypeConverter
-    fun fromCourses(courses: List<Course>): String? {
-        if (courses == null) {
-            return null
-        }
+    fun fromCourses(jsonString: List<Course>): String? {
         val gson = Gson()
         val type: Type = object :
             TypeToken<List<Course>>() {}.type
-        return gson.toJson(courses, type)
+        return gson.toJson(jsonString, type)
     }
 
     @TypeConverter
-    fun toAssignmentList(assignmentListString: String): List<Assignment>? {
-        if (assignmentListString == null) {
-            return null
-        }
+    fun toAssignmentList(jsonString: String): List<Assignment>? {
         val gson = Gson()
         val type: Type = object :
             TypeToken<List<Assignment>>() {}.type
-        return gson.fromJson<List<Assignment>>(assignmentListString, type)
+        return gson.fromJson<List<Assignment>>(jsonString, type)
     }
 
     @TypeConverter
-    fun toCourseList(courseListString: String): List<List<Course>>? {
-        if (courseListString == null) {
-            return null
-        }
+    fun toCourseList(jsonString: String): ArrayList<ArrayList<Course>>? {
         val gson = Gson()
         val type: Type = object :
-            TypeToken<List<List<Course>>>() {}.type
-        return gson.fromJson<List<List<Course>>>(courseListString, type)
+            TypeToken<ArrayList<ArrayList<Course>>>() {}.type
+        return gson.fromJson<ArrayList<ArrayList<Course>>>(jsonString, type)
     }
+
+    @TypeConverter
+    fun fromCourseList(jsonString: ArrayList<ArrayList<Course>>): String? {
+        val gson = Gson()
+        val type: Type = object :
+            TypeToken<ArrayList<ArrayList<Course>>>() {}.type
+        return gson.toJson(jsonString, type)
+    }
+
     @TypeConverter
-    fun fromCourseList(courseList: List<List<Course>>): String? {
-        if (courseList == null) {
-            return null
-        }
+    fun fromCourse(jsonString: Course): String? {
         val gson = Gson()
         val type: Type = object :
-            TypeToken<List<List<Course>>>() {}.type
-        return gson.toJson(courseList, type)
+            TypeToken<Course>() {}.type
+        return gson.toJson(jsonString, type)
     }
+    @TypeConverter
+    fun toCourse(jsonString: String): Course? {
+        val gson = Gson()
+        val type: Type = object :
+            TypeToken<Course>() {}.type
+        return gson.fromJson<Course>(jsonString, type)
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/phytal/sarona/data/network/ConnectivityInterceptorImpl.kt b/app/src/main/java/com/phytal/sarona/data/network/ConnectivityInterceptorImpl.kt
index f5fa110..bbecc4a 100644
--- a/app/src/main/java/com/phytal/sarona/data/network/ConnectivityInterceptorImpl.kt
+++ b/app/src/main/java/com/phytal/sarona/data/network/ConnectivityInterceptorImpl.kt
@@ -2,6 +2,7 @@ package com.phytal.sarona.data.network
 
 import android.content.Context
 import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import com.phytal.sarona.internal.NoConnectivityException
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -13,15 +14,17 @@ class ConnectivityInterceptorImpl(
     private val appContext = context.applicationContext
 
     override fun intercept(chain: Interceptor.Chain): Response {
-        if (!isOnline())
+        if (!isOnline(appContext))
             throw NoConnectivityException()
         return chain.proceed(chain.request())
     }
 
-    private fun isOnline(): Boolean {
-        val connectivityManager = appContext.getSystemService(Context.CONNECTIVITY_SERVICE)
-                as ConnectivityManager
-        val networkInfo = connectivityManager.activeNetworkInfo
-        return networkInfo != null && networkInfo.isConnected
-    }
+    private fun isOnline(context: Context) =
+        (context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager).run {
+            getNetworkCapabilities(activeNetwork)?.run {
+                hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+                        || hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                        || hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
+            } ?: false
+        }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSource.kt b/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSource.kt
index 6378d53..80816ae 100644
--- a/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSource.kt
+++ b/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSource.kt
@@ -1,10 +1,11 @@
 package com.phytal.sarona.data.network
 
 import androidx.lifecycle.LiveData
+import com.phytal.sarona.data.db.entities.Course
 import com.phytal.sarona.data.network.response.CourseResponse
 
 interface CourseNetworkDataSource {
-    val downloadedCurrentCourse: LiveData<CourseResponse>
+    val downloadedCurrentCourse: LiveData<ArrayList<ArrayList<Course>>>
 
     suspend fun fetchCurrent(
         hacLink: String,
diff --git a/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSourceImpl.kt b/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSourceImpl.kt
index f68263a..a120c1a 100644
--- a/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSourceImpl.kt
+++ b/app/src/main/java/com/phytal/sarona/data/network/CourseNetworkDataSourceImpl.kt
@@ -1,13 +1,13 @@
 package com.phytal.sarona.data.network
 
+import android.annotation.SuppressLint
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.phytal.sarona.data.db.entities.Course
 import com.phytal.sarona.data.network.response.CourseResponse
 import com.phytal.sarona.internal.NoConnectivityException
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 
 
@@ -15,10 +15,11 @@ class CourseNetworkDataSourceImpl(
     private val hacApiService: HacApiService
 ) : CourseNetworkDataSource {
 
-    private val _downloadedCurrentCourse = MutableLiveData<CourseResponse>()
-    override val downloadedCurrentCourse: LiveData<CourseResponse>
+    private val _downloadedCurrentCourse = MutableLiveData<ArrayList<ArrayList<Course>>>()
+    override val downloadedCurrentCourse: LiveData<ArrayList<ArrayList<Course>>>
         get() = _downloadedCurrentCourse
 
+    @SuppressLint("CheckResult")
     override suspend fun fetchCurrent(hacLink: String, username: String, password: String) {
         try {
 //           hacApiService.getAllCourses(hacLink, username, password)
diff --git a/app/src/main/java/com/phytal/sarona/data/network/HacApiService.kt b/app/src/main/java/com/phytal/sarona/data/network/HacApiService.kt
index 881c343..396a74a 100644
--- a/app/src/main/java/com/phytal/sarona/data/network/HacApiService.kt
+++ b/app/src/main/java/com/phytal/sarona/data/network/HacApiService.kt
@@ -1,5 +1,6 @@
 package com.phytal.sarona.data.network
 
+import com.phytal.sarona.data.db.entities.Course
 import com.phytal.sarona.data.network.adapter.NetworkResponseAdapterFactory
 import com.phytal.sarona.data.network.response.CourseResponse
 //import com.phytal.sarona.models.CourseList
@@ -11,6 +12,7 @@ import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Query
+import java.util.concurrent.TimeUnit
 
 interface HacApiService {
 
@@ -18,7 +20,7 @@ interface HacApiService {
     fun getAllCourses(@Query("l") hacLink: String,
                       @Query("u") username: String,
                       @Query("p") password: String):
-            Observable<CourseResponse>
+            Observable<ArrayList<ArrayList<Course>>>
 
     companion object {
         operator fun invoke(
@@ -27,6 +29,8 @@ interface HacApiService {
 
             val okHttpClient = OkHttpClient.Builder()
                 .addInterceptor(connectivityInterceptor)
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
                 .build()
 
             val rxAdapter: RxJava2CallAdapterFactory =
diff --git a/app/src/main/java/com/phytal/sarona/data/repository/CourseRepository.kt b/app/src/main/java/com/phytal/sarona/data/repository/CourseRepository.kt
index 5286599..3cec266 100644
--- a/app/src/main/java/com/phytal/sarona/data/repository/CourseRepository.kt
+++ b/app/src/main/java/com/phytal/sarona/data/repository/CourseRepository.kt
@@ -1,11 +1,11 @@
 package com.phytal.sarona.data.repository
 
 import androidx.lifecycle.LiveData
-import com.phytal.sarona.data.db.entities.CurrentCourseList
+import com.phytal.sarona.data.db.entities.CourseList
 import com.phytal.sarona.data.provider.LoginInformation
 
 
 interface CourseRepository {
-    suspend fun getCurrentCourses(loginInfo: LoginInformation) : LiveData<out CurrentCourseList>
+    suspend fun getCurrentCourses(loginInfo: LoginInformation) : LiveData<out CourseList>
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/phytal/sarona/data/repository/CourseRepositoryImpl.kt b/app/src/main/java/com/phytal/sarona/data/repository/CourseRepositoryImpl.kt
index acce95f..8f34fc4 100644
--- a/app/src/main/java/com/phytal/sarona/data/repository/CourseRepositoryImpl.kt
+++ b/app/src/main/java/com/phytal/sarona/data/repository/CourseRepositoryImpl.kt
@@ -1,19 +1,17 @@
 package com.phytal.sarona.data.repository
 
 import androidx.lifecycle.LiveData
-import com.phytal.sarona.data.db.CurrentCourseDao
-import com.phytal.sarona.data.db.entities.CurrentCourseList
+import com.phytal.sarona.data.db.CourseDao
+import com.phytal.sarona.data.db.entities.Course
+import com.phytal.sarona.data.db.entities.CourseList
 import com.phytal.sarona.data.network.CourseNetworkDataSource
-import com.phytal.sarona.data.network.response.CourseResponse
 import com.phytal.sarona.data.provider.LoginInformation
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import java.time.ZonedDateTime
 
+@DelicateCoroutinesApi
 class CourseRepositoryImpl (
-    private val currentCourseDao: CurrentCourseDao,
+    private val courseDao: CourseDao,
     private val courseNetworkDataSource: CourseNetworkDataSource
 ): CourseRepository {
 
@@ -22,16 +20,17 @@ class CourseRepositoryImpl (
             persistFetchedCurrentCourse(newCurrentCourses)
         }
     }
-    override suspend fun getCurrentCourses(loginInfo: LoginInformation): LiveData<out CurrentCourseList> {
+    override suspend fun getCurrentCourses(loginInfo: LoginInformation): LiveData<out CourseList> {
         return withContext(Dispatchers.IO) {
             initCourseData(loginInfo)
-            return@withContext currentCourseDao.getAllCourses()
+            return@withContext courseDao.getAllCourses()
         }
     }
 
-    private fun persistFetchedCurrentCourse(fetchedCourses: CourseResponse) {
+    @DelicateCoroutinesApi
+    private fun persistFetchedCurrentCourse(fetchedCourses: ArrayList<ArrayList<Course>>) {
         GlobalScope.launch(Dispatchers.IO) {
-            currentCourseDao.upsert(CurrentCourseList(fetchedCourses.courses))
+            courseDao.upsert(CourseList(fetchedCourses))
         }
     }
 
diff --git a/app/src/main/java/com/phytal/sarona/ui/adapters/CoursesAdapter.kt b/app/src/main/java/com/phytal/sarona/ui/adapters/CoursesAdapter.kt
index e6572f2..2b447a8 100644
--- a/app/src/main/java/com/phytal/sarona/ui/adapters/CoursesAdapter.kt
+++ b/app/src/main/java/com/phytal/sarona/ui/adapters/CoursesAdapter.kt
@@ -8,11 +8,17 @@ import androidx.annotation.NonNull
 import androidx.recyclerview.widget.RecyclerView
 import com.phytal.sarona.R
 import com.phytal.sarona.data.db.entities.Course
-import com.phytal.sarona.data.db.entities.CurrentCourseList
+import com.phytal.sarona.data.db.entities.CourseList
 
-class CoursesAdapter : RecyclerView.Adapter<CoursesAdapter.CourseHolder>() {
+class CoursesAdapter(
+    private val listener: OnItemClickListener
+) : RecyclerView.Adapter<CoursesAdapter.CourseHolder>() {
 
-    private var courses: List<Course> = ArrayList()
+    interface OnItemClickListener {
+        fun onItemClick(course : Course)
+    }
+
+    private var courses : List<Course> = ArrayList()
 
     @NonNull
     override fun onCreateViewHolder(@NonNull parent: ViewGroup, viewType: Int): CourseHolder {
@@ -22,17 +28,18 @@ class CoursesAdapter : RecyclerView.Adapter<CoursesAdapter.CourseHolder>() {
     }
 
     override fun onBindViewHolder(@NonNull holder: CourseHolder, position: Int) {
-        val currentCourse = courses[position]
-        holder.textViewTitle.text = currentCourse.name
-        holder.textViewDescription.setText(currentCourse.course)
-        holder.textViewPriority.text = currentCourse.average.toString()
+        val course = courses[position]
+        holder.textViewTitle.text = course.name
+        holder.textViewDescription.text = course.course
+        holder.textViewPriority.text = course.average.toString()
+        holder.itemView.setOnClickListener { listener }
     }
 
     override fun getItemCount(): Int {
         return courses.size
     }
 
-    fun setCourses(courses: CurrentCourseList) {
+    fun setCourses(courses: CourseList) {
         this.courses = courses.yearCourses[0]
         notifyDataSetChanged()
     }
diff --git a/app/src/main/java/com/phytal/sarona/ui/courses/CoursesFragment.kt b/app/src/main/java/com/phytal/sarona/ui/courses/CoursesFragment.kt
index f21e74c..393c0b2 100644
--- a/app/src/main/java/com/phytal/sarona/ui/courses/CoursesFragment.kt
+++ b/app/src/main/java/com/phytal/sarona/ui/courses/CoursesFragment.kt
@@ -4,17 +4,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.Toast
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.phytal.sarona.R
+import com.phytal.sarona.data.db.entities.Course
 import com.phytal.sarona.data.network.ConnectivityInterceptorImpl
 import com.phytal.sarona.data.network.HacApiService
+import com.phytal.sarona.databinding.FragmentCoursesBinding
 import com.phytal.sarona.ui.adapters.CoursesAdapter
 import com.phytal.sarona.ui.base.ScopedFragment
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.fragment_courses.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.Dispatchers.Main
 import org.kodein.di.KodeinAware
@@ -31,6 +34,8 @@ class CoursesFragment : ScopedFragment(), KodeinAware {
     private var disposable: Disposable? = null
 //    private lateinit var courseNetworkDataSource: CourseNetworkDataSourceImpl
     private lateinit var adapter: CoursesAdapter
+    private lateinit var binding: FragmentCoursesBinding
+
 
     private val hacApiServe by lazy {
         HacApiService(
@@ -41,19 +46,36 @@ class CoursesFragment : ScopedFragment(), KodeinAware {
     }
 
     override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View? {
-        val root = inflater.inflate(R.layout.fragment_courses, container, false)
+        binding = FragmentCoursesBinding.inflate(inflater)
 
+        val root = binding.root
         val recyclerView: RecyclerView = root.findViewById(R.id.recycler_view)
         recyclerView.layoutManager = LinearLayoutManager(context)
         recyclerView.setHasFixedSize(true)
 
-        adapter = CoursesAdapter()
+        adapter = CoursesAdapter(object : CoursesAdapter.OnItemClickListener {
+            override fun onItemClick(course : Course) {
+                Toast.makeText(context, "Item Clicked", Toast.LENGTH_LONG).show()
+            }
+        }) //TODO: navigate to CourseFragment
+
         recyclerView.adapter = adapter
 
+        // init onClickListeners
+        val backBtn: ImageView = root.findViewById(R.id.back_btn) as ImageView
+        backBtn.setOnClickListener {
+            // your code here
+        }
+
+        val forBtn: ImageView = root.findViewById(R.id.forward_btn) as ImageView
+        forBtn.setOnClickListener {
+            // your code here
+        }
+
         return root
     }
 
@@ -70,7 +92,7 @@ class CoursesFragment : ScopedFragment(), KodeinAware {
         currentCourses.observe(viewLifecycleOwner, Observer {
             if (it == null) return@Observer
 
-            group_loading.visibility = View.GONE
+            binding.groupLoading.visibility = View.GONE
 //            updateLastUpdated(ZonedDateTime.now())
 
             adapter.setCourses(it)
@@ -84,7 +106,7 @@ class CoursesFragment : ScopedFragment(), KodeinAware {
 
     private suspend fun setNewTextOnMainThread(input: String) {
         withContext(Main) {
-            textView_loading.text = input
+            binding.textViewLoading.text = input
         }
     }
 
diff --git a/app/src/main/java/com/phytal/sarona/ui/courses/assignments/CourseFragment.kt b/app/src/main/java/com/phytal/sarona/ui/courses/assignments/CourseFragment.kt
new file mode 100644
index 0000000..1bbd8b9
--- /dev/null
+++ b/app/src/main/java/com/phytal/sarona/ui/courses/assignments/CourseFragment.kt
@@ -0,0 +1,5 @@
+package com.phytal.sarona.ui.courses.assignments
+
+class CourseFragment {
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000..f632160
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml
new file mode 100644
index 0000000..d7c08d9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_forward.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5.88,4.12L13.76,12l-7.88,7.88L8,22l10,-10L8,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
new file mode 100644
index 0000000..8bf031f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml
new file mode 100644
index 0000000..d3d6259
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/layout/course_item.xml b/app/src/main/res/layout/course_item.xml
index c41a348..1422046 100644
--- a/app/src/main/res/layout/course_item.xml
+++ b/app/src/main/res/layout/course_item.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginEnd="8dp"
     android:layout_marginStart="8dp"
-    android:layout_marginTop="8dp"
+    android:layout_marginBottom="15dp"
     app:cardCornerRadius="15dp"
     app:cardElevation="3dp">
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_courses.xml b/app/src/main/res/layout/fragment_courses.xml
index 7cf9753..f99c611 100644
--- a/app/src/main/res/layout/fragment_courses.xml
+++ b/app/src/main/res/layout/fragment_courses.xml
@@ -1,16 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_gravity="center"
     android:gravity="center"
     tools:context=".ui.courses.CoursesFragment">
 
+    <ImageView
+        android:id="@+id/forward_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/ic_arrow_forward"
+        app:layout_constraintBottom_toTopOf="@+id/coordinatorLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/forward_button" />
+
+    <ImageView
+        android:id="@+id/back_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:contentDescription="@string/back_button"
+        android:src="@drawable/ic_arrow_back"
+        app:layout_constraintBottom_toTopOf="@+id/coordinatorLayout"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginTop="50dp"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
@@ -18,14 +43,12 @@
             android:layout_height="match_parent"
             tools:listitem="@layout/course_item" />
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/mp_viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.5"/>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/group_loading"
@@ -58,7 +81,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        android:text="Loading"
+        android:text="@string/loading"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d777841..95e5458 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,5 +56,8 @@
     <string name="assignment_item_title">Assignment Title</string>
     <string name="assignment_date_assigned">Date Assigned</string>
     <string name="course_item_max_grade">/Max Grade</string>
+    <string name="forward_button">Forward Button</string>
+    <string name="back_button">Back Button</string>
+    <string name="loading">Loading</string>
 
 </resources>
diff --git a/build.gradle b/build.gradle
index 2341922..5a650d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.5.10'
     repositories {
         google()
-        jcenter()
-        
+        mavenCentral()
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -19,8 +19,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
-        
+        mavenCentral()
+
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cd7f1e4..a7cf1a6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip