From 55bc2add8568cd0a4fffff730a62feffab9e0a90 Mon Sep 17 00:00:00 2001
From: Sadwhy <99601717+Sadwhy@users.noreply.github.com>
Date: Wed, 3 Apr 2024 05:04:18 +0600
Subject: [PATCH] Updated icons (#311)
* Branch
* Updated Icons (#13)
* update
* update beta.yml
* nicer icons
* update view_list_24.xml
* revert changes
* Missed one
---
.github/workflows/beta.yml | 2 +-
.../java/ani/dantotsu/settings/SettingsActivity.kt | 6 +++---
app/src/main/res/drawable/adjust.xml | 10 ++++++++++
app/src/main/res/drawable/backup_restore.xml | 11 +++++++++++
app/src/main/res/drawable/blur_on.xml | 10 ++++++++++
app/src/main/res/drawable/cast_warning.xml | 10 ++++++++++
app/src/main/res/drawable/stacks.xml | 10 ++++++++++
app/src/main/res/drawable/trail_length_short.xml | 10 ++++++++++
app/src/main/res/drawable/view_list_24.xml | 11 +++++++++++
app/src/main/res/layout/activity_player_settings.xml | 4 ++--
app/src/main/res/layout/activity_settings_anime.xml | 2 +-
app/src/main/res/layout/activity_settings_common.xml | 4 ++--
app/src/main/res/layout/activity_settings_manga.xml | 2 +-
.../res/layout/activity_user_interface_settings.xml | 8 ++++----
app/src/main/res/layout/fragment_login.xml | 2 +-
app/src/main/res/values/strings.xml | 10 +++++-----
16 files changed, 92 insertions(+), 20 deletions(-)
create mode 100644 app/src/main/res/drawable/adjust.xml
create mode 100644 app/src/main/res/drawable/backup_restore.xml
create mode 100644 app/src/main/res/drawable/blur_on.xml
create mode 100644 app/src/main/res/drawable/cast_warning.xml
create mode 100644 app/src/main/res/drawable/stacks.xml
create mode 100644 app/src/main/res/drawable/trail_length_short.xml
create mode 100644 app/src/main/res/drawable/view_list_24.xml
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index a1277018..0d595b14 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -127,4 +127,4 @@ jobs:
pre-release-keep-count: 3
pre-release-drop-tag: true
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
index 9f112c71..de9e9841 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
@@ -667,18 +667,18 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
val filteredLocations = Location.entries.filter { it.exportable }
selectedArray.addAll(List(filteredLocations.size - 1) { false })
val dialog = AlertDialog.Builder(this@SettingsActivity, R.style.MyPopup)
- .setTitle(R.string.import_export_settings)
+ .setTitle(R.string.backup_restore)
.setMultiChoiceItems(
filteredLocations.map { it.name }.toTypedArray(),
selectedArray.toBooleanArray()
) { _, which, isChecked ->
selectedArray[which] = isChecked
}
- .setPositiveButton(R.string.button_import) { dialog, _ ->
+ .setPositiveButton(R.string.button_restore) { dialog, _ ->
openDocumentLauncher.launch(arrayOf("*/*"))
dialog.dismiss()
}
- .setNegativeButton(R.string.button_export) { dialog, _ ->
+ .setNegativeButton(R.string.button_backup) { dialog, _ ->
if (!selectedArray.contains(true)) {
toast(R.string.no_location_selected)
return@setNegativeButton
diff --git a/app/src/main/res/drawable/adjust.xml b/app/src/main/res/drawable/adjust.xml
new file mode 100644
index 00000000..6736f14f
--- /dev/null
+++ b/app/src/main/res/drawable/adjust.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/backup_restore.xml b/app/src/main/res/drawable/backup_restore.xml
new file mode 100644
index 00000000..2c551ca4
--- /dev/null
+++ b/app/src/main/res/drawable/backup_restore.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/app/src/main/res/drawable/blur_on.xml b/app/src/main/res/drawable/blur_on.xml
new file mode 100644
index 00000000..11630fa4
--- /dev/null
+++ b/app/src/main/res/drawable/blur_on.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/cast_warning.xml b/app/src/main/res/drawable/cast_warning.xml
new file mode 100644
index 00000000..15f35a55
--- /dev/null
+++ b/app/src/main/res/drawable/cast_warning.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/stacks.xml b/app/src/main/res/drawable/stacks.xml
new file mode 100644
index 00000000..29383b41
--- /dev/null
+++ b/app/src/main/res/drawable/stacks.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/trail_length_short.xml b/app/src/main/res/drawable/trail_length_short.xml
new file mode 100644
index 00000000..81166f10
--- /dev/null
+++ b/app/src/main/res/drawable/trail_length_short.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/view_list_24.xml b/app/src/main/res/drawable/view_list_24.xml
new file mode 100644
index 00000000..f7378f12
--- /dev/null
+++ b/app/src/main/res/drawable/view_list_24.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_player_settings.xml b/app/src/main/res/layout/activity_player_settings.xml
index e1503989..adcd25b9 100644
--- a/app/src/main/res/layout/activity_player_settings.xml
+++ b/app/src/main/res/layout/activity_player_settings.xml
@@ -1162,7 +1162,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="false"
- android:drawableStart="@drawable/ic_round_cast_24"
+ android:drawableStart="@drawable/cast_warning"
android:drawablePadding="16dp"
android:elegantTextHeight="true"
android:fontFamily="@font/poppins_bold"
@@ -1215,4 +1215,4 @@
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/activity_settings_anime.xml b/app/src/main/res/layout/activity_settings_anime.xml
index 49793f34..288a57ca 100644
--- a/app/src/main/res/layout/activity_settings_anime.xml
+++ b/app/src/main/res/layout/activity_settings_anime.xml
@@ -199,7 +199,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
- android:drawableStart="@drawable/ic_round_movie_filter_24"
+ android:drawableStart="@drawable/view_list_24"
android:drawablePadding="16dp"
android:elegantTextHeight="true"
android:fontFamily="@font/poppins_bold"
diff --git a/app/src/main/res/layout/activity_settings_common.xml b/app/src/main/res/layout/activity_settings_common.xml
index 3eab0449..0171808d 100644
--- a/app/src/main/res/layout/activity_settings_common.xml
+++ b/app/src/main/res/layout/activity_settings_common.xml
@@ -173,12 +173,12 @@
android:insetBottom="0dp"
android:paddingStart="31dp"
android:paddingEnd="31dp"
- android:text="@string/import_export_settings"
+ android:text="@string/backup_restore"
android:textAlignment="viewStart"
android:textAllCaps="false"
android:textColor="?attr/colorOnBackground"
app:cornerRadius="0dp"
- app:icon="@drawable/ic_download_24"
+ app:icon="@drawable/backup_restore"
app:iconPadding="16dp"
app:iconSize="24dp"
app:iconTint="?attr/colorPrimary" />
diff --git a/app/src/main/res/layout/activity_settings_manga.xml b/app/src/main/res/layout/activity_settings_manga.xml
index 7bc6b84c..f3199de0 100644
--- a/app/src/main/res/layout/activity_settings_manga.xml
+++ b/app/src/main/res/layout/activity_settings_manga.xml
@@ -163,7 +163,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="false"
- android:drawableStart="@drawable/ic_round_movie_filter_24"
+ android:drawableStart="@drawable/view_list_24"
android:drawablePadding="16dp"
android:elegantTextHeight="true"
android:fontFamily="@font/poppins_bold"
diff --git a/app/src/main/res/layout/activity_user_interface_settings.xml b/app/src/main/res/layout/activity_user_interface_settings.xml
index 6d97b208..8cd05f44 100644
--- a/app/src/main/res/layout/activity_user_interface_settings.xml
+++ b/app/src/main/res/layout/activity_user_interface_settings.xml
@@ -240,7 +240,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:checked="true"
- android:drawableStart="@drawable/ic_round_animation_24"
+ android:drawableStart="@drawable/trail_length_short"
android:drawablePadding="16dp"
android:elegantTextHeight="true"
android:fontFamily="@font/poppins_bold"
@@ -302,7 +302,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
- android:drawableStart="@drawable/ic_round_photo_size_select_actual_24"
+ android:drawableStart="@drawable/blur_on"
android:drawablePadding="16dp"
android:elegantTextHeight="true"
android:fontFamily="@font/poppins_bold"
@@ -328,7 +328,7 @@
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:text="@string/radius"
- app:drawableStartCompat="@drawable/ic_internet"
+ app:drawableStartCompat="@drawable/adjust"
app:drawableTint="?attr/colorPrimary" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fd4eb4e..02046f7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -715,9 +715,9 @@
Requires Android 12+
Share username in crash reports
Pinned Sources
- Import/Export Settings
- Import Settings
- Import Settings
+ Backup and Restore
+ Import Settings
+ Restore Settings
Try Internal Cast (Experimental)
Comments
@@ -830,8 +830,8 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
Quality: %1$dp
Unknown Size
%1$s MB
- Import…
- Export…
+ Restore
+ Backup
No location selected
Enjoying the App?
Consider donating!