Fix warnings

2022-06-29 11:38:33 +03:00
parent d69b091858
commit 0106afc93c
33 changed files with 20 additions and 226 deletions
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Kotatsu is a free and open source manga reader for Android.
 alt="Get it on F-Droid"
 height="80">](https://f-droid.org/packages/org.koitharu.kotatsu)

-Download APK from Github Releases:
+Download APK from GitHub Releases:

 - [Latest release](https://github.com/KotatsuApp/Kotatsu/releases/latest)

--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
@@ -6,14 +6,12 @@ import androidx.annotation.CallSuper
 import androidx.annotation.StringRes
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
 import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment

 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
@@ -15,11 +15,11 @@ class BackupZipOutput(val file: File) : Closeable {

 	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)

-	suspend fun put(entry: BackupEntry) {
+	suspend fun put(entry: BackupEntry) = runInterruptible(Dispatchers.IO) {
 		output.put(entry.name, entry.data.toString(2))
 	}

-	suspend fun finish() {
+	suspend fun finish() = runInterruptible(Dispatchers.IO) {
 		output.finish()
 	}

--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.core.exceptions

-import androidx.annotation.StringRes
 import okio.IOException
-import org.koitharu.kotatsu.R

 class CloudFlareProtectedException(
 	val url: String
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -321,9 +321,6 @@ class AppSettings(context: Context) {
 		const val KEY_APP_UPDATE = "app_update"
 		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
 		const val KEY_APP_TRANSLATION = "about_app_translation"
-		const val KEY_FEEDBACK_4PDA = "about_feedback_4pda"
-		const val KEY_FEEDBACK_DISCORD = "about_feedback_discord"
-		const val KEY_FEEDBACK_GITHUB = "about_feedback_github"

 		private const val NETWORK_NEVER = 0
 		private const val NETWORK_ALWAYS = 1
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -9,7 +9,6 @@ import androidx.collection.ArraySet
 import androidx.core.graphics.Insets
 import androidx.core.view.isNotEmpty
 import androidx.core.view.updatePadding
-import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.snackbar.Snackbar
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt
@@ -16,6 +16,7 @@ abstract class BasePageHolder<B : ViewBinding>(
 	exceptionResolver: ExceptionResolver
 ) : RecyclerView.ViewHolder(binding.root), PageHolderDelegate.Callback {

+	@Suppress("LeakingThis")
 	protected val delegate = PageHolderDelegate(loader, settings, this, exceptionResolver)
 	protected val bindingInfo = LayoutPageInfoBinding.bind(binding.root)

--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt
@@ -11,10 +11,11 @@ import org.koitharu.kotatsu.utils.ext.resetTransformations
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine

+@Suppress("LeakingThis")
 abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 	private val loader: PageLoader,
 	private val settings: AppSettings,
-	private val exceptionResolver: ExceptionResolver
+	private val exceptionResolver: ExceptionResolver,
 ) : RecyclerView.Adapter<H>() {

 	private val differ = AsyncListDiffer(this, DiffCallback())
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.search.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsActivity.kt
@@ -22,7 +22,6 @@ import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.databinding.ActivitySettingsBinding
 import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.tracker.domain.Tracker
 import org.koitharu.kotatsu.utils.ext.isScrolledToTop

 class SettingsActivity :
--- a/app/src/main/java/org/koitharu/kotatsu/settings/utils/RingtonePickContract.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/utils/RingtonePickContract.kt
@@ -29,6 +29,6 @@ class RingtonePickContract(private val title: String?) : ActivityResultContract<
 	}

 	override fun parseResult(resultCode: Int, intent: Intent?): Uri? {
-		return intent?.getParcelableExtra<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+		return intent?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
 	}
 }
--- a/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
@@ -32,14 +32,14 @@ class SuggestionRepository(
 	suspend fun replace(suggestions: Iterable<MangaSuggestion>) {
 		db.withTransaction {
 			db.suggestionDao.deleteAll()
-			suggestions.forEach { x ->
-				val tags = x.manga.tags.toEntities()
+			suggestions.forEach { (manga, relevance) ->
+				val tags = manga.tags.toEntities()
 				db.tagsDao.upsert(tags)
-				db.mangaDao.upsert(x.manga.toEntity(), tags)
+				db.mangaDao.upsert(manga.toEntity(), tags)
 				db.suggestionDao.upsert(
 					SuggestionEntity(
-						mangaId = x.manga.id,
-						relevance = x.relevance,
+						mangaId = manga.id,
+						relevance = relevance,
 						createdAt = System.currentTimeMillis(),
 					)
 				)
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ScreenOrientationHelper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ScreenOrientationHelper.kt
@@ -35,7 +35,7 @@ class ScreenOrientationHelper(private val activity: Activity) {
 		isLandscape = !isLandscape
 	}

-	fun observeAutoOrientation() = callbackFlow<Boolean> {
+	fun observeAutoOrientation() = callbackFlow {
 		val observer = object : ContentObserver(Handler(activity.mainLooper)) {
 			override fun onChange(selfChange: Boolean) {
 				trySendBlocking(isAutoRotationEnabled)
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/InsetsExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/InsetsExt.kt
@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import android.view.View
-import androidx.core.graphics.Insets
-
-fun Insets.getStart(view: View): Int {
-	return if (view.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
-		right
-	} else {
-		left
-	}
-}
-
-fun Insets.getEnd(view: View): Int {
-	return if (view.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
-		left
-	} else {
-		right
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
@@ -4,11 +4,10 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.liveData
-import kotlinx.coroutines.Deferred
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.utils.BufferedObserver
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext

 fun <T> LiveData<T?>.observeNotNull(owner: LifecycleOwner, observer: Observer<T>) {
 	this.observe(owner) {
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
@@ -5,8 +5,6 @@ import android.graphics.Rect
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import androidx.annotation.StringRes
-import androidx.appcompat.widget.TooltipCompat
 import androidx.core.view.children
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
--- a/app/src/main/res/color-v23/selector_switch_thumb.xml
+++ b/app/src/main/res/color-v23/selector_switch_thumb.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorPrimaryContainer" android:state_checked="true" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimaryContainer" android:state_checked="true" android:state_enabled="false" />
-	<item android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
-</selector>
--- a/app/src/main/res/color-v23/selector_switch_track.xml
+++ b/app/src/main/res/color-v23/selector_switch_track.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorPrimary" android:state_checked="true" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimary" android:state_checked="true" android:state_enabled="false" />
-	<item android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
-</selector>
--- a/app/src/main/res/color/selector_switch_thumb.xml
+++ b/app/src/main/res/color/selector_switch_thumb.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/kotatsu_primaryContainer" android:state_checked="true" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/kotatsu_primaryContainer" android:state_checked="true" android:state_enabled="false" />
-	<item android:color="@color/kotatsu_surfaceVariant" android:state_checked="false" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/kotatsu_surfaceVariant" android:state_checked="false" android:state_enabled="false" />
-</selector>
--- a/app/src/main/res/color/selector_switch_track.xml
+++ b/app/src/main/res/color/selector_switch_track.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/blue_primary" android:state_checked="true" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/blue_primary" android:state_checked="true" android:state_enabled="false" />
-	<item android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
-</selector>
--- a/app/src/main/res/drawable/badge.xml
+++ b/app/src/main/res/drawable/badge.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<corners android:radius="32dp" />
-	<solid android:color="?attr/colorTertiary" />
-</shape>
--- a/app/src/main/res/drawable/ic_list_add.xml
+++ b/app/src/main/res/drawable/ic_list_add.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?attr/colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M2 16h8v-2H2m16 0v-4h-2v4h-4v2h4v4h2v-4h4v-2m-8-8H2v2h12m0 2H2v2h12v-2z" />
-</vector>
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M14,19H18V5H14M6,19H10V5H6V19Z" />
-</vector>
--- a/app/src/main/res/drawable/ic_resume.xml
+++ b/app/src/main/res/drawable/ic_resume.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M8,5.14V19.14L19,12.14L8,5.14Z" />
-</vector>
--- a/app/src/main/res/drawable/switch_thumb.xml
+++ b/app/src/main/res/drawable/switch_thumb.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-	xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:bottom="4dp"
-		android:left="4dp"
-		android:right="4dp"
-		android:top="4dp">
-		<shape android:shape="oval">
-			<solid android:color="@color/selector_switch_thumb" />
-			<size
-				android:width="20dp"
-				android:height="20dp" />
-		</shape>
-	</item>
-</layer-list>
--- a/app/src/main/res/drawable/switch_track.xml
+++ b/app/src/main/res/drawable/switch_track.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-	xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="rectangle">
-			<solid android:color="@color/selector_switch_track" />
-			<corners android:radius="56dp" />
-			<size
-				android:width="64dp"
-				android:height="28dp" />
-		</shape>
-	</item>
-</layer-list>
--- a/app/src/main/res/layout/dialog_input.xml
+++ b/app/src/main/res/layout/dialog_input.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:paddingStart="14dp"
-	android:paddingTop="8dp"
-	android:paddingEnd="14dp">
-
-	<com.google.android.material.textfield.TextInputLayout
-		android:id="@+id/inputLayout"
-		app:boxBackgroundMode="filled"
-		app:boxBackgroundColor="@android:color/transparent"
-		app:hintEnabled="false"
-		app:expandedHintEnabled="true"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/inputEdit"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:imeOptions="actionDone"
-			android:singleLine="true"
-			tools:hint="@tools:sample/lorem[2]" />
-
-	</com.google.android.material.textfield.TextInputLayout>
-
-</FrameLayout>
--- a/app/src/main/res/layout/item_category_checkable.xml
+++ b/app/src/main/res/layout/item_category_checkable.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CheckedTextView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/checkedTextView"
-	android:layout_width="match_parent"
-	android:layout_height="?android:listPreferredItemHeightSmall"
-	android:background="?android:selectableItemBackground"
-	android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-	android:gravity="start|center_vertical"
-	android:paddingStart="?android:listPreferredItemPaddingStart"
-	android:paddingEnd="?android:listPreferredItemPaddingEnd"
-	android:textAppearance="?attr/textAppearanceBodyLarge"
-	tools:checked="true"
-	tools:text="@tools:sample/lorem[4]" />
--- a/app/src/main/res/menu/opt_crash.xml
+++ b/app/src/main/res/menu/opt_crash.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools">
-
-	<item
-		android:id="@+id/action_share"
-		android:icon="@android:drawable/ic_menu_share"
-		android:showAsAction="ifRoom"
-		android:title="@string/share"
-		tools:ignore="AppCompatResource" />
-</menu>
--- a/app/src/main/res/menu/opt_downloads.xml
+++ b/app/src/main/res/menu/opt_downloads.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<item
-		android:icon="@drawable/ic_pause"
-		android:id="@+id/action_pause"
-		android:title="Pause"
-		app:showAsAction="ifRoom|withText" />
-
-	<item
-		android:icon="@drawable/ic_resume"
-		android:id="@+id/action_resume"
-		android:title="Resume"
-		app:showAsAction="ifRoom|withText" />
-
-</menu>
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 	<bool name="is_tablet">false</bool>
 	<bool name="light_status_bar">true</bool>
 	<bool name="light_navigation_bar">false</bool>
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<network-security-config xmlns:tools="http://schemas.android.com/tools">
+<network-security-config
+	xmlns:tools="http://schemas.android.com/tools">
 	<!-- Need to allow cleartext traffic for some sources -->
 	<base-config
 		cleartextTrafficPermitted="true"
@@ -8,7 +9,7 @@
 			<!-- Trust preinstalled CAs -->
 			<certificates src="system" />

-			<!-- Additionally trust user added CAs -->
+			<!-- Additionally, trust user added CAs -->
 			<certificates
 				src="user"
 				tools:ignore="AcceptsUserCertificates" />
--- a/metadata/ru/full_description.txt
+++ b/metadata/ru/full_description.txt
@@ -5,7 +5,7 @@ Kotatsu - приложения для чтения манги с открыты
 - Поиск манги по имени и жанрам
 - История чтения
 - Избранное с пользовательскими категориями
- Возможность сохранять мангу и читать её оффлайн. Поддержка сторонних комиксов в формате CBZ
+- Возможность сохранять мангу и читать её офлайн. Поддержка сторонних комиксов в формате CBZ
 - Интерфейс также оптимизирован для планшетов
 - Поддержка манхвы (Webtoon)
 - Уведомления о новых главах и лента обновлений