diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0a4cc96..16643b883 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,6 +32,18 @@ android:supportsRtl="true" android:theme="@style/Base.AppTheme" tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute"> + + + + + + + tvLast.text = item.getDisplayLastChapterTitle() "upCurSource" -> if (callBack.oldBookUrl == item.bookUrl) { ivChecked.visible() + root.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainer)) } else { ivChecked.invisible() + root.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainerLow)) } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt index 452429978..4cf47f99e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt @@ -2,6 +2,7 @@ package io.legato.kazusa.ui.book.changesource //import io.legado.app.lib.theme.getPrimaryTextColor //import io.legado.app.lib.theme.primaryColor +import android.annotation.SuppressLint import android.os.Bundle import android.view.Menu import android.view.MenuItem @@ -41,6 +42,7 @@ import io.legato.kazusa.utils.observeEvent import io.legato.kazusa.utils.startActivity import io.legato.kazusa.utils.transaction import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legato.kazusa.utils.visible import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.delay import kotlinx.coroutines.flow.conflate @@ -205,9 +207,11 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b } } + @SuppressLint("SetTextI18n") private fun initLiveData() { viewModel.searchStateData.observe(viewLifecycleOwner) { binding.refreshProgressBar.isVisible = it + if (it) { startStopMenuItem?.let { item -> item.setIcon(R.drawable.ic_stop_black_24dp) @@ -226,7 +230,7 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b viewModel.searchDataFlow.conflate().collect { adapter.setItems(it) - binding.loadingIndicator.isVisible = it.isEmpty() + binding.tvEmptyMsg.isVisible = it.isEmpty() binding.recyclerView.isVisible = it.isNotEmpty() delay(1000) @@ -239,15 +243,16 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b viewModel.changeSourceProgress .drop(1) .collect { (count, name) -> - binding.tvDur.text = - getString( - R.string.change_source_progress, - adapter.itemCount, - count, - viewModel.totalSourceCount, - name - ) - delay(500) + val total = viewModel.totalSourceCount + val progress = if (total > 0) (count * 100 / total) else 0 + + binding.refreshProgressBar.isIndeterminate = false + binding.refreshProgressBar.progress = progress + binding.llInfo.visible() + + binding.tvProgress.text = "$count / $total" + binding.tvResult.text = + getString(R.string.change_source_progress, adapter.itemCount) } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt index f5b52e635..82aba7449 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt @@ -549,6 +549,8 @@ class ReadMangaActivity : VMBaseActivity(AppConfig.mangaFooterConfig).getOrNull() ?: MangaFooterConfig() + var initialWebtoonSidePadding: Int = 0 + var initialScrollMode: Int = MangaScrollMode.PAGE_RIGHT_TO_LEFT + var callback: Callback? = null private val binding by viewBinding(DialogMangaFooterSettingBinding::bind) @@ -32,6 +36,56 @@ class MangaFooterSettingDialog : override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { + binding.chipGroupScrollMode.removeAllViews() + + MangaScrollMode.ALL.forEach { mode -> + binding.chipGroupScrollMode.addView(Chip(requireContext()).apply { + text = MangaScrollMode.labelOf(mode) + isCheckable = true + isChecked = (mode == initialScrollMode) + + setOnClickListener { + callback?.onScrollModeChanged(mode) + } + }) + } + + binding.scvPadding.apply { + valueFormat = { "$it %" } + progress = initialWebtoonSidePadding + onChanged = { newValue -> + callback?.upSidePadding(newValue) + } + } + + binding.checkboxDisableClickScroll.apply { + isChecked = AppConfig.disableClickScroll + setOnCheckedChangeListener { _, isChecked -> + callback?.onClickScrollDisabledChanged(isChecked) + } + } + + binding.checkboxDisableMangaScale.apply { + isChecked = AppConfig.disableMangaScale + setOnCheckedChangeListener { _, isChecked -> + callback?.onMangaScaleDisabledChanged(isChecked) + } + } + + binding.checkboxHideMangaTitle.apply { + isChecked = AppConfig.hideMangaTitle + setOnCheckedChangeListener { _, isChecked -> + callback?.onHideMangaTitleChanged(isChecked) + } + } + + binding.checkboxVolumeKeyPage.apply { + isChecked = AppConfig.MangaVolumeKeyPage + setOnCheckedChangeListener { _, isChecked -> + callback?.onVolumeKeyPageChanged(isChecked) + } + } + binding.cbChapterLabel.run { isChecked = !config.hideChapterLabel setOnCheckedChangeListener { _, isChecked -> @@ -187,6 +241,12 @@ class MangaFooterSettingDialog : fun onAutoPageSpeedChanged(speed: Int) fun showColorFilterConfig() fun showClickConfig() + fun onScrollModeChanged(mode: Int) + fun upSidePadding(padding: Int) + fun onClickScrollDisabledChanged(disabled: Boolean) + fun onMangaScaleDisabledChanged(disabled: Boolean) + fun onHideMangaTitleChanged(hide: Boolean) + fun onVolumeKeyPageChanged(enable: Boolean) } } \ No newline at end of file diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt index 433b9d134..f395e8261 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt @@ -2,7 +2,6 @@ package io.legato.kazusa.ui.book.manga.config import android.os.Bundle import android.view.View -import com.google.android.material.chip.Chip import io.legato.kazusa.R import io.legato.kazusa.base.BaseBottomSheetDialogFragment import io.legato.kazusa.databinding.DialogMangaScrollModeBinding @@ -14,8 +13,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang private val binding by viewBinding(DialogMangaScrollModeBinding::bind) var initialAutoPageEnabled: Boolean = false - var initialWebtoonSidePadding: Int = 0 - var initialScrollMode: Int = MangaScrollMode.PAGE_RIGHT_TO_LEFT var callback: Callback? = null @@ -24,20 +21,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang } private fun initView() { - binding.chipGroupScrollMode.removeAllViews() - - MangaScrollMode.ALL.forEach { mode -> - binding.chipGroupScrollMode.addView(Chip(requireContext()).apply { - text = MangaScrollMode.labelOf(mode) - isCheckable = true - isChecked = (mode == initialScrollMode) - - setOnClickListener { - callback?.onScrollModeChanged(mode) - binding.chipAutoPage.isChecked = false - } - }) - } binding.chipAutoPage.run { isChecked = initialAutoPageEnabled @@ -47,42 +30,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang } } - binding.checkboxDisableClickScroll.apply { - isChecked = AppConfig.disableClickScroll - setOnCheckedChangeListener { _, isChecked -> - callback?.onClickScrollDisabledChanged(isChecked) - } - } - - binding.checkboxDisableMangaScale.apply { - isChecked = AppConfig.disableMangaScale - setOnCheckedChangeListener { _, isChecked -> - callback?.onMangaScaleDisabledChanged(isChecked) - } - } - - binding.checkboxHideMangaTitle.apply { - isChecked = AppConfig.hideMangaTitle - setOnCheckedChangeListener { _, isChecked -> - callback?.onHideMangaTitleChanged(isChecked) - } - } - - binding.checkboxVolumeKeyPage.apply { - isChecked = AppConfig.MangaVolumeKeyPage - setOnCheckedChangeListener { _, isChecked -> - callback?.onVolumeKeyPageChanged(isChecked) - } - } - - binding.scvPadding.apply { - valueFormat = { "$it %" } - progress = initialWebtoonSidePadding - onChanged = { newValue -> - callback?.upSidePadding(newValue) - } - } - initAutoPageSpeed(initialAutoPageEnabled) } @@ -101,12 +48,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang interface Callback { fun onAutoPageToggle(enable: Boolean) fun onAutoPageSpeedChanged(speed: Int) - fun onScrollModeChanged(mode: Int) - fun onClickScrollDisabledChanged(disabled: Boolean) - fun onMangaScaleDisabledChanged(disabled: Boolean) - fun upSidePadding(padding: Int) - fun onHideMangaTitleChanged(hide: Boolean) - fun onVolumeKeyPageChanged(enable: Boolean) } } diff --git a/app/src/main/res/anim/popup_enter.xml b/app/src/main/res/anim/popup_enter.xml index f218d4b8e..fe46fbe53 100644 --- a/app/src/main/res/anim/popup_enter.xml +++ b/app/src/main/res/anim/popup_enter.xml @@ -1,10 +1,6 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..6c9f32f27 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 74e82bedb..b765f1c66 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -45,20 +45,15 @@ android:orientation="vertical" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - - - + app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/cd_about" /> + android:textStyle="bold" + tools:ignore="SmallSp" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/cd_ver" /> + app:layout_constraintTop_toBottomOf="@id/tv_detail"> - + + + + + + + + + + + + + + + + + + android:orientation="vertical" + android:visibility="gone"> + + + + + - + + android:paddingBottom="8dp"> + android:paddingBottom="8dp"> - + @@ -71,6 +70,7 @@ android:id="@+id/cp_epaper" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:checkable="true" android:layout_marginEnd="8dp" android:text="@string/manga_epaper" /> @@ -78,9 +78,9 @@ android:id="@+id/cp_enableGray" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:checkable="true" android:text="灰度" /> - + android:paddingBottom="8dp"> + android:paddingBottom="8dp"> - + + + + + + + + + + + + + @@ -95,6 +135,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="8dp" app:cardBackgroundColor="?attr/colorSurfaceVariant" + android:layout_marginHorizontal="16dp" app:cardCornerRadius="8dp" app:strokeWidth="0dp"> @@ -107,7 +148,8 @@ + android:layout_height="wrap_content" + android:paddingHorizontal="16dp"> + android:layout_height="wrap_content" + android:paddingHorizontal="16dp"> - + + + + + + + + + + + + + - + + diff --git a/app/src/main/res/layout/dialog_manga_scroll_mode.xml b/app/src/main/res/layout/dialog_manga_scroll_mode.xml index 0fa4be1d8..52b8b081d 100644 --- a/app/src/main/res/layout/dialog_manga_scroll_mode.xml +++ b/app/src/main/res/layout/dialog_manga_scroll_mode.xml @@ -24,7 +24,7 @@ android:id="@+id/bottom_sheet_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="漫画设置" + android:text="自动阅读" android:textSize="18sp" android:textStyle="bold" /> @@ -36,30 +36,6 @@ android:orientation="vertical" android:paddingHorizontal="16dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_read_book_style.xml b/app/src/main/res/layout/dialog_read_book_style.xml index ed11908dc..1b8a8226f 100644 --- a/app/src/main/res/layout/dialog_read_book_style.xml +++ b/app/src/main/res/layout/dialog_read_book_style.xml @@ -63,7 +63,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - - + - - + diff --git a/app/src/main/res/layout/dialog_read_padding.xml b/app/src/main/res/layout/dialog_read_padding.xml index f9f4551ab..4b6ae2343 100644 --- a/app/src/main/res/layout/dialog_read_padding.xml +++ b/app/src/main/res/layout/dialog_read_padding.xml @@ -15,15 +15,13 @@ android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center" - android:paddingVertical="16dp" + android:paddingBottom="16dp" android:paddingHorizontal="16dp"> - + @@ -10,15 +9,13 @@ android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center" - android:paddingVertical="8dp" + android:paddingBottom="8dp" android:paddingHorizontal="16dp"> - + - + + android:paddingBottom="16dp"> - + + android:background="@android:color/transparent" + android:foreground="?attr/selectableItemBackground" + android:paddingHorizontal="16dp" + android:paddingVertical="8dp"> - - - + + android:layout_marginStart="16dp" + android:ellipsize="end" + android:maxLines="1" + android:textColor="?attr/colorSecondary" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@id/tv_author" + app:layout_constraintStart_toEndOf="@id/iv_good" + app:layout_constraintTop_toTopOf="parent" + tools:text="latest chapter name" /> + + + + + + + + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:textSize="12sp" + app:layout_constraintEnd_toStartOf="@id/tv_respond_time" + app:layout_constraintStart_toEndOf="@id/iv_good" + app:layout_constraintTop_toBottomOf="@id/tv_origin" + tools:text="word count" /> + + tools:text="respond time" /> + - - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 09132acdd..ac94b34f5 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..ac94b34f5 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher0.xml b/app/src/main/res/mipmap-anydpi-v26/launcher0.xml new file mode 100644 index 000000000..09132acdd --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/launcher0.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index fee3a447a..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 000000000..392a17588 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 000000000..60b5554e8 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index eb89d0cbf..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 000000000..7705342aa Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 000000000..7cb0ae7a2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index c3f019f98..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 000000000..8ba25f593 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..72e6f7ea9 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index be9ab8859..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 000000000..1a77320c2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..3242bc2f2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 20f44239e..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 000000000..548e547e1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..686aa1a17 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-es-rES/arrays.xml b/app/src/main/res/values-es-rES/arrays.xml index 9ff6eb2ae..866d7255c 100644 --- a/app/src/main/res/values-es-rES/arrays.xml +++ b/app/src/main/res/values-es-rES/arrays.xml @@ -63,6 +63,7 @@ íconePrincipal + ícone0 ícone1 ícone2 ícone3 diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 73bcefe7b..e3c20953f 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1142,7 +1142,7 @@ 正在导出(%1$s),还有%2$d本待导出 导出(MD) 换源间隔 - 结果 %1$d, 当前进度 %2$d / %3$d: %4$s + 结果 %1$d 点击书名打开详情 等待导出 默认主页 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index fc0e95a10..c0011da73 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1145,7 +1145,7 @@ 正在导出(%1$s),还有%2$d本待导出 导出(MD) 换源间隔 - 結果 %1$d、現在の進行状況 %2$d / %3$d: %4$s + 結果 %1$d 点击书名打开详情 等待导出 默认主页 diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml index ec6a61c93..dbe732c81 100644 --- a/app/src/main/res/values-pt-rBR/arrays.xml +++ b/app/src/main/res/values-pt-rBR/arrays.xml @@ -63,6 +63,7 @@ íconePrincipal + icone0 ícone1 ícone2 ícone3 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a69399a9f..c7b4dd7a5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1145,7 +1145,7 @@ 正在导出(%1$s),还有%2$d本待导出 导出(MD) 换源间隔 - " Resultado %1$d, progresso atual %2$d / %3$d: %4$s" + Resultado %1$d 点击书名打开详情 等待导出 默认主页 diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e0e0d9269..1d13d0d37 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1141,7 +1141,7 @@ Còn 正在导出(%1$s),还有%2$d本待导出 导出(MD) 换源间隔 - Kết quả %1$d, tiến trình hiện tại %2$d / %3$d: %4$s + Kết quả %1$d 点击书名打开详情 等待导出 " Đồng bộ hóa tiến trình thành công" diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index abb9436be..6da3a7386 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1137,7 +1137,7 @@ 正在导出(%1$s),还有%2$d本待导出 导出(MD) 换源间隔 - " 結果 %1$d, 當前進度 %2$d / %3$d: %4$s" + 結果 %1$d 点击书名打开详情 等待导出 進度同步成功 diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml index e285a90fa..3321ae951 100644 --- a/app/src/main/res/values-zh-rTW/arrays.xml +++ b/app/src/main/res/values-zh-rTW/arrays.xml @@ -61,6 +61,7 @@ iconMain + icon0 icon1 icon2 icon3 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 804811825..88ca1aa3b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1139,7 +1139,7 @@ 正在导出(%1$s),还有%2$d本待导出 导出(MD) 换源间隔 - " 結果 %1$d, 當前進度 %2$d / %3$d: %4$s" + 結果 %1$d 点击书名打开详情 等待导出 進度同步成功 diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml index 5d0e9c241..a570b032c 100644 --- a/app/src/main/res/values-zh/arrays.xml +++ b/app/src/main/res/values-zh/arrays.xml @@ -49,6 +49,7 @@ iconMain + icon0 icon1 icon2 icon3 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 535faf2f0..1a22e77d1 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -97,7 +97,7 @@ 缓存选择的章节到本地 换源 - \u3000\u3000这是一款使用 Kotlin 全新开发的开源的阅读软件，欢迎您的加入。 + 全新设计的阅读 3.0 阅读 3.0 下载地址：\nhttps://github.com/gedoor/legado/releases @@ -1144,7 +1144,7 @@ 正在导出 (%1$s) ,还有 %2$d 本待导出 导出(MD) 换源间隔 - 结果 %1$d, 当前进度 %2$d / %3$d: %4$s + 结果 %1$d 点击书名打开详情 等待导出 进度同步成功 diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml index d2b0962aa..72bef30db 100644 --- a/app/src/main/res/values/array_values.xml +++ b/app/src/main/res/values/array_values.xml @@ -3,6 +3,7 @@ ic_launcher + launcher0 launcher1 launcher2 launcher3 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index cea12b4d3..457934543 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -103,6 +103,7 @@ iconMain + icon0 icon1 icon2 icon3 diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..6ca0e65b5 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #3C3B4D + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f6caa910b..5efbf7ee9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1147,7 +1147,7 @@ Exporting (%1$s), with %2$d to be exported. Export(MD) Change source delay - Result %1$d, Progress %2$d / %3$d: %4$s + Result %1$d Click on the book title to open details Waiting for export Show quick scroll bar