From c0e3243ee6098be0a32721b6065f626a9fb595b3 Mon Sep 17 00:00:00 2001
From: Sadwhy <99601717+Sadwhy@users.noreply.github.com>
Date: Fri, 12 Apr 2024 13:15:53 +0600
Subject: [PATCH] Feet(Settings): UI changes (#351)
* Account
* Theme
* Extension, common, notification and anime
* manga and about
* fix(Settings): icon colours
---
.../main/java/ani/dantotsu/media/Character.kt | 1 -
.../dantotsu/media/OtherDetailsViewModel.kt | 1 -
.../settings/SettingsAboutActivity.kt | 2 +-
.../settings/SettingsAccountActivity.kt | 2 +-
.../settings/SettingsAnimeActivity.kt | 2 +-
.../settings/SettingsCommonActivity.kt | 2 +-
.../settings/SettingsExtensionsActivity.kt | 2 +-
.../settings/SettingsMangaActivity.kt | 2 +-
.../settings/SettingsNotificationActivity.kt | 2 +-
.../settings/SettingsThemeActivity.kt | 2 +-
app/src/main/res/drawable/ic_lightbulb_24.xml | 10 +++
.../res/layout/activity_settings_about.xml | 61 +++++++++++----
.../res/layout/activity_settings_accounts.xml | 60 +++++++++++----
.../res/layout/activity_settings_anime.xml | 76 +++++++++++++------
.../res/layout/activity_settings_common.xml | 62 +++++++++++----
.../layout/activity_settings_extensions.xml | 61 +++++++++++----
.../res/layout/activity_settings_manga.xml | 60 +++++++++++----
.../activity_settings_notifications.xml | 62 +++++++++++----
.../res/layout/activity_settings_theme.xml | 61 +++++++++++----
19 files changed, 394 insertions(+), 137 deletions(-)
create mode 100644 app/src/main/res/drawable/ic_lightbulb_24.xml
diff --git a/app/src/main/java/ani/dantotsu/media/Character.kt b/app/src/main/java/ani/dantotsu/media/Character.kt
index 48746505..27300e46 100644
--- a/app/src/main/java/ani/dantotsu/media/Character.kt
+++ b/app/src/main/java/ani/dantotsu/media/Character.kt
@@ -2,7 +2,6 @@ package ani.dantotsu.media
import ani.dantotsu.connections.anilist.api.FuzzyDate
import ani.dantotsu.connections.anilist.api.Query
-import org.checkerframework.checker.units.qual.A
import java.io.Serializable
data class Character(
diff --git a/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt b/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
index 88ccc93f..0be0fc22 100644
--- a/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
+++ b/app/src/main/java/ani/dantotsu/media/OtherDetailsViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import ani.dantotsu.connections.anilist.Anilist
-import org.checkerframework.checker.units.qual.A
import java.text.DateFormat
import java.util.Date
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt
index 25f73f1c..d12da07f 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAboutActivity.kt
@@ -41,7 +41,7 @@ class SettingsAboutActivity : AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
- settingsAboutTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+ aboutSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
settingsDev.setOnClickListener {
DevelopersDialogFragment().show(supportFragmentManager, "dialog")
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt
index 8344c1a5..fd3300a4 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt
@@ -47,7 +47,7 @@ class SettingsAccountActivity : AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
- settingsaccountTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+ accountSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
settingsAccountHelp.setOnClickListener {
CustomBottomDialog.newInstance().apply {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt
index 5c517843..9ea39044 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAnimeActivity.kt
@@ -40,7 +40,7 @@ class SettingsAnimeActivity: AppCompatActivity(){
settingsPlayer.setOnClickListener {
startActivity(Intent(context, PlayerSettingsActivity::class.java))
}
- settingsAnimeTitle.setOnClickListener {
+ animeSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
purgeAnimeDownloads.setOnClickListener {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt
index d75ed217..ea24924a 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt
@@ -98,7 +98,7 @@ class SettingsCommonActivity: AppCompatActivity(){
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
- settingsCommonTitle.setOnClickListener {
+ commonSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
settingsDownloadManager.setOnClickListener {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
index 501d2fd9..b354fe98 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
@@ -149,7 +149,7 @@ class SettingsExtensionsActivity: AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
- settingsExtensionsTitle.setOnClickListener{
+ extensionSettingsBack.setOnClickListener{
onBackPressedDispatcher.onBackPressed()
}
setExtensionOutput(animeRepoInventory, MediaType.ANIME)
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt
index c4b08d40..e42034a0 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsMangaActivity.kt
@@ -36,7 +36,7 @@ class SettingsMangaActivity: AppCompatActivity(){
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
- settingsMangaTitle.setOnClickListener {
+ mangaSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
purgeMangaDownloads.setOnClickListener {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt
index f9ca378f..eaf6909e 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt
@@ -46,7 +46,7 @@ class SettingsNotificationActivity: AppCompatActivity(){
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
- settingsNotificationsTitle.setOnClickListener {
+ notificationSettingsBack.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
settingsSubscriptionsTime.text =
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt
index c4d629b8..3f23989a 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsThemeActivity.kt
@@ -33,7 +33,7 @@ class SettingsThemeActivity : AppCompatActivity() {
topMargin = statusBarHeight
bottomMargin = navBarHeight
}
- settingsThemeTitle.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+ themeSettingsBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
settingsUseMaterialYou.apply {
isChecked = PrefManager.getVal(PrefName.UseMaterialYou)
diff --git a/app/src/main/res/drawable/ic_lightbulb_24.xml b/app/src/main/res/drawable/ic_lightbulb_24.xml
new file mode 100644
index 00000000..487b9ff8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lightbulb_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_settings_about.xml b/app/src/main/res/layout/activity_settings_about.xml
index c2811c0c..348945b4 100644
--- a/app/src/main/res/layout/activity_settings_about.xml
+++ b/app/src/main/res/layout/activity_settings_about.xml
@@ -11,23 +11,54 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:paddingStart="31dp"
- android:paddingEnd="31dp">
+ android:paddingStart="32dp"
+ android:paddingEnd="32dp">
-
+
+
+
+
+
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ tools:ignore="UseCompoundDrawables">
+
+
+
+
+
+