migrate to androidx

2025-12-08 19:05:54 +00:00 · 2019-12-25 11:34:40 +01:00 · 2019-12-25 11:34:40 +01:00 · 50c651194a
commit 50c651194a
parent eda43e619c
578 changed files with 2120 additions and 2039 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -24,13 +24,13 @@ android {
            storePassword((buildProperties.secrets['android_store_password'] | buildProperties.notThere['android_store_password']).string)
        }
    }
-    compileSdkVersion 27
+    compileSdkVersion 29
    defaultConfig {
        applicationId "com.fastaccess.github"
        minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 467
-        versionName "4.6.7"
+        targetSdkVersion 29
+        versionCode 468
+        versionName "4.6.8"
        buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string
        buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string
        buildConfigString "IMGUR_CLIENT_ID", (buildProperties.secrets['imgur_client_id'] | buildProperties.notThere['imgur_client_id']).string
@ -38,7 +38,7 @@ android {
        buildConfigField "String", "REST_URL", '"https://api.github.com/"'
        buildConfigField "String", "IMGUR_URL", '"https://api.imgur.com/3/"'
        multiDexEnabled true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        javaCompileOptions {
            annotationProcessorOptions {
                includeCompileClasspath true
@ -89,7 +89,7 @@ android {
    }

    configurations {
-        all*.exclude module: 'annotation'
+        all*.exclude module: 'javax.annotation'
        all*.exclude group: 'org.jetbrains', module: 'annotations-java5'
    }

@ -118,13 +118,15 @@ repositories {

 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:${supportVersion}"
-    implementation "com.android.support:design:${supportVersion}"
-    implementation "com.android.support:cardview-v7:${supportVersion}"
-    implementation "com.android.support:recyclerview-v7:${supportVersion}"
-    implementation "com.android.support:preference-v14:${supportVersion}"
-    implementation "com.android.support:customtabs:${supportVersion}"
-    implementation "com.android.support:palette-v7:${supportVersion}"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.core:core:1.1.0'
    implementation "net.grandcentrix.thirtyinch:thirtyinch:${thirtyinchVersion}"
    implementation "net.grandcentrix.thirtyinch:thirtyinch-rx2:${thirtyinchVersion}"
    implementation "com.squareup.retrofit2:retrofit:${retrofit}"
@ -135,9 +137,9 @@ dependencies {
    implementation 'cn.gavinliu:ShapedImageView:0.8.7'
    implementation "com.jakewharton:butterknife:${butterKnifeVersion}"
    implementation 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.15'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.1'
    implementation 'com.annimon:stream:1.1.9'
    implementation 'com.github.GrenderG:Toasty:1.1.3'
    implementation 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2'
@ -154,10 +156,10 @@ dependencies {
    implementation "com.atlassian.commonmark:commonmark-ext-gfm-tables:${commonmark}"
    implementation "com.atlassian.commonmark:commonmark-ext-ins:${commonmark}"
    implementation "com.atlassian.commonmark:commonmark-ext-yaml-front-matter:${commonmark}"
-    implementation "com.google.firebase:firebase-core:${gms}"
-    implementation "com.google.firebase:firebase-messaging:${gms}"
-    implementation "com.google.firebase:firebase-database:${gms}"
-    implementation "com.google.android.gms:play-services-base:${gms}"
+    implementation "com.google.firebase:firebase-core:17.2.1"
+    implementation "com.google.firebase:firebase-messaging:20.1.0"
+    implementation "com.google.firebase:firebase-database:19.2.0"
+    implementation "com.google.android.gms:play-services-base:17.1.0"
    implementation('com.github.b3er.rxfirebase:firebase-database-kotlin:11.2.0') { transitive = false }
    implementation('com.github.b3er.rxfirebase:firebase-database:11.2.0') { transitive = false }
    implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') { transitive = true }
@ -170,7 +172,7 @@ dependencies {
    implementation("com.apollographql.apollo:apollo-runtime:1.2.2")
    implementation 'com.jaredrummler:android-device-names:1.1.5'
    implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.1.0'
-    implementation 'com.airbnb.android:lottie:2.2.5'
+    implementation 'com.airbnb.android:lottie:3.0.7'
    implementation 'com.firebase:firebase-jobdispatcher:0.8.2'

    compileOnly "org.projectlombok:lombok:${lombokVersion}"
@ -180,6 +182,7 @@ dependencies {
    kapt "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
    kapt 'com.github.matthiasrobbers:shortbread-compiler:1.0.1'
    kapt "io.requery:requery-processor:${requery}"
+    kapt "com.github.bumptech.glide:compiler:$glideVersion"

 }

--- a/app/src/main/java/com/fastaccess/App.java
+++ b/app/src/main/java/com/fastaccess/App.java
@ -1,8 +1,8 @@
 package com.fastaccess;

 import android.app.Application;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceManager;
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceManager;

 import com.fastaccess.data.dao.model.Models;
 import com.fastaccess.helper.DeviceNameGetter;
--- a/app/src/main/java/com/fastaccess/GlideModule.kt
+++ b/app/src/main/java/com/fastaccess/GlideModule.kt
@ -0,0 +1,8 @@
+package com.fastaccess
+
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.module.AppGlideModule
+
+
+@GlideModule
+class GlideModule : AppGlideModule()
--- a/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java
+++ b/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java
@ -2,8 +2,8 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Stream;

--- a/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java
@ -2,8 +2,8 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.helper.InputHelper;

--- a/app/src/main/java/com/fastaccess/data/dao/EditRepoFileModel.kt
+++ b/app/src/main/java/com/fastaccess/data/dao/EditRepoFileModel.kt
@ -9,23 +9,26 @@ import com.fastaccess.helper.writeBoolean
 /**
 * Created by Hashemsergani on 01/09/2017.
 */
-data class EditRepoFileModel(val login: String,
-                             val repoId: String,
-                             val path: String?,
-                             val ref: String,
-                             val sha: String?,
-                             val contentUrl: String?,
-                             val fileName: String?,
-                             val isEdit: Boolean) : KotlinParcelable {
+data class EditRepoFileModel(
+    val login: String,
+    val repoId: String,
+    val path: String?,
+    val ref: String,
+    val sha: String?,
+    val contentUrl: String?,
+    val fileName: String?,
+    val isEdit: Boolean
+) : KotlinParcelable {
    constructor(parcel: Parcel) : this(
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readBoolean())
+        parcel.readString() ?: "",
+        parcel.readString() ?: "",
+        parcel.readString() ?: "",
+        parcel.readString() ?: "",
+        parcel.readString() ?: "",
+        parcel.readString() ?: "",
+        parcel.readString() ?: "",
+        parcel.readBoolean()
+    )

    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
        writeString(login)
--- a/app/src/main/java/com/fastaccess/data/dao/FragmentPagerAdapterModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/FragmentPagerAdapterModel.java
@ -1,9 +1,9 @@
 package com.fastaccess.data.dao;

 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;

 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
--- a/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.dao;

-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
--- a/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Stream;
 import com.fastaccess.data.dao.model.Issue;
--- a/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
--- a/app/src/main/java/com/fastaccess/data/dao/NameParser.java
+++ b/app/src/main/java/com/fastaccess/data/dao/NameParser.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.dao;

 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.fastaccess.helper.InputHelper;
 import com.fastaccess.provider.scheme.LinkParserHelper;
--- a/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Stream;
 import com.fastaccess.data.dao.model.IssueEvent;
--- a/app/src/main/java/com/fastaccess/data/dao/PullsIssuesParser.java
+++ b/app/src/main/java/com/fastaccess/data/dao/PullsIssuesParser.java
@ -3,7 +3,7 @@ package com.fastaccess.data.dao;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.helper.InputHelper;

--- a/app/src/main/java/com/fastaccess/data/dao/ReactionsModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/ReactionsModel.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.fastaccess.data.dao.model.User;
 import com.google.gson.annotations.SerializedName;
--- a/app/src/main/java/com/fastaccess/data/dao/RepoPathsManager.java
+++ b/app/src/main/java/com/fastaccess/data/dao/RepoPathsManager.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.dao;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.data.dao.model.RepoFile;

--- a/app/src/main/java/com/fastaccess/data/dao/SettingsModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/SettingsModel.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.dao;

-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/app/src/main/java/com/fastaccess/data/dao/TabsCountStateModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/TabsCountStateModel.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;

 import java.io.Serializable;

--- a/app/src/main/java/com/fastaccess/data/dao/TimelineModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/TimelineModel.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.fastaccess.data.dao.model.Comment;
 import com.fastaccess.data.dao.model.Issue;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractComment.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractComment.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.ReactionsModel;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractCommit.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractCommit.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.CommitFileListModel;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractEvent.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractEvent.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;

 import com.fastaccess.App;
@ -42,7 +42,7 @@ import lombok.NoArgsConstructor;
    @Nullable String login;

    @NonNull
-    public static Disposable save(@android.support.annotation.Nullable List<Event> events, @android.support.annotation.Nullable String user) {
+    public static Disposable save(@androidx.annotation.Nullable List<Event> events, @androidx.annotation.Nullable String user) {
        return RxHelper.getSingle(Single.fromPublisher(s -> {
            try {
                Login login = Login.getUser();
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractFastHubNotification.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractFastHubNotification.java
@ -2,8 +2,8 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;

--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.annimon.stream.Collectors;
 import com.annimon.stream.LongStream;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssue.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssue.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.LabelListModel;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssueEvent.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssueEvent.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.LabelModel;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractLogin.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractLogin.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.helper.PrefGetter;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotification.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotification.java
@ -72,7 +72,7 @@ import lombok.NoArgsConstructor;
        })).subscribe(o -> {/*do nothing*/}, Throwable::printStackTrace);
    }

-    public static Disposable save(@android.support.annotation.Nullable List<Notification> models) {
+    public static Disposable save(@androidx.annotation.Nullable List<Notification> models) {
        if (models == null || models.isEmpty()) {
            return Observable.empty().subscribe();
        }
@ -92,7 +92,7 @@ import lombok.NoArgsConstructor;
        })).subscribe(o -> {/*do nothing*/}, Throwable::printStackTrace);
    }

-    public static Single<Boolean> saveAsSingle(@android.support.annotation.Nullable List<Notification> models) {
+    public static Single<Boolean> saveAsSingle(@androidx.annotation.Nullable List<Notification> models) {
        if (models == null || models.isEmpty()) {
            return Single.just(true);
        }
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotificationQueue.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotificationQueue.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.helper.RxHelper;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.dao.model;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.converters.GistConverter;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedIssues.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedIssues.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.dao.model;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.converters.IssueConverter;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedPullRequests.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedPullRequests.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.dao.model;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.converters.PullRequestConverter;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedRepos.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedRepos.java
@ -1,8 +1,8 @@
 package com.fastaccess.data.dao.model;

 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.converters.RepoConverter;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPullRequest.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPullRequest.java
@ -3,7 +3,7 @@ package com.fastaccess.data.dao.model;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRelease.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRelease.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.ReleasesAssetsListModel;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepo.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepo.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.LicenseModel;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepoFile.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepoFile.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.data.dao.types.FilesType;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractUser.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractUser.java
@ -2,8 +2,8 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.helper.RxHelper;
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractViewerFile.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractViewerFile.java
@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model;

 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.App;
 import com.fastaccess.helper.RxHelper;
--- a/app/src/main/java/com/fastaccess/data/dao/types/EventsType.java
+++ b/app/src/main/java/com/fastaccess/data/dao/types/EventsType.java
@ -1,8 +1,8 @@
 package com.fastaccess.data.dao.types;


-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;

 import com.fastaccess.R;

--- a/app/src/main/java/com/fastaccess/data/dao/types/FilesType.java
+++ b/app/src/main/java/com/fastaccess/data/dao/types/FilesType.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.dao.types;

-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;

 import com.fastaccess.R;

--- a/app/src/main/java/com/fastaccess/data/dao/types/IssueEventType.java
+++ b/app/src/main/java/com/fastaccess/data/dao/types/IssueEventType.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.dao.types;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Stream;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/data/dao/types/IssueState.java
+++ b/app/src/main/java/com/fastaccess/data/dao/types/IssueState.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.dao.types;

-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;

 import com.fastaccess.R;

--- a/app/src/main/java/com/fastaccess/data/dao/types/ReactionTypes.java
+++ b/app/src/main/java/com/fastaccess/data/dao/types/ReactionTypes.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.dao.types;

-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Stream;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/data/dao/types/ReviewStateType.java
+++ b/app/src/main/java/com/fastaccess/data/dao/types/ReviewStateType.java
@ -1,9 +1,9 @@
 package com.fastaccess.data.dao.types;

-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;

 import com.annimon.stream.Stream;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/data/dao/types/StatusStateType.java
+++ b/app/src/main/java/com/fastaccess/data/dao/types/StatusStateType.java
@ -1,8 +1,8 @@
 package com.fastaccess.data.dao.types;

-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Stream;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt
+++ b/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt
@ -7,16 +7,18 @@ import com.fastaccess.helper.parcelableCreator
 /**
 * Created by Kosh on 13 Jun 2017, 8:06 PM
 */
-data class WikiContentModel(val content: String? = null, private val footer: String? = null,
-                            val sidebar: List<WikiSideBarModel>) : KotlinParcelable {
+data class WikiContentModel(
+    val content: String? = null, private val footer: String? = null,
+    val sidebar: List<WikiSideBarModel>
+) : KotlinParcelable {
    companion object {
        @JvmField val CREATOR = parcelableCreator(::WikiContentModel)
    }

    constructor(source: Parcel) : this(
-            source.readString(),
-            source.readString(),
-            source.createTypedArrayList(WikiSideBarModel.CREATOR)
+        source.readString(),
+        source.readString(),
+        source.createTypedArrayList(WikiSideBarModel.CREATOR) ?: arrayListOf()
    )

    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
--- a/app/src/main/java/com/fastaccess/data/service/GistService.java
+++ b/app/src/main/java/com/fastaccess/data/service/GistService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.CommentRequestModel;
 import com.fastaccess.data.dao.CreateGistModel;
--- a/app/src/main/java/com/fastaccess/data/service/ImgurService.java
+++ b/app/src/main/java/com/fastaccess/data/service/ImgurService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.fastaccess.data.dao.ImgurReponseModel;

--- a/app/src/main/java/com/fastaccess/data/service/IssueService.java
+++ b/app/src/main/java/com/fastaccess/data/service/IssueService.java
@ -1,7 +1,7 @@
 package com.fastaccess.data.service;


-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.AssigneesRequestModel;
 import com.fastaccess.data.dao.CommentRequestModel;
--- a/app/src/main/java/com/fastaccess/data/service/LoginRestService.java
+++ b/app/src/main/java/com/fastaccess/data/service/LoginRestService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.AccessTokenModel;
 import com.fastaccess.data.dao.AuthModel;
--- a/app/src/main/java/com/fastaccess/data/service/NotificationService.java
+++ b/app/src/main/java/com/fastaccess/data/service/NotificationService.java
@ -1,8 +1,8 @@
 package com.fastaccess.data.service;


-import android.support.annotation.NonNull;
-import android.support.annotation.StringDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringDef;

 import com.fastaccess.data.dao.NotificationSubscriptionBodyModel;
 import com.fastaccess.data.dao.Pageable;
--- a/app/src/main/java/com/fastaccess/data/service/OrganizationService.java
+++ b/app/src/main/java/com/fastaccess/data/service/OrganizationService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.Pageable;
 import com.fastaccess.data.dao.TeamsModel;
--- a/app/src/main/java/com/fastaccess/data/service/PullRequestService.java
+++ b/app/src/main/java/com/fastaccess/data/service/PullRequestService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.AssigneesRequestModel;
 import com.fastaccess.data.dao.CommitFileModel;
--- a/app/src/main/java/com/fastaccess/data/service/ReactionsService.java
+++ b/app/src/main/java/com/fastaccess/data/service/ReactionsService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.Pageable;
 import com.fastaccess.data.dao.PostReactionModel;
--- a/app/src/main/java/com/fastaccess/data/service/RepoService.java
+++ b/app/src/main/java/com/fastaccess/data/service/RepoService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.BranchesModel;
 import com.fastaccess.data.dao.CommentRequestModel;
--- a/app/src/main/java/com/fastaccess/data/service/ReviewService.java
+++ b/app/src/main/java/com/fastaccess/data/service/ReviewService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.CommentRequestModel;
 import com.fastaccess.data.dao.Pageable;
--- a/app/src/main/java/com/fastaccess/data/service/UserRestService.java
+++ b/app/src/main/java/com/fastaccess/data/service/UserRestService.java
@ -1,6 +1,6 @@
 package com.fastaccess.data.service;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.Pageable;
 import com.fastaccess.data.dao.model.Event;
--- a/app/src/main/java/com/fastaccess/helper/ActivityHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/ActivityHelper.java
@ -12,15 +12,15 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.ShareCompat;
-import android.support.v4.util.Pair;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.app.ShareCompat;
+import androidx.core.util.Pair;
 import android.view.View;
 import android.widget.Toast;

--- a/app/src/main/java/com/fastaccess/helper/AnimHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/AnimHelper.java
@ -5,14 +5,14 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.app.Dialog;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.animation.FastOutLinearInInterpolator;
-import android.support.v4.view.animation.LinearOutSlowInInterpolator;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.DialogFragment;
+import androidx.core.view.ViewCompat;
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.ViewPropertyAnimator;
--- a/app/src/main/java/com/fastaccess/helper/AppHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/AppHelper.java
@ -11,10 +11,10 @@ import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;

--- a/app/src/main/java/com/fastaccess/helper/BundleConstant.java
+++ b/app/src/main/java/com/fastaccess/helper/BundleConstant.java
@ -1,6 +1,6 @@
 package com.fastaccess.helper;

-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/app/src/main/java/com/fastaccess/helper/Bundler.java
+++ b/app/src/main/java/com/fastaccess/helper/Bundler.java
@ -4,7 +4,7 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.SparseArray;

 import java.io.Serializable;
--- a/app/src/main/java/com/fastaccess/helper/FileHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/FileHelper.java
@ -8,8 +8,8 @@ import android.net.Uri;
 import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.R;
 import com.fastaccess.data.dao.NotificationSoundModel;
--- a/app/src/main/java/com/fastaccess/helper/InputHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/InputHelper.java
@ -1,8 +1,8 @@
 package com.fastaccess.helper;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.TextUtils;
 import android.widget.EditText;
 import android.widget.TextView;
--- a/app/src/main/java/com/fastaccess/helper/Logger.java
+++ b/app/src/main/java/com/fastaccess/helper/Logger.java
@ -1,7 +1,7 @@
 package com.fastaccess.helper;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;

 import com.fastaccess.BuildConfig;
--- a/app/src/main/java/com/fastaccess/helper/ObjectsCompat.java
+++ b/app/src/main/java/com/fastaccess/helper/ObjectsCompat.java
@ -1,6 +1,6 @@
 package com.fastaccess.helper;

-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 /**
 * Created by Kosh on 18 Apr 2017, 10:57 PM
--- a/app/src/main/java/com/fastaccess/helper/ParseDateFormat.java
+++ b/app/src/main/java/com/fastaccess/helper/ParseDateFormat.java
@ -1,7 +1,7 @@
 package com.fastaccess.helper;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.format.DateUtils;

 import java.text.DateFormat;
--- a/app/src/main/java/com/fastaccess/helper/PrefGetter.java
+++ b/app/src/main/java/com/fastaccess/helper/PrefGetter.java
@ -4,9 +4,9 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.media.RingtoneManager;
 import android.net.Uri;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.BuildConfig;
--- a/app/src/main/java/com/fastaccess/helper/PrefHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/PrefHelper.java
@ -3,8 +3,8 @@ package com.fastaccess.helper;
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;

--- a/app/src/main/java/com/fastaccess/helper/RxHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/RxHelper.java
@ -1,6 +1,6 @@
 package com.fastaccess.helper;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import io.reactivex.Observable;
 import io.reactivex.Single;
--- a/app/src/main/java/com/fastaccess/helper/ViewHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/ViewHelper.java
@ -14,10 +14,10 @@ import android.graphics.drawable.RippleDrawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.StateListDrawable;
 import android.graphics.drawable.shapes.RoundRectShape;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
 import android.text.Layout;
 import android.util.TypedValue;
 import android.view.View;
--- a/app/src/main/java/com/fastaccess/provider/colors/ColorsProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/colors/ColorsProvider.java
@ -3,9 +3,9 @@ package com.fastaccess.provider.colors;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
--- a/app/src/main/java/com/fastaccess/provider/fabric/FabricProvider.kt
+++ b/app/src/main/java/com/fastaccess/provider/fabric/FabricProvider.kt
@ -18,18 +18,20 @@ object FabricProvider {

    fun initFabric(context: Context) {
        val fabric = Fabric.Builder(context)
-                .kits(Crashlytics.Builder()
-                        .core(CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build())
-                        .build())
-                .debuggable(BuildConfig.DEBUG)
-                .build()
+            .kits(
+                Crashlytics.Builder()
+                    .core(CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build())
+                    .build()
+            )
+            .debuggable(BuildConfig.DEBUG)
+            .build()
        Fabric.with(fabric)
    }

-    fun logPurchase(productKey: String, price: Long? = null, priceText: String? = null) {
+    fun logPurchase(productKey: String?, price: Long? = null, priceText: String? = null) {
        val purchaseEvent = PurchaseEvent()
-                .putItemName(productKey)
-                .putSuccess(true)
+            .putItemName(productKey)
+            .putSuccess(true)

        priceText?.let {
            purchaseEvent.putItemType(priceText)
--- a/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java
+++ b/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java
@ -4,7 +4,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;

 import com.fastaccess.R;
 import com.fastaccess.data.dao.model.FastHubNotification;
--- a/app/src/main/java/com/fastaccess/provider/gson/ToGsonProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/gson/ToGsonProvider.java
@ -1,7 +1,7 @@
 package com.fastaccess.provider.gson;

 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.R;

--- a/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java
@ -1,7 +1,7 @@
 package com.fastaccess.provider.markdown;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Html;
 import android.view.ViewTreeObserver;
 import android.webkit.MimeTypeMap;
--- a/app/src/main/java/com/fastaccess/provider/rest/ImgurProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/ImgurProvider.java
@ -1,6 +1,6 @@
 package com.fastaccess.provider.rest;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.BuildConfig;
 import com.fastaccess.data.service.ImgurService;
--- a/app/src/main/java/com/fastaccess/provider/rest/LoginProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/LoginProvider.java
@ -1,7 +1,7 @@
 package com.fastaccess.provider.rest;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.BuildConfig;
 import com.fastaccess.data.service.LoginRestService;
--- a/app/src/main/java/com/fastaccess/provider/rest/RepoQueryProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/RepoQueryProvider.java
@ -1,6 +1,6 @@
 package com.fastaccess.provider.rest;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.data.dao.types.IssueState;

--- a/app/src/main/java/com/fastaccess/provider/rest/RestProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/RestProvider.java
@ -4,8 +4,8 @@ import android.app.DownloadManager;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.Toast;

--- a/app/src/main/java/com/fastaccess/provider/rest/converters/GithubResponseConverter.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/converters/GithubResponseConverter.java
@ -1,6 +1,6 @@
 package com.fastaccess.provider.rest.converters;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.google.gson.Gson;

--- a/app/src/main/java/com/fastaccess/provider/rest/interceptors/AuthenticationInterceptor.kt
+++ b/app/src/main/java/com/fastaccess/provider/rest/interceptors/AuthenticationInterceptor.kt
@ -24,7 +24,7 @@ class AuthenticationInterceptor : Interceptor {
    @Throws(IOException::class) override fun intercept(chain: Interceptor.Chain): Response {
        val original = chain.request()
        val builder = original.newBuilder()
-        val isEnterprise = LinkParserHelper.isEnterprise(original.url().host())
+        val isEnterprise = LinkParserHelper.isEnterprise(original.url.host)
        val authToken = if (token.isNullOrBlank()) if (isEnterprise) PrefGetter.getEnterpriseToken() else PrefGetter.getToken() else token
        val otpCode = if (otp.isNullOrBlank()) if (isEnterprise) PrefGetter.getEnterpriseOtpCode() else PrefGetter.getOtpCode() else otp
        if (!authToken.isNullOrBlank()) {
--- a/app/src/main/java/com/fastaccess/provider/rest/interceptors/ContentTypeInterceptor.kt
+++ b/app/src/main/java/com/fastaccess/provider/rest/interceptors/ContentTypeInterceptor.kt
@ -13,7 +13,7 @@ class ContentTypeInterceptor : Interceptor {
        return chain.proceed(request.newBuilder()
                .addHeader("Accept", "application/vnd.github.v3+json")
                .addHeader("Content-type", "application/vnd.github.v3+json")
-                .method(request.method(), request.body())
+                .method(request.method, request.body)
                .build())
    }
 }
--- a/app/src/main/java/com/fastaccess/provider/rest/interceptors/PaginationInterceptor.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/interceptors/PaginationInterceptor.java
@ -1,7 +1,7 @@
 package com.fastaccess.provider.rest.interceptors;

 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.helper.InputHelper;

--- a/app/src/main/java/com/fastaccess/provider/rest/jsoup/JsoupProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/jsoup/JsoupProvider.java
@ -1,6 +1,6 @@
 package com.fastaccess.provider.rest.jsoup;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import com.fastaccess.BuildConfig;
 import com.fastaccess.data.service.ScrapService;
--- a/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java
+++ b/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java
@ -1,6 +1,6 @@
 package com.fastaccess.provider.rest.loadmore;

-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.fastaccess.ui.base.mvp.BaseMvp;
 import com.fastaccess.ui.widgets.recyclerview.scroll.InfiniteScroll;
--- a/app/src/main/java/com/fastaccess/provider/scheme/LinkParserHelper.java
+++ b/app/src/main/java/com/fastaccess/provider/scheme/LinkParserHelper.java
@ -1,8 +1,8 @@
 package com.fastaccess.provider.scheme;

 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;

--- a/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java
+++ b/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java
@ -7,8 +7,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;

--- a/app/src/main/java/com/fastaccess/provider/tasks/git/GithubActionService.java
+++ b/app/src/main/java/com/fastaccess/provider/tasks/git/GithubActionService.java
@ -5,10 +5,10 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;

 import com.fastaccess.R;
 import com.fastaccess.helper.BundleConstant;
--- a/app/src/main/java/com/fastaccess/provider/tasks/git/ReactionService.java
+++ b/app/src/main/java/com/fastaccess/provider/tasks/git/ReactionService.java
@ -5,9 +5,9 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;

 import com.fastaccess.R;
 import com.fastaccess.data.dao.PostReactionModel;
--- a/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
+++ b/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
@ -9,10 +9,10 @@ import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.media.AudioManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;

 import com.annimon.stream.Stream;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/provider/tasks/notification/ReadNotificationService.java
+++ b/app/src/main/java/com/fastaccess/provider/tasks/notification/ReadNotificationService.java
@ -7,9 +7,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;

 import com.annimon.stream.LongStream;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/provider/tasks/slack/SlackInvitationService.java
+++ b/app/src/main/java/com/fastaccess/provider/tasks/slack/SlackInvitationService.java
@ -2,7 +2,7 @@ package com.fastaccess.provider.tasks.slack;

 import android.app.IntentService;
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import com.fastaccess.App;
 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt
+++ b/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt
@ -3,7 +3,7 @@ package com.fastaccess.provider.theme
 import android.app.Activity
 import android.app.ActivityManager
 import android.graphics.BitmapFactory
-import android.support.annotation.StyleRes
+import androidx.annotation.StyleRes
 import com.danielstone.materialaboutlibrary.MaterialAboutActivity
 import com.fastaccess.R
 import com.fastaccess.helper.Logger
--- a/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java
+++ b/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java
@ -1,8 +1,8 @@
 package com.fastaccess.provider.timeline;

 import android.content.Context;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.widget.TextView;

--- a/app/src/main/java/com/fastaccess/provider/timeline/HtmlHelper.java
+++ b/app/src/main/java/com/fastaccess/provider/timeline/HtmlHelper.java
@ -4,9 +4,9 @@ package com.fastaccess.provider.timeline;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import android.view.HapticFeedbackConstants;
 import android.widget.PopupMenu;
 import android.widget.TextView;
--- a/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java
@ -1,9 +1,9 @@
 package com.fastaccess.provider.timeline;

-import android.support.annotation.IdRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IdRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.fastaccess.data.dao.PostReactionModel;
 import com.fastaccess.data.dao.ReactionsModel;
--- a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java
+++ b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java
@ -2,8 +2,8 @@ package com.fastaccess.provider.timeline;

 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.style.BackgroundColorSpan;

 import com.fastaccess.R;
--- a/app/src/main/java/com/fastaccess/provider/timeline/handler/HrSpan.java
+++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/HrSpan.java
@ -5,7 +5,7 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.style.LineHeightSpan;
 import android.text.style.ReplacementSpan;

--- a/app/src/main/java/com/fastaccess/provider/timeline/handler/ListsHandler.java
+++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/ListsHandler.java
@ -1,7 +1,7 @@
 package com.fastaccess.provider.timeline.handler;

 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.SpannableStringBuilder;

 import com.fastaccess.helper.Logger;
--- a/Show More
+++ b/Show More