Merge branch 'devel' into feature/sync

2022-05-15 17:17:12 +03:00
parent d31d302896 e4b29b3ff9
commit 7bc945b243
24 changed files with 191 additions and 92 deletions
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -121,13 +121,7 @@ class ChaptersFragment :
 			(activity as? DetailsActivity)?.showChapterMissingDialog(item.chapter.id)
 			return
 		}
-		val options = ActivityOptions.makeScaleUpAnimation(
-			view,
-			0,
-			0,
-			view.measuredWidth,
-			view.measuredHeight
-		)
+		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
 		startActivity(
 			ReaderActivity.newIntent(
 				context = view.context,
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -84,7 +84,7 @@ class DetailsFragment :
 	}

 	override fun onItemClick(item: Bookmark, view: View) {
-		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.measuredWidth, view.measuredHeight)
+		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
 		startActivity(ReaderActivity.newIntent(view.context, item), options.toBundle())
 	}

@@ -245,13 +245,9 @@ class DetailsFragment :
 				)
 			}
 			R.id.imageView_cover -> {
-				val options = ActivityOptions.makeSceneTransitionAnimation(
-					requireActivity(),
-					binding.imageViewCover,
-					binding.imageViewCover.transitionName,
-				)
+				val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
 				startActivity(
-					ImageActivity.newIntent(v.context, manga.largeCoverUrl ?: manga.coverUrl),
+					ImageActivity.newIntent(v.context, manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }),
 					options.toBundle()
 				)
 			}
@@ -317,20 +313,20 @@ class DetailsFragment :
 	}

 	private fun loadCover(manga: Manga) {
-		val currentCover = binding.imageViewCover.drawable
+		val imageUrl = manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }
+		val lastResult = CoilUtils.result(binding.imageViewCover)
+		if (lastResult?.request?.data == imageUrl) {
+			return
+		}
 		val request = ImageRequest.Builder(context ?: return)
 			.target(binding.imageViewCover)
-		if (currentCover != null) {
-			request.data(manga.largeCoverUrl ?: return)
-				.placeholderMemoryCacheKey(CoilUtils.result(binding.imageViewCover)?.request?.memoryCacheKey)
-				.fallback(currentCover)
-		} else {
-			request.crossfade(true)
-				.data(manga.coverUrl)
-				.fallback(R.drawable.ic_placeholder)
-		}
-		request.referer(manga.publicUrl)
+			.data(imageUrl)
+			.crossfade(true)
+			.referer(manga.publicUrl)
 			.lifecycle(viewLifecycleOwner)
-			.enqueueWith(coil)
+		lastResult?.drawable?.let {
+			request.fallback(it)
+		} ?: request.fallback(R.drawable.ic_placeholder)
+		request.enqueueWith(coil)
 	}
 }
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.main.ui

 import android.app.ActivityOptions
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
@@ -320,15 +319,7 @@ class MainActivity :
 	}

 	private fun onOpenReader(manga: Manga) {
-		val options = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			ActivityOptions.makeClipRevealAnimation(
-				binding.fab, 0, 0, binding.fab.measuredWidth, binding.fab.measuredHeight
-			)
-		} else {
-			ActivityOptions.makeScaleUpAnimation(
-				binding.fab, 0, 0, binding.fab.measuredWidth, binding.fab.measuredHeight
-			)
-		}
+		val options = ActivityOptions.makeScaleUpAnimation(binding.fab, 0, 0, binding.fab.width, binding.fab.height)
 		startActivity(ReaderActivity.newIntent(this, manga), options?.toBundle())
 	}

--- a/app/src/main/res/layout-w600dp/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp/fragment_details.xml
@@ -21,7 +21,6 @@
 			android:layout_marginTop="16dp"
 			android:foreground="?selectableItemBackground"
 			android:scaleType="centerCrop"
-			android:transitionName="cover"
 			app:layout_constraintDimensionRatio="H,13:18"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0"
--- a/app/src/main/res/layout/activity_image.xml
+++ b/app/src/main/res/layout/activity_image.xml
@@ -7,8 +7,7 @@
 	<com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 		android:id="@+id/ssiv"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:transitionName="cover" />
+		android:layout_height="match_parent" />

 	<com.google.android.material.appbar.MaterialToolbar
 		android:id="@+id/toolbar"
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -21,7 +21,6 @@
 			android:layout_marginTop="16dp"
 			android:foreground="?selectableItemBackground"
 			android:scaleType="centerCrop"
-			android:transitionName="cover"
 			app:layout_constraintDimensionRatio="H,13:18"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0"
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -153,8 +153,6 @@
    <string name="update_check_failed">Памылка пры праверцы абнаўленняў</string>
    <string name="no_update_available">Няма даступных абнаўленняў</string>
    <string name="right_to_left">Справа налева</string>
-    <string name="prefer_rtl_reader">Аддаваць перавагу рэжыму справа налева</string>
-    <string name="prefer_rtl_reader_summary">Вы можаце наладзіць рэжым чытання для кожнай мангі асобна</string>
    <string name="create_category">Стварыць катэгорыю</string>
    <string name="report_github">Пачаць абмеркаванне праблемы на GitHub</string>
    <string name="scale_mode">Маштабаванне</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -86,9 +86,7 @@
    <string name="black_dark_theme_summary">Nützlich für AMOLED-Bildschirme</string>
    <string name="black_dark_theme">Schwarzer dunkler Modus</string>
    <string name="restart_required">Neustart erforderlich</string>
-    <string name="prefer_rtl_reader_summary">Du kannst den Lesemodus für jeden Manga separat einrichten</string>
    <string name="right_to_left">Von rechts nach links</string>
-    <string name="prefer_rtl_reader">Von rechts nach links-Lesemodus bevorzugen</string>
    <string name="create_category">Neue Kategorie</string>
    <string name="backup_restore">Sicherung und Wiederherstellung</string>
    <string name="data_restored">Daten wiederhergestellt</string>
@@ -278,4 +276,23 @@
    <string name="chapters_will_removed_background">Die Kapitel werden im Hintergrund entfernt. Das kann einige Zeit dauern</string>
    <string name="hide">Ausblenden</string>
    <string name="new_sources_text">Neue Manga-Quellen sind verfügbar</string>
+    <string name="check_new_chapters_title">Nach neuen Kapiteln suchen und darüber informieren</string>
+    <string name="show_notification_new_chapters_on">Sie erhalten Benachrichtigungen über Aktualisierungen der Manga, die Sie lesen</string>
+    <string name="notifications_enable">Benachrichtigungen einschalten</string>
+    <string name="empty_favourite_categories">Keine bevorzugten Kategorien</string>
+    <string name="name">Name</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="show_notification_new_chapters_off">Sie werden keine Benachrichtigungen erhalten, aber neue Kapitel werden in den Listen hervorgehoben</string>
+    <string name="edit_category">Kategorie bearbeiten</string>
+    <string name="bookmark_add">Lesezeichen hinzufügen</string>
+    <string name="bookmarks">Lesezeichen</string>
+    <string name="bookmark_removed">Lesezeichen entfernt</string>
+    <string name="removed_from_history">Aus dem Verlauf entfernt</string>
+    <string name="bookmark_remove">Lesezeichen entfernen</string>
+    <string name="bookmark_added">Lesezeichen hinzugefügt</string>
+    <string name="undo">Rückgängig</string>
+    <string name="dns_over_https">DNS über HTTPS</string>
+    <string name="default_mode">Standard-Modus</string>
+    <string name="detect_reader_mode">Automatische Erkennung des Lesegerätmodus</string>
+    <string name="detect_reader_mode_summary">Automatisch erkennen, ob ein Manga ein Webtoon ist</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -153,8 +153,6 @@
    <string name="update_check_failed">Fallo en la comprobación de actualizaciones</string>
    <string name="no_update_available">No hay actualizaciones disponibles</string>
    <string name="right_to_left">Derecha a izquierda (←)</string>
-    <string name="prefer_rtl_reader">Preferir lector de derecha a izquierda (←)</string>
-    <string name="prefer_rtl_reader_summary">Puedes configurar el modo de lectura para cada manga por separado</string>
    <string name="create_category">Nueva categoría</string>
    <string name="report_github">Crear incidencia en GitHub</string>
    <string name="scale_mode">Modo de escala</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -63,8 +63,6 @@
    <string name="scale_mode">Skaalaustila</string>
    <string name="report_github">Luo ongelma GitHubissa</string>
    <string name="create_category">Uusi luokka</string>
-    <string name="prefer_rtl_reader_summary">Voit määrittää lukutilan jokaiselle mangalle erikseen</string>
-    <string name="prefer_rtl_reader">Mieluummin oikealta vasemmalle lukutila</string>
    <string name="right_to_left">Oikealta vasemmalle</string>
    <string name="no_update_available">Ei päivityksiä saatavilla</string>
    <string name="update_check_failed">Päivityksen tarkistus epäonnistui</string>
@@ -278,4 +276,23 @@
    <string name="local_manga_processing">Tallennettujen mangojen käsittely</string>
    <string name="hide">Piilota</string>
    <string name="new_sources_text">Uusia mangalähteitä on saatavilla</string>
+    <string name="check_new_chapters_title">Tarkista uudet luvut ja ilmoita siitä</string>
+    <string name="notifications_enable">Ota ilmoitukset käyttöön</string>
+    <string name="empty_favourite_categories">Ei suosikkiluokkia</string>
+    <string name="name">Nimi</string>
+    <string name="edit">Muokkaa</string>
+    <string name="edit_category">Muokkaa luokkaa</string>
+    <string name="show_notification_new_chapters_off">Et saa ilmoituksia, mutta uudet luvut korostetaan luetteloissa</string>
+    <string name="show_notification_new_chapters_on">Saat ilmoituksia lukemasi mangan päivityksistä</string>
+    <string name="bookmark_add">Lisää kirjanmerkki</string>
+    <string name="bookmark_remove">Poista kirjanmerkki</string>
+    <string name="bookmarks">Kirjanmerkit</string>
+    <string name="bookmark_removed">Kirjanmerkki poistettu</string>
+    <string name="bookmark_added">Kirjanmerkki lisätty</string>
+    <string name="undo">Kumoa</string>
+    <string name="removed_from_history">Poistettu historiasta</string>
+    <string name="dns_over_https">DNS HTTPS:n kautta</string>
+    <string name="detect_reader_mode">Lukijan automaattinen tunnistaminen</string>
+    <string name="detect_reader_mode_summary">Tunnista automaattisesti, onko manga webtoon</string>
+    <string name="default_mode">Oletustila</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -52,8 +52,6 @@
    <string name="scale_mode">Mode mise à l\'échelle</string>
    <string name="report_github">Signaler un problème sur GitHub</string>
    <string name="create_category">Nouvelle catégorie</string>
-    <string name="prefer_rtl_reader_summary">Le mode de lecture peut être configuré séparément pour chaque série</string>
-    <string name="prefer_rtl_reader">Préférer le lecteur de droite à gauche (←)</string>
    <string name="right_to_left">De droite à gauche (←)</string>
    <string name="no_update_available">Aucune mise à jour disponible</string>
    <string name="update_check_failed">Échec de la recherche de mise à jour</string>
@@ -278,4 +276,23 @@
    <string name="local_manga_processing">Traitement des mangas sauvegardés</string>
    <string name="hide">Masquer</string>
    <string name="new_sources_text">De nouvelles sources de mangas sont disponibles</string>
+    <string name="check_new_chapters_title">Vérifier les nouveaux chapitres et les notifier</string>
+    <string name="notifications_enable">Activer les notifications</string>
+    <string name="show_notification_new_chapters_on">Vous recevrez des notifications sur les mises à jour des mangas que vous lisez</string>
+    <string name="show_notification_new_chapters_off">Vous ne recevrez pas de notifications mais les nouveaux chapitres seront mis en évidence dans les listes</string>
+    <string name="empty_favourite_categories">Pas de catégories préférées</string>
+    <string name="name">Nom</string>
+    <string name="edit">Modifier</string>
+    <string name="edit_category">Modifier la catégorie</string>
+    <string name="bookmark_add">Ajouter un marque-page</string>
+    <string name="bookmark_remove">Retirer le marque-page</string>
+    <string name="bookmarks">Marque-pages</string>
+    <string name="bookmark_added">Marque-page ajouté</string>
+    <string name="bookmark_removed">Marque-page retiré</string>
+    <string name="undo">Annuler</string>
+    <string name="removed_from_history">Retiré de l\'historique</string>
+    <string name="dns_over_https">DNS sur HTTPS</string>
+    <string name="default_mode">Mode par défaut</string>
+    <string name="detect_reader_mode">Mode de détection automatique du lecteur</string>
+    <string name="detect_reader_mode_summary">Détecter automatiquement si un manga est un webtoon</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -96,8 +96,6 @@
    <string name="black_dark_theme">Tema nero scuro</string>
    <string name="report_github">Segnala un problema su GitHub</string>
    <string name="create_category">Nuova categoria</string>
-    <string name="prefer_rtl_reader_summary">Puoi impostare la modalità di lettura per ogni manga separatamente</string>
-    <string name="prefer_rtl_reader">Preferisci la lettura da destra a sinistra</string>
    <string name="right_to_left">Da destra a sinistra</string>
    <string name="no_update_available">Nessun aggiornamento disponibile</string>
    <string name="update_check_failed">Controllo dell\'aggiornamento fallito</string>
@@ -278,4 +276,23 @@
    <string name="download_slowdown_summary">Aiuta ad evitare il blocco del tuo indirizzo IP</string>
    <string name="hide">Nascondi</string>
    <string name="new_sources_text">Sono disponibili nuove fonti di manga</string>
+    <string name="show_notification_new_chapters_on">Riceverai notifiche sugli aggiornamenti del manga che stai leggendo</string>
+    <string name="notifications_enable">Abilita le notifiche</string>
+    <string name="show_notification_new_chapters_off">Non riceverai notifiche ma i nuovi capitoli saranno evidenziati nelle liste</string>
+    <string name="empty_favourite_categories">Nessuna categoria preferita</string>
+    <string name="name">Nome</string>
+    <string name="edit">Modifica</string>
+    <string name="edit_category">Modifica la categoria</string>
+    <string name="check_new_chapters_title">Controlla i nuovi capitoli e notificarli</string>
+    <string name="bookmarks">Segnalibri</string>
+    <string name="removed_from_history">Rimosso dalla cronologia</string>
+    <string name="bookmark_remove">Rimuovi il segnalibro</string>
+    <string name="bookmark_add">Aggiungi un segnalibro</string>
+    <string name="bookmark_removed">Segnalibro rimosso</string>
+    <string name="bookmark_added">Segnalibro aggiunto</string>
+    <string name="undo">Annulla</string>
+    <string name="default_mode">Modalità predefinita</string>
+    <string name="detect_reader_mode">Modalità di lettura a rilevamento automatico</string>
+    <string name="dns_over_https">DNS su HTTPS</string>
+    <string name="detect_reader_mode_summary">Rileva automaticamente se il manga è un webtoon</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -159,7 +159,6 @@
    <string name="update_check_failed">アップデートを確認する事が出来ませんでした</string>
    <string name="no_update_available">利用可能なアップデートはありません</string>
    <string name="right_to_left">右から左(←)</string>
-    <string name="prefer_rtl_reader">右から左（←）の読書を好む</string>
    <string name="about_feedback">フィードバック</string>
    <string name="about_feedback_4pda">4PDAに関する話題</string>
    <string name="auth_complete">承認済み</string>
@@ -222,7 +221,6 @@
    <string name="exclude_nsfw_from_history">NSFW漫画を履歴から除外する</string>
    <string name="queued">キュー</string>
    <string name="cookies_cleared">全てのCookieが削除されました</string>
-    <string name="prefer_rtl_reader_summary">読み取りモードはシリーズごとに設定できます</string>
    <string name="restart_required">再起動が必要です</string>
    <string name="tracker_warning">一部のデバイスはシステムでの動作が異なり、バックグラウンドタスクが中断される可能性があります。</string>
    <string name="genres">ジャンル</string>
@@ -278,4 +276,23 @@
    <string name="chapters_will_removed_background">チャプターはバックグラウンドで削除されます。時間がかかる場合があります</string>
    <string name="hide">隠す</string>
    <string name="new_sources_text">新しいマンガソースが利用可能になりました</string>
+    <string name="check_new_chapters_title">新着チャプターの確認とお知らせ</string>
+    <string name="show_notification_new_chapters_on">読んでいるマンガの更新情報をお知らせします</string>
+    <string name="notifications_enable">通知を有効にする</string>
+    <string name="show_notification_new_chapters_off">通知はありませんが、新しいチャプターはリストでハイライト表示されます</string>
+    <string name="name">名称</string>
+    <string name="edit">編集</string>
+    <string name="edit_category">カテゴリーを編集する</string>
+    <string name="empty_favourite_categories">お気に入りのカテゴリーはありません</string>
+    <string name="bookmarks">ブックマーク</string>
+    <string name="bookmark_removed">ブックマーク削除</string>
+    <string name="undo">元に戻す</string>
+    <string name="removed_from_history">履歴から削除</string>
+    <string name="bookmark_add">ブックマークの追加</string>
+    <string name="bookmark_remove">ブックマークの削除</string>
+    <string name="bookmark_added">ブックマークを追加</string>
+    <string name="dns_over_https">HTTPS 経由の DNS</string>
+    <string name="detect_reader_mode">リーダーモードの自動検出</string>
+    <string name="default_mode">デフォルトモード</string>
+    <string name="detect_reader_mode_summary">マンガがウェブトゥーンかどうかを自動判定</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -26,9 +26,7 @@
    <string name="zoom_mode_fit_center">Tilpass sentrum</string>
    <string name="scale_mode">Skaleringsmodus</string>
    <string name="report_github">Opprett feilrapport på GitHub</string>
-    <string name="prefer_rtl_reader_summary">Lesemodus kan settes opp for hver serie</string>
    <string name="right_to_left">Høyre-til-venstre (←)</string>
-    <string name="prefer_rtl_reader">Foretrekk høyre-til-venstre (←)-leser</string>
    <string name="no_update_available">Ingen tilgjengelige oppdateringer</string>
    <string name="update_check_failed">Kunne ikke se etter oppdateringer</string>
    <string name="checking_for_updates">Ser etter oppdateringer …</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -140,8 +140,6 @@
    <string name="about">Sobre</string>
    <string name="checking_for_updates">Verificando atualizações…</string>
    <string name="update_check_failed">Não foi possível procurar atualizações</string>
-    <string name="prefer_rtl_reader">Prefira o leitor da direita para a esquerda (←)</string>
-    <string name="prefer_rtl_reader_summary">O modo de leitura pode ser configurado separadamente para cada série</string>
    <string name="backup_information">Você pode criar backup de seu histórico e favoritos e restaurá-lo</string>
    <string name="just_now">Agora mesmo</string>
    <string name="yesterday">Ontem</string>
@@ -278,4 +276,23 @@
    <string name="chapters_will_removed_background">Os capítulos serão removidos em segundo plano. Pode levar algum tempo</string>
    <string name="parallel_downloads">Downloads paralelos</string>
    <string name="new_sources_text">Novas fontes de mangá estão disponíveis</string>
+    <string name="check_new_chapters_title">Verifique se há novos capítulos e notifique sobre isso</string>
+    <string name="show_notification_new_chapters_on">Você receberá notificações sobre atualizações do mangá que está lendo</string>
+    <string name="edit_category">Editar categoria</string>
+    <string name="empty_favourite_categories">Nenhuma categoria favorita</string>
+    <string name="bookmark_add">Adicionar marcador</string>
+    <string name="bookmark_remove">Remover marcador</string>
+    <string name="bookmarks">Marcadores</string>
+    <string name="bookmark_added">Marcador adicionado</string>
+    <string name="show_notification_new_chapters_off">Você não receberá notificações, mas novos capítulos serão destacados nas listas</string>
+    <string name="notifications_enable">Ativar notificações</string>
+    <string name="name">Nome</string>
+    <string name="edit">Editar</string>
+    <string name="bookmark_removed">Marcador removido</string>
+    <string name="undo">Desfazer</string>
+    <string name="removed_from_history">Removido do histórico</string>
+    <string name="dns_over_https">DNS sobre HTTPS</string>
+    <string name="default_mode">Modo padrão</string>
+    <string name="detect_reader_mode">Detecção automática do modo de leitura</string>
+    <string name="detect_reader_mode_summary">Detectar automaticamente se o mangá é webtoon</string>
 </resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -201,7 +201,6 @@
    <string name="recent_manga">Recente</string>
    <string name="other_storage">Outro armazenamento</string>
    <string name="text_search_holder_secondary">Tente reformular a consulta.</string>
-    <string name="prefer_rtl_reader">Prefira o leitor da direita para a esquerda (←)</string>
    <string name="not_available">Não disponível</string>
    <string name="size_s">Tamanho: %s</string>
    <string name="text_history_holder_primary">O que você ler será exibido aqui</string>
@@ -228,7 +227,6 @@
    <string name="text_clear_search_history_prompt">Remover todas as consultas de pesquisa recentes permanentemente\?</string>
    <string name="auth_required">Faça login para ver este conteúdo</string>
    <string name="text_categories_holder">Você pode usar categorias para organizar seus favoritos. Pressione «+» para criar uma categoria</string>
-    <string name="prefer_rtl_reader_summary">O modo de leitura pode ser configurado separadamente para cada série</string>
    <string name="manga_save_location">Pasta para downloads</string>
    <string name="exclude_nsfw_from_history">Excluir mangá NSFW do histórico</string>
    <string name="date_format">Formato da data</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -159,8 +159,6 @@
    <string name="update_check_failed">Не удалось проверить обновления</string>
    <string name="no_update_available">Нет доступных обновлений</string>
    <string name="right_to_left">Справа налево (←)</string>
-    <string name="prefer_rtl_reader">Предпочитать читать справа налево (←)</string>
-    <string name="prefer_rtl_reader_summary">Режим чтения может быть настроен отдельно для каждой серии</string>
    <string name="create_category">Создать категорию</string>
    <string name="scale_mode">Масштабирование</string>
    <string name="zoom_mode_fit_center">Вписать в экран</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -129,7 +129,7 @@
    <string name="sign_in">Logga in</string>
    <string name="auth_required">Logga in för att visa innehåll</string>
    <string name="default_s">Standard: %s</string>
-    <string name="_and_x_more">...och %1$d till</string>
+    <string name="_and_x_more">…och %1$d till</string>
    <string name="next">Nästa</string>
    <string name="password_length_hint">Lösenordet måste vara minst 4 tecken</string>
    <string name="search_only_on_s">Sök endast på %s</string>
@@ -243,9 +243,7 @@
    <string name="zoom_mode_fit_center">Centrera</string>
    <string name="zoom_mode_fit_height">Anpassa mot höjd</string>
    <string name="zoom_mode_keep_start">Anpassa till start</string>
-    <string name="prefer_rtl_reader">Föredra höger-till-vänster (←) läsare</string>
    <string name="preparing_">Förbereder…</string>
-    <string name="prefer_rtl_reader_summary">Läsläge kan sättas up separat för varje serie</string>
    <string name="zoom_mode_fit_width">Anpassa mot bredd</string>
    <string name="black_dark_theme">Svart</string>
    <string name="black_dark_theme_summary">Använder mindre ström på AMOLED-skärmar</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -32,7 +32,7 @@
    <string name="processing_">İşleniyor…</string>
    <string name="download_complete">İndirildi</string>
    <string name="downloads">İndirilenler</string>
-    <string name="by_name">İsim</string>
+    <string name="by_name">Ad</string>
    <string name="updated">Güncellenme</string>
    <string name="newest">Yeniler</string>
    <string name="by_rating">Puanlama</string>
@@ -121,7 +121,6 @@
    <string name="clear_search_history">Arama geçmişini temizle</string>
    <string name="text_empty_holder_primary">Burası biraz boş…</string>
    <string name="rotate_screen">Ekranı döndür</string>
-    <string name="prefer_rtl_reader_summary">Okuma modu her seri için ayrı bir şekilde ayarlanabilir</string>
    <string name="scale_mode">Ölçek modu</string>
    <string name="zoom_mode_fit_height">Yüksekliğe sığdır</string>
    <string name="black_dark_theme">Siyah</string>
@@ -278,4 +277,23 @@
    <string name="local_manga_processing">Kaydedilen manga işleme</string>
    <string name="hide">Gizle</string>
    <string name="new_sources_text">Yeni manga kaynakları var</string>
+    <string name="show_notification_new_chapters_off">Bildirim almayacaksınız ancak yeni bölümler listelerde vurgulanacak</string>
+    <string name="notifications_enable">Bildirimleri etkinleştir</string>
+    <string name="check_new_chapters_title">Yeni bölümleri denetle ve bildirim gönder</string>
+    <string name="show_notification_new_chapters_on">Okuduğunuz manga güncellemeleri hakkında bildirim alacaksınız</string>
+    <string name="empty_favourite_categories">Favori kategori yok</string>
+    <string name="name">Ad</string>
+    <string name="edit">Düzenle</string>
+    <string name="edit_category">Kategoriyi düzenle</string>
+    <string name="bookmark_add">Yer imi ekle</string>
+    <string name="bookmark_remove">Yer imini kaldır</string>
+    <string name="bookmarks">Yer imleri</string>
+    <string name="bookmark_removed">Yer imi kaldırıldı</string>
+    <string name="bookmark_added">Yer imi eklendi</string>
+    <string name="undo">Geri al</string>
+    <string name="removed_from_history">Geçmişten kaldırıldı</string>
+    <string name="dns_over_https">HTTPS üzerinden DNS</string>
+    <string name="detect_reader_mode">Okuyucu modunu otomatik algıla</string>
+    <string name="detect_reader_mode_summary">Manganın webtoon olup olmadığını otomatik olarak algıla</string>
+    <string name="default_mode">Öntanımlı mod</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -89,7 +89,6 @@
    <string name="notifications">Сповіщення</string>
    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Увімкнено %1$d з %2$d</string>
    <string name="new_chapters">Нові розділи</string>
-    <string name="show_notification_new_chapters">Повідомляти про оновлення манґи, яку Ви читаєте</string>
    <string name="download">Завантажити</string>
    <string name="read_from_start">Читати з початку</string>
    <string name="restart">Перезавантажити</string>
@@ -136,7 +135,6 @@
    <string name="checking_for_updates">Перевірка наявності оновлень…</string>
    <string name="update_check_failed">Не вдалося перевірити оновлення</string>
    <string name="no_update_available">Немає доступних оновлень</string>
-    <string name="prefer_rtl_reader">Віддавати перевагу читанню справа наліво (←)</string>
    <string name="create_category">Нова категорія</string>
    <string name="scale_mode">Режим масштабування</string>
    <string name="zoom_mode_fit_center">Вмістити в екран</string>
@@ -166,7 +164,7 @@
    <string name="sign_in">Увійти</string>
    <string name="auth_required">Увійдіть, щоб переглянути цей вміст</string>
    <string name="default_s">За замовчуванням: %s</string>
-    <string name="_and_x_more">...і ще %1$d</string>
+    <string name="_and_x_more">…і ще %1$d</string>
    <string name="next">Далі</string>
    <string name="protect_application_subtitle">Введіть пароль для запуску програми</string>
    <string name="confirm">Підтвердити</string>
@@ -252,7 +250,6 @@
    <string name="text_categories_holder">Ви можете використовувати категорії для впорядкування своїх уподобань. Натисніть «+», щоб створити категорію</string>
    <string name="yesterday">Учора</string>
    <string name="right_to_left">Справа наліво (←)</string>
-    <string name="prefer_rtl_reader_summary">Режим читання можна налаштувати окремо для кожної серії</string>
    <string name="create_backup">Створити резервну копію</string>
    <string name="restore_backup">Відновити з резервної копії</string>
    <string name="data_restored_success">Всі дані були відновлені</string>
@@ -279,4 +276,19 @@
    <string name="suggestions_excluded_genres_summary">Укажіть жанри, які ви не хочете бачити в пропозиціях</string>
    <string name="download_slowdown_summary">Допомагає уникнути блокування вашої IP-адреси</string>
    <string name="chapters_will_removed_background">Розділи будуть видалені у фоновому режимі. Це може зайняти деякий час</string>
+    <string name="check_new_chapters_title">Перевіряти наявність нових розділів і повідомляти про них</string>
+    <string name="show_notification_new_chapters_on">Ви будете отримувати повідомлення про оновлення манґи, яку ви читаєте</string>
+    <string name="notifications_enable">Увімкнути сповіщення</string>
+    <string name="show_notification_new_chapters_off">Ви не будете отримувати повідомлення, але нові розділи будуть відображатися у списку</string>
+    <string name="empty_favourite_categories">Немає улюблених категорій</string>
+    <string name="name">Назва</string>
+    <string name="edit">Змінити</string>
+    <string name="edit_category">Змінити категорію</string>
+    <string name="bookmark_add">Додати закладку</string>
+    <string name="bookmark_remove">Видалити закладку</string>
+    <string name="bookmarks">Закладки</string>
+    <string name="bookmark_removed">Закладка видалена</string>
+    <string name="bookmark_added">Додано закладку</string>
+    <string name="undo">Скасувати</string>
+    <string name="removed_from_history">Видалено з історії</string>
 </resources>
--- a/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt
+++ b/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt
@@ -1,50 +1,52 @@
 package org.koitharu.kotatsu.core.github

+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.koitharu.kotatsu.BuildConfig
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue

 class VersionIdTest {

 	@Test
 	fun testVersionIdParse() {
-		val version = VersionId.parse("2.0")
+		val version = VersionId("2.0")
 		assertEquals(version.major, 2)
-		assertEquals(version.minor,0)
-		assertEquals(version.build,0)
+		assertEquals(version.minor, 0)
+		assertEquals(version.build, 0)
 		assertEquals(version.variantType, "")
-		assertEquals(version.variantNumber,0)
+		assertEquals(version.variantNumber, 0)
 	}

 	@Test
 	fun testVersionIdVariantParse() {
-		val version = VersionId.parse("2.0.1-b1")
+		val version = VersionId("2.0.1-b1")
 		assertEquals(version.major, 2)
 		assertEquals(version.minor, 0)
 		assertEquals(version.build, 1)
 		assertEquals(version.variantType, "b")
 		assertEquals(version.variantNumber, 1)
+		val version2 = VersionId("2.0.1-beta1")
+		assertEquals(compareValues(version, version2), 0)
 	}

 	@Test
 	fun testVersionIdCompare() {
-		val version1 = VersionId.parse("1.99.99")
-		val version2 = VersionId.parse("2.0.0")
+		val version1 = VersionId("1.99.99")
+		val version2 = VersionId("2.0.0")
 		assertTrue(version1 < version2)
 	}
 	
 	@Test
 	fun testVersionIdVariantCompare() {
-		val version1 = VersionId.parse("2.0.1-a2")
-		val version2 = VersionId.parse("2.0.1-b1")
+		val version1 = VersionId("2.0.1-a2")
+		val version2 = VersionId("2.0.1-b1")
 		assertTrue(version1 < version2)
 	}

 	@Test
 	fun testCurrentVersion() {
-		val version1 = VersionId.parse("2.4.6")
-		val version2 = VersionId.parse(BuildConfig.VERSION_NAME)
+		val version1 = VersionId("2.4.6")
+		val version2 = VersionId(BuildConfig.VERSION_NAME)
 		assertTrue(version1 < version2)
 	}
 }