More core-ktx usages

app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt

@@ -6,6 +6,7 @@ import android.net.Uri
 import android.os.Environment
 import android.os.StatFs
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.core.os.EnvironmentCompat
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.Hash
@@ -77,7 +78,7 @@ object DiskUtil {
      * Scans the given file so that it can be shown in gallery apps, for example.
      */
     fun scanMedia(context: Context, file: File) {
-        scanMedia(context, Uri.fromFile(file))
+        scanMedia(context, file.toUri())
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/util/storage/FileExtensions.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import android.os.Build
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import eu.kanade.tachiyomi.BuildConfig
 import java.io.File
 
@@ -16,6 +17,6 @@ fun File.getUriCompat(context: Context): Uri {
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", this)
     } else {
-        Uri.fromFile(this)
+        this.toUri()
     }
 }

app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -13,7 +13,6 @@ import android.content.pm.PackageManager
 import android.content.res.Resources
 import android.graphics.Color
 import android.net.ConnectivityManager
-import android.net.Uri
 import android.os.PowerManager
 import android.view.View
 import android.widget.Toast
@@ -23,6 +22,12 @@ import androidx.annotation.StringRes
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
+import androidx.core.content.getSystemService
+import androidx.core.graphics.alpha
+import androidx.core.graphics.blue
+import androidx.core.graphics.green
+import androidx.core.graphics.red
+import androidx.core.net.toUri
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.nononsenseapps.filepicker.FilePickerActivity
 import eu.kanade.tachiyomi.R
@@ -126,11 +131,8 @@ fun Context.hasPermission(permission: String) = ContextCompat.checkSelfPermissio
     typedArray.recycle()
 
     if (alphaFactor < 1f) {
-        val alpha = (Color.alpha(color) * alphaFactor).roundToInt()
-        val red = Color.red(color)
-        val green = Color.green(color)
-        val blue = Color.blue(color)
-        return Color.argb(alpha, red, green, blue)
+        val alpha = (color.alpha * alphaFactor).roundToInt()
+        return Color.argb(alpha, color.red, color.green, color.blue)
     }
 
     return color
@@ -239,11 +241,10 @@ fun Context.isServiceRunning(serviceClass: Class<*>): Boolean {
  */
 fun Context.openInBrowser(url: String) {
     try {
-        val parsedUrl = Uri.parse(url)
         val intent = CustomTabsIntent.Builder()
             .setToolbarColor(getResourceColor(R.attr.colorPrimary))
             .build()
-        intent.launchUrl(this, parsedUrl)
+        intent.launchUrl(this, url.toUri())
     } catch (e: Exception) {
         toast(e.message)
     }