prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move fallback inset to dimens

Browse Source
This commit is contained in:
vianh
2022-09-14 18:55:46 +07:00
committed by Koitharu
parent 29a073d844
commit c05b0eaa59
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt
View File

@@ -62,8 +62,9 @@ class ReaderInfoBarView @JvmOverloads constructor(
init { init {
paint.strokeWidth = context.resources.resolveDp(2f) paint.strokeWidth = context.resources.resolveDp(2f)
val insetCorner = getSystemUiDimensionOffset("rounded_corner_content_padding") val insetCorner = getSystemUiDimensionOffset("rounded_corner_content_padding")
val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", resources.resolveDp(8)) + insetCorner val fallbackInset = resources.getDimensionPixelOffset(R.dimen.reader_bar_inset_fallback)
val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", resources.resolveDp(8)) + insetCorner val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", fallbackInset) + insetCorner
val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", fallbackInset) + insetCorner
val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
insetLeft = if (isRtl) insetEnd else insetStart insetLeft = if (isRtl) insetEnd else insetStart
insetRight = if (isRtl) insetStart else insetEnd 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 manager = context.packageManager
val resources = manager.getResourcesForApplication("com.android.systemui") val resources = manager.getResourcesForApplication("com.android.systemui")
val resId = resources.getIdentifier(name, "dimen", "com.android.systemui") val resId = resources.getIdentifier(name, "dimen", "com.android.systemui")
resources.getDimensionPixelOffset(resId) resources.getDimensionPixelOffset(resId)
}.onFailure { }.onFailure {
it.printStackTraceDebug() it.printStackTraceDebug()
}.getOrDefault(default) }.getOrDefault(fallback)
} }

1
app/src/main/res/values/dimens.xml
View File

@@ -29,6 +29,7 @@
<dimen name="widget_cover_width">84dp</dimen> <dimen name="widget_cover_width">84dp</dimen>
<dimen name="reading_progress_stroke">4dp</dimen> <dimen name="reading_progress_stroke">4dp</dimen>
<dimen name="reading_progress_text_size">10dp</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="scrobbling_list_spacing">12dp</dimen>
<dimen name="search_suggestions_manga_height">124dp</dimen> <dimen name="search_suggestions_manga_height">124dp</dimen>