From 3a3af9ea0061e2eeb4c64fa9bac00983e16d7145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Sun, 24 Jul 2022 18:21:56 +0200 Subject: [PATCH 1/9] Translated using Weblate (Turkish) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (323 of 323 strings) Co-authored-by: Oğuz Ersen Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/tr/ Translation: Kotatsu/Strings --- app/src/main/res/values-tr/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a28015222..a80cd86bb 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -319,4 +319,5 @@ Tümünü göster Geçersiz etki alanı Aralık seç + İçerik bulunamadı veya kaldırıldı \ No newline at end of file From 00bdd859a78b2e2bc569f239c5f8ee2c73d40e0b Mon Sep 17 00:00:00 2001 From: kuragehime Date: Sun, 24 Jul 2022 18:21:57 +0200 Subject: [PATCH 2/9] Translated using Weblate (Japanese) Currently translated at 100.0% (323 of 323 strings) Co-authored-by: kuragehime Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ja/ Translation: Kotatsu/Strings --- app/src/main/res/values-ja/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 55469e6a2..21bae11a6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -318,4 +318,6 @@ NSFWとマークされたマンガは履歴に追加されず、進行状況も保存されない すべて表示 無効なドメイン + 範囲を選択 + コンテンツが見つからない、または削除された \ No newline at end of file From 12474e23f9537330e2a76cc4d3674f51c004f7e3 Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Sun, 24 Jul 2022 18:21:57 +0200 Subject: [PATCH 3/9] Translated using Weblate (Finnish) Currently translated at 96.2% (311 of 323 strings) Translated using Weblate (French) Currently translated at 100.0% (323 of 323 strings) Translated using Weblate (Italian) Currently translated at 99.0% (320 of 323 strings) Translated using Weblate (German) Currently translated at 97.8% (316 of 323 strings) Co-authored-by: J. Lavoie Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/de/ Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fi/ Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fr/ Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/it/ Translation: Kotatsu/Strings --- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7e357f987..ba9010c20 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -317,4 +317,5 @@ Ungültige Domäne Lesen Bereich auswählen + Inhalt nicht gefunden oder entfernt \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index eaefdaa71..62ae98170 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -309,4 +309,5 @@ Tietojen poistaminen Näytä kaikki Valitse alue + Sisältöä ei löydy tai se on poistettu \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5766fde42..715426b0c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -319,4 +319,5 @@ Relecture Domaine invalide Sélectionner une plage + Contenu non trouvé ou supprimé \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 88eb65044..cfcbf91fb 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -319,4 +319,5 @@ Abbandonato Dominio non valido Seleziona l\'intervallo + Contenuto non trovato o rimosso \ No newline at end of file From 517e8015802e1291a9552dbc49fe29131eba6019 Mon Sep 17 00:00:00 2001 From: Dpper Date: Sun, 24 Jul 2022 18:21:57 +0200 Subject: [PATCH 4/9] Translated using Weblate (Ukrainian) Currently translated at 100.0% (323 of 323 strings) Co-authored-by: Dpper Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/uk/ Translation: Kotatsu/Strings --- app/src/main/res/values-uk/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c46882135..1f2932beb 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -318,4 +318,6 @@ Манґа, позначена як NSFW, ніколи не буде додана до історії і ваш прогрес не буде збережений Може допомогти в разі виникнення проблем. Усі авторизації будуть анульовані Показати всі + Виберіть діапазон + Вміст не знайдено або видалено \ No newline at end of file From 75915ff36665e3796ea33c66a24f69bf80f812f5 Mon Sep 17 00:00:00 2001 From: TheDawnOvO <66421771+TheDawnOvO@users.noreply.github.com> Date: Wed, 27 Jul 2022 20:18:43 +0800 Subject: [PATCH 5/9] Update activity_main.xml --- app/src/main/res/layout-w720dp-land/activity_main.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout-w720dp-land/activity_main.xml b/app/src/main/res/layout-w720dp-land/activity_main.xml index a442269b3..5efddc509 100644 --- a/app/src/main/res/layout-w720dp-land/activity_main.xml +++ b/app/src/main/res/layout-w720dp-land/activity_main.xml @@ -9,7 +9,7 @@ - \ No newline at end of file + From bb23f998e08ca474aac7e04bd3c1b344922e5463 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 27 Jul 2022 11:39:20 +0300 Subject: [PATCH 6/9] Fix crash on description selection --- .../base/ui/widgets/SelectableTextView.kt | 29 +++++++++++++++++++ .../res/layout-w600dp/fragment_details.xml | 2 +- app/src/main/res/layout/fragment_details.xml | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SelectableTextView.kt diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SelectableTextView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SelectableTextView.kt new file mode 100644 index 000000000..e931853f0 --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SelectableTextView.kt @@ -0,0 +1,29 @@ +package org.koitharu.kotatsu.base.ui.widgets + +import android.content.Context +import android.text.Selection +import android.text.Spannable +import android.util.AttributeSet +import android.view.MotionEvent +import androidx.annotation.AttrRes +import com.google.android.material.textview.MaterialTextView + +class SelectableTextView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + @AttrRes defStyleAttr: Int = android.R.attr.textViewStyle, +) : MaterialTextView(context, attrs, defStyleAttr) { + + override fun dispatchTouchEvent(event: MotionEvent?): Boolean { + fixSelectionRange() + return super.dispatchTouchEvent(event) + } + + // https://stackoverflow.com/questions/22810147/error-when-selecting-text-from-textview-java-lang-indexoutofboundsexception-se + private fun fixSelectionRange() { + if (selectionStart < 0 || selectionEnd < 0) { + val spannableText = text as? Spannable ?: return + Selection.setSelection(spannableText, text.length) + } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout-w600dp/fragment_details.xml b/app/src/main/res/layout-w600dp/fragment_details.xml index e45f03909..5775a9790 100644 --- a/app/src/main/res/layout-w600dp/fragment_details.xml +++ b/app/src/main/res/layout-w600dp/fragment_details.xml @@ -217,7 +217,7 @@ app:layout_constraintTop_toBottomOf="@id/recyclerView_bookmarks" tools:visibility="visible" /> - - Date: Wed, 27 Jul 2022 11:46:31 +0300 Subject: [PATCH 7/9] Fix FadingSnackbar text color --- .../java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt | 3 ++- app/src/main/res/layout/fading_snackbar_layout.xml | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index 8e517b73d..b82206eba 100644 --- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -103,7 +103,8 @@ class DetailsActivity : private fun onMangaRemoved(manga: Manga) { Toast.makeText( - this, getString(R.string._s_deleted_from_local_storage, manga.title), + this, + getString(R.string._s_deleted_from_local_storage, manga.title), Toast.LENGTH_SHORT ).show() finishAfterTransition() diff --git a/app/src/main/res/layout/fading_snackbar_layout.xml b/app/src/main/res/layout/fading_snackbar_layout.xml index 0ebbb7bdd..10b125246 100644 --- a/app/src/main/res/layout/fading_snackbar_layout.xml +++ b/app/src/main/res/layout/fading_snackbar_layout.xml @@ -40,8 +40,6 @@ android:maxLines="4" android:padding="@dimen/margin_normal" android:textAlignment="viewStart" - android:textAppearance="@style/TextAppearance.Design.Snackbar.Message" - android:textColor="@android:color/white" tools:text="Look at all the wonderful snack bar text..." />