From bce824b19d138e09a90366701a391bab912a0092 Mon Sep 17 00:00:00 2001 From: amwatson Date: Wed, 31 Jan 2024 18:29:29 -0600 Subject: [PATCH] Added logo to settings --- src/android/app/src/main/AndroidManifest.xml | 4 ++ .../src/main/res/drawable/ic_citra_full.xml | 25 +++---- .../src/main/res/font/dancing_script_bold.xml | 7 ++ .../app/src/main/res/font/lato_bold.xml | 7 ++ .../src/main/res/layout/fragment_about.xml | 70 +++++++++---------- .../res/layout/fragment_home_settings.xml | 12 ++-- .../app/src/main/res/layout/vr_logo.xml | 43 ++++++++++++ .../app/src/main/res/values/font_certs.xml | 17 +++++ .../src/main/res/values/preloaded_fonts.xml | 7 ++ 9 files changed, 135 insertions(+), 57 deletions(-) create mode 100644 src/android/app/src/main/res/font/dancing_script_bold.xml create mode 100644 src/android/app/src/main/res/font/lato_bold.xml create mode 100644 src/android/app/src/main/res/layout/vr_logo.xml create mode 100644 src/android/app/src/main/res/values/font_certs.xml create mode 100644 src/android/app/src/main/res/values/preloaded_fonts.xml diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index 621ae6bd0..0b355415b 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -161,6 +161,10 @@ android:exported="false" android:theme="@style/Theme.Citra.Main" android:label="@string/cheats"/> + + diff --git a/src/android/app/src/main/res/drawable/ic_citra_full.xml b/src/android/app/src/main/res/drawable/ic_citra_full.xml index 4c1edf3d9..1487ad939 100644 --- a/src/android/app/src/main/res/drawable/ic_citra_full.xml +++ b/src/android/app/src/main/res/drawable/ic_citra_full.xml @@ -28,10 +28,10 @@ android:color="#ADFF2F" android:offset="0" /> @@ -53,7 +53,7 @@ android:color="#ADFF2F" android:offset="0" /> @@ -75,7 +75,7 @@ android:color="#ADFF2F" android:offset="0" /> @@ -97,7 +97,7 @@ android:color="#ADFF2F" android:offset="0" /> @@ -122,7 +122,7 @@ android:color="#ADFF2F" android:offset="0.5" /> @@ -144,7 +144,7 @@ android:color="#ADFF2F" android:offset="0" /> @@ -166,11 +166,12 @@ android:color="#ADFF2F" android:offset="0" /> + @@ -210,7 +211,7 @@ android:gradientRadius="160" android:type="radial"> - + @@ -233,7 +234,7 @@ android:type="linear"> - + diff --git a/src/android/app/src/main/res/font/dancing_script_bold.xml b/src/android/app/src/main/res/font/dancing_script_bold.xml new file mode 100644 index 000000000..f86570d00 --- /dev/null +++ b/src/android/app/src/main/res/font/dancing_script_bold.xml @@ -0,0 +1,7 @@ + + + diff --git a/src/android/app/src/main/res/font/lato_bold.xml b/src/android/app/src/main/res/font/lato_bold.xml new file mode 100644 index 000000000..e12d82bb3 --- /dev/null +++ b/src/android/app/src/main/res/font/lato_bold.xml @@ -0,0 +1,7 @@ + + + diff --git a/src/android/app/src/main/res/layout/fragment_about.xml b/src/android/app/src/main/res/layout/fragment_about.xml index 77bbcdcec..5983bd743 100644 --- a/src/android/app/src/main/res/layout/fragment_about.xml +++ b/src/android/app/src/main/res/layout/fragment_about.xml @@ -17,8 +17,8 @@ android:id="@+id/toolbar_about" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - app:title="@string/about" - app:navigationIcon="@drawable/ic_back" /> + app:navigationIcon="@drawable/ic_back" + app:title="@string/about" /> @@ -26,8 +26,8 @@ android:id="@+id/scroll_about" android:layout_width="match_parent" android:layout_height="match_parent" - android:scrollbars="vertical" android:fadeScrollbars="false" + android:scrollbars="vertical" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + + android:orientation="vertical" + android:paddingHorizontal="16dp" + android:paddingVertical="16dp"> + android:text="@string/build" + android:textAlignment="viewStart" /> + android:orientation="vertical" + android:paddingHorizontal="16dp" + android:paddingVertical="16dp"> + android:text="@string/release_notes_title" + android:textAlignment="viewStart" /> @@ -112,18 +106,18 @@ android:id="@+id/button_licenses" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="16dp" - android:paddingHorizontal="16dp" android:background="?attr/selectableItemBackground" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingHorizontal="16dp" + android:paddingVertical="16dp"> + android:text="@string/licenses" + android:textAlignment="viewStart" /> + android:text="@string/vr_licenses_description" + android:textAlignment="viewStart" /> @@ -144,33 +138,33 @@ + android:gravity="center_horizontal" + android:orientation="horizontal">