Merge branch 'master' into devel

2021-06-26 15:19:50 +03:00
parent de3c4545e6 873b41e4f9
commit e37f6f31da
22 changed files with 87 additions and 162 deletions
--- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
@@ -35,6 +35,7 @@ class ShortcutsRepository(
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return
 		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
 		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
+			.filter { x -> x.title.isNotEmpty() }
 			.map { buildShortcutInfo(it).build().toShortcutInfo() }
 		manager.dynamicShortcuts = shortcuts
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
@@ -49,18 +49,17 @@ class MangareadRepository(
 				id = generateUid(href),
 				url = href,
 				publicUrl = href.inContextOf(div),
-				coverUrl = div.selectFirst("img").attr("data-srcset")
-					.split(',').firstOrNull()?.substringBeforeLast(' ').orEmpty(),
+				coverUrl = div.selectFirst("img").absUrl("src"),
 				title = summary.selectFirst("h3").text(),
 				rating = div.selectFirst("span.total_votes")?.ownText()
 					?.toFloatOrNull()?.div(5f) ?: -1f,
-				tags = summary.selectFirst(".mg_genres").select("a").mapToSet { a ->
+				tags = summary.selectFirst(".mg_genres")?.select("a")?.mapToSet { a ->
 					MangaTag(
 						key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
 						title = a.text(),
 						source = MangaSource.MANGAREAD
 					)
-				},
+				}.orEmpty(),
 				author = summary.selectFirst(".mg_author")?.selectFirst("a")?.ownText(),
 				state = when (summary.selectFirst(".mg_status")?.selectFirst(".summary-content")
 					?.ownText()?.trim()) {
@@ -148,7 +147,7 @@ class MangareadRepository(
 			?: throw ParseException("Root not found")
 		return root.select("div.page-break").map { div ->
 			val img = div.selectFirst("img")
-			val url = img.relUrl("data-src")
+			val url = img.relUrl("src")
 			MangaPage(
 				id = generateUid(url),
 				url = url,
--- a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
@@ -2,13 +2,12 @@ package org.koitharu.kotatsu.details

 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
-import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.details.ui.DetailsViewModel

 val detailsModule
 	get() = module {

-		viewModel { (intent: MangaIntent) ->
-			DetailsViewModel(intent, get(), get(), get(), get(), get(), get())
+		viewModel { intent ->
+			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get())
 		}
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.favourites

 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
 import org.koitharu.kotatsu.favourites.ui.categories.select.MangaCategoriesViewModel
@@ -13,11 +12,11 @@ val favouritesModule

 		single { FavouritesRepository(get()) }

-		viewModel { (categoryId: Long) ->
-			FavouritesListViewModel(categoryId, get(), get())
+		viewModel { categoryId ->
+			FavouritesListViewModel(categoryId.get(), get(), get())
 		}
 		viewModel { FavouritesCategoriesViewModel(get()) }
-		viewModel { (manga: Manga) ->
-			MangaCategoriesViewModel(manga, get())
+		viewModel { manga ->
+			MangaCategoriesViewModel(manga.get(), get())
 		}
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import com.tomclaw.cache.DiskLruCache
 import org.koitharu.kotatsu.utils.FileSizeUtils
 import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.sub
+import org.koitharu.kotatsu.utils.ext.subdir
 import org.koitharu.kotatsu.utils.ext.takeIfReadable
 import java.io.File
 import java.io.InputStream
@@ -13,8 +13,10 @@ import java.io.OutputStream
 class PagesCache(context: Context) {

 	private val cacheDir = context.externalCacheDir ?: context.cacheDir
-	private val lruCache =
-		DiskLruCache.create(cacheDir.sub(Cache.PAGES.dir), FileSizeUtils.mbToBytes(200))
+	private val lruCache = DiskLruCache.create(
+		cacheDir.subdir(Cache.PAGES.dir),
+		FileSizeUtils.mbToBytes(200)
+	)

 	operator fun get(url: String): File? {
 		return lruCache.get(url)?.takeIfReadable()
@@ -22,7 +24,7 @@ class PagesCache(context: Context) {

 	@Deprecated("Useless lambda")
 	fun put(url: String, writer: (OutputStream) -> Unit): File {
-		val file = cacheDir.sub(url.longHashCode().toString())
+		val file = File(cacheDir, url.longHashCode().toString())
 		file.outputStream().use(writer)
 		val res = lruCache.put(url, file)
 		file.delete()
@@ -30,7 +32,7 @@ class PagesCache(context: Context) {
 	}

 	fun put(url: String, inputStream: InputStream): File {
-		val file = cacheDir.sub(url.longHashCode().toString())
+		val file = File(cacheDir, url.longHashCode().toString())
 		file.outputStream().use { out ->
 			inputStream.copyTo(out)
 		}
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -175,10 +175,12 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
 		}

 		fun getAvailableStorageDirs(context: Context): List<File> {
-			val result = ArrayList<File>(5)
-			result += context.filesDir.sub(DIR_NAME)
+			val result = ArrayList<File?>(5)
+			result += File(context.filesDir, DIR_NAME)
 			result += context.getExternalFilesDirs(DIR_NAME)
-			return result.distinctBy { it.canonicalPath }.filter { it.exists() || it.mkdir() }
+			return result.filterNotNull()
+				.distinctBy { it.canonicalPath }
+				.filter { it.exists() || it.mkdir() }
 		}

 		fun getFallbackStorageDir(context: Context): File? {
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
@@ -3,9 +3,7 @@ package org.koitharu.kotatsu.reader
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.ReaderViewModel

 val readerModule
@@ -14,7 +12,7 @@ val readerModule
 		single { MangaDataRepository(get()) }
 		single { PagesCache(get()) }

-		viewModel { (intent: MangaIntent, state: ReaderState?) ->
-			ReaderViewModel(intent, state, get(), get(), get(), get())
+		viewModel { params ->
+			ReaderViewModel(params[0], params[1], get(), get(), get(), get())
 		}
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
@@ -9,7 +9,7 @@ import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
 val remoteListModule
 	get() = module {

-		viewModel { (source: MangaSource) ->
-			RemoteListViewModel(get(named(source)), get())
+		viewModel { source ->
+			RemoteListViewModel(get(named(source.get<MangaSource>())), get())
 		}
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
@@ -1,15 +1,10 @@
 package org.koitharu.kotatsu.remotelist.ui

-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaFilter
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.list.ui.MangaListFragment
-import org.koitharu.kotatsu.search.ui.SearchActivity
 import org.koitharu.kotatsu.utils.ext.parcelableArgument
 import org.koitharu.kotatsu.utils.ext.withArgs

@@ -25,7 +20,7 @@ class RemoteListFragment : MangaListFragment() {
 		viewModel.loadNextPage()
 	}

-	override fun getTitle(): CharSequence? {
+	override fun getTitle(): CharSequence {
 		return source.title
 	}

@@ -34,19 +29,6 @@ class RemoteListFragment : MangaListFragment() {
 		super.onFilterChanged(filter)
 	}

-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		inflater.inflate(R.menu.opt_remote, menu)
-		super.onCreateOptionsMenu(menu, inflater)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_search_internal -> {
-			context?.startActivity(SearchActivity.newIntent(requireContext(), source, null))
-			true
-		}
-		else -> super.onOptionsItemSelected(item)
-	}
-
 	companion object {

 		private const val ARG_SOURCE = "provider"
--- a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
@@ -18,11 +18,11 @@ val searchModule

 		factory { MangaSuggestionsProvider.createSuggestions(androidContext()) }

-		viewModel { (source: MangaSource, query: String) ->
-			SearchViewModel(get(named(source)), query, get())
+		viewModel { params ->
+			SearchViewModel(get(named(params.get<MangaSource>(0))), params[1], get())
 		}
-		viewModel { (query: String) ->
-			GlobalSearchViewModel(query, get(), get())
+		viewModel { query ->
+			GlobalSearchViewModel(query.get(), get(), get())
 		}
 		viewModel { SearchSuggestionViewModel(get()) }
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
@@ -96,7 +96,7 @@ class MangaSearchRepository(
 			MangaSuggestionsProvider.QUERY_URI,
 			SUGGESTION_PROJECTION,
 			null,
-			null,
+			arrayOfNulls(1),
 			null
 		)?.use { cursor -> cursor.count } ?: 0
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.settings

 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
@@ -87,16 +88,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				true
 			}
 			AppSettings.KEY_SEARCH_HISTORY_CLEAR -> {
-				viewLifecycleScope.launch {
-					searchRepository.clearSearchHistory()
-					preference.summary = preference.context.resources
-						.getQuantityString(R.plurals.items, 0, 0)
-					Snackbar.make(
-						view ?: return@launch,
-						R.string.search_history_cleared,
-						Snackbar.LENGTH_SHORT
-					).show()
-				}
+				clearSearchHistory(preference)
 				true
 			}
 			AppSettings.KEY_UPDATES_FEED_CLEAR -> {
@@ -133,4 +125,23 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 			}
 		}
 	}
+
+	private fun clearSearchHistory(preference: Preference) {
+		AlertDialog.Builder(context ?: return)
+			.setTitle(R.string.clear_search_history)
+			.setMessage(R.string.text_clear_search_history_prompt)
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.clear) { _, _ ->
+				viewLifecycleScope.launch {
+					searchRepository.clearSearchHistory()
+					preference.summary = preference.context.resources
+						.getQuantityString(R.plurals.items, 0, 0)
+					Snackbar.make(
+						view ?: return@launch,
+						R.string.search_history_cleared,
+						Snackbar.LENGTH_SHORT
+					).show()
+				}
+			}.show()
+	}
 }
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
@@ -20,7 +20,9 @@ val settingsModule
 		single { AppSettings(androidContext()) }

 		viewModel { BackupViewModel(get(), androidContext()) }
-		viewModel { (uri: Uri?) -> RestoreViewModel(uri, get(), androidContext()) }
+		viewModel { params ->
+			RestoreViewModel(params.getOrNull(Uri::class), get(), androidContext())
+		}
 		viewModel { ProtectSetupViewModel(get()) }
 		viewModel { OnboardViewModel(get()) }
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
@@ -8,7 +8,6 @@ import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.map
-import org.koitharu.kotatsu.utils.ext.mapTo
 import org.koitharu.kotatsu.utils.ext.mapToSet
 import java.util.*

@@ -30,10 +29,10 @@ class OnboardViewModel(
 		if (settings.isSourcesSelected) {
 			selectedLocales.removeAll(settings.hiddenSources.map { x -> MangaSource.valueOf(x).locale })
 		} else {
-			LocaleListCompat.getDefault().mapTo(selectedLocales) { x ->
+			val deviceLocales = LocaleListCompat.getDefault().map { x ->
 				x.language
 			}
-			selectedLocales.retainAll(allSources.map { x -> x.locale })
+			selectedLocales.retainAll(deviceLocales)
 			if (selectedLocales.isEmpty()) {
 				selectedLocales += "en"
 			}
@@ -71,7 +70,7 @@ class OnboardViewModel(
 		}.sortedWith(SourceLocaleComparator())
 	}

-	private class SourceLocaleComparator : Comparator<SourceLocale> {
+	private class SourceLocaleComparator : Comparator<SourceLocale?> {

 		private val deviceLocales = LocaleListCompat.getAdjustedDefault()
 			.map { it.language }
--- a/app/src/main/java/org/koitharu/kotatsu/utils/CacheUtils.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/CacheUtils.kt
@@ -23,12 +23,12 @@ object CacheUtils {

 	@WorkerThread
 	fun computeCacheSize(context: Context, name: String) = getCacheDirs(context)
-		.map { it.sub(name) }
+		.map { File(it, name) }
 		.sumOf { x -> x.computeSize() }

 	@WorkerThread
 	fun clearCache(context: Context, name: String) = getCacheDirs(context)
-		.map { it.sub(name) }
+		.map { File(it, name) }
 		.forEach { it.deleteRecursively() }

 	// FIXME need async implementation
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FileExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FileExt.kt
@@ -13,8 +13,13 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile

@Suppress("NOTHING_TO_INLINE")
+@Deprecated("Useless", ReplaceWith("File(this, name)", "java.io.File"))
 inline fun File.sub(name: String) = File(this, name)

+fun File.subdir(name: String) = File(this, name).also {
+	if (!it.exists()) it.mkdirs()
+}
+
 fun File.takeIfReadable() = takeIf { it.exists() && it.canRead() }

 fun ZipFile.readText(entry: ZipEntry) = getInputStream(entry).bufferedReader().use {
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
@@ -80,7 +80,7 @@ fun String.toRelativeUrl(domain: String): String {
 }

 fun Element.relUrl(attributeKey: String): String {
-	val attr = attr(attributeKey)
+	val attr = attr(attributeKey).trim()
 	if (attr.isEmpty()) {
 		return ""
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
@@ -50,18 +50,22 @@ fun String.toCamelCase(): String {

 fun String.transliterate(skipMissing: Boolean): String {
 	val cyr = charArrayOf(
-		'a', 'б', 'в', 'г', 'д', 'ё', 'ж', 'з', 'и', 'к', 'л', 'м', 'н',
-		'п', 'р', 'с', 'т', 'у', 'ў', 'ф', 'х', 'ц', 'ш', 'щ', 'ы', 'э', 'ю', 'я'
+		'а', 'б', 'в', 'г', 'д', 'е', 'ж', 'з', 'и', 'й', 'к', 'л', 'м', 'н', 'о', 'п',
+		'р', 'с', 'т', 'у', 'ф', 'х', 'ц', 'ч', 'ш', 'щ', 'ъ', 'ы', 'ь', 'э', 'ю', 'я', 'ё', 'ў'
 	)
 	val lat = arrayOf(
-		"a", "b", "v", "g", "d", "jo", "zh", "z", "i", "k", "l", "m", "n",
-		"p", "r", "s", "t", "u", "w", "f", "h", "ts", "sh", "sch", "", "e", "ju", "ja"
+		"a", "b", "v", "g", "d", "e", "zh", "z", "i", "y", "k", "l", "m", "n", "o", "p",
+		"r", "s", "t", "u", "f", "h", "ts", "ch", "sh", "sch", "", "i", "", "e", "ju", "ja", "jo", "w"
 	)
 	return buildString(length + 5) {
 		for (c in this@transliterate) {
-			val p = cyr.binarySearch(c.toLowerCase())
+			val p = cyr.binarySearch(c.lowercaseChar())
 			if (p in lat.indices) {
-				append(lat[p])
+				if (c.isUpperCase()) {
+					append(lat[p].uppercase())
+				} else {
+					append(lat[p])
+				}
 			} else if (!skipMissing) {
 				append(c)
 			}
--- a/app/src/main/res/menu/opt_remote.xml
+++ b/app/src/main/res/menu/opt_remote.xml
@@ -1,12 +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:id="@+id/action_search_internal"
-		android:orderInCategory="26"
-		android:title="@string/search"
-		app:showAsAction="never" />
-
-</menu>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -201,13 +201,13 @@
 	<string name="_and_x_more">…и ещё %1$d</string>
 	<string name="next">Далее</string>
 	<string name="protect_application_subtitle">Введите пароль, который вам понадобится при запуске приложения</string>
-	<string name="confirm">Confirm</string>
+	<string name="confirm">Подтвердить</string>
 	<string name="password_length_hint">Пароль должен содержать не менее 4 символов</string>
 	<string name="hide_toolbar">Прятать заголовок при прокрутке</string>
 	<string name="search_only_on_s">Поиск только по %s</string>
 	<string name="other">Другие</string>
-	<string name="languages">Languages</string>
-	<string name="welcome">Welcome</string>
 	<string name="description">Описание</string>
-	<string name="text_clear_search_history_prompt">Вы действительно хотите удалить все последние поисковые запросы? Это действие не может быть отменено.</string>
+	<string name="languages">Языки</string>
+	<string name="welcome">Добро пожаловать</string>
+	<string name="text_clear_search_history_prompt">Вы действительно хотите удалить все недавние поисковые запросы? Это действие не может быть отменено.</string>
 </resources>