diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fe3e7e0a..ad2294b7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ buttons - Fixed issue where the transition would be wrong when navigating out of the detail views after a rotation - Fixed issue where widget resizing would be far different than intended +- Fixed broken playback layout on small portrait screens #### What's Changed - ReplayGain can now no longer be disabled. Remove ReplayGain tags from diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 7c8201051..200b25bd5 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,7 +20,8 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --dontobfuscate - -keep class org.oxycblt.auxio.AuxioApp --keep class org.oxycblt.auxio.settings.SettingsListFragment \ No newline at end of file +-keep class org.oxycblt.auxio.settings.SettingsListFragment + +# Free software does not obsfucate. Also it's easier to debug stack traces. +-dontobfuscate \ No newline at end of file diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index fbb081c44..6eb998892 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -38,7 +38,7 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat /** * The single [AppCompatActivity] for Auxio. * - * TODO: Add error screens. + * TODO: Add error screens * * TODO: Custom language support * @@ -113,7 +113,7 @@ class MainActivity : AppCompatActivity() { val settings = Settings(this) // Disable theme customization above Android 12, as it's far enough in as a version to - // the point where most phones should have an automatic option for light/dark theming. + // the point where most phones should have an option for light/dark theming. if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { AppCompatDelegate.setDefaultNightMode(settings.theme) } diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index 1b2be3d98..fdad06639 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -97,8 +97,7 @@ class MainFragment : } } } else { - // Dual-pane mode, color/pad the queue sheet manually. Note that we do not round - // corners, as the queue sheet cannot be dragged in dual-pane mode. + // Dual-pane mode, color/pad the queue sheet manually. binding.queueSheet.apply { background = MaterialShapeDrawable.createWithElevationOverlay(context).apply { @@ -310,8 +309,6 @@ class MainFragment : /** * A back press callback that handles how to respond to backwards navigation in the detail * fragments and the playback panel. - * - * TODO: Migrate to new predictive API */ private inner class DynamicBackPressedCallback : OnBackPressedCallback(false) { override fun handleOnBackPressed() { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt index 058be34e5..9c459c91e 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt @@ -50,9 +50,6 @@ class PlaybackPanelFragment : MenuFragment(), StyledSeekBar.Callback, Toolbar.OnMenuItemClickListener { - private var animator: ValueAnimator? = null - private var radius = 0.3f - // AudioEffect expects you to use startActivityForResult with the panel intent. Use // the contract analogue for this since there is no built-in contract for AudioEffect. private val activityLauncher by lifecycleObject { diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt index a99bccfef..6261ad189 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt @@ -116,9 +116,7 @@ class WidgetProvider : AppWidgetProvider() { private fun requestUpdate(context: Context) { logD("Sending update intent to PlaybackService") - val intent = Intent(ACTION_WIDGET_UPDATE).addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY) - context.sendBroadcast(intent) } @@ -157,7 +155,8 @@ class WidgetProvider : AppWidgetProvider() { logD("Assuming true widget dimens are ${width}x$height") // Find the layout with the greatest area that fits entirely within - // the widget. This is what we will use. + // the widget. This is what we will use. Fall back to the smallest layout + // otherwise. val candidates = mutableListOf() for (size in views.keys) { diff --git a/app/src/main/res/drawable-nodpi/ui_widget_preview.png b/app/src/main/res/drawable-nodpi/ui_widget_preview.png index 396fc7dba..a46297336 100644 Binary files a/app/src/main/res/drawable-nodpi/ui_widget_preview.png and b/app/src/main/res/drawable-nodpi/ui_widget_preview.png differ diff --git a/app/src/main/res/drawable/ui_remote_fab_container_paused.xml b/app/src/main/res/drawable/ui_remote_fab_container_paused.xml index 599b2b7ca..da659fc04 100644 --- a/app/src/main/res/drawable/ui_remote_fab_container_paused.xml +++ b/app/src/main/res/drawable/ui_remote_fab_container_paused.xml @@ -1,20 +1,6 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ui_remote_fab_container_playing.xml b/app/src/main/res/drawable/ui_remote_fab_container_playing.xml index ceabcf551..f5e00b30c 100644 --- a/app/src/main/res/drawable/ui_remote_fab_container_playing.xml +++ b/app/src/main/res/drawable/ui_remote_fab_container_playing.xml @@ -1,20 +1,5 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-h400dp/fragment_playback_panel.xml b/app/src/main/res/layout-h480dp/fragment_playback_panel.xml similarity index 100% rename from app/src/main/res/layout-h400dp/fragment_playback_panel.xml rename to app/src/main/res/layout-h480dp/fragment_playback_panel.xml