Added logo to settings

This commit is contained in:
amwatson 2024-01-31 18:29:29 -06:00
parent e3670db4e4
commit bce824b19d
9 changed files with 135 additions and 57 deletions

View file

@ -161,6 +161,10 @@
android:exported="false"
android:theme="@style/Theme.Citra.Main"
android:label="@string/cheats"/>
<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
</application>
</manifest>

View file

@ -28,10 +28,10 @@
android:color="#ADFF2F"
android:offset="0" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="0.67" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
@ -53,7 +53,7 @@
android:color="#ADFF2F"
android:offset="0" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
@ -75,7 +75,7 @@
android:color="#ADFF2F"
android:offset="0" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
@ -97,7 +97,7 @@
android:color="#ADFF2F"
android:offset="0" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
@ -122,7 +122,7 @@
android:color="#ADFF2F"
android:offset="0.5" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
@ -144,7 +144,7 @@
android:color="#ADFF2F"
android:offset="0" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
@ -166,11 +166,12 @@
android:color="#ADFF2F"
android:offset="0" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<!-- too dark -->
<path
android:fillType="nonZero"
android:pathData="M214.54,105.16C208.5,107.05 203.13,110.26 197.7,113.38C175.34,126.18 154.58,141.13 136.79,159.92C128.54,168.64 129.85,174.36 141.29,177.63C162.55,183.7 184.15,188.4 206.38,188.95C218.08,189.24 223.98,183.77 226.07,172.36C228.2,160.7 228.65,148.97 228.34,133.48C228,128.78 229.54,120.25 227.29,111.97C225.84,106.66 223.42,104.28 219.43,104.28C218.01,104.28 216.38,104.58 214.54,105.16"
@ -188,10 +189,10 @@
android:color="#ADFF2F"
android:offset="0" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="0.67" />
<item
android:color="#32CD32"
android:color="#60d860"
android:offset="1" />
</gradient>
</aapt:attr>
@ -210,7 +211,7 @@
android:gradientRadius="160"
android:type="radial">
<item android:color="#ADFF2F" android:offset="0.25" />
<item android:color="#32CD32" android:offset="0.55" />
<item android:color="#60d860" android:offset="0.55" />
<item android:color="#228B22" android:offset="1" />
</gradient>
</aapt:attr>
@ -233,7 +234,7 @@
android:type="linear">
<item android:color="#004C00" android:offset="0"/>
<item android:color="#228B22" android:offset="0.5"/>
<item android:color="#32CD32" android:offset="1"/>
<item android:color="#60d860" android:offset="1"/>
</gradient>
</aapt:attr>
</path>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="name=Dancing Script&amp;weight=700"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="name=Lato&amp;weight=700"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

View file

@ -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" />
</com.google.android.material.appbar.AppBarLayout>
@ -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">
<LinearLayout
@ -36,13 +36,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/image_logo"
android:layout_width="104dp"
android:layout_height="104dp"
android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_citra_full" />
<include layout="@layout/vr_logo" />
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
@ -54,18 +48,18 @@
android:id="@+id/button_build_hash"
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">
<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.TitleMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:textAlignment="viewStart"
android:text="@string/build" />
android:text="@string/build"
android:textAlignment="viewStart" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_build_hash"
@ -88,18 +82,18 @@
android:id="@+id/button_release_notes"
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">
<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.TitleMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:textAlignment="viewStart"
android:text="@string/release_notes_title" />
android:text="@string/release_notes_title"
android:textAlignment="viewStart" />
</LinearLayout>
@ -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">
<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.TitleMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:textAlignment="viewStart"
android:text="@string/licenses" />
android:text="@string/licenses"
android:textAlignment="viewStart" />
<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.BodyMedium"
@ -131,8 +125,8 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="6dp"
android:textAlignment="viewStart"
android:text="@string/vr_licenses_description" />
android:text="@string/vr_licenses_description"
android:textAlignment="viewStart" />
</LinearLayout>
@ -144,33 +138,33 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:layout_marginHorizontal="40dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="16dp"
android:layout_marginHorizontal="40dp">
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button
style="?attr/materialIconButtonStyle"
android:id="@+id/button_discord"
style="?attr/materialIconButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:icon="@drawable/ic_discord"
app:iconTint="?attr/colorOnSurface"
app:iconGravity="textEnd"
app:iconSize="24dp"
app:iconGravity="textEnd" />
app:iconTint="?attr/colorOnSurface" />
<Button
style="?attr/materialIconButtonStyle"
android:id="@+id/button_website"
style="?attr/materialIconButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:icon="@drawable/ic_controller"
app:iconTint="?attr/colorOnSurface"
app:iconGravity="textEnd"
app:iconSize="24dp"
app:iconGravity="textEnd" />
app:iconTint="?attr/colorOnSurface" />
<Button
android:id="@+id/button_github"
@ -179,9 +173,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
app:icon="@drawable/ic_github"
app:iconTint="?attr/colorOnSurface"
app:iconGravity="textEnd"
app:iconSize="24dp"
app:iconGravity="textEnd" />
app:iconTint="?attr/colorOnSurface" />
</LinearLayout>

View file

@ -16,13 +16,11 @@
android:orientation="vertical"
android:background="?attr/colorSurface">
<ImageView
android:id="@+id/logo_image"
android:layout_width="104dp"
android:layout_height="104dp"
android:layout_margin="32dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_citra_full" />
<include layout="@layout/vr_logo"
android:layout_marginBottom="24dp"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/home_settings_list"

View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal">
<ImageView
android:id="@+id/image_logo"
android:layout_width="104dp"
android:layout_height="104dp"
android:layout_marginTop="20dp"
android:src="@drawable/ic_citra_full"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
<TextView
android:id="@+id/materialTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:fontFamily="@font/lato_bold"
android:gravity="center"
android:text="Citra"
android:textSize="64sp"
app:layout_constraintBottom_toBottomOf="@+id/image_logo"
app:layout_constraintStart_toEndOf="@+id/image_logo"
app:layout_constraintTop_toTopOf="@+id/image_logo" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="@font/dancing_script_bold"
android:text="VR"
android:textColor="#60d860"
android:textSize="64sp"
app:layout_constraintBottom_toBottomOf="@+id/materialTextView"
app:layout_constraintStart_toEndOf="@+id/materialTextView"
app:layout_constraintTop_toTopOf="@+id/materialTextView" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="com_google_android_gms_fonts_certs">
<item>@array/com_google_android_gms_fonts_certs_dev</item>
<item>@array/com_google_android_gms_fonts_certs_prod</item>
</array>
<string-array name="com_google_android_gms_fonts_certs_dev">
<item>
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
</item>
</string-array>
<string-array name="com_google_android_gms_fonts_certs_prod">
<item>
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
</item>
</string-array>
</resources>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="preloaded_fonts" translatable="false">
<item>@font/dancing_script_bold</item>
<item>@font/lato_bold</item>
</array>
</resources>