Update Okio, use more KTX stuff (#4353)

* Update Okio to 2.10.0

* Use some more KTX extensions

(cherry picked from commit 5f7e34b6a1cbda755db6f943a87da16cfc51e6e4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt

app/build.gradle.kts

@@ -163,7 +163,7 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
     implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
     implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
-    implementation("com.squareup.okio:okio:2.9.0")
+    implementation("com.squareup.okio:okio:2.10.0")
 
     // TLS 1.3 support for Android < 10
     implementation("org.conscrypt:conscrypt-android:2.5.1")

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -36,16 +36,14 @@ class CategoryPutResolver : DefaultPutResolver<Category>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: Category) = ContentValues(4).apply {
+    override fun mapToContentValues(obj: Category) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_NAME, obj.name)
+            COL_ID to obj.id,
-        put(COL_ORDER, obj.order)
+            COL_NAME to obj.name,
-        put(COL_FLAGS, obj.flags)
+            COL_ORDER to obj.order,
-        // SY -->
+            COL_FLAGS to obj.flags,
-        val orderString = obj.mangaOrder.joinToString("/")
+            COL_MANGA_ORDER to obj.mangaOrder.joinToString("/")
-        put(COL_MANGA_ORDER, orderString)
+        )
-        // SY <--
-    }
 }
 
 class CategoryGetResolver : DefaultGetResolver<Category>() {

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -43,20 +43,21 @@ class ChapterPutResolver : DefaultPutResolver<Chapter>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: Chapter) = ContentValues(11).apply {
+    override fun mapToContentValues(obj: Chapter) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_MANGA_ID, obj.manga_id)
+            COL_ID to obj.id,
-        put(COL_URL, obj.url)
+            COL_MANGA_ID to obj.manga_id,
-        put(COL_NAME, obj.name)
+            COL_URL to obj.url,
-        put(COL_READ, obj.read)
+            COL_NAME to obj.name,
-        put(COL_SCANLATOR, obj.scanlator)
+            COL_READ to obj.read,
-        put(COL_BOOKMARK, obj.bookmark)
+            COL_SCANLATOR to obj.scanlator,
-        put(COL_DATE_FETCH, obj.date_fetch)
+            COL_BOOKMARK to obj.bookmark,
-        put(COL_DATE_UPLOAD, obj.date_upload)
+            COL_DATE_FETCH to obj.date_fetch,
-        put(COL_LAST_PAGE_READ, obj.last_page_read)
+            COL_DATE_UPLOAD to obj.date_upload,
-        put(COL_CHAPTER_NUMBER, obj.chapter_number)
+            COL_LAST_PAGE_READ to obj.last_page_read,
-        put(COL_SOURCE_ORDER, obj.source_order)
+            COL_CHAPTER_NUMBER to obj.chapter_number,
-    }
+            COL_SOURCE_ORDER to obj.source_order
+        )
 }
 
 class ChapterGetResolver : DefaultGetResolver<Chapter>() {

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/HistoryTypeMapping.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -35,12 +35,13 @@ open class HistoryPutResolver : DefaultPutResolver<History>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: History) = ContentValues(4).apply {
+    override fun mapToContentValues(obj: History) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_CHAPTER_ID, obj.chapter_id)
+            COL_ID to obj.id,
-        put(COL_LAST_READ, obj.last_read)
+            COL_CHAPTER_ID to obj.chapter_id,
-        put(COL_TIME_READ, obj.time_read)
+            COL_LAST_READ to obj.last_read,
-    }
+            COL_TIME_READ to obj.time_read
+        )
 }
 
 class HistoryGetResolver : DefaultGetResolver<History>() {

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -33,11 +33,12 @@ class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: MangaCategory) = ContentValues(3).apply {
+    override fun mapToContentValues(obj: MangaCategory) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_MANGA_ID, obj.manga_id)
+            COL_ID to obj.id,
-        put(COL_CATEGORY_ID, obj.category_id)
+            COL_MANGA_ID to obj.manga_id,
-    }
+            COL_CATEGORY_ID to obj.category_id
+        )
 }
 
 class MangaCategoryGetResolver : DefaultGetResolver<MangaCategory>() {

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -48,27 +48,28 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: Manga) = ContentValues(17).apply {
+    override fun mapToContentValues(obj: Manga) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_SOURCE, obj.source)
+            COL_ID to obj.id,
-        put(COL_URL, obj.url)
+            COL_SOURCE to obj.source,
-        // SY -->
+            COL_URL to obj.url,
-        put(COL_ARTIST, obj.originalArtist)
+            // SY -->
-        put(COL_AUTHOR, obj.originalAuthor)
+            COL_ARTIST to obj.originalArtist,
-        put(COL_DESCRIPTION, obj.originalDescription)
+            COL_AUTHOR to obj.originalAuthor,
-        put(COL_GENRE, obj.originalGenre)
+            COL_DESCRIPTION to obj.originalDescription,
-        put(COL_TITLE, obj.originalTitle)
+            COL_GENRE to obj.originalGenre,
-        // SY <--
+            COL_TITLE to obj.originalTitle,
-        put(COL_STATUS, obj.status)
+            // SY <--
-        put(COL_THUMBNAIL_URL, obj.thumbnail_url)
+            COL_STATUS to obj.status,
-        put(COL_FAVORITE, obj.favorite)
+            COL_THUMBNAIL_URL to obj.thumbnail_url,
-        put(COL_LAST_UPDATE, obj.last_update)
+            COL_FAVORITE to obj.favorite,
-        put(COL_INITIALIZED, obj.initialized)
+            COL_LAST_UPDATE to obj.last_update,
-        put(COL_VIEWER, obj.viewer)
+            COL_INITIALIZED to obj.initialized,
-        put(COL_CHAPTER_FLAGS, obj.chapter_flags)
+            COL_VIEWER to obj.viewer,
-        put(COL_COVER_LAST_MODIFIED, obj.cover_last_modified)
+            COL_CHAPTER_FLAGS to obj.chapter_flags,
-        put(COL_DATE_ADDED, obj.date_added)
+            COL_COVER_LAST_MODIFIED to obj.cover_last_modified,
-    }
+            COL_DATE_ADDED to obj.date_added
+        )
 }
 
 interface BaseMangaGetResolver {

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/TrackTypeMapping.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -44,21 +44,22 @@ class TrackPutResolver : DefaultPutResolver<Track>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: Track) = ContentValues(10).apply {
+    override fun mapToContentValues(obj: Track) =
-        put(COL_ID, obj.id)
+        contentValuesOf(
-        put(COL_MANGA_ID, obj.manga_id)
+            COL_ID to obj.id,
-        put(COL_SYNC_ID, obj.sync_id)
+            COL_MANGA_ID to obj.manga_id,
-        put(COL_MEDIA_ID, obj.media_id)
+            COL_SYNC_ID to obj.sync_id,
-        put(COL_LIBRARY_ID, obj.library_id)
+            COL_MEDIA_ID to obj.media_id,
-        put(COL_TITLE, obj.title)
+            COL_LIBRARY_ID to obj.library_id,
-        put(COL_LAST_CHAPTER_READ, obj.last_chapter_read)
+            COL_TITLE to obj.title,
-        put(COL_TOTAL_CHAPTERS, obj.total_chapters)
+            COL_LAST_CHAPTER_READ to obj.last_chapter_read,
-        put(COL_STATUS, obj.status)
+            COL_TOTAL_CHAPTERS to obj.total_chapters,
-        put(COL_TRACKING_URL, obj.tracking_url)
+            COL_STATUS to obj.status,
-        put(COL_SCORE, obj.score)
+            COL_TRACKING_URL to obj.tracking_url,
-        put(COL_START_DATE, obj.started_reading_date)
+            COL_SCORE to obj.score,
-        put(COL_FINISH_DATE, obj.finished_reading_date)
+            COL_START_DATE to obj.started_reading_date,
-    }
+            COL_FINISH_DATE to obj.finished_reading_date
+        )
 }
 
 class TrackGetResolver : DefaultGetResolver<Track>() {

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterBackupPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,9 +25,10 @@ class ChapterBackupPutResolver : PutResolver<Chapter>() {
         .whereArgs(chapter.url)
         .build()
 
-    fun mapToContentValues(chapter: Chapter) = ContentValues(3).apply {
+    fun mapToContentValues(chapter: Chapter) =
-        put(ChapterTable.COL_READ, chapter.read)
+        contentValuesOf(
-        put(ChapterTable.COL_BOOKMARK, chapter.bookmark)
+            ChapterTable.COL_READ to chapter.read,
-        put(ChapterTable.COL_LAST_PAGE_READ, chapter.last_page_read)
+            ChapterTable.COL_BOOKMARK to chapter.bookmark,
-    }
+            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,9 +25,10 @@ class ChapterProgressPutResolver : PutResolver<Chapter>() {
         .whereArgs(chapter.id)
         .build()
 
-    fun mapToContentValues(chapter: Chapter) = ContentValues(3).apply {
+    fun mapToContentValues(chapter: Chapter) =
-        put(ChapterTable.COL_READ, chapter.read)
+        contentValuesOf(
-        put(ChapterTable.COL_BOOKMARK, chapter.bookmark)
+            ChapterTable.COL_READ to chapter.read,
-        put(ChapterTable.COL_LAST_PAGE_READ, chapter.last_page_read)
+            ChapterTable.COL_BOOKMARK to chapter.bookmark,
-    }
+            ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterSourceOrderPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,8 @@ class ChapterSourceOrderPutResolver : PutResolver<Chapter>() {
         .whereArgs(chapter.url, chapter.manga_id)
         .build()
 
-    fun mapToContentValues(chapter: Chapter) = ContentValues(1).apply {
+    fun mapToContentValues(chapter: Chapter) =
-        put(ChapterTable.COL_SOURCE_ORDER, chapter.source_order)
+        contentValuesOf(
-    }
+            ChapterTable.COL_SOURCE_ORDER to chapter.source_order
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryLastReadPutResolver.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
 import androidx.annotation.NonNull
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
 import com.pushtorefresh.storio.sqlite.queries.Query
@@ -57,7 +57,8 @@ class HistoryLastReadPutResolver : HistoryPutResolver() {
      * Create content query
      * @param history object
      */
-    fun mapToUpdateContentValues(history: History) = ContentValues(1).apply {
+    fun mapToUpdateContentValues(history: History) =
-        put(HistoryTable.COL_LAST_READ, history.last_read)
+        contentValuesOf(
-    }
+            HistoryTable.COL_LAST_READ to history.last_read
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaCoverLastModifiedPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,8 @@ class MangaCoverLastModifiedPutResolver : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+    fun mapToContentValues(manga: Manga) =
-        put(MangaTable.COL_COVER_LAST_MODIFIED, manga.cover_last_modified)
+        contentValuesOf(
-    }
+            MangaTable.COL_COVER_LAST_MODIFIED to manga.cover_last_modified
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,8 +25,9 @@ class MangaFavoritePutResolver : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(2).apply {
+    fun mapToContentValues(manga: Manga) =
-        put(MangaTable.COL_FAVORITE, manga.favorite)
+        contentValuesOf(
-        put(MangaTable.COL_DATE_ADDED, manga.date_added)
+            MangaTable.COL_FAVORITE to manga.favorite,
-    }
+            MangaTable.COL_DATE_ADDED to manga.date_added
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -35,7 +35,8 @@ class MangaFlagsPutResolver(private val updateAll: Boolean = false) : PutResolve
         }
     }
 
-    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+    fun mapToContentValues(manga: Manga) =
-        put(MangaTable.COL_CHAPTER_FLAGS, manga.chapter_flags)
+        contentValuesOf(
-    }
+            MangaTable.COL_CHAPTER_FLAGS to manga.chapter_flags
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
 import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,13 +26,13 @@ class MangaInfoPutResolver(val reset: Boolean = false) : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+    fun mapToContentValues(manga: Manga) = contentValuesOf(
-        put(MangaTable.COL_TITLE, manga.originalTitle)
+        MangaTable.COL_TITLE to manga.originalTitle,
-        put(MangaTable.COL_GENRE, manga.originalGenre)
+        MangaTable.COL_GENRE to manga.originalGenre,
-        put(MangaTable.COL_AUTHOR, manga.originalAuthor)
+        MangaTable.COL_AUTHOR to manga.originalAuthor,
-        put(MangaTable.COL_ARTIST, manga.originalArtist)
+        MangaTable.COL_ARTIST to manga.originalArtist,
-        put(MangaTable.COL_DESCRIPTION, manga.originalDescription)
+        MangaTable.COL_DESCRIPTION to manga.originalDescription
-    }
+    )
 
     fun resetToContentValues(manga: Manga) = ContentValues(1).apply {
         val splitter = "▒ ▒∩▒"

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,8 @@ class MangaLastUpdatedPutResolver : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+    fun mapToContentValues(manga: Manga) =
-        put(MangaTable.COL_LAST_UPDATE, manga.last_update)
+        contentValuesOf(
-    }
+            MangaTable.COL_LAST_UPDATE to manga.last_update
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaMigrationPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,11 +25,11 @@ class MangaMigrationPutResolver : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(5).apply {
+    fun mapToContentValues(manga: Manga) = contentValuesOf(
-        put(MangaTable.COL_FAVORITE, manga.favorite)
+        MangaTable.COL_FAVORITE to manga.favorite,
-        put(MangaTable.COL_DATE_ADDED, manga.date_added)
+        MangaTable.COL_DATE_ADDED to manga.date_added,
-        put(MangaTable.COL_TITLE, manga.title)
+        MangaTable.COL_TITLE to manga.title,
-        put(MangaTable.COL_CHAPTER_FLAGS, manga.chapter_flags)
+        MangaTable.COL_CHAPTER_FLAGS to manga.chapter_flags,
-        put(MangaTable.COL_VIEWER, manga.viewer)
+        MangaTable.COL_VIEWER to manga.viewer
-    }
+    )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaTitlePutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,8 @@ class MangaTitlePutResolver : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+    fun mapToContentValues(manga: Manga) =
-        put(MangaTable.COL_TITLE, manga.title)
+        contentValuesOf(
-    }
+            MangaTable.COL_TITLE to manga.title
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaUrlPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -26,7 +26,7 @@ class MangaUrlPutResolver : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+    fun mapToContentValues(manga: Manga) = contentValuesOf(
-        put(MangaTable.COL_URL, manga.url)
+        MangaTable.COL_URL to manga.url
-    }
+    )
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaViewerPutResolver.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,8 @@ class MangaViewerPutResolver : PutResolver<Manga>() {
         .whereArgs(manga.id)
         .build()
 
-    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+    fun mapToContentValues(manga: Manga) =
-        put(MangaTable.COL_VIEWER, manga.viewer)
+        contentValuesOf(
-    }
+            MangaTable.COL_VIEWER to manga.viewer
+        )
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt

@@ -3,6 +3,10 @@ package eu.kanade.tachiyomi.ui.reader
 import android.view.ViewGroup
 import android.widget.SeekBar
 import androidx.annotation.ColorInt
+import androidx.core.graphics.alpha
+import androidx.core.graphics.blue
+import androidx.core.graphics.green
+import androidx.core.graphics.red
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -156,16 +160,16 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BottomSheet
      * @param color integer containing color information
      */
     fun setValues(color: Int): Array<Int> {
-        val alpha = getAlphaFromColor(color)
+        val alpha = color.alpha
-        val red = getRedFromColor(color)
+        val red = color.red
-        val green = getGreenFromColor(color)
+        val green = color.green
-        val blue = getBlueFromColor(color)
+        val blue = color.blue
 
         // Initialize values
-        binding.txtColorFilterAlphaValue.text = alpha.toString()
+        binding.txtColorFilterAlphaValue.text = "$alpha"
-        binding.txtColorFilterRedValue.text = red.toString()
+        binding.txtColorFilterRedValue.text = "$red"
-        binding.txtColorFilterGreenValue.text = green.toString()
+        binding.txtColorFilterGreenValue.text = "$green"
-        binding.txtColorFilterBlueValue.text = blue.toString()
+        binding.txtColorFilterBlueValue.text = "$blue"
 
         return arrayOf(alpha, red, green, blue)
     }
@@ -232,42 +236,6 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BottomSheet
         preferences.colorFilterValue().set(updatedColor)
     }
 
-    /**
-     * Returns the alpha value from the Color Hex
-     * @param color color hex as int
-     * @return alpha of color
-     */
-    private fun getAlphaFromColor(color: Int): Int {
-        return color shr 24 and 0xFF
-    }
-
-    /**
-     * Returns the red value from the Color Hex
-     * @param color color hex as int
-     * @return red of color
-     */
-    private fun getRedFromColor(color: Int): Int {
-        return color shr 16 and 0xFF
-    }
-
-    /**
-     * Returns the green value from the Color Hex
-     * @param color color hex as int
-     * @return green of color
-     */
-    private fun getGreenFromColor(color: Int): Int {
-        return color shr 8 and 0xFF
-    }
-
-    /**
-     * Returns the blue value from the Color Hex
-     * @param color color hex as int
-     * @return blue of color
-     */
-    private fun getBlueFromColor(color: Int): Int {
-        return color and 0xFF
-    }
-
     private companion object {
         /** Integer mask of alpha value **/
         const val ALPHA_MASK: Long = 0xFF000000

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

@@ -165,19 +165,19 @@ val Resources.isLTR
  * Property to get the notification manager from the context.
  */
 val Context.notificationManager: NotificationManager
-    get() = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    get() = getSystemService()!!
 
 /**
  * Property to get the connectivity manager from the context.
  */
 val Context.connectivityManager: ConnectivityManager
-    get() = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    get() = getSystemService()!!
 
 /**
  * Property to get the power manager from the context.
  */
 val Context.powerManager: PowerManager
-    get() = getSystemService(Context.POWER_SERVICE) as PowerManager
+    get() = getSystemService()!!
 
 /**
  * Convenience method to acquire a partial wake lock.

app/src/main/java/exh/md/similar/sql/mappers/SimilarTypeMapping.kt

@@ -1,7 +1,7 @@
 package exh.md.similar.sql.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -35,12 +35,12 @@ class SimilarPutResolver : DefaultPutResolver<MangaSimilar>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: MangaSimilar) = ContentValues(4).apply {
+    override fun mapToContentValues(obj: MangaSimilar) = contentValuesOf(
-        put(COL_ID, obj.id)
+        COL_ID to obj.id,
-        put(COL_MANGA_ID, obj.manga_id)
+        COL_MANGA_ID to obj.manga_id,
-        put(COL_MANGA_SIMILAR_MATCHED_IDS, obj.matched_ids)
+        COL_MANGA_SIMILAR_MATCHED_IDS to obj.matched_ids,
-        put(COL_MANGA_SIMILAR_MATCHED_TITLES, obj.matched_titles)
+        COL_MANGA_SIMILAR_MATCHED_TITLES to obj.matched_titles
-    }
+    )
 }
 
 class SimilarGetResolver : DefaultGetResolver<MangaSimilar>() {

app/src/main/java/exh/merged/sql/mappers/MergedMangaTypeMapping.kt

@@ -1,7 +1,7 @@
 package exh.merged.sql.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import androidx.core.database.getLongOrNull
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
@@ -42,19 +42,19 @@ class MergedMangaPutResolver : DefaultPutResolver<MergedMangaReference>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: MergedMangaReference) = ContentValues(5).apply {
+    override fun mapToContentValues(obj: MergedMangaReference) = contentValuesOf(
-        put(COL_ID, obj.id)
+        COL_ID to obj.id,
-        put(COL_IS_INFO_MANGA, obj.isInfoManga)
+        COL_IS_INFO_MANGA to obj.isInfoManga,
-        put(COL_GET_CHAPTER_UPDATES, obj.getChapterUpdates)
+        COL_GET_CHAPTER_UPDATES to obj.getChapterUpdates,
-        put(COL_CHAPTER_SORT_MODE, obj.chapterSortMode)
+        COL_CHAPTER_SORT_MODE to obj.chapterSortMode,
-        put(COL_CHAPTER_PRIORITY, obj.chapterPriority)
+        COL_CHAPTER_PRIORITY to obj.chapterPriority,
-        put(COL_DOWNLOAD_CHAPTERS, obj.downloadChapters)
+        COL_DOWNLOAD_CHAPTERS to obj.downloadChapters,
-        put(COL_MERGE_ID, obj.mergeId)
+        COL_MERGE_ID to obj.mergeId,
-        put(COL_MERGE_URL, obj.mergeUrl)
+        COL_MERGE_URL to obj.mergeUrl,
-        put(COL_MANGA_ID, obj.mangaId)
+        COL_MANGA_ID to obj.mangaId,
-        put(COL_MANGA_URL, obj.mangaUrl)
+        COL_MANGA_URL to obj.mangaUrl,
-        put(COL_MANGA_SOURCE, obj.mangaSourceId)
+        COL_MANGA_SOURCE to obj.mangaSourceId
-    }
+    )
 }
 
 class MergedMangaGetResolver : DefaultGetResolver<MergedMangaReference>() {

app/src/main/java/exh/merged/sql/resolvers/MergeMangaSettingsPutResolver.kt

@@ -1,6 +1,6 @@
 package exh.merged.sql.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,7 @@ class MergeMangaSettingsPutResolver(val reset: Boolean = false) : PutResolver<Me
         .whereArgs(mergedMangaReference.id)
         .build()
 
-    fun mapToContentValues(mergedMangaReference: MergedMangaReference) = ContentValues(1).apply {
+    fun mapToContentValues(mergedMangaReference: MergedMangaReference) = contentValuesOf(
-        put(MergedTable.COL_CHAPTER_SORT_MODE, mergedMangaReference.chapterSortMode)
+        MergedTable.COL_CHAPTER_SORT_MODE to mergedMangaReference.chapterSortMode,
-    }
+    )
 }

app/src/main/java/exh/merged/sql/resolvers/MergedMangaIdPutResolver.kt

@@ -1,6 +1,6 @@
 package exh.merged.sql.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,7 +25,7 @@ class MergedMangaIdPutResolver : PutResolver<MergedMangaReference>() {
         .whereArgs(mergedMangaReference.id)
         .build()
 
-    fun mapToContentValues(mergedMangaReference: MergedMangaReference) = ContentValues(1).apply {
+    fun mapToContentValues(mergedMangaReference: MergedMangaReference) = contentValuesOf(
-        put(MergedTable.COL_MANGA_ID, mergedMangaReference.mangaId)
+        MergedTable.COL_MANGA_ID to mergedMangaReference.mangaId
-    }
+    )
 }

app/src/main/java/exh/merged/sql/resolvers/MergedMangaSettingsPutResolver.kt

@@ -1,6 +1,6 @@
 package exh.merged.sql.resolvers
 
-import android.content.ContentValues
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@@ -25,10 +25,10 @@ class MergedMangaSettingsPutResolver(val reset: Boolean = false) : PutResolver<M
         .whereArgs(mergedMangaReference.id)
         .build()
 
-    fun mapToContentValues(mergedMangaReference: MergedMangaReference) = ContentValues(4).apply {
+    fun mapToContentValues(mergedMangaReference: MergedMangaReference) = contentValuesOf(
-        put(MergedTable.COL_GET_CHAPTER_UPDATES, mergedMangaReference.getChapterUpdates)
+        MergedTable.COL_GET_CHAPTER_UPDATES to mergedMangaReference.getChapterUpdates,
-        put(MergedTable.COL_DOWNLOAD_CHAPTERS, mergedMangaReference.downloadChapters)
+        MergedTable.COL_DOWNLOAD_CHAPTERS to mergedMangaReference.downloadChapters,
-        put(MergedTable.COL_IS_INFO_MANGA, mergedMangaReference.isInfoManga)
+        MergedTable.COL_IS_INFO_MANGA to mergedMangaReference.isInfoManga,
-        put(MergedTable.COL_CHAPTER_PRIORITY, mergedMangaReference.chapterPriority)
+        MergedTable.COL_CHAPTER_PRIORITY to mergedMangaReference.chapterPriority,
-    }
+    )
 }

app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt

@@ -1,7 +1,7 @@
 package exh.metadata.sql.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -35,13 +35,13 @@ class SearchMetadataPutResolver : DefaultPutResolver<SearchMetadata>() {
         .whereArgs(obj.mangaId)
         .build()
 
-    override fun mapToContentValues(obj: SearchMetadata) = ContentValues(5).apply {
+    override fun mapToContentValues(obj: SearchMetadata) = contentValuesOf(
-        put(COL_MANGA_ID, obj.mangaId)
+        COL_MANGA_ID to obj.mangaId,
-        put(COL_UPLOADER, obj.uploader)
+        COL_UPLOADER to obj.uploader,
-        put(COL_EXTRA, obj.extra)
+        COL_EXTRA to obj.extra,
-        put(COL_INDEXED_EXTRA, obj.indexedExtra)
+        COL_INDEXED_EXTRA to obj.indexedExtra,
-        put(COL_EXTRA_VERSION, obj.extraVersion)
+        COL_EXTRA_VERSION to obj.extraVersion,
-    }
+    )
 }
 
 class SearchMetadataGetResolver : DefaultGetResolver<SearchMetadata>() {

app/src/main/java/exh/metadata/sql/mappers/SearchTagTypeMapping.kt

@@ -1,7 +1,7 @@
 package exh.metadata.sql.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -35,13 +35,13 @@ class SearchTagPutResolver : DefaultPutResolver<SearchTag>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: SearchTag) = ContentValues(5).apply {
+    override fun mapToContentValues(obj: SearchTag) = contentValuesOf(
-        put(COL_ID, obj.id)
+        COL_ID to obj.id,
-        put(COL_MANGA_ID, obj.mangaId)
+        COL_MANGA_ID to obj.mangaId,
-        put(COL_NAMESPACE, obj.namespace)
+        COL_NAMESPACE to obj.namespace,
-        put(COL_NAME, obj.name)
+        COL_NAME to obj.name,
-        put(COL_TYPE, obj.type)
+        COL_TYPE to obj.type,
-    }
+    )
 }
 
 class SearchTagGetResolver : DefaultGetResolver<SearchTag>() {

app/src/main/java/exh/metadata/sql/mappers/SearchTitleTypeMapping.kt

@@ -1,7 +1,7 @@
 package exh.metadata.sql.mappers
 
-import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping
 import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
@@ -34,12 +34,12 @@ class SearchTitlePutResolver : DefaultPutResolver<SearchTitle>() {
         .whereArgs(obj.id)
         .build()
 
-    override fun mapToContentValues(obj: SearchTitle) = ContentValues(4).apply {
+    override fun mapToContentValues(obj: SearchTitle) = contentValuesOf(
-        put(COL_ID, obj.id)
+        COL_ID to obj.id,
-        put(COL_MANGA_ID, obj.mangaId)
+        COL_MANGA_ID to obj.mangaId,
-        put(COL_TITLE, obj.title)
+        COL_TITLE to obj.title,
-        put(COL_TYPE, obj.type)
+        COL_TYPE to obj.type,
-    }
+    )
 }
 
 class SearchTitleGetResolver : DefaultGetResolver<SearchTitle>() {