some more theme tweaks

This commit is contained in:
ari melody 2024-09-14 03:26:32 +01:00
parent cc87416120
commit c3999d1c63
Signed by: ari
GPG key ID: CF99829C92678188
23 changed files with 41 additions and 73 deletions

1
.gitignore vendored
View file

@ -7,6 +7,7 @@
/.idea/workspace.xml /.idea/workspace.xml
/.idea/navEditor.xml /.idea/navEditor.xml
/.idea/assetWizardSettings.xml /.idea/assetWizardSettings.xml
/app/release
.DS_Store .DS_Store
/build /build
/captures /captures

View file

@ -11,9 +11,9 @@
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"attributes": [], "attributes": [],
"versionCode": 2, "versionCode": 3,
"versionName": "1.1", "versionName": "1.1.1",
"outputFile": "me.arimelody.aridroid-v2(1.1)-release.apk" "outputFile": "me.arimelody.aridroid-v3(1.1.1)-release.apk"
} }
], ],
"elementType": "File", "elementType": "File",
@ -22,14 +22,14 @@
"minApi": 28, "minApi": 28,
"maxApi": 30, "maxApi": 30,
"baselineProfiles": [ "baselineProfiles": [
"baselineProfiles/1/me.arimelody.aridroid-v2(1.1)-release.dm" "baselineProfiles/1/me.arimelody.aridroid-v3(1.1.1)-release.dm"
] ]
}, },
{ {
"minApi": 31, "minApi": 31,
"maxApi": 2147483647, "maxApi": 2147483647,
"baselineProfiles": [ "baselineProfiles": [
"baselineProfiles/0/me.arimelody.aridroid-v2(1.1)-release.dm" "baselineProfiles/0/me.arimelody.aridroid-v3(1.1.1)-release.dm"
] ]
} }
], ],

View file

@ -21,9 +21,6 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".ReleaseViewActivity"/> <activity android:name=".ReleaseViewActivity"/>
<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
</application> </application>
</manifest> </manifest>

View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/inter_regular" />
<font
android:fontStyle="normal"
android:fontWeight="600"
android:font="@font/inter_bold" />
<font
android:fontStyle="normal"
android:fontWeight="800"
android:font="@font/inter_black" />
</font-family>

View file

@ -1,7 +0,0 @@
<?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="Inter"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

Binary file not shown.

View file

@ -1,7 +0,0 @@
<?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=Inter&amp;weight=900"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

Binary file not shown.

View file

@ -1,7 +0,0 @@
<?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=Inter&amp;weight=700"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

Binary file not shown.

View file

@ -6,6 +6,6 @@
android:font="@font/monaspace_regular" /> android:font="@font/monaspace_regular" />
<font <font
android:fontStyle="normal" android:fontStyle="normal"
android:fontWeight="800" android:fontWeight="600"
android:font="@font/monaspace_bold" /> android:font="@font/monaspace_bold" />
</font-family> </font-family>

View file

@ -25,7 +25,7 @@
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:layout_marginVertical="10dp" android:layout_marginVertical="10dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:fontFamily="@font/inter_black" android:textFontWeight="800"
android:text="@string/releases_list_title" android:text="@string/releases_list_title"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:textSize="32sp" /> android:textSize="32sp" />
@ -57,7 +57,7 @@
android:layout_marginVertical="10dp" android:layout_marginVertical="10dp"
app:layout_constraintTop_toBottomOf="@id/musicListContainer" app:layout_constraintTop_toBottomOf="@id/musicListContainer"
android:textSize="32sp" android:textSize="32sp"
android:fontFamily="@font/inter_black" android:textFontWeight="800"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:text="@string/artists_list_title" /> android:text="@string/artists_list_title" />
<FrameLayout <FrameLayout

View file

@ -32,7 +32,7 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:textSize="32sp" android:textSize="32sp"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_black" android:textFontWeight="800"
android:textAlignment="center" android:textAlignment="center"
android:text="@string/default_release_title" /> android:text="@string/default_release_title" />
<TextView <TextView
@ -45,7 +45,7 @@
android:layout_marginTop="-10dp" android:layout_marginTop="-10dp"
android:textSize="16sp" android:textSize="16sp"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_bold" android:textFontWeight="700"
android:textAlignment="center" android:textAlignment="center"
android:text="@string/default_artist" /> android:text="@string/default_artist" />

View file

@ -47,7 +47,7 @@
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:fontFamily="@font/inter_bold" android:textFontWeight="600"
android:textSize="16sp" android:textSize="16sp"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:text="@string/default_artist_name" /> android:text="@string/default_artist_name" />

View file

@ -45,7 +45,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:fontFamily="@font/inter_bold" android:textFontWeight="600"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:text="@string/default_release_title" /> android:text="@string/default_release_title" />
@ -56,7 +56,7 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
app:layout_constraintLeft_toRightOf="@id/musicTitle" app:layout_constraintLeft_toRightOf="@id/musicTitle"
app:layout_constraintTop_toTopOf="@id/musicTitle" app:layout_constraintTop_toTopOf="@id/musicTitle"
android:fontFamily="@font/inter_bold" android:textFontWeight="600"
android:textColor="@color/on_surface_dim" android:textColor="@color/on_surface_dim"
android:text="@string/default_year" /> android:text="@string/default_year" />

View file

@ -36,14 +36,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="5dp" android:layout_marginVertical="5dp"
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:fontFamily="@font/inter_bold" android:textFontWeight="600"
android:textColor="?attr/colorOnPrimary" android:textColor="?attr/colorOnPrimary"
android:text="@string/new_item" /> android:text="@string/new_item" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <TextView
android:id="@+id/release_artist" android:id="@+id/release_artist"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toTopOf="@id/release_title" app:layout_constraintBottom_toTopOf="@id/release_title"
@ -51,11 +51,11 @@
android:layout_marginBottom="-14dp" android:layout_marginBottom="-14dp"
android:textSize="24sp" android:textSize="24sp"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_bold" android:textFontWeight="600"
android:text="@string/default_artist" /> android:text="@string/default_artist" />
<TextView <TextView
android:id="@+id/release_title" android:id="@+id/release_title"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toTopOf="@id/tap_to_view" app:layout_constraintBottom_toTopOf="@id/tap_to_view"
@ -63,11 +63,11 @@
android:layout_marginBottom="-10dp" android:layout_marginBottom="-10dp"
android:textSize="40sp" android:textSize="40sp"
android:textColor="?attr/colorOnSurface" android:textColor="?attr/colorOnSurface"
android:fontFamily="@font/inter_black" android:textFontWeight="800"
android:text="@string/default_release_title" /> android:text="@string/default_release_title" />
<TextView <TextView
android:id="@+id/tap_to_view" android:id="@+id/tap_to_view"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="@id/release_artwork" app:layout_constraintBottom_toBottomOf="@id/release_artwork"

View file

@ -1,17 +0,0 @@
<?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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="ic_launcher_background">#BBFF67</color> <color name="ic_launcher_background">@color/brand_green</color>
</resources> </resources>

View file

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

View file

@ -1,9 +1,5 @@
<resources> <resources>
<style name="AriDroid.Base" parent="Theme.Material3.DayNight.NoActionBar"> <style name="AriDroid.Base" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:fontFamily">@font/inter</item>
</style>
<style name="AriDroid.Theme" parent="AriDroid.Base">
<item name="colorPrimary">@color/brand_pink_dark</item> <item name="colorPrimary">@color/brand_pink_dark</item>
<item name="colorOnPrimary">@color/white100</item> <item name="colorOnPrimary">@color/white100</item>
<item name="colorSecondary">@color/brand_green_dark</item> <item name="colorSecondary">@color/brand_green_dark</item>
@ -11,6 +7,11 @@
<item name="colorSurface">@color/white90</item> <item name="colorSurface">@color/white90</item>
<item name="colorOnSurface">@color/dark90</item> <item name="colorOnSurface">@color/dark90</item>
<item name="colorOnSurfaceVariant">@color/dark50</item> <item name="colorOnSurfaceVariant">@color/dark50</item>
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:fontFamily">@font/basic</item>
</style>
<style name="AriDroid.Theme" parent="AriDroid.Base">
</style> </style>
<style name="AriDroid.Card" parent="AriDroid.Theme"> <style name="AriDroid.Card" parent="AriDroid.Theme">