diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt index d006296a0..da6b349b6 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt @@ -109,6 +109,8 @@ class AppSettings private constructor(private val prefs: SharedPreferences) : val isSourcesSelected: Boolean get() = KEY_SOURCES_HIDDEN in prefs + val isPagesNumbersEnabled by BoolPreferenceDelegate(KEY_PAGES_NUMBERS, false) + fun getStorageDir(context: Context): File? { val value = prefs.getString(KEY_LOCAL_STORAGE, null)?.let { File(it) @@ -195,6 +197,7 @@ class AppSettings private constructor(private val prefs: SharedPreferences) : const val KEY_HISTORY_GROUPING = "history_grouping" const val KEY_REVERSE_CHAPTERS = "reverse_chapters" const val KEY_HISTORY_EXCLUDE_NSFW = "history_exclude_nsfw" + const val KEY_PAGES_NUMBERS = "pages_numbers" // About const val KEY_APP_UPDATE = "app_update" diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedPageHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedPageHolder.kt index edf5b205b..33920e631 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedPageHolder.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedPageHolder.kt @@ -1,6 +1,8 @@ package org.koitharu.kotatsu.reader.ui.pager.reversed import android.graphics.PointF +import android.view.Gravity +import android.widget.FrameLayout import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver import org.koitharu.kotatsu.core.model.ZoomMode @@ -16,6 +18,11 @@ class ReversedPageHolder( exceptionResolver: ExceptionResolver ) : PageHolder(binding, loader, settings, exceptionResolver) { + init { + (binding.textViewNumber.layoutParams as FrameLayout.LayoutParams) + .gravity = Gravity.START or Gravity.BOTTOM + } + override fun onImageShowing(zoom: ZoomMode) { with(binding.ssiv) { maxScale = 2f * maxOf( diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt index 369bccf48..653a700d1 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt @@ -20,17 +20,20 @@ import org.koitharu.kotatsu.utils.ext.getDisplayMessage open class PageHolder( binding: ItemPageBinding, loader: PageLoader, - settings: AppSettings, exceptionResolver: ExceptionResolver + settings: AppSettings, + exceptionResolver: ExceptionResolver, ) : BasePageHolder(binding, loader, settings, exceptionResolver), View.OnClickListener { init { binding.ssiv.setOnImageEventListener(delegate) binding.buttonRetry.setOnClickListener(this) + binding.textViewNumber.isVisible = settings.isPagesNumbersEnabled } override fun onBind(data: ReaderPage) { delegate.onBind(data.toMangaPage()) + binding.textViewNumber.text = data.index.toString() } override fun onRecycled() { diff --git a/app/src/main/res/layout/item_page.xml b/app/src/main/res/layout/item_page.xml index 307f2db03..1579a57d0 100644 --- a/app/src/main/res/layout/item_page.xml +++ b/app/src/main/res/layout/item_page.xml @@ -19,6 +19,17 @@ android:layout_height="wrap_content" android:layout_gravity="center" /> + + По умолчанию Исключить NSFW мангу из истории Имя не может быть пустым + Показывать номера страниц \ 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 6592ee8bc..a1054d10d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -245,5 +245,6 @@ Date format Default Exclude NSFW manga from history - Name sould not be empty + Name should not be empty + Show pages numbers \ No newline at end of file diff --git a/app/src/main/res/xml/pref_reader.xml b/app/src/main/res/xml/pref_reader.xml index 22e04c405..18e6aae70 100644 --- a/app/src/main/res/xml/pref_reader.xml +++ b/app/src/main/res/xml/pref_reader.xml @@ -3,18 +3,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - + + + + \ No newline at end of file