Extract source api from app module (#8014)

* Extract source api from app module * Extract source online api from app module
2022-09-16 00:12:27 +02:00
parent 30ac94181b
commit 86fe850794
53 changed files with 219 additions and 106 deletions
@@ -24,10 +24,8 @@ import android.util.TypedValue
 import android.view.Display
 import android.view.View
 import android.view.WindowManager
-import android.widget.Toast
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
-import androidx.annotation.StringRes
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
@@ -52,29 +50,6 @@ import kotlin.math.roundToInt

 private const val TABLET_UI_MIN_SCREEN_WIDTH_DP = 720

-/**
- * Display a toast in this context.
- *
- * @param resource the text resource.
- * @param duration the duration of the toast. Defaults to short.
- */
-fun Context.toast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT, block: (Toast) -> Unit = {}): Toast {
-    return toast(getString(resource), duration, block)
-}
-
-/**
- * Display a toast in this context.
- *
- * @param text the text to display.
- * @param duration the duration of the toast. Defaults to short.
- */
-fun Context.toast(text: String?, duration: Int = Toast.LENGTH_SHORT, block: (Toast) -> Unit = {}): Toast {
-    return Toast.makeText(applicationContext, text.orEmpty(), duration).also {
-        block(it)
-        it.show()
-    }
-}
-
 /**
 * Copies a string to clipboard
 *
@@ -1,51 +0,0 @@
-package eu.kanade.tachiyomi.util.system
-
-import android.annotation.SuppressLint
-import android.os.Build
-import com.google.android.material.color.DynamicColors
-import logcat.LogPriority
-
-object DeviceUtil {
-
-    val isMiui by lazy {
-        getSystemProperty("ro.miui.ui.version.name")?.isNotEmpty() ?: false
-    }
-
-    @SuppressLint("PrivateApi")
-    fun isMiuiOptimizationDisabled(): Boolean {
-        val sysProp = getSystemProperty("persist.sys.miui_optimization")
-        if (sysProp == "0" || sysProp == "false") {
-            return true
-        }
-
-        return try {
-            Class.forName("android.miui.AppOpsUtils")
-                .getDeclaredMethod("isXOptMode")
-                .invoke(null) as Boolean
-        } catch (e: Exception) {
-            false
-        }
-    }
-
-    val isSamsung by lazy {
-        Build.MANUFACTURER.equals("samsung", ignoreCase = true)
-    }
-
-    val isDynamicColorAvailable by lazy {
-        DynamicColors.isDynamicColorAvailable() || (isSamsung && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-    }
-
-    val invalidDefaultBrowsers = listOf("android", "com.huawei.android.internal.app")
-
-    @SuppressLint("PrivateApi")
-    private fun getSystemProperty(key: String?): String? {
-        return try {
-            Class.forName("android.os.SystemProperties")
-                .getDeclaredMethod("get", String::class.java)
-                .invoke(null, key) as String
-        } catch (e: Exception) {
-            logcat(LogPriority.WARN, e) { "Unable to use SystemProperties.get()" }
-            null
-        }
-    }
-}
@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.util.system
+
+import android.os.Build
+import com.google.android.material.color.DynamicColors
+
+val DeviceUtil.isDynamicColorAvailable by lazy {
+    DynamicColors.isDynamicColorAvailable() || (DeviceUtil.isSamsung && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+}
@@ -1,18 +0,0 @@
-package eu.kanade.tachiyomi.util.system
-
-import logcat.LogPriority
-import logcat.asLog
-import logcat.logcat
-
-inline fun Any.logcat(
-    priority: LogPriority = LogPriority.DEBUG,
-    throwable: Throwable? = null,
-    message: () -> String = { "" },
-) = logcat(priority = priority) {
-    var msg = message()
-    if (throwable != null) {
-        if (msg.isNotBlank()) msg += "\n"
-        msg += throwable.asLog()
-    }
-    msg
-}
@@ -1,94 +0,0 @@
-package eu.kanade.tachiyomi.util.system
-
-import android.annotation.TargetApi
-import android.os.Build
-import android.webkit.WebResourceError
-import android.webkit.WebResourceRequest
-import android.webkit.WebResourceResponse
-import android.webkit.WebView
-import android.webkit.WebViewClient
-
-@Suppress("OverridingDeprecatedMember")
-abstract class WebViewClientCompat : WebViewClient() {
-
-    open fun shouldOverrideUrlCompat(view: WebView, url: String): Boolean {
-        return false
-    }
-
-    open fun shouldInterceptRequestCompat(view: WebView, url: String): WebResourceResponse? {
-        return null
-    }
-
-    open fun onReceivedErrorCompat(
-        view: WebView,
-        errorCode: Int,
-        description: String?,
-        failingUrl: String,
-        isMainFrame: Boolean,
-    ) {
-    }
-
-    @TargetApi(Build.VERSION_CODES.N)
-    final override fun shouldOverrideUrlLoading(
-        view: WebView,
-        request: WebResourceRequest,
-    ): Boolean {
-        return shouldOverrideUrlCompat(view, request.url.toString())
-    }
-
-    final override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-        return shouldOverrideUrlCompat(view, url)
-    }
-
-    final override fun shouldInterceptRequest(
-        view: WebView,
-        request: WebResourceRequest,
-    ): WebResourceResponse? {
-        return shouldInterceptRequestCompat(view, request.url.toString())
-    }
-
-    final override fun shouldInterceptRequest(
-        view: WebView,
-        url: String,
-    ): WebResourceResponse? {
-        return shouldInterceptRequestCompat(view, url)
-    }
-
-    final override fun onReceivedError(
-        view: WebView,
-        request: WebResourceRequest,
-        error: WebResourceError,
-    ) {
-        onReceivedErrorCompat(
-            view,
-            error.errorCode,
-            error.description?.toString(),
-            request.url.toString(),
-            request.isForMainFrame,
-        )
-    }
-
-    final override fun onReceivedError(
-        view: WebView,
-        errorCode: Int,
-        description: String?,
-        failingUrl: String,
-    ) {
-        onReceivedErrorCompat(view, errorCode, description, failingUrl, failingUrl == view.url)
-    }
-
-    final override fun onReceivedHttpError(
-        view: WebView,
-        request: WebResourceRequest,
-        error: WebResourceResponse,
-    ) {
-        onReceivedErrorCompat(
-            view,
-            error.statusCode,
-            error.reasonPhrase,
-            request.url
-                .toString(),
-            request.isForMainFrame,
-        )
-    }
-}
@@ -1,67 +0,0 @@
-package eu.kanade.tachiyomi.util.system
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.pm.PackageManager
-import android.webkit.CookieManager
-import android.webkit.WebSettings
-import android.webkit.WebView
-import logcat.LogPriority
-
-object WebViewUtil {
-    const val SPOOF_PACKAGE_NAME = "org.chromium.chrome"
-
-    const val MINIMUM_WEBVIEW_VERSION = 100
-
-    fun supportsWebView(context: Context): Boolean {
-        try {
-            // May throw android.webkit.WebViewFactory$MissingWebViewPackageException if WebView
-            // is not installed
-            CookieManager.getInstance()
-        } catch (e: Throwable) {
-            logcat(LogPriority.ERROR, e)
-            return false
-        }
-
-        return context.packageManager.hasSystemFeature(PackageManager.FEATURE_WEBVIEW)
-    }
-}
-
-fun WebView.isOutdated(): Boolean {
-    return getWebViewMajorVersion() < WebViewUtil.MINIMUM_WEBVIEW_VERSION
-}
-
-@SuppressLint("SetJavaScriptEnabled")
-fun WebView.setDefaultSettings() {
-    with(settings) {
-        javaScriptEnabled = true
-        domStorageEnabled = true
-        databaseEnabled = true
-        useWideViewPort = true
-        loadWithOverviewMode = true
-        cacheMode = WebSettings.LOAD_DEFAULT
-    }
-}
-
-private fun WebView.getWebViewMajorVersion(): Int {
-    val uaRegexMatch = """.*Chrome/(\d+)\..*""".toRegex().matchEntire(getDefaultUserAgentString())
-    return if (uaRegexMatch != null && uaRegexMatch.groupValues.size > 1) {
-        uaRegexMatch.groupValues[1].toInt()
-    } else {
-        0
-    }
-}
-
-// Based on https://stackoverflow.com/a/29218966
-private fun WebView.getDefaultUserAgentString(): String {
-    val originalUA: String = settings.userAgentString
-
-    // Next call to getUserAgentString() will get us the default
-    settings.userAgentString = null
-    val defaultUserAgentString = settings.userAgentString
-
-    // Revert to original UA string
-    settings.userAgentString = originalUA
-
-    return defaultUserAgentString
-}