androidx migration

I DID THIS ONE MYSELF WITHOUT TAKING IT FROM THE OTHER FORKS YEEEEEEEEEEET
2025-11-08 10:08:56 +01:00 · 2020-01-06 03:26:31 -05:00
parent 53402459f2
commit 9b883b1a09
243 changed files with 4537 additions and 4604 deletions
--- a/app/src/main/java/exh/ui/base/BaseExhController.kt
+++ b/app/src/main/java/exh/ui/base/BaseExhController.kt
@@ -1,10 +1,10 @@
 package exh.ui.base

 import android.os.Bundle
-import android.support.annotation.LayoutRes
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.LayoutRes
 import eu.kanade.tachiyomi.ui.base.controller.BaseController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
--- a/app/src/main/java/exh/ui/captcha/AutoSolvingWebViewClient.kt
+++ b/app/src/main/java/exh/ui/captcha/AutoSolvingWebViewClient.kt
@@ -1,10 +1,10 @@
 package exh.ui.captcha

 import android.os.Build
-import android.support.annotation.RequiresApi
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
+import androidx.annotation.RequiresApi
 import eu.kanade.tachiyomi.util.asJsoup
 import exh.ui.captcha.BrowserActionActivity.Companion.CROSS_WINDOW_SCRIPT_INNER
 import org.jsoup.nodes.DataNode
--- a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
+++ b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
@@ -4,34 +4,38 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.support.annotation.RequiresApi
-import android.support.v7.app.AppCompatActivity
+import android.os.SystemClock
+import android.view.MotionEvent
 import android.webkit.*
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import com.afollestad.materialdialogs.MaterialDialog
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.string
 import com.google.gson.JsonParser
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.online.HttpSource
+import exh.source.DelegatedHttpSource
+import exh.util.melt
 import kotlinx.android.synthetic.main.eh_activity_captcha.*
-import okhttp3.*
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.Request
+import okhttp3.RequestBody
+import rx.Observable
 import rx.Single
 import rx.schedulers.Schedulers
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
+import java.io.Serializable
 import java.net.URL
 import java.util.*
-import android.view.MotionEvent
-import android.os.SystemClock
-import com.afollestad.materialdialogs.MaterialDialog
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.online.HttpSource
-import exh.source.DelegatedHttpSource
-import exh.util.melt
-import rx.Observable
-import java.io.Serializable
 import kotlin.collections.HashMap

 class BrowserActionActivity : AppCompatActivity() {
@@ -146,7 +150,7 @@ class BrowserActionActivity : AppCompatActivity() {
                        .asObservableSuccess()
                        .subscribeOn(Schedulers.io())
                        .map {
-                            val json = jsonParser.parse(it.body()!!.string())
+                            val json = jsonParser.parse(it.body!!.string())
                            it.close()
                            json["token"].string
                        }.melt()
@@ -267,10 +271,10 @@ class BrowserActionActivity : AppCompatActivity() {
                token to it
            }
        }.flatMap { (token, response) ->
-            val audioFile = response.body()!!.bytes()
+            val audioFile = response.body!!.bytes()

            httpClient.newCall(Request.Builder()
-                    .url(HttpUrl.parse("https://stream.watsonplatform.net/speech-to-text/api/v1/recognize")!!
+                    .url("https://stream.watsonplatform.net/speech-to-text/api/v1/recognize".toHttpUrlOrNull()!!
                            .newBuilder()
                            .addQueryParameter("watson-token", token)
                            .build())
@@ -279,11 +283,11 @@ class BrowserActionActivity : AppCompatActivity() {
                            .addFormDataPart("jsonDescription", RECOGNIZE_JSON)
                            .addFormDataPart("audio.mp3",
                                    "audio.mp3",
-                                    RequestBody.create(MediaType.parse("audio/mp3"), audioFile))
+                                    RequestBody.create("audio/mp3".toMediaTypeOrNull(), audioFile))
                            .build())
                    .build()).asObservableSuccess()
        }.map { response ->
-            jsonParser.parse(response.body()!!.string())["results"][0]["alternatives"][0]["transcript"].string.trim()
+            jsonParser.parse(response.body!!.string())["results"][0]["alternatives"][0]["transcript"].string.trim()
        }.toSingle()
    }

--- a/app/src/main/java/exh/ui/captcha/HeadersInjectingWebViewClient.kt
+++ b/app/src/main/java/exh/ui/captcha/HeadersInjectingWebViewClient.kt
@@ -1,10 +1,10 @@
 package exh.ui.captcha

 import android.os.Build
-import android.support.annotation.RequiresApi
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
+import androidx.annotation.RequiresApi

@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
 open class HeadersInjectingWebViewClient(activity: BrowserActionActivity,
--- a/app/src/main/java/exh/ui/captcha/WebViewUtil.kt
+++ b/app/src/main/java/exh/ui/captcha/WebViewUtil.kt
@@ -1,8 +1,8 @@
 package exh.ui.captcha

 import android.os.Build
-import android.support.annotation.RequiresApi
 import android.webkit.WebResourceRequest
+import androidx.annotation.RequiresApi
 import okhttp3.Request

@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
--- a/app/src/main/java/exh/ui/lock/FingerLockPreference.kt
+++ b/app/src/main/java/exh/ui/lock/FingerLockPreference.kt
@@ -4,12 +4,12 @@ import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.content.Context
 import android.os.Build
-import android.support.v7.preference.SwitchPreferenceCompat
-import android.support.v7.widget.LinearLayoutCompat
 import android.util.AttributeSet
 import android.view.Gravity
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.appcompat.widget.LinearLayoutCompat
+import androidx.preference.SwitchPreferenceCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import com.github.ajalt.reprint.core.AuthenticationResult
 import com.github.ajalt.reprint.core.Reprint
--- a/app/src/main/java/exh/ui/lock/LockPreference.kt
+++ b/app/src/main/java/exh/ui/lock/LockPreference.kt
@@ -1,9 +1,9 @@
 package exh.ui.lock

 import android.content.Context
-import android.support.v7.preference.SwitchPreferenceCompat
 import android.text.InputType
 import android.util.AttributeSet
+import androidx.preference.SwitchPreferenceCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
--- a/app/src/main/java/exh/ui/migration/manga/design/MigrationDesignController.kt
+++ b/app/src/main/java/exh/ui/migration/manga/design/MigrationDesignController.kt
@@ -1,7 +1,6 @@
 package exh.ui.migration.manga.design

 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.R
@@ -42,7 +41,7 @@ class MigrationDesignController(bundle: Bundle? = null) : BaseExhController(bund
                this
        )
        adapter = ourAdapter
-        recycler.layoutManager = LinearLayoutManager(view.context)
+        recycler.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(view.context)
        recycler.setHasFixedSize(true)
        recycler.adapter = ourAdapter
        ourAdapter.itemTouchHelperCallback = null // Reset adapter touch adapter to fix drag after rotation
--- a/app/src/main/java/exh/ui/migration/manga/design/MigrationSourceItem.kt
+++ b/app/src/main/java/exh/ui/migration/manga/design/MigrationSourceItem.kt
@@ -1,7 +1,6 @@
 package exh.ui.migration.manga.design

 import android.os.Parcelable
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -14,7 +13,7 @@ import kotlinx.android.parcel.Parcelize
 class MigrationSourceItem(val source: HttpSource, var sourceEnabled: Boolean): AbstractFlexibleItem<MigrationSourceHolder>() {
    override fun getLayoutRes() = R.layout.eh_source_item

-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): MigrationSourceHolder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<androidx.recyclerview.widget.RecyclerView.ViewHolder>>): MigrationSourceHolder {
        return MigrationSourceHolder(view, adapter as MigrationSourceAdapter)
    }

@@ -26,7 +25,7 @@ class MigrationSourceItem(val source: HttpSource, var sourceEnabled: Boolean): A
     * @param position The position of this item in the adapter.
     * @param payloads List of partial changes.
     */
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>,
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<androidx.recyclerview.widget.RecyclerView.ViewHolder>>,
                                holder: MigrationSourceHolder,
                                position: Int,
                                payloads: List<Any?>?) {
--- a/app/src/main/java/exh/ui/migration/manga/process/DeactivatableViewPager.kt
+++ b/app/src/main/java/exh/ui/migration/manga/process/DeactivatableViewPager.kt
@@ -1,11 +1,10 @@
 package exh.ui.migration.manga.process

 import android.content.Context
-import android.support.v4.view.ViewPager
 import android.util.AttributeSet
 import android.view.MotionEvent

-class DeactivatableViewPager: ViewPager {
+class DeactivatableViewPager : androidx.viewpager.widget.ViewPager {
    constructor(context: Context): super(context)
    constructor(context: Context, attrs: AttributeSet): super(context, attrs)

--- a/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureAdapter.kt
+++ b/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureAdapter.kt
@@ -1,6 +1,5 @@
 package exh.ui.migration.manga.process

-import android.support.v4.view.PagerAdapter
 import android.view.View
 import android.view.ViewGroup
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -18,7 +17,9 @@ import eu.kanade.tachiyomi.source.online.all.MergedSource
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.ui.migration.MigrationFlags
-import eu.kanade.tachiyomi.util.*
+import eu.kanade.tachiyomi.util.gone
+import eu.kanade.tachiyomi.util.inflate
+import eu.kanade.tachiyomi.util.visible
 import exh.MERGED_SOURCE_ID
 import exh.util.await
 import kotlinx.android.synthetic.main.eh_manga_card.view.*
@@ -34,7 +35,7 @@ import kotlin.coroutines.CoroutineContext

 class MigrationProcedureAdapter(val controller: MigrationProcedureController,
                                val migratingManga: List<MigratingManga>,
-                                override val coroutineContext: CoroutineContext) : PagerAdapter(), CoroutineScope {
+                                override val coroutineContext: CoroutineContext) : androidx.viewpager.widget.PagerAdapter(), CoroutineScope {
    private val db: DatabaseHelper by injectLazy()
    private val gson: Gson by injectLazy()
    private val sourceManager: SourceManager by injectLazy()
--- a/app/src/main/java/exh/ui/webview/WebViewActivity.kt
+++ b/app/src/main/java/exh/ui/webview/WebViewActivity.kt
@@ -129,7 +129,7 @@ class WebViewActivity : BaseActivity() {
        webview.restoreState(savedInstanceState)
    }

-    override fun onSaveInstanceState(outState: Bundle?) {
+    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
        outState?.putString(STATE_KEY_MOBILE_USER_AGENT, mobileUserAgent)
        outState?.putBoolean(STATE_KEY_IS_DESKTOP, isDesktop)