From 5825ec3ebc51ebfd284ca74f1906c925170b45d0 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 18 Mar 2025 12:54:00 -0600 Subject: [PATCH 1/5] musikr: consider parent dir name as cover file --- .../src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt b/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt index 3322ae8ef..dfb8dbdb2 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt @@ -117,7 +117,7 @@ class MutableFSCovers(private val context: Context) : MutableCovers { // that should not be managed by the app } - private fun coverArtScore(file: DeviceFile): Int { + private suspend fun coverArtScore(file: DeviceFile): Int { if (!file.mimeType.startsWith("image/", ignoreCase = true)) { // Not an image file. You lose! return 0 @@ -127,9 +127,9 @@ class MutableFSCovers(private val context: Context) : MutableCovers { val name = filename.substringBeforeLast('.') val extension = filename.substringAfterLast('.', "") // See if the name contains any of the preferred cover names. This helps weed out - // images that are not actually cover art and are just there. + // images that are not actually cover art and are just there., var score = - preferredCoverNames + (preferredCoverNames + requireNotNull(file.parent.await().path.name)) .withIndex() .filter { name.contains(it.value, ignoreCase = true) } .sumOf { it.index + 1 } From 9e683a7856777592a0d9b8930766815419b75533 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 18 Mar 2025 13:01:29 -0600 Subject: [PATCH 2/5] info: add mark pitblado to sponsors --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 2b8abee38..fdf158595 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,14 @@ precise/original dates, sort tags, and more You can support Auxio's development through [my Github Sponsors page](https://github.com/sponsors/OxygenCobalt). Get the ability to prioritize features and have your profile added to the README, Release Changelogs, and even the app itself! +

$16/month supporters:

+ +

+ +
+ Mark Pitblado +

+

$8/month supporters:

From 44633142d9d355ee408cf38be2955e764961cbee Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 18 Mar 2025 13:01:51 -0600 Subject: [PATCH 3/5] about: add mark pitblado to about sponsors --- .../java/org/oxycblt/auxio/settings/AboutFragment.kt | 4 ++++ app/src/main/res/layout/fragment_about.xml | 11 +++++++++++ app/src/main/res/values/donottranslate.xml | 1 + 3 files changed, 16 insertions(+) diff --git a/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt index 7f278df5c..dd46665ec 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt @@ -72,6 +72,9 @@ class AboutFragment : ViewBindingFragment() { binding.aboutLicenses.setOnClickListener { requireContext().openInBrowser(LINK_LICENSES) } binding.aboutProfile.setOnClickListener { requireContext().openInBrowser(LINK_PROFILE) } binding.aboutDonate.setOnClickListener { requireContext().openInBrowser(LINK_DONATE) } + binding.aboutSupMarkPitblado.setOnClickListener { + requireContext().openInBrowser(LINK_SUP_MARK_PITBLADO) + } binding.aboutFeedbackGithub.setOnClickListener { requireContext().openInBrowser(LINK_NEW_ISSUE) } @@ -113,5 +116,6 @@ class AboutFragment : ViewBindingFragment() { const val LINK_NEW_ISSUE = "$LINK_SOURCE/issues/new" const val LINK_PROFILE = "https://github.com/OxygenCobalt" const val LINK_DONATE = "https://github.com/sponsors/OxygenCobalt" + const val LINK_SUP_MARK_PITBLADO = "https://github.com/mark-pitblado" } } diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index d574f8e79..9656e88a1 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -226,6 +226,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> + + org.oxycblt.auxio.image.CoverProvider + Mark Pitblado \ No newline at end of file From a71ef0daf2a9528f87776e1fbd9991090784bfe1 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 18 Mar 2025 13:03:50 -0600 Subject: [PATCH 4/5] settings: fix mark pitblado sponsor entry icon --- app/src/main/res/layout/fragment_about.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 9656e88a1..58ccb4217 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -234,6 +234,7 @@ android:text="@string/sup_mark_pitblado" android:textAppearance="@style/TextAppearance.Auxio.BodyMedium" app:layout_constraintEnd_toEndOf="parent" + app:drawableStartCompat="@drawable/ic_person_24" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/about_licenses" /> From 93953aee8bd918b155957a788b0c365965514d32 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 18 Mar 2025 13:05:16 -0600 Subject: [PATCH 5/5] about: fix mark pitblado sponsor entry text --- app/src/main/res/layout/fragment_about.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 58ccb4217..2c13dbb5a 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -232,7 +232,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sup_mark_pitblado" - android:textAppearance="@style/TextAppearance.Auxio.BodyMedium" app:layout_constraintEnd_toEndOf="parent" app:drawableStartCompat="@drawable/ic_person_24" app:layout_constraintStart_toStartOf="parent"