KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Merge branch 'devel' into release/5

Browse Source
pull/311/head
Koitharu 3 years ago
parent c50fa8f10c f5a6e1e124
commit c6446afab1
No known key found for this signature in database
GPG Key ID: 8E861F8CE6E7CE27
17 changed files with 3694 additions and 3658 deletions
Show Stats Download Patch File Download Diff File

4
app/build.gradle
Unescape Escape View File

@ -15,8 +15,8 @@ android {
applicationId 'org.koitharu.kotatsu' applicationId 'org.koitharu.kotatsu'
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 33
versionCode 518 versionCode 519
versionName '4.4.2' versionName '4.4.3'
generatedDensities = [] generatedDensities = []
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

3
app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
Unescape Escape View File

@ -61,6 +61,9 @@ fun mangaListDetailedItemAD(
source(item.source) source(item.source)
enqueueWith(coil) enqueueWith(coil)
} }
if (payloads.isEmpty()) {
binding.scrollViewTags.scrollTo(0, 0)
}
binding.chipsTags.setChips(item.tags) binding.chipsTags.setChips(item.tags)
binding.ratingBar.isVisible = item.manga.hasRating binding.ratingBar.isVisible = item.manga.hasRating
binding.ratingBar.rating = binding.ratingBar.numStars * item.manga.rating binding.ratingBar.rating = binding.ratingBar.numStars * item.manga.rating

6
app/src/main/java/org/koitharu/kotatsu/sync/ui/SyncProvider.kt
Unescape Escape View File

@ -52,7 +52,7 @@ abstract class SyncProvider : ContentProvider() {
.selection(selection, selectionArgs) .selection(selection, selectionArgs)
.orderBy(sortOrder) .orderBy(sortOrder)
.create() .create()
logger.log("query: ${sqlQuery.sql}") logger.log("query: ${sqlQuery.sql} (${selectionArgs.contentToString()})")
return database.openHelper.readableDatabase.query(sqlQuery) return database.openHelper.readableDatabase.query(sqlQuery)
} }
@ -75,7 +75,7 @@ abstract class SyncProvider : ContentProvider() {
override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int { override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int {
val table = getTableName(uri) ?: return 0 val table = getTableName(uri) ?: return 0
logger.log { "delete: $table ($selection) : ($selectionArgs)" } logger.log { "delete: $table ($selection) : (${selectionArgs.contentToString()})" }
return database.openHelper.writableDatabase.delete(table, selection, selectionArgs) return database.openHelper.writableDatabase.delete(table, selection, selectionArgs)
} }
@ -84,7 +84,7 @@ abstract class SyncProvider : ContentProvider() {
if (values == null || table == null) { if (values == null || table == null) {
return 0 return 0
} }
logger.log { "update: $table ($selection) : ($selectionArgs) [$values]" } logger.log { "update: $table ($selection) : (${selectionArgs.contentToString()}) [$values]" }
return database.openHelper.writableDatabase return database.openHelper.writableDatabase
.update(table, SQLiteDatabase.CONFLICT_IGNORE, values, selection, selectionArgs) .update(table, SQLiteDatabase.CONFLICT_IGNORE, values, selection, selectionArgs)
} }

3
app/src/main/res/layout/activity_category_edit.xml
Unescape Escape View File

@ -47,7 +47,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/name" android:hint="@string/name"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="textCapSentences" /> android:inputType="textCapSentences"
android:maxLength="120" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>

2
app/src/main/res/values-de/strings.xml
Unescape Escape View File

@ -403,7 +403,5 @@
<string name="show_suspicious_content">Verdächtige Inhalte anzeigen</string> <string name="show_suspicious_content">Verdächtige Inhalte anzeigen</string>
<string name="status_dropped">Abgebrochen</string> <string name="status_dropped">Abgebrochen</string>
<string name="color_theme">Farbschema</string> <string name="color_theme">Farbschema</string>
<string name="theme_name_october">Oktober</string>
<string name="theme_name_mint">Minze</string>
<string name="theme_name_dynamic">Dynamisch</string> <string name="theme_name_dynamic">Dynamisch</string>
</resources> </resources>

5
app/src/main/res/values-es/strings.xml
Unescape Escape View File

@ -360,7 +360,6 @@
<string name="explore">Explorar</string> <string name="explore">Explorar</string>
<string name="memory_usage_pattern">%s - %s</string> <string name="memory_usage_pattern">%s - %s</string>
<string name="changelog">Registro de cambios</string> <string name="changelog">Registro de cambios</string>
<string name="tools">Herramientas</string>
<string name="exit_confirmation_summary">Pulse dos veces «Atrás» para salir de la aplicación</string> <string name="exit_confirmation_summary">Pulse dos veces «Atrás» para salir de la aplicación</string>
<string name="exit_confirmation">Confirmación de salida</string> <string name="exit_confirmation">Confirmación de salida</string>
<string name="pages_cache">Caché de páginas</string> <string name="pages_cache">Caché de páginas</string>
@ -404,10 +403,8 @@
<string name="enable_logging_summary">Grabar algunas acciones para depurar</string> <string name="enable_logging_summary">Grabar algunas acciones para depurar</string>
<string name="enable_logging">Activar el registro</string> <string name="enable_logging">Activar el registro</string>
<string name="show_suspicious_content">Mostrar contenido sospechoso</string> <string name="show_suspicious_content">Mostrar contenido sospechoso</string>
<string name="theme_name_mint">Mint</string>
<string name="theme_name_dynamic">Dinámico</string> <string name="theme_name_dynamic">Dinámico</string>
<string name="color_theme">Esquema de colores</string> <string name="color_theme">Esquema de colores</string>
<string name="theme_name_october">Octubre</string>
<string name="show_in_grid_view">Mostrar en vista de cuadrícula</string> <string name="show_in_grid_view">Mostrar en vista de cuadrícula</string>
<string name="theme_name_asuka">Asuka</string> <string name="theme_name_asuka">Asuka</string>
<string name="theme_name_mion">Mion</string> <string name="theme_name_mion">Mion</string>
@ -422,4 +419,6 @@
<string name="allow_unstable_updates_summary">Actualizaciones propuestas para las versiones beta de la aplicación</string> <string name="allow_unstable_updates_summary">Actualizaciones propuestas para las versiones beta de la aplicación</string>
<string name="allow_unstable_updates">Permitir actualizaciones inestables</string> <string name="allow_unstable_updates">Permitir actualizaciones inestables</string>
<string name="download_started">Descarga iniciada</string> <string name="download_started">Descarga iniciada</string>
<string name="user_agent">Encabezado del agente de usuario</string>
<string name="settings_apply_restart_required">Por favor, reinicie la aplicación para aplicar estos cambios</string>
</resources> </resources>

2
app/src/main/res/values-eu/strings.xml
Unescape Escape View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>

3
app/src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -403,10 +403,8 @@
<string name="enable_logging_summary">Enregistrer certaines actions à des fins de débogage</string> <string name="enable_logging_summary">Enregistrer certaines actions à des fins de débogage</string>
<string name="language">Langue</string> <string name="language">Langue</string>
<string name="show_suspicious_content">Afficher le contenu suspect</string> <string name="show_suspicious_content">Afficher le contenu suspect</string>
<string name="theme_name_mint">Menthe</string>
<string name="theme_name_dynamic">Dynamique</string> <string name="theme_name_dynamic">Dynamique</string>
<string name="color_theme">Schéma de couleurs</string> <string name="color_theme">Schéma de couleurs</string>
<string name="theme_name_october">Octobre</string>
<string name="show_in_grid_view">Afficher en vue grille</string> <string name="show_in_grid_view">Afficher en vue grille</string>
<string name="scrobbling_empty_hint">Pour suivre la progression de la lecture, sélectionnez Menu → Suivre sur l\'écran des détails du manga.</string> <string name="scrobbling_empty_hint">Pour suivre la progression de la lecture, sélectionnez Menu → Suivre sur l\'écran des détails du manga.</string>
<string name="services">Prestations de service</string> <string name="services">Prestations de service</string>
@ -421,4 +419,5 @@
<string name="download_started">Téléchargement commencé</string> <string name="download_started">Téléchargement commencé</string>
<string name="theme_name_kanade">Kanade</string> <string name="theme_name_kanade">Kanade</string>
<string name="allow_unstable_updates_summary">Proposer des mises à jour des versions bêta de l\'application</string> <string name="allow_unstable_updates_summary">Proposer des mises à jour des versions bêta de l\'application</string>
<string name="user_agent">En-tête UserAgent</string>
</resources> </resources>

2
app/src/main/res/values-it/strings.xml
Unescape Escape View File

@ -403,8 +403,6 @@
<string name="enable_logging_summary">Registra alcune azioni a scopo di debug</string> <string name="enable_logging_summary">Registra alcune azioni a scopo di debug</string>
<string name="enable_logging">Abilita la registrazione</string> <string name="enable_logging">Abilita la registrazione</string>
<string name="show_suspicious_content">Mostra il contenuto sospetto</string> <string name="show_suspicious_content">Mostra il contenuto sospetto</string>
<string name="theme_name_mint">Menta</string>
<string name="theme_name_october">Ottobre</string>
<string name="theme_name_dynamic">Dinamico</string> <string name="theme_name_dynamic">Dinamico</string>
<string name="color_theme">Schema colori</string> <string name="color_theme">Schema colori</string>
<string name="show_in_grid_view">Mostra nella vista griglia</string> <string name="show_in_grid_view">Mostra nella vista griglia</string>

1
app/src/main/res/values-ja/strings.xml
Unescape Escape View File

@ -327,7 +327,6 @@
<string name="empty">空</string> <string name="empty">空</string>
<string name="changelog">変更ログ</string> <string name="changelog">変更ログ</string>
<string name="explore">探検</string> <string name="explore">探検</string>
<string name="tools">ツール</string>
<string name="exit_confirmation_summary">アプリを終了するには、戻るを2回押してください</string> <string name="exit_confirmation_summary">アプリを終了するには、戻るを2回押してください</string>
<string name="saved_manga">保存したマンガ</string> <string name="saved_manga">保存したマンガ</string>
<string name="app_update_available_s">アプリケーションのアップデートが利用可能: %s</string> <string name="app_update_available_s">アプリケーションのアップデートが利用可能: %s</string>

1
app/src/main/res/values-nb-rNO/strings.xml
Unescape Escape View File

@ -341,7 +341,6 @@
<string name="exit_confirmation">Avsluttingsbekreftelse</string> <string name="exit_confirmation">Avsluttingsbekreftelse</string>
<string name="invalid_domain_message">Ugyldig daomene</string> <string name="invalid_domain_message">Ugyldig daomene</string>
<string name="share_logs">Del loggføring</string> <string name="share_logs">Del loggføring</string>
<string name="theme_name_october">Oktober</string>
<string name="color_theme">Fargedrakt</string> <string name="color_theme">Fargedrakt</string>
<string name="theme_name_dynamic">Dynamisk</string> <string name="theme_name_dynamic">Dynamisk</string>
<string name="language">Språk</string> <string name="language">Språk</string>

27
app/src/main/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -8,7 +8,7 @@
<string name="favourites">Favoritos</string> <string name="favourites">Favoritos</string>
<string name="history">Histórico</string> <string name="history">Histórico</string>
<string name="error_occurred">Um erro ocorreu</string> <string name="error_occurred">Um erro ocorreu</string>
<string name="network_error">Não foi possível conectar à Internet</string> <string name="network_error">Erro de rede</string>
<string name="details">Detalhes</string> <string name="details">Detalhes</string>
<string name="chapters">Capítulos</string> <string name="chapters">Capítulos</string>
<string name="list">Lista</string> <string name="list">Lista</string>
@ -385,4 +385,29 @@
<string name="text_unsaved_changes_prompt">Você tem alterações não salvas, deseja salvá-las ou descartá-las\?</string> <string name="text_unsaved_changes_prompt">Você tem alterações não salvas, deseja salvá-las ou descartá-las\?</string>
<string name="discard">Descartar</string> <string name="discard">Descartar</string>
<string name="not_found_404">Conteúdo não encontrado ou removido</string> <string name="not_found_404">Conteúdo não encontrado ou removido</string>
<string name="services">Serviços</string>
<string name="nothing_here">Não há nada aqui</string>
<string name="server_error">Erro do lado do servidor (%1$d). Por favor, tente novamente mais tarde</string>
<string name="compact">Compactar</string>
<string name="enable_logging">Habilitar registros</string>
<string name="share_logs">Compartilhar registros</string>
<string name="error_no_space_left">Não há espaço disponível no aparelho</string>
<string name="network_unavailable">A rede não está disponível</string>
<string name="network_unavailable_hint">Ative o Wi-Fi ou a rede móvel para ler mangá online</string>
<string name="allow_unstable_updates">Permitir atualizações instáveis</string>
<string name="download_started">Download iniciado</string>
<string name="language">Idioma</string>
<string name="mark_as_current">Marcar como atual</string>
<string name="show_in_grid_view">Mostrar na visualização em grade</string>
<string name="color_theme">Esquema de cores</string>
<string name="show_suspicious_content">Exibir conteúdo suspeito</string>
<string name="prefetch_content">Pré-carregamento de conteúdo</string>
<string name="theme_name_dynamic">Dinâmico</string>
<string name="settings_apply_restart_required">Por favor, reinicie o app para aplicar essas mudanças</string>
<string name="different_languages">Idiomas diferentes</string>
<string name="theme_name_asuka">Asuka</string>
<string name="theme_name_mion">Mion</string>
<string name="theme_name_rikka">Rikka</string>
<string name="theme_name_sakura">Sakura</string>
<string name="source_disabled">Fonte desativada</string>
</resources> </resources>

1
app/src/main/res/values-pt/strings.xml
Unescape Escape View File

@ -396,4 +396,5 @@
<string name="reader_control_ltr">Controle de leitura ergonômico</string> <string name="reader_control_ltr">Controle de leitura ergonômico</string>
<string name="color_correction_hint">As configurações de cor escolhidas serão lembradas para esse mangá</string> <string name="color_correction_hint">As configurações de cor escolhidas serão lembradas para esse mangá</string>
<string name="discard">Descartar</string> <string name="discard">Descartar</string>
<string name="language">Idioma</string>
</resources> </resources>

5
app/src/main/res/values-ru/strings.xml
Unescape Escape View File

@ -331,7 +331,6 @@
<string name="reorder">Упорядочить</string> <string name="reorder">Упорядочить</string>
<string name="empty">Пусто</string> <string name="empty">Пусто</string>
<string name="explore">Обзор</string> <string name="explore">Обзор</string>
<string name="tools">Инструменты</string>
<string name="confirm_exit">Нажмите Назад ещё раз, чтобы выйти</string> <string name="confirm_exit">Нажмите Назад ещё раз, чтобы выйти</string>
<string name="exit_confirmation_summary">Нажмите Назад 2 раза для выхода из приложения</string> <string name="exit_confirmation_summary">Нажмите Назад 2 раза для выхода из приложения</string>
<string name="other_cache">Другой кэш</string> <string name="other_cache">Другой кэш</string>
@ -404,10 +403,8 @@
<string name="enable_logging">Включить логирование</string> <string name="enable_logging">Включить логирование</string>
<string name="enable_logging_summary">Записывать некоторые действия для отладки</string> <string name="enable_logging_summary">Записывать некоторые действия для отладки</string>
<string name="show_suspicious_content">Отображать сомнительный контент</string> <string name="show_suspicious_content">Отображать сомнительный контент</string>
<string name="theme_name_mint">Мята</string>
<string name="theme_name_dynamic">Динамическая</string> <string name="theme_name_dynamic">Динамическая</string>
<string name="color_theme">Цветовая схема</string> <string name="color_theme">Цветовая схема</string>
<string name="theme_name_october">Октябрь</string>
<string name="show_in_grid_view">Показать в виде сетки</string> <string name="show_in_grid_view">Показать в виде сетки</string>
<string name="theme_name_miku">Мику</string> <string name="theme_name_miku">Мику</string>
<string name="theme_name_asuka">Аска</string> <string name="theme_name_asuka">Аска</string>
@ -422,4 +419,6 @@
<string name="download_started">Загрузка началась</string> <string name="download_started">Загрузка началась</string>
<string name="allow_unstable_updates">Разрешить нестабильные обновления</string> <string name="allow_unstable_updates">Разрешить нестабильные обновления</string>
<string name="allow_unstable_updates_summary">Предлагать обновления до бета-версий приложения</string> <string name="allow_unstable_updates_summary">Предлагать обновления до бета-версий приложения</string>
<string name="settings_apply_restart_required">Пожалуйста, перезапустите приложение, чтобы применить эти изменения</string>
<string name="user_agent">Заголовок UserAgent</string>
</resources> </resources>

12
app/src/main/res/values-tr/strings.xml
Unescape Escape View File

@ -409,4 +409,16 @@
<string name="theme_name_dynamic">Dinamik</string> <string name="theme_name_dynamic">Dinamik</string>
<string name="color_theme">renk vurgusu</string> <string name="color_theme">renk vurgusu</string>
<string name="show_in_grid_view">Izgara görünümünde göster</string> <string name="show_in_grid_view">Izgara görünümünde göster</string>
<string name="theme_name_mamimi">Mamimi</string>
<string name="theme_name_kanade">Kanade</string>
<string name="user_agent">UserAgent başlığı</string>
<string name="allow_unstable_updates_summary">Uygulamanın beta sürümleri için güncellemeler öner</string>
<string name="allow_unstable_updates">Kararsız güncellemelere izin ver</string>
<string name="download_started">İndirme başladı</string>
<string name="theme_name_miku">Miku</string>
<string name="theme_name_asuka">Asuka</string>
<string name="theme_name_mion">Mion</string>
<string name="theme_name_rikka">Rikka</string>
<string name="theme_name_sakura">Sakura</string>
<string name="settings_apply_restart_required">Bu değişiklikleri uygulamak için lütfen uygulamayı yeniden başlatın</string>
</resources> </resources>

3
app/src/main/res/values-uk/strings.xml
Unescape Escape View File

@ -416,4 +416,7 @@
<string name="theme_name_dynamic">Динамічний</string> <string name="theme_name_dynamic">Динамічний</string>
<string name="color_theme">Колірний акцент</string> <string name="color_theme">Колірний акцент</string>
<string name="show_in_grid_view">Показати у вигляді сітки</string> <string name="show_in_grid_view">Показати у вигляді сітки</string>
<string name="allow_unstable_updates">Дозволити нестабільні оновлення</string>
<string name="allow_unstable_updates_summary">Пропонувати оновлення до бета-версій додатку</string>
<string name="download_started">Завантаження розпочато</string>
</resources> </resources>

2
app/src/main/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -421,4 +421,6 @@
<string name="allow_unstable_updates">允许不稳定更新</string> <string name="allow_unstable_updates">允许不稳定更新</string>
<string name="allow_unstable_updates_summary">提示更新到测试版</string> <string name="allow_unstable_updates_summary">提示更新到测试版</string>
<string name="download_started">已开始下载</string> <string name="download_started">已开始下载</string>
<string name="user_agent">UserAgent 标头</string>
<string name="settings_apply_restart_required">要应用这些更改请重启程序</string>
</resources> </resources>
Write Preview
Loading…
Cancel
Save