From b680cc4366dbc60afa310783061863c2ee96ad91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 20 Oct 2018 20:59:46 +0200
Subject: [PATCH] Migrate to AndroidX (#169)

---
 app/build.gradle                              |  49 ++++++++++--------
 .../repositories/local/AttendanceLocalTest.kt |   8 +--
 .../data/repositories/local/ExamLocalTest.kt  |   8 +--
 .../repositories/local/SessionLocalTest.kt    |   8 +--
 .../repositories/local/TimetableLocalTest.kt  |   8 +--
 .../wulkanowy/utils/security/ScramblerTest.kt |  15 +++---
 app/src/main/AndroidManifest.xml              |   1 +
 .../java/io/github/wulkanowy/WulkanowyApp.kt  |   2 +-
 .../github/wulkanowy/data/RepositoryModule.kt |   4 +-
 .../github/wulkanowy/data/db/AppDatabase.kt   |   8 +--
 .../io/github/wulkanowy/data/db/Converters.kt |   2 +-
 .../wulkanowy/data/db/dao/AttendanceDao.kt    |   8 +--
 .../github/wulkanowy/data/db/dao/ExamDao.kt   |   8 +--
 .../github/wulkanowy/data/db/dao/GradeDao.kt  |   2 +-
 .../wulkanowy/data/db/dao/GradeSummaryDao.kt  |  10 ++--
 .../wulkanowy/data/db/dao/SemesterDao.kt      |   6 +--
 .../wulkanowy/data/db/dao/StudentDao.kt       |   6 +--
 .../wulkanowy/data/db/dao/TimetableDao.kt     |   8 +--
 .../wulkanowy/data/db/entities/Attendance.kt  |   6 +--
 .../github/wulkanowy/data/db/entities/Exam.kt |   6 +--
 .../wulkanowy/data/db/entities/Grade.kt       |   6 +--
 .../data/db/entities/GradeSummary.kt          |   6 +--
 .../wulkanowy/data/db/entities/Semester.kt    |   6 +--
 .../wulkanowy/data/db/entities/Student.kt     |   6 +--
 .../wulkanowy/data/db/entities/Timetable.kt   |   6 +--
 .../github/wulkanowy/ui/base/BaseActivity.kt  |   6 +--
 .../github/wulkanowy/ui/base/BaseFragment.kt  |   4 +-
 .../wulkanowy/ui/base/BasePagerAdapter.kt     |   6 +--
 .../ui/login/options/LoginOptionsFragment.kt  |   2 +-
 .../github/wulkanowy/ui/main/MainActivity.kt  |   2 +-
 .../ui/main/attendance/AttendanceDialog.kt    |   2 +-
 .../wulkanowy/ui/main/exam/ExamDialog.kt      |   2 +-
 .../github/wulkanowy/ui/main/exam/ExamItem.kt |   3 +-
 .../wulkanowy/ui/main/grade/GradeFragment.kt  |   2 +-
 .../main/grade/details/GradeDetailsDialog.kt  |   2 +-
 .../ui/main/timetable/TimetableDialog.kt      |   2 +-
 .../utils/FragNavControlerExtension.kt        |   2 +-
 .../wulkanowy/utils/ViewPagerExtension.kt     |   2 +-
 .../img_splash_logo.png                       | Bin
 .../layer_splash_background.xml               |   0
 app/src/main/res/layout/activity_login.xml    |   4 +-
 app/src/main/res/layout/activity_main.xml     |  11 ++--
 .../main/res/layout/fragment_attendance.xml   |  13 +++--
 app/src/main/res/layout/fragment_exam.xml     |  13 +++--
 app/src/main/res/layout/fragment_grade.xml    |   8 +--
 .../res/layout/fragment_grade_details.xml     |   8 +--
 .../res/layout/fragment_grade_summary.xml     |   8 +--
 .../main/res/layout/fragment_login_form.xml   |  25 ++++-----
 .../res/layout/fragment_login_options.xml     |   2 +-
 .../main/res/layout/fragment_timetable.xml    |  13 +++--
 app/src/main/res/layout/header_exam.xml       |   2 +-
 .../main/res/layout/header_grade_summary.xml  |   2 +-
 .../main/res/layout/item_login_options.xml    |   2 +-
 app/src/main/res/layout/widget_timetable.xml  |   2 +-
 app/src/main/res/values/api_symbols.xml       |   2 +-
 .../ui/login/form/LoginFormPresenterTest.kt   |   1 -
 .../options/LoginOptionsPresenterTest.kt      |   1 -
 gradle.properties                             |   2 +
 58 files changed, 179 insertions(+), 180 deletions(-)
 rename app/src/main/res/{drawable-v15 => drawable}/img_splash_logo.png (100%)
 rename app/src/main/res/{drawable-v15 => drawable}/layer_splash_background.xml (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 811ba11c..53489f93 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         versionCode 16
         versionName "0.5.2"
         multiDexEnabled true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         playAccountConfig = playAccountConfigs.defaultAccountConfig
         manifestPlaceholders = [
@@ -68,38 +68,39 @@ play {
     uploadImages = true
 }
 
-ext.supportVersion = "28.0.0"
+ext.androidx_version = "1.0.0"
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation('com.github.wulkanowy:api:1400211f0d') { exclude module: "threetenbp" }
 
-    implementation "com.android.support:support-v4:$supportVersion"
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.android.support:preference-v14:$supportVersion"
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation "androidx.legacy:legacy-support-v4:$androidx_version"
+    implementation "androidx.appcompat:appcompat:$androidx_version"
+    implementation "androidx.cardview:cardview:$androidx_version"
+    implementation "androidx.legacy:legacy-preference-v14:$androidx_version"
+    implementation "com.google.android.material:material:$androidx_version"
+    implementation 'androidx.multidex:multidex:2.0.0'
 
     implementation "com.google.android.gms:play-services-oss-licenses:16.0.1"
     implementation "com.firebase:firebase-jobdispatcher:0.8.5"
 
-    implementation "com.google.dagger:dagger-android-support:2.17"
-    kapt "com.google.dagger:dagger-compiler:2.17"
-    kapt "com.google.dagger:dagger-android-processor:2.17"
+    //Do not update dagger https://github.com/google/dagger/issues/1245
+    implementation "com.google.dagger:dagger-android-support:2.16"
+    kapt "com.google.dagger:dagger-compiler:2.16"
+    kapt "com.google.dagger:dagger-android-processor:2.16"
 
-    implementation "android.arch.persistence.room:runtime:1.1.1"
-    implementation "android.arch.persistence.room:rxjava2:1.1.1"
-    kapt "android.arch.persistence.room:compiler:1.1.1"
+    implementation "androidx.room:room-runtime:2.1.0-alpha01"
+    implementation "androidx.room:room-rxjava2:2.1.0-alpha01"
+    kapt "androidx.room:room-compiler:2.1.0-alpha01"
 
-    implementation "eu.davidea:flexible-adapter:5.0.6"
-    implementation "eu.davidea:flexible-adapter-ui:1.0.0-b5"
+    implementation "eu.davidea:flexible-adapter:5.1.0"
+    implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.2.0"
     implementation 'com.ncapdevi:frag-nav:3.0.0-RC3'
 
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:2.1.0'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.1"
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.0'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation "io.reactivex.rxjava2:rxjava:2.2.2"
 
     implementation "com.jakewharton.threetenabp:threetenabp:1.1.0"
 
@@ -115,11 +116,13 @@ dependencies {
     debugImplementation "com.amitshekhar.android:debug-db:1.0.4"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.8.8"
-    testImplementation "org.mockito:mockito-inline:2.21.0"
+    testImplementation "io.mockk:mockk:1.8.9"
+    testImplementation "org.mockito:mockito-inline:2.23.0"
     testImplementation 'org.threeten:threetenbp:1.3.7'
 
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation "org.mockito:mockito-android:2.21.0"
+    androidTestImplementation 'androidx.test:core:1.0.0-beta02'
+    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
+    androidTestImplementation 'androidx.test.ext:junit:1.0.0-beta02'
+    androidTestImplementation "org.mockito:mockito-android:2.23.0"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt
index 39eddc73..47116483 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.repositories.local
 
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
@@ -22,7 +22,7 @@ class AttendanceLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(), AppDatabase::class.java).build()
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
         attendanceLocal = AttendanceLocal(testDb.attendanceDao())
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt
index f2179236..7e4217f1 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.repositories.local
 
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
@@ -22,7 +22,7 @@ class ExamLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(), AppDatabase::class.java).build()
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
         examLocal = ExamLocal(testDb.examsDao())
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt
index 08eff5ab..ba9273f4 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.data.repositories.local
 
-import android.arch.persistence.room.Room
 import android.content.Context
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.db.entities.Student
@@ -24,7 +24,7 @@ class SessionLocalTest {
 
     @Before
     fun createDb() {
-        val context = InstrumentationRegistry.getContext()
+        val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
                 .build()
         sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt
index 534b6fc1..81d822ea 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.repositories.local
 
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
@@ -23,7 +23,7 @@ class TimetableLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(), AppDatabase::class.java).build()
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
         timetableDb = TimetableLocal(testDb.timetableDao())
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/utils/security/ScramblerTest.kt b/app/src/androidTest/java/io/github/wulkanowy/utils/security/ScramblerTest.kt
index c6bcb9b7..a6e7e918 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/utils/security/ScramblerTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/utils/security/ScramblerTest.kt
@@ -1,16 +1,15 @@
 package io.github.wulkanowy.utils.security
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.security.KeyStore
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
-
 @SmallTest
 @RunWith(AndroidJUnit4::class)
 class ScramblerTest {
@@ -18,7 +17,7 @@ class ScramblerTest {
     @Test
     fun encryptDecryptTest() {
         assertEquals("TEST", decrypt(encrypt("TEST",
-                InstrumentationRegistry.getTargetContext())))
+                ApplicationProvider.getApplicationContext())))
     }
 
     @Test
@@ -28,14 +27,14 @@ class ScramblerTest {
         }
 
         assertFailsWith<ScramblerException> {
-            encrypt("", InstrumentationRegistry.getTargetContext())
+            encrypt("", ApplicationProvider.getApplicationContext())
         }
     }
 
     @Test
     @SdkSuppress(minSdkVersion = 18)
     fun emptyKeyStoreTest() {
-        val text = encrypt("test", InstrumentationRegistry.getTargetContext())
+        val text = encrypt("test", ApplicationProvider.getApplicationContext())
 
         val keyStore = KeyStore.getInstance("AndroidKeyStore")
         keyStore.load(null)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e4d5f780..beb4a9ac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true">
         <activity
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index e26d3583..84885edc 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy
 
 import android.content.Context
-import android.support.multidex.MultiDex
+import androidx.multidex.MultiDex
 import com.crashlytics.android.Crashlytics
 import com.crashlytics.android.answers.Answers
 import com.crashlytics.android.core.CrashlyticsCore
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
index 05b70347..df14b4f5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.data
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.support.v7.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.SocketInternetObservingStrategy
 import dagger.Module
@@ -17,7 +17,7 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideInternetObservingSettings(): InternetObservingSettings {
-        return InternetObservingSettings
+        return InternetObservingSettings.builder()
                 .strategy(SocketInternetObservingStrategy())
                 .host("www.google.com")
                 .build()
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 060ee220..2f5920a5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.data.db
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.Room
-import android.arch.persistence.room.RoomDatabase
-import android.arch.persistence.room.TypeConverters
 import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import io.github.wulkanowy.data.db.dao.*
 import io.github.wulkanowy.data.db.entities.*
 import javax.inject.Singleton
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index cde0348d..0700dd43 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.data.db
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import org.threeten.bp.*
 import java.util.*
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
index f29dfcfa..7babb76e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.data.db.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Delete
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
index 5f96a9ba..58c7867b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.data.db.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Delete
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Exam
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
index a95be3d6..6212b5b0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.data.db.dao
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import io.github.wulkanowy.data.db.entities.Grade
 import io.reactivex.Maybe
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
index 8f67501d..dbbfa4df 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.data.db.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Delete
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy.REPLACE
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy.REPLACE
+import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.reactivex.Maybe
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
index dac3068e..e8e89406 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Single
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index 39292bad..41bf5da9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
index 77b04f60..2624e94a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.data.db.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Delete
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
index 57083c94..bd571240 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import org.threeten.bp.LocalDate
 import java.io.Serializable
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
index 6177b120..daa886d5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import org.threeten.bp.LocalDate
 import java.io.Serializable
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
index 52ac967f..44c16103 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import org.threeten.bp.LocalDate
 import java.io.Serializable
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
index 5bd72aa2..74d709bb 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
 @Entity(tableName = "Grades_Summary")
 data class GradeSummary(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
index 4941ba73..fc776e9b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
 @Entity(tableName = "Semesters")
 data class Semester(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index acadb181..a9f405c8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
 @Entity(tableName = "Students")
 data class Student(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
index bf35cece..2aa1eafa 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
 import java.io.Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index 69e9beb0..f02b6488 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.ui.base
 
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.design.widget.Snackbar.LENGTH_LONG
-import android.support.v7.app.AppCompatDelegate
 import android.view.View
+import androidx.appcompat.app.AppCompatDelegate
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.support.DaggerAppCompatActivity
 
 abstract class BaseActivity : DaggerAppCompatActivity(), BaseView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index 57279ccb..b0d6178e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.ui.base
 
-import android.support.design.widget.Snackbar
-import android.support.design.widget.Snackbar.LENGTH_LONG
 import android.view.View
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.support.DaggerFragment
 
 abstract class BaseFragment : DaggerFragment(), BaseView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt
index 12c6ee33..000efdcd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.base
 
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentStatePagerAdapter
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
 
 class BasePagerAdapter(fragmentManager: FragmentManager) : FragmentStatePagerAdapter(fragmentManager) {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsFragment.kt
index 4f4567f2..5571880c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsFragment.kt
@@ -1,12 +1,12 @@
 package io.github.wulkanowy.ui.login.options
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt
index 79c653da..176890f2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.ui.main
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.ncapdevi.fragnav.FragNavController
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialog.kt
index 75d39427..4d07b6af 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialog.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.ui.main.attendance
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.utils.toFormattedString
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamDialog.kt
index 4a833cad..43649864 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamDialog.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.ui.main.exam
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.utils.toFormattedString
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamItem.kt b/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamItem.kt
index f9d05d47..e849c1de 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamItem.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.main.exam
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractSectionableItem
@@ -15,7 +14,7 @@ class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<Exa
 
     override fun getLayoutRes() = R.layout.item_exam
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): ViewHolder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt
index 82ac05ec..559c89c8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.ui.main.grade
 
 import android.os.Bundle
-import android.support.v7.app.AlertDialog
 import android.view.*
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BasePagerAdapter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsDialog.kt
index f0861226..c40ee540 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsDialog.kt
@@ -1,11 +1,11 @@
 package io.github.wulkanowy.ui.main.grade.details
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.utils.colorStringId
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialog.kt
index c2e2ff15..4ca860d1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialog.kt
@@ -2,11 +2,11 @@ package io.github.wulkanowy.ui.main.timetable
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.utils.toFormattedString
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
index 588a2cf9..ce1ec72a 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.utils
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import com.ncapdevi.fragnav.FragNavController
 
 inline fun FragNavController.setOnTabTransactionListener(crossinline listener: (index: Int) -> Unit) {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ViewPagerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ViewPagerExtension.kt
index 1e51da09..6a5ad880 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ViewPagerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ViewPagerExtension.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.utils
 
-import android.support.v4.view.ViewPager
+import androidx.viewpager.widget.ViewPager
 
 inline fun ViewPager.setOnSelectPageListener(crossinline selectListener: (position: Int) -> Unit) {
     addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
diff --git a/app/src/main/res/drawable-v15/img_splash_logo.png b/app/src/main/res/drawable/img_splash_logo.png
similarity index 100%
rename from app/src/main/res/drawable-v15/img_splash_logo.png
rename to app/src/main/res/drawable/img_splash_logo.png
diff --git a/app/src/main/res/drawable-v15/layer_splash_background.xml b/app/src/main/res/drawable/layer_splash_background.xml
similarity index 100%
rename from app/src/main/res/drawable-v15/layer_splash_background.xml
rename to app/src/main/res/drawable/layer_splash_background.xml
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3b04cf22..1a86fa92 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,7 +1,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/loginContainer"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/loginContainer">
+    android:layout_height="match_parent">
 
     <com.aurelhubert.ahbottomnavigation.AHBottomNavigationViewPager
         android:id="@+id/loginViewpager"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 507fa3b1..38057f7c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mainContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/mainAppBarContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:elevation="0dp">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/mainToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize" />
-
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/mainFragmentContainer"
@@ -30,4 +29,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 1ce62294..c859acc8 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
@@ -16,17 +16,16 @@
             android:layout_gravity="center"
             android:indeterminate="true" />
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/attendanceSwipe"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/attendanceRecycler"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
-
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
             android:id="@+id/attendanceEmpty"
@@ -37,7 +36,7 @@
             android:padding="10dp"
             android:visibility="gone">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:minWidth="100dp"
@@ -54,7 +53,7 @@
                 android:text="@string/attendance_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index 14cc94dd..1e31450a 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
@@ -16,17 +16,16 @@
             android:layout_gravity="center"
             android:indeterminate="true" />
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/examSwipe"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/examRecycler"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
-
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
             android:id="@+id/examEmpty"
@@ -37,7 +36,7 @@
             android:padding="10dp"
             android:visibility="gone">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:minWidth="100dp"
@@ -54,7 +53,7 @@
                 android:text="@string/exam_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index 08bb40d9..a65048a3 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/gradeTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
@@ -17,7 +17,7 @@
         app:tabMode="fixed"
         app:tabTextColor="@android:color/white" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/gradeViewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -30,4 +30,4 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true" />
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index f30c7b19..aab81075 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -4,16 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeDetailsSwipe"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gradeDetailsRecycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
         android:id="@+id/gradeDetailsProgress"
@@ -30,7 +30,7 @@
         android:orientation="vertical"
         android:visibility="invisible">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="100dp"
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index f4e49090..37b97028 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -4,16 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeSummarySwipe"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gradeSummaryRecycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
         android:id="@+id/gradeSummaryProgress"
@@ -30,7 +30,7 @@
         android:orientation="vertical"
         android:visibility="invisible">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="100dp"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 58a4afe8..43e55844 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -1,5 +1,6 @@
 <RelativeLayout 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">
 
@@ -62,28 +63,28 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="15dp"
                     android:hint="@string/login_nickname_hint">
 
-                    <android.support.design.widget.TextInputEditText
+                    <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/loginNicknameEdit"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textEmailAddress"
                         android:maxLines="1" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="15dp"
                     android:hint="@string/login_password_hint">
 
-                    <android.support.design.widget.TextInputEditText
+                    <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/loginPassEdit"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -93,16 +94,16 @@
                         android:maxLines="1"
                         app:fontFamily="sans-serif" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/loginHostEdit"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/login_host_hint" />
             </LinearLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginSymbolInput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -116,11 +117,11 @@
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
                     android:inputType="textAutoComplete"
-                    android:maxLines="1" />
+                    android:maxLines="1"
+                    tools:ignore="LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/loginSignButton"
                 style="?android:textAppearanceSmall"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_login_options.xml b/app/src/main/res/layout/fragment_login_options.xml
index be09acd1..45636ad8 100644
--- a/app/src/main/res/layout/fragment_login_options.xml
+++ b/app/src/main/res/layout/fragment_login_options.xml
@@ -30,7 +30,7 @@
             android:text="@string/login_sync" />
     </RelativeLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/loginOptionsRecycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 888854db..a7181523 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
@@ -16,17 +16,16 @@
             android:layout_gravity="center"
             android:indeterminate="true" />
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/timetableSwipe"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/timetableRecycler"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
-
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
             android:id="@+id/timetableEmpty"
@@ -37,7 +36,7 @@
             android:padding="10dp"
             android:visibility="gone">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:minWidth="100dp"
@@ -54,7 +53,7 @@
                 android:text="@string/timetable_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index 9b32ebf9..7345a4b9 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorControlHighlight"
+    android:foreground="?attr/colorControlHighlight"
     android:minHeight="40dp"
     android:orientation="horizontal"
     android:paddingLeft="20dp"
diff --git a/app/src/main/res/layout/header_grade_summary.xml b/app/src/main/res/layout/header_grade_summary.xml
index e282d446..f7628688 100644
--- a/app/src/main/res/layout/header_grade_summary.xml
+++ b/app/src/main/res/layout/header_grade_summary.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorControlHighlight"
+    android:foreground="?attr/colorControlHighlight"
     android:orientation="horizontal"
     android:paddingLeft="20dp"
     android:paddingTop="7dp"
diff --git a/app/src/main/res/layout/item_login_options.xml b/app/src/main/res/layout/item_login_options.xml
index 911b84d7..3ab0e7bd 100644
--- a/app/src/main/res/layout/item_login_options.xml
+++ b/app/src/main/res/layout/item_login_options.xml
@@ -14,7 +14,7 @@
     android:paddingStart="10dp"
     android:paddingTop="5dp">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/loginItemImage"
         android:layout_width="60dp"
         android:layout_height="60dp"
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 64b39573..ddcb03fc 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:foreground="@android:color/white">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/api_symbols.xml b/app/src/main/res/values/api_symbols.xml
index 6f443c81..d9f89a23 100644
--- a/app/src/main/res/values/api_symbols.xml
+++ b/app/src/main/res/values/api_symbols.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,Typos">
     <string-array name="symbols">
         <item>Andrychów</item>
         <item>Augustów</item>
diff --git a/app/src/test/java/io/github/wulkanowy/ui/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/login/form/LoginFormPresenterTest.kt
index 5f0ba6b0..695edc0e 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/login/form/LoginFormPresenterTest.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.login.form
 
 import io.github.wulkanowy.TestSchedulers
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.login.LoginErrorHandler
diff --git a/app/src/test/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenterTest.kt
index 5ee3c10d..87507cb4 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenterTest.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.login.options
 
 import io.github.wulkanowy.TestSchedulers
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.SessionRepository
diff --git a/gradle.properties b/gradle.properties
index aac7c9b4..9e6fce10 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.