From c05b0eaa5978accd856dc03dd2f6cafb6707a3d3 Mon Sep 17 00:00:00 2001
From: vianh <polaris140698@gmail.com>
Date: Wed, 14 Sep 2022 18:55:46 +0700
Subject: [PATCH] Move fallback inset to dimens

---
 .../org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt  | 9 +++++----
 app/src/main/res/values/dimens.xml                       | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt
index 98580d73d..3407866e6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt
@@ -62,8 +62,9 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	init {
 		paint.strokeWidth = context.resources.resolveDp(2f)
 		val insetCorner = getSystemUiDimensionOffset("rounded_corner_content_padding")
-		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", resources.resolveDp(8)) + insetCorner
-		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", resources.resolveDp(8)) + insetCorner
+		val fallbackInset = resources.getDimensionPixelOffset(R.dimen.reader_bar_inset_fallback)
+		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", fallbackInset) + insetCorner
+		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", fallbackInset) + insetCorner
 		val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
 		insetLeft = if (isRtl) insetEnd else insetStart
 		insetRight = if (isRtl) insetStart else insetEnd
@@ -179,12 +180,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		}
 	}
 
-	private fun getSystemUiDimensionOffset(name: String, default: Int = 0): Int = runCatching {
+	private fun getSystemUiDimensionOffset(name: String, fallback: Int = 0): Int = runCatching {
 		val manager = context.packageManager
 		val resources = manager.getResourcesForApplication("com.android.systemui")
 		val resId = resources.getIdentifier(name, "dimen", "com.android.systemui")
 		resources.getDimensionPixelOffset(resId)
 	}.onFailure {
 		it.printStackTraceDebug()
-	}.getOrDefault(default)
+	}.getOrDefault(fallback)
 }
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f68a30c84..f3dce9572 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -29,6 +29,7 @@
 	<dimen name="widget_cover_width">84dp</dimen>
 	<dimen name="reading_progress_stroke">4dp</dimen>
 	<dimen name="reading_progress_text_size">10dp</dimen>
+	<dimen name="reader_bar_inset_fallback">8dp</dimen>
 	<dimen name="scrobbling_list_spacing">12dp</dimen>
 
 	<dimen name="search_suggestions_manga_height">124dp</dimen>