From 876ccc4a40299895c3586f510b30baf5711c94a3 Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Fri, 8 Mar 2024 20:56:10 +0100 Subject: [PATCH] Rebrand android app --- .../app/src/ea/res/drawable/ic_suyu.xml | 14 +++++++++ .../app/src/ea/res/drawable/ic_suyu_full.xml | 12 ++++++++ .../app/src/ea/res/drawable/ic_suyu_title.xml | 30 +++++++++++++++++++ .../app/src/ea/res/drawable/ic_yuzu.xml | 22 -------------- .../app/src/ea/res/drawable/ic_yuzu_full.xml | 12 -------- .../app/src/ea/res/drawable/ic_yuzu_title.xml | 24 --------------- .../yuzu_emu/features/DocumentProvider.kt | 4 +-- .../yuzu/yuzu_emu/fragments/SetupFragment.kt | 2 +- .../app/src/main/res/drawable/ic_launcher.xml | 4 +-- .../app/src/main/res/drawable/ic_suyu.xml | 14 +++++++++ .../src/main/res/drawable/ic_suyu_full.xml | 12 ++++++++ .../src/main/res/drawable/ic_suyu_title.xml | 30 +++++++++++++++++++ .../app/src/main/res/drawable/ic_yuzu.xml | 22 -------------- .../src/main/res/drawable/ic_yuzu_full.xml | 12 -------- .../src/main/res/drawable/ic_yuzu_title.xml | 24 --------------- .../main/res/layout-w600dp/fragment_about.xml | 2 +- .../src/main/res/layout/fragment_about.xml | 2 +- .../res/layout/fragment_home_settings.xml | 4 +-- .../app/src/main/res/values/themes.xml | 2 +- 19 files changed, 122 insertions(+), 126 deletions(-) create mode 100644 src/android/app/src/ea/res/drawable/ic_suyu.xml create mode 100644 src/android/app/src/ea/res/drawable/ic_suyu_full.xml create mode 100644 src/android/app/src/ea/res/drawable/ic_suyu_title.xml delete mode 100644 src/android/app/src/ea/res/drawable/ic_yuzu.xml delete mode 100644 src/android/app/src/ea/res/drawable/ic_yuzu_full.xml delete mode 100644 src/android/app/src/ea/res/drawable/ic_yuzu_title.xml create mode 100644 src/android/app/src/main/res/drawable/ic_suyu.xml create mode 100644 src/android/app/src/main/res/drawable/ic_suyu_full.xml create mode 100644 src/android/app/src/main/res/drawable/ic_suyu_title.xml delete mode 100644 src/android/app/src/main/res/drawable/ic_yuzu.xml delete mode 100644 src/android/app/src/main/res/drawable/ic_yuzu_full.xml delete mode 100644 src/android/app/src/main/res/drawable/ic_yuzu_title.xml diff --git a/src/android/app/src/ea/res/drawable/ic_suyu.xml b/src/android/app/src/ea/res/drawable/ic_suyu.xml new file mode 100644 index 0000000000..d2a744d5a3 --- /dev/null +++ b/src/android/app/src/ea/res/drawable/ic_suyu.xml @@ -0,0 +1,14 @@ + + + + diff --git a/src/android/app/src/ea/res/drawable/ic_suyu_full.xml b/src/android/app/src/ea/res/drawable/ic_suyu_full.xml new file mode 100644 index 0000000000..f5b41ff7cf --- /dev/null +++ b/src/android/app/src/ea/res/drawable/ic_suyu_full.xml @@ -0,0 +1,12 @@ + + + + diff --git a/src/android/app/src/ea/res/drawable/ic_suyu_title.xml b/src/android/app/src/ea/res/drawable/ic_suyu_title.xml new file mode 100644 index 0000000000..970472f1d6 --- /dev/null +++ b/src/android/app/src/ea/res/drawable/ic_suyu_title.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/src/android/app/src/ea/res/drawable/ic_yuzu.xml b/src/android/app/src/ea/res/drawable/ic_yuzu.xml deleted file mode 100644 index deb8ba53fd..0000000000 --- a/src/android/app/src/ea/res/drawable/ic_yuzu.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - diff --git a/src/android/app/src/ea/res/drawable/ic_yuzu_full.xml b/src/android/app/src/ea/res/drawable/ic_yuzu_full.xml deleted file mode 100644 index 4ef4728769..0000000000 --- a/src/android/app/src/ea/res/drawable/ic_yuzu_full.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/android/app/src/ea/res/drawable/ic_yuzu_title.xml b/src/android/app/src/ea/res/drawable/ic_yuzu_title.xml deleted file mode 100644 index 29d0cfced8..0000000000 --- a/src/android/app/src/ea/res/drawable/ic_yuzu_title.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt index f3be156b5e..4ed5f2a2c5 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt @@ -91,7 +91,7 @@ class DocumentProvider : DocumentsProvider() { add(DocumentsContract.Root.COLUMN_DOCUMENT_ID, getDocumentId(baseDirectory)) add(DocumentsContract.Root.COLUMN_MIME_TYPES, "*/*") add(DocumentsContract.Root.COLUMN_AVAILABLE_BYTES, baseDirectory.freeSpace) - add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_yuzu) + add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_suyu) } return cursor @@ -288,7 +288,7 @@ class DocumentProvider : DocumentsProvider() { add(DocumentsContract.Document.COLUMN_LAST_MODIFIED, localFile.lastModified()) add(DocumentsContract.Document.COLUMN_FLAGS, flags) if (localFile == baseDirectory) { - add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_yuzu) + add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_suyu) } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt index 4f7548e98e..6f6d3d6f2b 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt @@ -100,7 +100,7 @@ class SetupFragment : Fragment() { pages.apply { add( SetupPage( - R.drawable.ic_yuzu_title, + R.drawable.ic_suyu_title, R.string.welcome, R.string.welcome_description, 0, diff --git a/src/android/app/src/main/res/drawable/ic_launcher.xml b/src/android/app/src/main/res/drawable/ic_launcher.xml index 3bb60fdfbb..1859f0760d 100644 --- a/src/android/app/src/main/res/drawable/ic_launcher.xml +++ b/src/android/app/src/main/res/drawable/ic_launcher.xml @@ -1,6 +1,6 @@ - - + + diff --git a/src/android/app/src/main/res/drawable/ic_suyu.xml b/src/android/app/src/main/res/drawable/ic_suyu.xml new file mode 100644 index 0000000000..0227c51bbd --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_suyu.xml @@ -0,0 +1,14 @@ + + + + diff --git a/src/android/app/src/main/res/drawable/ic_suyu_full.xml b/src/android/app/src/main/res/drawable/ic_suyu_full.xml new file mode 100644 index 0000000000..8df3be3237 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_suyu_full.xml @@ -0,0 +1,12 @@ + + + + diff --git a/src/android/app/src/main/res/drawable/ic_suyu_title.xml b/src/android/app/src/main/res/drawable/ic_suyu_title.xml new file mode 100644 index 0000000000..970472f1d6 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_suyu_title.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/src/android/app/src/main/res/drawable/ic_yuzu.xml b/src/android/app/src/main/res/drawable/ic_yuzu.xml deleted file mode 100644 index 5e2a8efd0c..0000000000 --- a/src/android/app/src/main/res/drawable/ic_yuzu.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_full.xml b/src/android/app/src/main/res/drawable/ic_yuzu_full.xml deleted file mode 100644 index 04e4584002..0000000000 --- a/src/android/app/src/main/res/drawable/ic_yuzu_full.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/android/app/src/main/res/drawable/ic_yuzu_title.xml b/src/android/app/src/main/res/drawable/ic_yuzu_title.xml deleted file mode 100644 index b733e52481..0000000000 --- a/src/android/app/src/main/res/drawable/ic_yuzu_title.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml index a5eba6474a..15fa96ee42 100644 --- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml +++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml @@ -45,7 +45,7 @@ android:layout_height="200dp" android:layout_gravity="center_horizontal" android:padding="20dp" - android:src="@drawable/ic_yuzu_title" /> + android:src="@drawable/ic_suyu_title" /> + android:src="@drawable/ic_suyu_title" /> + android:layout_marginVertical="32dp" + android:src="@drawable/ic_suyu_full" /> @color/yuzu_surface - @drawable/ic_yuzu + @drawable/ic_suyu @style/Theme.Yuzu.Main