Fix warnings and cleanup

app/build.gradle

@@ -94,7 +94,7 @@ dependencies {
 	implementation 'androidx.appcompat:appcompat:1.7.0'
 	implementation 'androidx.core:core-ktx:1.13.1'
 	implementation 'androidx.activity:activity-ktx:1.9.2'
-	implementation 'androidx.fragment:fragment-ktx:1.8.3'
+	implementation 'androidx.fragment:fragment-ktx:1.8.4'
 	implementation 'androidx.transition:transition-ktx:1.5.1'
 	implementation 'androidx.collection:collection-ktx:1.4.4'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt

@@ -17,9 +17,6 @@ data class Bookmark(
 	val percent: Float,
 ) : ListModel {
 
-	val directImageUrl: String?
-		get() = if (isImageUrlDirect()) imageUrl else null
-
 	val imageLoadData: Any
 		get() = if (isImageUrlDirect()) imageUrl else toMangaPage()
 

app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt

@@ -12,7 +12,6 @@ import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import dagger.hilt.android.AndroidEntryPoint
-import okhttp3.internal.userAgent
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.network.CommonHeaders
@@ -22,49 +21,50 @@ import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
 class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
-    private lateinit var onBackPressedCallback: WebViewBackPressedCallback
+	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
-
+
-    @Inject
+	@Inject
-    lateinit var mangaRepositoryFactory: MangaRepository.Factory
+	lateinit var mangaRepositoryFactory: MangaRepository.Factory
-
+
-    override fun onCreate(savedInstanceState: Bundle?) {
+	override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+		super.onCreate(savedInstanceState)
-        if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
-            return
+			return
-        }
+		}
-        supportActionBar?.run {
+		supportActionBar?.run {
-            setDisplayHomeAsUpEnabled(true)
+			setDisplayHomeAsUpEnabled(true)
-            setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
-        }
+		}
-        val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
+		val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
-        val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
+		val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
-        val userAgent = repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
+		val userAgent = repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
-        viewBinding.webView.configureForParser(userAgent)
+		viewBinding.webView.configureForParser(userAgent)
-        CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
+		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
-        viewBinding.webView.webViewClient = BrowserClient(this)
+		viewBinding.webView.webViewClient = BrowserClient(this)
-        viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
+		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
-        onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
+		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
-        onBackPressedDispatcher.addCallback(onBackPressedCallback)
+		onBackPressedDispatcher.addCallback(onBackPressedCallback)
-        if (savedInstanceState != null) {
+		if (savedInstanceState != null) {
-            return
+			return
-        }
+		}
-        val url = intent?.dataString
+		val url = intent?.dataString
-        if (url.isNullOrEmpty()) {
+		if (url.isNullOrEmpty()) {
-            finishAfterTransition()
+			finishAfterTransition()
-        } else {
+		} else {
-            onTitleChanged(
+			onTitleChanged(
-                intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
+				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
-                url,
+				url,
-            )
+			)
-            viewBinding.webView.loadUrl(url)
+			viewBinding.webView.loadUrl(url)
-        }
+		}
-    }
+	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		super.onCreateOptionsMenu(menu)
@@ -136,17 +136,17 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			bottom = insets.bottom,
 		)
 	}
-	
+
-    companion object {
+	companion object {
-
+
-        private const val EXTRA_TITLE = "title"
+		private const val EXTRA_TITLE = "title"
-        private const val EXTRA_SOURCE = "source"
+		private const val EXTRA_SOURCE = "source"
-
+
-        fun newIntent(context: Context, url: String, source: MangaSource?, title: String?): Intent {
+		fun newIntent(context: Context, url: String, source: MangaSource?, title: String?): Intent {
-            return Intent(context, BrowserActivity::class.java)
+			return Intent(context, BrowserActivity::class.java)
-                .setData(Uri.parse(url))
+				.setData(Uri.parse(url))
-                .putExtra(EXTRA_TITLE, title)
+				.putExtra(EXTRA_TITLE, title)
-                .putExtra(EXTRA_SOURCE, source?.name)
+				.putExtra(EXTRA_SOURCE, source?.name)
-        }
+		}
-    }
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core
 
 import android.app.Application
-import android.content.ContentResolver
 import android.content.Context
 import android.provider.SearchRecentSuggestions
 import android.text.Html

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/CloudFlareBlockedException.kt

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.exceptions
 
-import okhttp3.Headers
 import okio.IOException
 import org.koitharu.kotatsu.parsers.model.MangaSource
 

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/NoDataReceivedException.kt

@@ -3,5 +3,5 @@ package org.koitharu.kotatsu.core.exceptions
 import okio.IOException
 
 class NoDataReceivedException(
-	private val url: String,
+	url: String,
 ) : IOException("No data has been received from $url")

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/ParserMangaRepository.kt

@@ -8,7 +8,6 @@ import org.koitharu.kotatsu.core.prefs.SourceSettings
 import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
 import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Favicons
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
@@ -17,13 +16,10 @@ import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
 import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
-import org.koitharu.kotatsu.parsers.model.MangaState
-import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import org.koitharu.kotatsu.parsers.util.domain
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import java.util.Locale
 
 class ParserMangaRepository(
 	private val parser: MangaParser,

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import java.util.EnumSet
 
 class ExternalMangaRepository(
-	private val contentResolver: ContentResolver,
+	contentResolver: ContentResolver,
 	override val source: ExternalMangaSource,
 	cache: MemoryContentCache,
 ) : CachingMangaRepository(cache) {

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/ReorderableListAdapter.kt

@@ -28,10 +28,12 @@ open class ReorderableListAdapter<T : ListModel> : ListDelegationAdapter<List<T>
 		listListeners.forEach { it.onCurrentListChanged(oldList, newList) }
 	}
 
-	@Deprecated("Use emit() to dispatch list updates", level = DeprecationLevel.ERROR)
+	@Deprecated(
-	override fun setItems(items: List<T>?) {
+		message = "Use emit() to dispatch list updates",
-		super.setItems(items)
+		level = DeprecationLevel.ERROR,
-	}
+		replaceWith = ReplaceWith("emit(items)"),
+	)
+	override fun setItems(items: List<T>?) = super.setItems(items)
 
 	fun reorderItems(oldPos: Int, newPos: Int) {
 		Collections.swap(items ?: return, oldPos, newPos)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Collections.kt

@@ -92,7 +92,7 @@ fun LongSet.toLongArray(): LongArray {
 	return result
 }
 
-fun LongSet.toSet(): Set<Long> = toCollection(ArraySet<Long>(size))
+fun LongSet.toSet(): Set<Long> = toCollection(ArraySet(size))
 
 fun <R : MutableCollection<Long>> LongSet.toCollection(out: R): R = out.also { result ->
 	forEach(result::add)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Flow.kt

@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.flow.transformWhile
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt

@@ -12,7 +12,7 @@ import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class ChaptersAdapter(
-	private val onItemClickListener: OnListItemClickListener<ChapterListItem>,
+	onItemClickListener: OnListItemClickListener<ChapterListItem>,
 ) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	private var hasVolumes = false

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt

@@ -71,7 +71,6 @@ import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.data.TempFileFilter
-import org.koitharu.kotatsu.local.data.index.LocalMangaIndex
 import org.koitharu.kotatsu.local.data.input.LocalMangaInput
 import org.koitharu.kotatsu.local.data.output.LocalMangaOutput
 import org.koitharu.kotatsu.local.domain.MangaLock

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt

@@ -22,7 +22,6 @@ import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.list.domain.ListFilterOption
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaTag
 
 abstract class MangaListViewModel(
 	private val settings: AppSettings,

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorFooter.kt

@@ -1,7 +1,5 @@
 package org.koitharu.kotatsu.list.ui.model
 
-import androidx.annotation.DrawableRes
-
 data class ErrorFooter(
 	val exception: Throwable,
 ) : ListModel {

app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt

@@ -4,7 +4,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import okhttp3.internal.format
 import okio.Closeable
 import org.koitharu.kotatsu.core.prefs.DownloadFormat
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/protect/ProtectViewModel.kt

@@ -8,7 +8,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.parsers.util.isNumeric
 import org.koitharu.kotatsu.parsers.util.md5
 import javax.inject.Inject
 

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderManager.kt

@@ -19,7 +19,7 @@ import java.util.EnumMap
 class ReaderManager(
 	private val fragmentManager: FragmentManager,
 	private val container: FragmentContainerView,
-	private val settings: AppSettings,
+	settings: AppSettings,
 ) {
 
 	private val modeMap = EnumMap<ReaderMode, Class<out BaseReaderFragment<*>>>(ReaderMode::class.java)

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt

@@ -13,7 +13,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt

@@ -7,7 +7,6 @@ import androidx.viewbinding.ViewBinding
 import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
-import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.reader.ui.ReaderState

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt

@@ -20,7 +20,6 @@ import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.ifZero
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.requireValue

app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt

@@ -17,7 +17,6 @@ import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.DownloadFormat
-import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.resolveFile

app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt

@@ -15,7 +15,6 @@ import org.koitharu.kotatsu.core.backup.BackupZipOutput
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.exceptions.BadBackupFormatException
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.io.File
 import java.io.FileDescriptor
 import java.io.FileInputStream

app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt

@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.settings.backup
 
-import android.content.ContentResolver
 import android.content.Context
-import android.net.Uri
 import androidx.lifecycle.SavedStateHandle
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -13,8 +11,6 @@ import org.koitharu.kotatsu.core.backup.BackupEntry
 import org.koitharu.kotatsu.core.backup.BackupRepository
 import org.koitharu.kotatsu.core.backup.BackupZipInput
 import org.koitharu.kotatsu.core.backup.CompositeResult
-import org.koitharu.kotatsu.core.exceptions.BadBackupFormatException
-import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call

app/src/main/kotlin/org/koitharu/kotatsu/stats/data/StatsEntity.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.stats.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.history.data.HistoryEntity
 
 @Entity(

app/src/main/kotlin/org/koitharu/kotatsu/stats/data/StatsRepository.kt

@@ -1,10 +1,7 @@
 package org.koitharu.kotatsu.stats.data
 
-import androidx.collection.LongIntMap
-import androidx.collection.MutableLongIntMap
 import androidx.room.withTransaction
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
@@ -13,7 +10,6 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
-import org.koitharu.kotatsu.core.util.ext.combine
 import org.koitharu.kotatsu.stats.domain.StatsPeriod
 import org.koitharu.kotatsu.stats.domain.StatsRecord
 import java.util.NavigableMap

app/src/main/kotlin/org/koitharu/kotatsu/stats/domain/StatsRecord.kt

@@ -1,17 +1,9 @@
 package org.koitharu.kotatsu.stats.domain
 
-import android.content.Context
-import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
-import com.google.android.material.R
-import com.google.android.material.color.MaterialColors
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.details.data.ReadingTime
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import java.util.concurrent.TimeUnit
-import kotlin.math.absoluteValue
 
 data class StatsRecord(
 	val manga: Manga?,

app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/StatsViewModel.kt

@@ -21,7 +21,7 @@ import javax.inject.Inject
 @HiltViewModel
 class StatsViewModel @Inject constructor(
 	private val repository: StatsRepository,
-	private val favouritesRepository: FavouritesRepository,
+	favouritesRepository: FavouritesRepository,
 ) : BaseViewModel() {
 
 	val period = MutableStateFlow(StatsPeriod.WEEK)

app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/sheet/MangaStatsViewModel.kt

@@ -1,10 +1,8 @@
 package org.koitharu.kotatsu.stats.ui.sheet
 
 import androidx.collection.IntList
-import androidx.collection.LongIntMap
 import androidx.collection.MutableIntList
 import androidx.collection.emptyIntList
-import androidx.collection.emptyLongIntMap
 import androidx.lifecycle.SavedStateHandle
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -15,7 +13,6 @@ import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.core.util.ext.calculateTimeAgo
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.stats.data.StatsRepository
-import org.koitharu.kotatsu.stats.domain.StatsRecord
 import java.time.Instant
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/views/PieChartView.kt

@@ -13,6 +13,7 @@ import androidx.core.graphics.ColorUtils
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.parsers.util.replaceWith
+import kotlin.math.atan2
 import kotlin.math.sqrt
 
 class PieChartView @JvmOverloads constructor(
@@ -130,7 +131,7 @@ class PieChartView @JvmOverloads constructor(
 		if (distance < chartBounds.height() / 4f || distance > chartBounds.centerX()) {
 			return -1
 		}
-		var touchAngle = Math.toDegrees(Math.atan2(dy, dx)).toFloat()
+		var touchAngle = Math.toDegrees(atan2(dy, dx)).toFloat()
 		if (touchAngle < 0) {
 			touchAngle += 360
 		}

app/src/main/kotlin/org/koitharu/kotatsu/sync/data/SyncSettings.kt

@@ -4,7 +4,6 @@ import android.accounts.Account
 import android.accounts.AccountManager
 import android.content.Context
 import androidx.annotation.WorkerThread
-import dagger.Reusable
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
@@ -30,11 +29,11 @@ class SyncSettings(
 	@set:WorkerThread
 	var syncURL: String
 		get() = account?.let {
-			val sync_url = accountManager.getUserData(it, KEY_SYNC_URL)
+			val result = accountManager.getUserData(it, KEY_SYNC_URL)
-			if ( !sync_url.startsWith("http://") && !sync_url.startsWith("https://") ) {
+			if (!result.startsWith("http://") && !result.startsWith("https://")) {
-				return "http://$sync_url"
+				return "http://$result"
 			}
-			return sync_url
+			return result
 		}.ifNullOrEmpty { defaultSyncUrl }
 		set(value) {
 			account?.let {

app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugViewModel.kt

@@ -16,7 +16,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class TrackerDebugViewModel @Inject constructor(
-	private val db: MangaDatabase
+	db: MangaDatabase
 ) : BaseViewModel() {
 
 	val content = db.getTracksDao().observeAll()

app/src/main/res/color/ripple_toolbar.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<!-- 34% of 12% = ~4% -->
-	<item android:alpha="0.34" android:color="?attr/colorPrimary" />
-</selector>

app/src/main/res/drawable/bg_card_bottom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="@color/selector_overlay">
-	<item
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="?colorSurfaceContainerHighest" />
-			<corners
-				android:bottomLeftRadius="@dimen/m3_card_corner"
-				android:bottomRightRadius="@dimen/m3_card_corner" />
-			<padding
-				android:left="@dimen/list_spacing_small"
-				android:right="@dimen/list_spacing_small" />
-		</shape>
-	</item>
-	<item
-		android:id="@android:id/mask"
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/selector_overlay" />
-			<corners
-				android:bottomLeftRadius="@dimen/m3_card_corner"
-				android:bottomRightRadius="@dimen/m3_card_corner" />
-		</shape>
-	</item>
-</ripple>

app/src/main/res/drawable/bg_card_full.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="@color/selector_overlay">
-	<item
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="?colorSurfaceContainerHighest" />
-			<corners android:radius="@dimen/m3_card_corner" />
-			<padding
-				android:left="@dimen/list_spacing_small"
-				android:right="@dimen/list_spacing_small" />
-		</shape>
-	</item>
-	<item
-		android:id="@android:id/mask"
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/selector_overlay" />
-			<corners android:radius="@dimen/m3_card_corner" />
-		</shape>
-	</item>
-</ripple>

app/src/main/res/drawable/bg_card_none.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="@color/selector_overlay">
-	<item
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="?colorSurfaceContainerHighest" />
-			<padding
-				android:left="@dimen/list_spacing_small"
-				android:right="@dimen/list_spacing_small" />
-		</shape>
-	</item>
-	<item
-		android:id="@android:id/mask"
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/selector_overlay" />
-		</shape>
-	</item>
-</ripple>

app/src/main/res/drawable/bg_card_top.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="@color/selector_overlay">
-	<item
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="?colorSurfaceContainerHighest" />
-			<corners
-				android:topLeftRadius="@dimen/m3_card_corner"
-				android:topRightRadius="@dimen/m3_card_corner" />
-			<padding
-				android:left="@dimen/list_spacing_small"
-				android:right="@dimen/list_spacing_small" />
-		</shape>
-	</item>
-	<item
-		android:id="@android:id/mask"
-		android:left="@dimen/list_spacing_large"
-		android:right="@dimen/list_spacing_large">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/selector_overlay" />
-			<corners
-				android:topLeftRadius="@dimen/m3_card_corner"
-				android:topRightRadius="@dimen/m3_card_corner" />
-		</shape>
-	</item>
-</ripple>

app/src/main/res/drawable/ic_discord.xml

@@ -1,11 +0,0 @@
-<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="@android:color/white"
-		android:pathData="M19.27,5.33C17.94,4.71 16.5,4.26 15,4c-0.03,0 -0.05,0.01 -0.07,0.03c-0.18,0.33 -0.39,0.76 -0.53,1.09c-1.61,-0.24 -3.22,-0.24 -4.8,0C9.46,4.78 9.25,4.36 9.06,4.03C9.05,4.01 9.02,4 8.99,4c-1.5,0.26 -2.93,0.71 -4.27,1.33c-0.01,0 -0.02,0.01 -0.03,0.02c-2.72,4.07 -3.47,8.03 -3.1,11.95c0,0.02 0.01,0.04 0.03,0.05c1.8,1.32 3.53,2.12 5.24,2.65c0.03,0.01 0.06,0 0.07,-0.02c0.4,-0.55 0.76,-1.13 1.07,-1.74c0.02,-0.04 0,-0.08 -0.04,-0.09c-0.57,-0.22 -1.11,-0.48 -1.64,-0.78c-0.04,-0.02 -0.04,-0.08 -0.01,-0.11c0.11,-0.08 0.22,-0.17 0.33,-0.25c0.02,-0.02 0.05,-0.02 0.07,-0.01c3.44,1.57 7.15,1.57 10.55,0c0.02,-0.01 0.05,-0.01 0.07,0.01c0.11,0.09 0.22,0.17 0.33,0.26c0.04,0.03 0.04,0.09 -0.01,0.11c-0.52,0.31 -1.07,0.56 -1.64,0.78c-0.04,0.01 -0.05,0.06 -0.04,0.09c0.32,0.61 0.68,1.19 1.07,1.74C17.07,20 17.1,20.01 17.13,20c1.72,-0.53 3.45,-1.33 5.25,-2.65c0.02,-0.01 0.03,-0.03 0.03,-0.05c0.44,-4.53 -0.73,-8.46 -3.1,-11.95C19.3,5.34 19.29,5.33 19.27,5.33zM8.52,14.91c-1.03,0 -1.89,-0.95 -1.89,-2.12s0.84,-2.12 1.89,-2.12c1.06,0 1.9,0.96 1.89,2.12C10.41,13.96 9.57,14.91 8.52,14.91zM15.49,14.91c-1.03,0 -1.89,-0.95 -1.89,-2.12s0.84,-2.12 1.89,-2.12c1.06,0 1.9,0.96 1.89,2.12C17.38,13.96 16.55,14.91 15.49,14.91z" />
-</vector>

app/src/main/res/drawable/ic_github.xml

@@ -1,11 +0,0 @@
-<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="@android:color/white"
-		android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
-</vector>

app/src/main/res/drawable/ic_list_sheet.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="#000000"
-		android:pathData="M17 7V9H15V7H17M13 7V9H7V7H13M13 11H7V13H13V11M15 11V13H17V11H15M21 22L18 20L15 22L12 20L9 22L6 20L3 22V3H21V22M19 18.26V5H5V18.26L6 17.6L9 19.6L12 17.6L15 19.6L18 17.6L19 18.26Z" />
-</vector>

app/src/main/res/drawable/ic_telegram.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:pathData="m196.03,328.68 l162,118.8c16.8,10.8 31.2,4.8 36,-16.8l66,-309.6c6,-26.4 -10.8,-38.4 -28.8,-30L46.03,239.88c-25.2,9.6 -25.2,25.2 -4.8,31.2l99.6,31.2 228,-145.2c10.8,-6 20.4,-3.6 13.2,4.8"
-      android:strokeWidth="1.2"
-      android:fillColor="#000000"/>
-</vector>

app/src/main/res/layout/dialog_onboard.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	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:orientation="vertical">
-
-	<TextView
-		android:id="@+id/textView_title"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingHorizontal="?attr/dialogPreferredPadding"
-		android:paddingVertical="16dp"
-		android:textAppearance="?attr/textAppearanceBodyMedium"
-		tools:text="@string/onboard_text" />
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/recycler_view"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:scrollIndicators="top|bottom"
-		android:scrollbars="vertical"
-		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		tools:ignore="UnusedAttribute"
-		tools:listitem="@layout/item_source_locale" />
-
-</LinearLayout>

app/src/main/res/layout/item_catalog_page.xml

@@ -1,19 +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:id="@+id/layout_list"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<org.koitharu.kotatsu.core.ui.list.fastscroll.FastScrollRecyclerView
-		android:id="@+id/recyclerView"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:clipToPadding="false"
-		android:orientation="vertical"
-		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		tools:listitem="@layout/item_source_config" />
-
-</FrameLayout>

app/src/main/res/layout/item_source_config_checkable.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	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:gravity="center_vertical"
-	android:orientation="horizontal"
-	android:paddingVertical="@dimen/margin_small"
-	android:paddingStart="?listPreferredItemPaddingStart"
-	android:paddingEnd="?listPreferredItemPaddingEnd">
-
-	<com.google.android.material.imageview.ShapeableImageView
-		android:id="@+id/imageView_icon"
-		android:layout_width="32dp"
-		android:layout_height="32dp"
-		android:background="?colorControlHighlight"
-		android:labelFor="@id/textView_title"
-		android:scaleType="fitCenter"
-		app:shapeAppearance="?shapeAppearanceCornerSmall"
-		tools:src="@tools:sample/avatars" />
-
-	<LinearLayout
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="?android:listPreferredItemPaddingStart"
-		android:layout_marginEnd="?android:listPreferredItemPaddingEnd"
-		android:layout_weight="1"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="?attr/textAppearanceBodyLarge"
-			tools:text="@tools:sample/lorem[15]" />
-
-		<TextView
-			android:id="@+id/textView_description"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="2dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="?attr/textAppearanceBodySmall"
-			tools:text="English" />
-
-	</LinearLayout>
-
-	<com.google.android.material.materialswitch.MaterialSwitch
-		android:id="@+id/switch_toggle"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" />
-
-</LinearLayout>

app/src/main/res/layout/item_source_locale.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:gravity="center_vertical"
-	android:minHeight="?android:listPreferredItemHeightSmall"
-	android:orientation="horizontal">
-
-	<LinearLayout
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginVertical="8dp"
-		android:layout_marginStart="?attr/dialogPreferredPadding"
-		android:layout_marginEnd="?attr/dialogPreferredPadding"
-		android:layout_weight="1"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="?attr/textAppearanceBodyLarge"
-			tools:text="@tools:sample/lorem[15]" />
-
-		<TextView
-			android:id="@+id/textView_description"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="2dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="?attr/textAppearanceBodySmall"
-			tools:text="English" />
-
-	</LinearLayout>
-
-	<com.google.android.material.materialswitch.MaterialSwitch
-		android:id="@+id/switch_toggle"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginEnd="?attr/dialogPreferredPadding" />
-
-</LinearLayout>

app/src/main/res/layout/preference_about_links.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	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:gravity="center">
-
-	<ImageButton
-		android:id="@+id/btn_github"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackgroundBorderless"
-		android:contentDescription="GitHub"
-		android:padding="16dp"
-		android:src="@drawable/ic_github"
-		app:tint="?attr/colorAccent"
-		tools:ignore="HardcodedText" />
-
-	<ImageButton
-		android:id="@+id/btn_discord"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackgroundBorderless"
-		android:contentDescription="Discord"
-		android:padding="16dp"
-		android:src="@drawable/ic_discord"
-		app:tint="?attr/colorAccent"
-		tools:ignore="HardcodedText" />
-
-	<ImageButton
-		android:id="@+id/btn_telegram"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackgroundBorderless"
-		android:contentDescription="Telegram"
-		android:padding="16dp"
-		android:src="@drawable/ic_telegram"
-		app:tint="?attr/colorAccent"
-		tools:ignore="HardcodedText" />
-
-</LinearLayout>