diff --git a/.gitignore b/.gitignore
index aa724b7..a46aa94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
+/app/release
.DS_Store
/build
/captures
diff --git a/app/release/baselineProfiles/0/me.arimelody.aridroid-v2(1.1)-release.dm b/app/release/baselineProfiles/0/me.arimelody.aridroid-v2(1.1)-release.dm
deleted file mode 100644
index 328c4be..0000000
Binary files a/app/release/baselineProfiles/0/me.arimelody.aridroid-v2(1.1)-release.dm and /dev/null differ
diff --git a/app/release/baselineProfiles/1/me.arimelody.aridroid-v2(1.1)-release.dm b/app/release/baselineProfiles/1/me.arimelody.aridroid-v2(1.1)-release.dm
deleted file mode 100644
index aea7f86..0000000
Binary files a/app/release/baselineProfiles/1/me.arimelody.aridroid-v2(1.1)-release.dm and /dev/null differ
diff --git a/app/release/me.arimelody.aridroid-v2(1.1)-release.apk b/app/release/me.arimelody.aridroid-v2(1.1)-release.apk
deleted file mode 100644
index b7e5443..0000000
Binary files a/app/release/me.arimelody.aridroid-v2(1.1)-release.apk and /dev/null differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 67c29ec..aa1b1ec 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,9 +11,9 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 2,
- "versionName": "1.1",
- "outputFile": "me.arimelody.aridroid-v2(1.1)-release.apk"
+ "versionCode": 3,
+ "versionName": "1.1.1",
+ "outputFile": "me.arimelody.aridroid-v3(1.1.1)-release.apk"
}
],
"elementType": "File",
@@ -22,14 +22,14 @@
"minApi": 28,
"maxApi": 30,
"baselineProfiles": [
- "baselineProfiles/1/me.arimelody.aridroid-v2(1.1)-release.dm"
+ "baselineProfiles/1/me.arimelody.aridroid-v3(1.1.1)-release.dm"
]
},
{
"minApi": 31,
"maxApi": 2147483647,
"baselineProfiles": [
- "baselineProfiles/0/me.arimelody.aridroid-v2(1.1)-release.dm"
+ "baselineProfiles/0/me.arimelody.aridroid-v3(1.1.1)-release.dm"
]
}
],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 04c8350..fe4c848 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,9 +21,6 @@
-
diff --git a/app/src/main/res/font/basic.xml b/app/src/main/res/font/basic.xml
new file mode 100644
index 0000000..74e9081
--- /dev/null
+++ b/app/src/main/res/font/basic.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/inter.xml b/app/src/main/res/font/inter.xml
deleted file mode 100644
index 71311f0..0000000
--- a/app/src/main/res/font/inter.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/app/src/main/res/font/inter_black.ttf b/app/src/main/res/font/inter_black.ttf
new file mode 100644
index 0000000..034a73e
Binary files /dev/null and b/app/src/main/res/font/inter_black.ttf differ
diff --git a/app/src/main/res/font/inter_black.xml b/app/src/main/res/font/inter_black.xml
deleted file mode 100644
index 9995dba..0000000
--- a/app/src/main/res/font/inter_black.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/app/src/main/res/font/inter_bold.ttf b/app/src/main/res/font/inter_bold.ttf
new file mode 100644
index 0000000..15e908f
Binary files /dev/null and b/app/src/main/res/font/inter_bold.ttf differ
diff --git a/app/src/main/res/font/inter_bold.xml b/app/src/main/res/font/inter_bold.xml
deleted file mode 100644
index fc40af7..0000000
--- a/app/src/main/res/font/inter_bold.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/app/src/main/res/font/inter_regular.ttf b/app/src/main/res/font/inter_regular.ttf
new file mode 100644
index 0000000..c544be4
Binary files /dev/null and b/app/src/main/res/font/inter_regular.ttf differ
diff --git a/app/src/main/res/font/monaspace.xml b/app/src/main/res/font/monaspace.xml
index fe1090f..a3c022c 100644
--- a/app/src/main/res/font/monaspace.xml
+++ b/app/src/main/res/font/monaspace.xml
@@ -6,6 +6,6 @@
android:font="@font/monaspace_regular" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dab99ed..5c7869a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,7 +25,7 @@
android:layout_marginHorizontal="10dp"
android:layout_marginVertical="10dp"
app:layout_constraintTop_toTopOf="parent"
- android:fontFamily="@font/inter_black"
+ android:textFontWeight="800"
android:text="@string/releases_list_title"
android:textColor="?attr/colorOnSurface"
android:textSize="32sp" />
@@ -57,7 +57,7 @@
android:layout_marginVertical="10dp"
app:layout_constraintTop_toBottomOf="@id/musicListContainer"
android:textSize="32sp"
- android:fontFamily="@font/inter_black"
+ android:textFontWeight="800"
android:textColor="?attr/colorOnSurface"
android:text="@string/artists_list_title" />
diff --git a/app/src/main/res/layout/artist_list_item.xml b/app/src/main/res/layout/artist_list_item.xml
index dc7c73f..0f44381 100644
--- a/app/src/main/res/layout/artist_list_item.xml
+++ b/app/src/main/res/layout/artist_list_item.xml
@@ -47,7 +47,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:fontFamily="@font/inter_bold"
+ android:textFontWeight="600"
android:textSize="16sp"
android:textColor="?attr/colorOnSurface"
android:text="@string/default_artist_name" />
diff --git a/app/src/main/res/layout/release_list_item.xml b/app/src/main/res/layout/release_list_item.xml
index 0d57655..4cd860e 100644
--- a/app/src/main/res/layout/release_list_item.xml
+++ b/app/src/main/res/layout/release_list_item.xml
@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
- android:fontFamily="@font/inter_bold"
+ android:textFontWeight="600"
android:textColor="?attr/colorOnSurface"
android:text="@string/default_release_title" />
@@ -56,7 +56,7 @@
android:layout_marginStart="5dp"
app:layout_constraintLeft_toRightOf="@id/musicTitle"
app:layout_constraintTop_toTopOf="@id/musicTitle"
- android:fontFamily="@font/inter_bold"
+ android:textFontWeight="600"
android:textColor="@color/on_surface_dim"
android:text="@string/default_year" />
diff --git a/app/src/main/res/layout/top_release_card.xml b/app/src/main/res/layout/top_release_card.xml
index 13a543f..9bfc021 100644
--- a/app/src/main/res/layout/top_release_card.xml
+++ b/app/src/main/res/layout/top_release_card.xml
@@ -36,14 +36,14 @@
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginHorizontal="10dp"
- android:fontFamily="@font/inter_bold"
+ android:textFontWeight="600"
android:textColor="?attr/colorOnPrimary"
android:text="@string/new_item" />
-
-
- - @array/com_google_android_gms_fonts_certs_dev
- - @array/com_google_android_gms_fonts_certs_prod
-
-
- -
- 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
-
-
-
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 3a79dd8..d8164b8 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #BBFF67
+ @color/brand_green
\ No newline at end of file
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
deleted file mode 100644
index b0d075d..0000000
--- a/app/src/main/res/values/preloaded_fonts.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- - @font/inter
- - @font/inter_black
- - @font/inter_bold
-
-
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ef2a8e8..89942ef 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,9 +1,5 @@
-
-
+
+