From 9f5e31d4662df0ae69da44fc0da82496efc9477e Mon Sep 17 00:00:00 2001 From: nift4 Date: Fri, 5 Jul 2024 11:22:28 +0200 Subject: [PATCH] cleanup --- .idea/misc.xml | 4 + app/build.gradle.kts | 2 +- app/src/main/AndroidManifest.xml | 1 - .../logic/ui/CustomSmoothScroller.java | 7 +- .../gramophone/logic/GramophoneExtensions.kt | 1 - .../logic/GramophonePlaybackService.kt | 3 +- .../logic/utils/CalculationUtils.kt | 6 +- .../logic/utils/LifecycleCallbackList.kt | 3 - .../gramophone/logic/utils/LrcUtils.kt | 9 +- .../exoplayer/GramophoneExtractorsFactory.kt | 1 + .../exoplayer/GramophoneMediaSourceFactory.kt | 1 + .../gramophone/ui/adapters/BaseAdapter.kt | 2 +- .../ui/components/FullBottomSheet.kt | 9 +- .../ui/components/NowPlayingDrawable.kt | 2 + .../ui/fragments/GeneralSubFragment.kt | 4 +- app/src/main/res/drawable/ic_alarm_off.xml | 6 +- .../main/res/drawable/ic_draw_abstract.xml | 6 +- app/src/main/res/drawable/ic_favorite.xml | 6 +- .../main/res/drawable/ic_manufacturing.xml | 6 +- app/src/main/res/drawable/ic_palette.xml | 6 +- app/src/main/res/layout/activity_main.xml | 3 +- .../res/layout/preference_dropdown_md.xml | 3 +- app/src/main/res/layout/preference_icon.xml | 3 +- .../main/res/layout/preference_seekbar.xml | 3 +- .../res/layout/preference_switch_widget.xml | 3 +- app/src/main/res/menu/navigation_menu.xml | 87 --------------- .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 -- .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2632 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1660 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3580 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5936 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 8198 -> 0 bytes app/src/main/res/values-be/strings.xml | 2 +- app/src/main/res/values-night/colors.xml | 1 - app/src/main/res/values/colors.xml | 95 ----------------- app/src/main/res/values/dimens.xml | 4 +- app/src/main/res/values/drawables.xml | 13 +-- app/src/main/res/values/strings.xml | 16 +-- app/src/main/res/values/theme_overlays.xml | 99 +----------------- app/src/userdebug/res/values/strings.xml | 2 +- baselineprofile/build.gradle.kts | 4 +- readme.md | 2 +- readme_ja.md | 2 +- 43 files changed, 72 insertions(+), 361 deletions(-) delete mode 100644 app/src/main/res/menu/navigation_menu.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/.idea/misc.xml b/.idea/misc.xml index d5dfa06d1..3e196b06b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + + + + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a8ba15a74..c1f9417d5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -190,7 +190,7 @@ dependencies { implementation("androidx.activity:activity-ktx:1.9.0") implementation("androidx.appcompat:appcompat:1.7.0") implementation("androidx.collection:collection-ktx:1.4.0") - implementation("androidx.concurrent:concurrent-futures-ktx:1.1.0") + implementation("androidx.concurrent:concurrent-futures-ktx:1.2.0") implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha13") implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.core:core-splashscreen:1.0.1") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0415ea031..5a5081a5a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ android:enableOnBackInvokedCallback="false" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Gramophone" android:windowSoftInputMode="adjustResize" diff --git a/app/src/main/java/org/akanework/gramophone/logic/ui/CustomSmoothScroller.java b/app/src/main/java/org/akanework/gramophone/logic/ui/CustomSmoothScroller.java index 44cc85606..dc0f97640 100644 --- a/app/src/main/java/org/akanework/gramophone/logic/ui/CustomSmoothScroller.java +++ b/app/src/main/java/org/akanework/gramophone/logic/ui/CustomSmoothScroller.java @@ -76,8 +76,8 @@ public class CustomSmoothScroller extends RecyclerView.SmoothScroller { // scrolling slows down and reschedule another interim target scroll private static final float TARGET_SEEK_EXTRA_SCROLL_RATIO = 1.2f; private final DisplayMetrics mDisplayMetrics; - protected LinearInterpolator mLinearInterpolator = new LinearInterpolator(); - protected TimeInterpolator mDecelerateInterpolator = + protected final LinearInterpolator mLinearInterpolator = new LinearInterpolator(); + protected final TimeInterpolator mDecelerateInterpolator = new PathInterpolator(0.4f, 0.2f, 0f, 1f); @SuppressLint("UnknownNullness") // b/240775049: Cannot annotate properly protected PointF mTargetVector; @@ -102,6 +102,7 @@ protected void onStart() { /** * {@inheritDoc} + * @noinspection NullableProblems */ @Override @SuppressLint("UnknownNullness") // b/240775049: Cannot annotate properly @@ -124,6 +125,7 @@ protected void afterTargetFound() { /** * {@inheritDoc} + * @noinspection NullableProblems */ @Override @SuppressLint("UnknownNullness") // b/240775049: Cannot annotate properly @@ -135,7 +137,6 @@ protected void onSeekTargetStep(int dx, int dy, RecyclerView.State state, Action stop(); return; } - //noinspection PointlessBooleanExpression if (DEBUG && mTargetVector != null && (mTargetVector.x * dx < 0 || mTargetVector.y * dy < 0)) { throw new IllegalStateException("Scroll happened in the opposite direction" diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/GramophoneExtensions.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/GramophoneExtensions.kt index 2bf4d5b68..70d6d0a7b 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/GramophoneExtensions.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/GramophoneExtensions.kt @@ -178,7 +178,6 @@ fun MediaController.getTimer(): Int? = else null } -fun MediaController.hasTimer(): Boolean = getTimer() != null fun MediaController.setTimer(value: Int) { sendCustomCommand( SessionCommand(SERVICE_SET_TIMER, Bundle.EMPTY).apply { diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/GramophonePlaybackService.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/GramophonePlaybackService.kt index 2b35b19cc..df25d196b 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/GramophonePlaybackService.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/GramophonePlaybackService.kt @@ -60,6 +60,7 @@ import androidx.media3.session.MediaSession import androidx.media3.session.MediaSession.MediaItemsWithStartPosition import androidx.media3.session.MediaSessionService import androidx.media3.session.SessionCommand +import androidx.media3.session.SessionError import androidx.media3.session.SessionResult import androidx.preference.PreferenceManager import coil3.BitmapImage @@ -482,7 +483,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis } else -> { - SessionResult(SessionResult.RESULT_ERROR_BAD_VALUE) + SessionResult(SessionError.ERROR_BAD_VALUE) } }) } diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/CalculationUtils.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/CalculationUtils.kt index 3841292b1..e9d6c4e6e 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/CalculationUtils.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/CalculationUtils.kt @@ -70,10 +70,6 @@ object CalculationUtils { return color and 0x00ffffff or (alpha shl 24) } - private fun constrain(amount: Float, low: Float, high: Float): Float { - return if (amount < low) low else amount.coerceAtMost(high) - } - @Suppress("NOTHING_TO_INLINE") inline fun lerp(start: Float, stop: Float, amount: Float): Float { return start + (stop - start) * amount @@ -92,7 +88,7 @@ object CalculationUtils { /** Returns the single argument constrained between [0.0, 1.0]. */ private fun saturate(value: Float): Float { - return constrain(value, 0.0f, 1.0f) + return value.coerceAtLeast(0f).coerceAtMost(1f) } /** Returns the saturated (constrained between [0, 1]) result of [.lerpInv]. */ diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LifecycleCallbackList.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LifecycleCallbackList.kt index a57f43456..10db7fae5 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LifecycleCallbackList.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LifecycleCallbackList.kt @@ -6,9 +6,6 @@ import androidx.lifecycle.LifecycleOwner import coil3.request.Disposable interface LifecycleCallbackList { - fun addCallbackForever(callback: T) { - addCallback(null, callback) - } fun addCallback(lifecycle: Lifecycle?, callback: T) fun removeCallback(callback: T) } diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt index 95e987a2d..1078a7779 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt @@ -124,12 +124,11 @@ object LrcUtils { } // read as single line *IF* this is a single line lyric - if (nextSync == "[$firstSync]") { - lyricLine = line.substring(sequence.last().range.last + 1) + lyricLine = if (nextSync == "[$firstSync]") { + line.substring(sequence.last().range.last + 1) .let { if (trim) it.trim() else it } - } - else { - lyricLine = lrcContent.substring(startIndex + 1, endIndex) + } else { + lrcContent.substring(startIndex + 1, endIndex) .let { if (trim) it.trim() else it } } } diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneExtractorsFactory.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneExtractorsFactory.kt index 72cc6c4b2..fb66106e2 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneExtractorsFactory.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneExtractorsFactory.kt @@ -22,6 +22,7 @@ import java.lang.reflect.Constructor import java.lang.reflect.InvocationTargetException import java.util.concurrent.atomic.AtomicBoolean +@Suppress("unused") @OptIn(UnstableApi::class) class GramophoneExtractorsFactory : ExtractorsFactory { companion object { diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneMediaSourceFactory.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneMediaSourceFactory.kt index 29350103b..d79a8dec3 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneMediaSourceFactory.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneMediaSourceFactory.kt @@ -36,6 +36,7 @@ import com.google.common.primitives.Ints import java.io.IOException @OptIn(UnstableApi::class) +@Suppress("unused") class GramophoneMediaSourceFactory( private var dataSourceFactory: DataSource.Factory, extractorsFactory: ExtractorsFactory diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt index d164464d5..aa861a624 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt @@ -97,7 +97,7 @@ abstract class BaseAdapter( override val concatAdapter by lazy { ConcatAdapter(decorAdapter, this) } override val itemHeightHelper by lazy { DefaultItemHeightHelper.concatItemHeightHelper(decorAdapter, {1}, this) } - protected val handler = Handler(Looper.getMainLooper()) + private val handler = Handler(Looper.getMainLooper()) private var bgHandlerThread: HandlerThread? = null private var bgHandler: Handler? = null private val rawList = ArrayList(liveData?.value?.size ?: 0) diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt index edea0ae07..4eb5f72d6 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt @@ -35,7 +35,9 @@ import androidx.core.view.WindowInsetsCompat import androidx.media3.common.C import androidx.media3.common.MediaItem import androidx.media3.common.Player +import androidx.media3.common.util.UnstableApi import androidx.media3.session.MediaController +import androidx.media3.session.SessionError import androidx.media3.session.SessionResult import androidx.preference.PreferenceManager import androidx.recyclerview.widget.ItemTouchHelper @@ -98,13 +100,14 @@ import java.util.LinkedList import kotlin.math.min @SuppressLint("NotifyDataSetChanged") -class FullBottomSheet(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : +@androidx.annotation.OptIn(UnstableApi::class) +class FullBottomSheet + (context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : ConstraintLayout(context, attrs, defStyleAttr, defStyleRes), Player.Listener, SharedPreferences.OnSharedPreferenceChangeListener { constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : this(context, attrs, defStyleAttr, 0) constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) - constructor(context: Context) : this(context, null) private val activity get() = context as MainActivity @@ -286,7 +289,7 @@ class FullBottomSheet(context: Context, attrs: AttributeSet?, defStyleAttr: Int, } else -> { - return@addCallback Futures.immediateFuture(SessionResult(SessionResult.RESULT_ERROR_NOT_SUPPORTED)) + return@addCallback Futures.immediateFuture(SessionResult(SessionError.ERROR_NOT_SUPPORTED)) } } return@addCallback Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS)) diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/NowPlayingDrawable.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/NowPlayingDrawable.kt index 8ef755404..e011a753a 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/ui/components/NowPlayingDrawable.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/ui/components/NowPlayingDrawable.kt @@ -1,3 +1,5 @@ +@file:Suppress("SameReturnValue") + package org.akanework.gramophone.ui.components import android.content.res.ColorStateList diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/GeneralSubFragment.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/GeneralSubFragment.kt index 92d612971..f56c49d6e 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/GeneralSubFragment.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/GeneralSubFragment.kt @@ -140,8 +140,8 @@ class GeneralSubFragment : BaseFragment(true) { itemList, true, helper, - true, - true + ownsView = true, + isSubFragment = true ) recyclerView.enableEdgeToEdgePaddingListener() diff --git a/app/src/main/res/drawable/ic_alarm_off.xml b/app/src/main/res/drawable/ic_alarm_off.xml index a724fc0a8..716601a83 100644 --- a/app/src/main/res/drawable/ic_alarm_off.xml +++ b/app/src/main/res/drawable/ic_alarm_off.xml @@ -1,10 +1,12 @@ + android:pathData="M798,690L738,630Q749,603 754.5,577.5Q760,552 760,524Q760,408 678,324Q596,240 480,240Q452,240 426,244.5Q400,249 374,260L314,200Q352,180 393.5,170Q435,160 480,160Q554,160 619.5,188Q685,216 734,265.5Q783,315 811.5,381Q840,447 840,524Q840,569 829,610.5Q818,652 798,690ZM850,320L680,150L736,94L906,264L850,320ZM820,936L694,810Q649,843 594.5,861.5Q540,880 480,880Q406,880 340.5,852Q275,824 226,776Q177,728 148.5,663Q120,598 120,524Q120,462 138.5,407.5Q157,353 192,308L158,274L110,322L54,266L102,218L28,144L84,88L876,880L820,936ZM480,801Q522,801 562,788Q602,775 636,752L248,366Q225,401 212.5,441.5Q200,482 200,524Q200,640 282,720.5Q364,801 480,801ZM442,559Q442,559 442,559Q442,559 442,559Q442,559 442,559Q442,559 442,559L442,559Q442,559 442,559Q442,559 442,559ZM556,445L556,445Q556,445 556,445Q556,445 556,445Q556,445 556,445Q556,445 556,445Q556,445 556,445Q556,445 556,445Z" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/ic_draw_abstract.xml b/app/src/main/res/drawable/ic_draw_abstract.xml index 68c09392d..08cd7fd8c 100644 --- a/app/src/main/res/drawable/ic_draw_abstract.xml +++ b/app/src/main/res/drawable/ic_draw_abstract.xml @@ -1,10 +1,12 @@ + android:pathData="M120,840Q112,840 104.5,836.5Q97,833 92,828Q80,817 80,800.5Q80,784 91,772Q110,752 136.5,748Q163,744 190,749Q198,751 205,753Q212,755 217,750Q223,744 221.5,735Q220,726 218,718Q214,691 217,664.5Q220,638 239,618Q258,598 284.5,594Q311,590 338,595Q346,597 353.5,599Q361,601 366,596Q372,590 370,581Q368,572 366,564Q362,537 365,510.5Q368,484 387,464Q406,444 432.5,440Q459,436 486,441Q494,443 501.5,445Q509,447 514,442Q520,436 518,427Q516,418 514,410Q510,383 513.5,356.5Q517,330 536,310Q555,290 581.5,286Q608,282 635,287Q643,289 650.5,291Q658,293 663,288Q669,282 667,273Q665,264 663,256Q659,229 662.5,202.5Q666,176 685,156Q704,136 730.5,132Q757,128 784,133Q792,135 799.5,136.5Q807,138 812,133Q823,121 839.5,121Q856,121 868,132Q880,143 880,159.5Q880,176 869,188Q850,208 823.5,212.5Q797,217 770,212Q762,210 754.5,208Q747,206 742,211Q736,217 738,226Q740,235 742,243Q746,270 742.5,296.5Q739,323 720,343Q701,363 674.5,367Q648,371 621,366Q613,364 606,362Q599,360 594,365Q588,371 589.5,380Q591,389 593,397Q597,424 594,450.5Q591,477 572,497Q553,516 526.5,520.5Q500,525 473,520Q465,518 458,516.5Q451,515 446,520Q440,526 441.5,534.5Q443,543 445,551Q449,578 446,604.5Q443,631 424,651Q405,671 378,675Q351,679 324,674Q316,672 309,670.5Q302,669 297,674Q291,680 293,688.5Q295,697 297,705Q301,732 297.5,758.5Q294,785 275,805Q256,825 229.5,829Q203,833 176,828Q168,826 161,824.5Q154,823 149,828Q143,834 135.5,837Q128,840 120,840ZM240,440Q157,440 98.5,381.5Q40,323 40,240Q40,156 98.5,98Q157,40 240,40Q324,40 382,98Q440,156 440,240Q440,323 382,381.5Q324,440 240,440ZM240,360Q291,360 325.5,325Q360,290 360,240Q360,189 325.5,154.5Q291,120 240,120Q190,120 155,154.5Q120,189 120,240Q120,290 155,325Q190,360 240,360ZM640,920Q607,920 583.5,896.5Q560,873 560,840L560,640Q560,607 583.5,583.5Q607,560 640,560L840,560Q873,560 896.5,583.5Q920,607 920,640L920,840Q920,873 896.5,896.5Q873,920 840,920L640,920ZM640,840L840,840Q840,840 840,840Q840,840 840,840L840,640Q840,640 840,640Q840,640 840,640L640,640Q640,640 640,640Q640,640 640,640L640,840Q640,840 640,840Q640,840 640,840ZM740,740L740,740Q740,740 740,740Q740,740 740,740L740,740Q740,740 740,740Q740,740 740,740L740,740Q740,740 740,740Q740,740 740,740L740,740Q740,740 740,740Q740,740 740,740ZM240,240Q240,240 240,240Q240,240 240,240Q240,240 240,240Q240,240 240,240Q240,240 240,240Q240,240 240,240Q240,240 240,240Q240,240 240,240Z" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/ic_favorite.xml b/app/src/main/res/drawable/ic_favorite.xml index 267f32c18..dbc53fcc3 100644 --- a/app/src/main/res/drawable/ic_favorite.xml +++ b/app/src/main/res/drawable/ic_favorite.xml @@ -1,10 +1,12 @@ + android:pathData="M480,840L422,788Q321,697 255,631Q189,565 150,512.5Q111,460 95.5,416Q80,372 80,326Q80,232 143,169Q206,106 300,106Q352,106 399,128Q446,150 480,190Q514,150 561,128Q608,106 660,106Q754,106 817,169Q880,232 880,326Q880,372 864.5,416Q849,460 810,512.5Q771,565 705,631Q639,697 538,788L480,840ZM480,732Q576,646 638,584.5Q700,523 736,477.5Q772,432 786,396.5Q800,361 800,326Q800,266 760,226Q720,186 660,186Q613,186 573,212.5Q533,239 518,280L518,280L442,280L442,280Q427,239 387,212.5Q347,186 300,186Q240,186 200,226Q160,266 160,326Q160,361 174,396.5Q188,432 224,477.5Q260,523 322,584.5Q384,646 480,732ZM480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459L480,459L480,459L480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Z" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/ic_manufacturing.xml b/app/src/main/res/drawable/ic_manufacturing.xml index 72059ed47..e90979522 100644 --- a/app/src/main/res/drawable/ic_manufacturing.xml +++ b/app/src/main/res/drawable/ic_manufacturing.xml @@ -1,10 +1,12 @@ + android:pathData="M234,480L222,420Q210,415 199.5,409.5Q189,404 178,396L120,414L80,346L126,306Q124,293 124,280Q124,267 126,254L80,214L120,146L178,164Q189,156 199.5,150.5Q210,145 222,140L234,80L314,80L326,140Q338,145 348.5,150.5Q359,156 370,164L428,146L468,214L422,254Q424,267 424,280Q424,293 422,306L468,346L428,414L370,396Q359,404 348.5,409.5Q338,415 326,420L314,480L234,480ZM274,360Q307,360 330.5,336.5Q354,313 354,280Q354,247 330.5,223.5Q307,200 274,200Q241,200 217.5,223.5Q194,247 194,280Q194,313 217.5,336.5Q241,360 274,360ZM592,920L574,836Q557,830 542.5,821.5Q528,813 514,802L434,828L378,732L442,676Q440,658 440,640Q440,622 442,604L378,548L434,452L514,478Q528,467 542.5,458.5Q557,450 574,444L592,360L704,360L722,444Q739,450 753.5,458.5Q768,467 782,478L862,452L918,548L854,604Q856,622 856,640Q856,658 854,676L918,732L862,828L782,802Q768,813 753.5,821.5Q739,830 722,836L704,920L592,920ZM648,760Q698,760 733,725Q768,690 768,640Q768,590 733,555Q698,520 648,520Q598,520 563,555Q528,590 528,640Q528,690 563,725Q598,760 648,760Z" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/ic_palette.xml b/app/src/main/res/drawable/ic_palette.xml index 22b7cce27..ec77411f2 100644 --- a/app/src/main/res/drawable/ic_palette.xml +++ b/app/src/main/res/drawable/ic_palette.xml @@ -1,10 +1,12 @@ + android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 112.5,324Q145,251 200.5,197Q256,143 330,111.5Q404,80 488,80Q568,80 639,107.5Q710,135 763.5,183.5Q817,232 848.5,298.5Q880,365 880,442Q880,557 810,618.5Q740,680 640,680L566,680Q557,680 553.5,685Q550,690 550,696Q550,708 565,730.5Q580,753 580,782Q580,832 552.5,856Q525,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM260,520Q286,520 303,503Q320,486 320,460Q320,434 303,417Q286,400 260,400Q234,400 217,417Q200,434 200,460Q200,486 217,503Q234,520 260,520ZM380,360Q406,360 423,343Q440,326 440,300Q440,274 423,257Q406,240 380,240Q354,240 337,257Q320,274 320,300Q320,326 337,343Q354,360 380,360ZM580,360Q606,360 623,343Q640,326 640,300Q640,274 623,257Q606,240 580,240Q554,240 537,257Q520,274 520,300Q520,326 537,343Q554,360 580,360ZM700,520Q726,520 743,503Q760,486 760,460Q760,434 743,417Q726,400 700,400Q674,400 657,417Q640,434 640,460Q640,486 657,503Q674,520 700,520ZM480,800Q489,800 494.5,795Q500,790 500,782Q500,768 485,749Q470,730 470,692Q470,650 499,625Q528,600 570,600L640,600Q706,600 753,561.5Q800,523 800,442Q800,321 707.5,240.5Q615,160 488,160Q352,160 256,253Q160,346 160,480Q160,613 253.5,706.5Q347,800 480,800Z" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 129765c4f..c6abc6760 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,8 +2,7 @@ diff --git a/app/src/main/res/layout/preference_dropdown_md.xml b/app/src/main/res/layout/preference_dropdown_md.xml index 61318c21d..96607599a 100644 --- a/app/src/main/res/layout/preference_dropdown_md.xml +++ b/app/src/main/res/layout/preference_dropdown_md.xml @@ -61,8 +61,7 @@ tools:text="Summary" /> diff --git a/app/src/main/res/layout/preference_seekbar.xml b/app/src/main/res/layout/preference_seekbar.xml index be77782cd..95e5d1577 100644 --- a/app/src/main/res/layout/preference_seekbar.xml +++ b/app/src/main/res/layout/preference_seekbar.xml @@ -85,8 +85,7 @@ tools:text="50" /> - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index ef49c9917..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index 7343eec2eb60847d26aebcb26f0ce3b2033ce31d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2632 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 814035a54635ca1f314052371eced1e4740ee0dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1660 zcmV-?27~!hNk&F=1^@t8MM6+kP&iCy1^@srFTe{B)rLSIIe+dQB4PqsD!6DRS=+zV z&2JO6HMlOI^G-ADDtzePxx0Hia(8!kxpBAuA7(`05A5Jqw*9v@OO>{58b!x?&!Y)w{4W{n6ZyQU6nwTz?2|D)EGuX2TiI3ssxUuD!mlg zA6@Bxv8)MQ4{1q zWPH_F=_XewA&KAj&AvWw4{1OM1Rw=?+wXHHen^BgiT3nWDjoTlbAM@;_z1gGxSI?q z1VWY2CL{m=GC-L7&P5_6viXF2n;i5@51ywD;riVxBSn*V5s@~%`+o1*ziw__-F~$h0r{busmoBN4Rw%^E&8R+jLI=+%pEV(oYH+ftC*$2H% zP8A^mNzh+D_e)HZ$mJ8RI>i_bF+;=Ts#u*8T$Bj_cAD$cNhcW)fU^e?)zzc`c_2MS zpBpN~_mv&y-N)~*2?!*_x@>c#AuB}`zzK3>dq2^s>%S%E)nNHZFVWlhR1xrMX>)VZ zEj-RhVM5Pz3V|aY4TW5a)x3>M1;eztyZhb}(+;kjWHG>0ySmnxWWog?CiN}zZ6#Xi zoKQtP^GCnH+~@&Cz(?NN|6+b;@ppQ+f3K=$$)(R7=hBqqqb^N?leFjUqK66MX_y!C zNdSkvH_|re`Xm9sSKhrJsT)tCEoSaQ6r+0lkBmhCU;ccJX zW&J#fTpnT1nHmVB>D=kHx5C*xpqei5rY)_p3=!Om;l+h_!arkZ-BiOd^KMiwx#YP$oaeq$& z89A9;E@9ibY9MgGGzUh9VJbyBIdE#xv+pIBA{aX0DevAtzIb%t(G(906IIao5cGkw zwS|Ooot(K+lXUL$K$p8J>G;8;GnKVlb~QoJzB(A+}(XEJ` z1A{D^_+3diZWlQOiBMVR3O@nct*f*uuHP=ke+?kxNLPFBf%C z{`bH3eH&R=0U-;a4Pl+|5whZJ!;#a%^(*hu6i3!|^6TMC_;`wMTzT*Qyoa#qsl61$ z)IiPkT;dQ)JvE;OgwvS*{l*^rUBBZ~O^+8Z>F1c#>AfA~>v%1MJcMGERU3b;1ktO1 G5(EH{(~;r2L`(pqIh+kE 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 Sh04<@tj{4QRRm diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 83358e1032975b19d9ec8ac7bc9e16b41286d8ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8198 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Па альбоме Альбомы Файл - Абноўлены % 1$s трэкі + Абноўлены %1$s трэкі Цёмны Па імені Сачыце за абнаўленнямі ў нашым канале! diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index be73507c4..f6cf3aa9d 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -23,7 +23,6 @@ #C3C6CF #8D9199 #43474E - #000000 #E1E2E8 #2E3035 #38608F diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1bce7ec4d..e07dd282b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -23,7 +23,6 @@ #43474E #73777F #C3C6CF - #000000 #2E3035 #EFF0F7 #A2C9FE @@ -46,98 +45,4 @@ #ECEEF4 #E7E8EE #E1E2E8 - #174471 - #FFFFFF - #4F77A6 - #FFFFFF - #384454 - #FFFFFF - #697587 - #FFFFFF - #4F3B5B - #FFFFFF - #836C8F - #FFFFFF - #8C0009 - #FFFFFF - #DA342E - #FFFFFF - #F8F9FF - #191C20 - #F8F9FF - #191C20 - #DFE2EB - #3F434A - #5B5F67 - #777B83 - #000000 - #2E3035 - #EFF0F7 - #A2C9FE - #4F77A6 - #FFFFFF - #355E8C - #FFFFFF - #697587 - #FFFFFF - #515D6E - #FFFFFF - #836C8F - #FFFFFF - #695475 - #FFFFFF - #D8DAE0 - #F8F9FF - #FFFFFF - #F2F3FA - #ECEEF4 - #E7E8EE - #E1E2E8 - #002342 - #FFFFFF - #174471 - #FFFFFF - #172332 - #FFFFFF - #384454 - #FFFFFF - #2D1B38 - #FFFFFF - #4F3B5B - #FFFFFF - #4E0002 - #FFFFFF - #8C0009 - #FFFFFF - #F8F9FF - #191C20 - #F8F9FF - #000000 - #DFE2EB - #20242B - #3F434A - #3F434A - #000000 - #2E3035 - #FFFFFF - #E2EDFF - #174471 - #FFFFFF - #002E54 - #FFFFFF - #384454 - #FFFFFF - #222D3D - #FFFFFF - #4F3B5B - #FFFFFF - #382543 - #FFFFFF - #D8DAE0 - #F8F9FF - #FFFFFF - #F2F3FA - #ECEEF4 - #E7E8EE - #E1E2E8 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index efde4d301..27f298a7c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ - + 27dp 2.7dp 8dp @@ -9,7 +9,7 @@ 24dp 12dp - 24dp + 24dp 48dp 75dp 78dp diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml index eef1c7a5c..d0ec952c5 100644 --- a/app/src/main/res/values/drawables.xml +++ b/app/src/main/res/values/drawables.xml @@ -1,19 +1,16 @@ - + @drawable/ic_album @drawable/ic_groups @drawable/ic_genres - @drawable/ic_settings @drawable/ic_schedule @drawable/ic_media_pause_anim @drawable/ic_media_play_anim - @drawable/ic_filter_alt - @drawable/ic_folder - @drawable/ic_play_arrow_filled - @drawable/ic_pause_filled - @drawable/ic_skip_previous_filled - @drawable/ic_skip_next_filled + @drawable/ic_play_arrow_filled + @drawable/ic_pause_filled + @drawable/ic_skip_previous_filled + @drawable/ic_skip_next_filled \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 375400c6a..11e3a89fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,8 +2,7 @@ Search - Shuffle - Settings + Settings Refresh Songs Albums @@ -35,9 +34,7 @@ Name Artist Album - Categories - Operations - Dismiss + Dismiss Unknown genre Unknown year Refreshed %1$s songs @@ -87,8 +84,7 @@ Check our channel for updates! Default progress bar Enable material styled progress bar - About - Open-sourced under GPL-3.0\nCopyright © 2024 Akane Foundation + Open-sourced under GPL-3.0\nCopyright © 2024 Akane Foundation Favourite Gramophone @@ -101,8 +97,7 @@ Package type No lyric found Disc number - Disc - Unknown title + Unknown title Filesystem Mime type Duration @@ -163,11 +158,8 @@ Album cover Edit Lyrics - Delete Deleting song failed Already deleting another song - Yes - No Enhanced album cover loading Support high quality song covers and allow album and song cover to differ (requires photos access) diff --git a/app/src/main/res/values/theme_overlays.xml b/app/src/main/res/values/theme_overlays.xml index e81f18fb5..7abc06d3b 100644 --- a/app/src/main/res/values/theme_overlays.xml +++ b/app/src/main/res/values/theme_overlays.xml @@ -1,98 +1 @@ - - - - + diff --git a/app/src/userdebug/res/values/strings.xml b/app/src/userdebug/res/values/strings.xml index 73862c416..6a6931e99 100644 --- a/app/src/userdebug/res/values/strings.xml +++ b/app/src/userdebug/res/values/strings.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/baselineprofile/build.gradle.kts b/baselineprofile/build.gradle.kts index 9e3478727..24b981414 100644 --- a/baselineprofile/build.gradle.kts +++ b/baselineprofile/build.gradle.kts @@ -51,8 +51,8 @@ baselineProfile { } dependencies { - implementation("androidx.test.ext:junit:1.1.5") - implementation("androidx.test.espresso:espresso-core:3.5.1") + implementation("androidx.test.ext:junit:1.2.1") + implementation("androidx.test.espresso:espresso-core:3.6.1") implementation("androidx.test.uiautomator:uiautomator:2.3.0") implementation("androidx.benchmark:benchmark-macro-junit4:1.2.4") } diff --git a/readme.md b/readme.md index 418a4a446..2258729c2 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,7 @@ A sane music player built with media3 and material design library that is follow ## Screenshots | ![Screenshot 1](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_1.jpg) | ![Screenshot 2](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_2.jpg) | ![Screenshot 3](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_3.jpg) | -|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------| +|------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------| | ![Screenshot 4](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_4.jpg) | ![Screenshot 5](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_5.jpg) | ![Screenshot 6](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_6.jpg) | | ![Screenshot 7](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_7.jpg) | ![Screenshot 8](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_8.jpg) | ![Screenshot 9](https://raw.githubusercontent.com/AkaneTan/Gramophone/beta/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_9.jpg) | diff --git a/readme_ja.md b/readme_ja.md index 5d19c9a94..396f2f09f 100644 --- a/readme_ja.md +++ b/readme_ja.md @@ -20,7 +20,7 @@ ## スクリーンショット | ![スクリーンショット 1](https://github.com/AkaneTan/Gramophone/raw/beta/resources/screenshot_1.png) | ![スクリーンショット 2](https://github.com/AkaneTan/Gramophone/raw/beta/resources/screenshot_2.png) | ![スクリーンショット 3](https://github.com/AkaneTan/Gramophone/raw/beta/resources/screenshot_3.png) | -|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------| +|--------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------| | ![スクリーンショット 4](https://github.com/AkaneTan/Gramophone/raw/beta/resources/screenshot_4.png) | ![スクリーンショット 5](https://github.com/AkaneTan/Gramophone/raw/beta/resources/screenshot_5.png) | ![スクリーンショット 6](https://github.com/AkaneTan/Gramophone/raw/beta/resources/screenshot_6.png) | ## インストール