From 8724f5b30c44ad2d7e2766c8388b8f52c439e138 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 27 Feb 2025 09:36:32 +0200
Subject: [PATCH] Fixes

---
 .../reader/ui/colorfilter/ColorFilterConfigActivity.kt       | 3 +++
 .../kotlin/org/koitharu/kotatsu/sync/data/SyncSettings.kt    | 2 +-
 .../kotlin/org/koitharu/kotatsu/sync/ui/SyncAuthViewModel.kt | 2 +-
 app/src/main/res/values/constants.xml                        | 5 ++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt
index ddaa3e400..f811aebb2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.reader.ui.colorfilter
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.os.Bundle
+import android.view.Gravity
 import android.view.View
 import android.widget.CompoundButton
 import androidx.activity.viewModels
@@ -18,6 +19,7 @@ import com.google.android.material.slider.Slider
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.util.ext.consumeInsetsAsPadding
 import org.koitharu.kotatsu.core.util.ext.decodeRegion
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.indicator
@@ -52,6 +54,7 @@ class ColorFilterConfigActivity :
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
+		viewBinding.root.consumeInsetsAsPadding(Gravity.FILL)
 		viewBinding.sliderBrightness.addOnChangeListener(this)
 		viewBinding.sliderContrast.addOnChangeListener(this)
 		val formatter = PercentLabelFormatter(resources)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/sync/data/SyncSettings.kt b/app/src/main/kotlin/org/koitharu/kotatsu/sync/data/SyncSettings.kt
index 620c6ed0f..fc44bbbc6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/sync/data/SyncSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/sync/data/SyncSettings.kt
@@ -24,7 +24,7 @@ class SyncSettings(
 	)
 
 	private val accountManager = AccountManager.get(context)
-	private val defaultSyncUrl = context.getString(R.string.sync_url_default)
+	private val defaultSyncUrl = context.resources.getStringArray(R.array.sync_url_list).first()
 
 	@get:WorkerThread
 	@set:WorkerThread
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncAuthViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncAuthViewModel.kt
index 33d062b57..17cc2313f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncAuthViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncAuthViewModel.kt
@@ -22,7 +22,7 @@ class SyncAuthViewModel @Inject constructor(
 
 	val onAccountAlreadyExists = MutableEventFlow<Unit>()
 	val onTokenObtained = MutableEventFlow<SyncAuthResult>()
-	val syncURL = MutableStateFlow(context.getString(R.string.sync_url_default))
+	val syncURL = MutableStateFlow(context.resources.getStringArray(R.array.sync_url_list).first())
 
 	init {
 		launchJob(Dispatchers.Default) {
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index 97a5b20b5..1897cfd04 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -7,7 +7,6 @@
 	<string name="url_user_manual" translatable="false">https://kotatsu.app/manuals/guides/getting-started/</string>
 	<string name="url_error_report" translatable="false">https://bugs.kotatsu.app/report</string>
 	<string name="account_type_sync" translatable="false">org.kotatsu.sync</string>
-	<string name="sync_url_default" translatable="false">https://sync.kotatsu.app</string>
 	<string name="github_updates_repo" translatable="false">KotatsuApp/Kotatsu</string>
 	<string name="shikimori_clientId" translatable="false">Mw6F0tPEOgyV7F9U9Twg50Q8SndMY7hzIOfXg0AX_XU</string>
 	<string name="shikimori_clientSecret" translatable="false">euBMt1GGRSDpVIFQVPxZrO7Kh6X4gWyv0dABuj4B-M8</string>
@@ -45,9 +44,9 @@
 		<item>1</item>
 	</string-array>
 	<string-array name="sync_url_list" translatable="false">
-		<item>@string/sync_url_default</item>
 		<item>https://moe.shirizu.org</item>
-		<item>http://dragonx943.id.vn:8080</item>
+		<item>https://sync.kotatsu.app</item>
+		<item>http://dragonx943.id.vn</item>
 		<item>http://86.57.183.214:8081</item>
 	</string-array>
 	<string-array name="values_proxy_types" translatable="false">