From 2ff7d93263b53d0cf96b489f4379d3e552f50c70 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sun, 13 Mar 2022 18:56:24 -0600 Subject: [PATCH] all: view cleanup Do even more cleanup regarding views. --- CHANGELOG.md | 3 +++ .../java/org/oxycblt/auxio/MainActivity.kt | 4 +++- .../java/org/oxycblt/auxio/MainFragment.kt | 5 +++-- .../org/oxycblt/auxio/home/HomeFragment.kt | 6 ++++-- .../home/fastscroll/FastScrollRecyclerView.kt | 14 +++----------- .../auxio/home/list/HomeListFragment.kt | 1 - .../oxycblt/auxio/home/tabs/TabDragCallback.kt | 6 ++++-- .../java/org/oxycblt/auxio/music/Models.kt | 6 ++++-- .../java/org/oxycblt/auxio/music/MusicStore.kt | 9 ++++++--- .../auxio/music/excluded/ExcludedViewModel.kt | 4 +++- .../oxycblt/auxio/playback/PlaybackFragment.kt | 4 +++- .../oxycblt/auxio/playback/PlaybackLayout.kt | 5 +++-- .../oxycblt/auxio/playback/PlaybackSeekBar.kt | 5 +++-- .../auxio/playback/system/AudioReactor.kt | 10 +++++++--- .../auxio/playback/system/PlaybackService.kt | 7 ++++--- .../java/org/oxycblt/auxio/ui/ActionMenu.kt | 6 ++++-- .../org/oxycblt/auxio/ui/EdgeRecyclerView.kt | 18 ++++++++++++++++-- .../org/oxycblt/auxio/ui/LifecycleDialog.kt | 2 -- .../java/org/oxycblt/auxio/ui/ViewHolders.kt | 1 - app/src/main/res/drawable/ic_song.xml | 6 +++--- app/src/main/res/drawable/ui_indicator.xml | 3 ++- .../main/res/layout-land/fragment_playback.xml | 3 +-- .../layout-sw600dp-land/fragment_playback.xml | 3 +-- .../res/layout-sw600dp/fragment_playback.xml | 3 +-- .../res/layout-sw640dp/fragment_home_list.xml | 15 --------------- .../layout-w600dp-land/fragment_playback.xml | 3 +-- app/src/main/res/layout/fragment_detail.xml | 1 - app/src/main/res/layout/fragment_home_list.xml | 3 +-- app/src/main/res/layout/fragment_playback.xml | 3 +-- app/src/main/res/layout/fragment_queue.xml | 1 - app/src/main/res/layout/fragment_search.xml | 1 - app/src/main/res/layout/fragment_settings.xml | 1 - app/src/main/res/layout/item_song.xml | 4 +++- app/src/main/res/menu/menu_detail_sort.xml | 3 ++- app/src/main/res/menu/menu_home.xml | 3 ++- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-night/colors.xml | 4 ++-- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sw640dp/styles_ui.xml | 5 +++++ app/src/main/res/values-v31/styles_android.xml | 3 ++- app/src/main/res/values-v31/styles_core.xml | 3 ++- app/src/main/res/values-zh-rCN/strings.xml | 6 +++--- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/styles_android.xml | 6 ++++-- app/src/main/res/values/styles_ui.xml | 6 +++++- app/src/main/res/values/themes.xml | 2 +- app/src/main/res/values/themes_black.xml | 3 ++- app/src/main/res/values/typography.xml | 4 ++-- 48 files changed, 122 insertions(+), 98 deletions(-) delete mode 100644 app/src/main/res/layout-sw640dp/fragment_home_list.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index febae9e63..4760c1de9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## dev [v2.2.3, v2.3.0, or v3.0.0] +#### What's Fixed +- Fixed incorrect ellipsizing on song items + #### Dev/Meta - Switched to spotless and ktfmt instead of ktlint diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index 9c294b41d..473ea97de 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -38,7 +38,9 @@ import org.oxycblt.auxio.util.replaceSystemBarInsetsCompat import org.oxycblt.auxio.util.systemBarInsetsCompat /** - * The single [AppCompatActivity] for Auxio. TODO: Add a new view for crashes with a stack trace + * The single [AppCompatActivity] for Auxio. + * + * TODO: Add a new view for crashes with a stack trace * TODO: Custom language support TODO: Rework menus [perhaps add multi-select] */ class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index 1594a94c5..7ff7e5f7a 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -40,8 +40,9 @@ import org.oxycblt.auxio.util.logW /** * A wrapper around the home fragment that shows the playback fragment and controls the more * high-level navigation features. - * @author OxygenCobalt TODO: Add a new view with a stack trace whenever the music loading process - * fails. + * @author OxygenCobalt + * + * TODO: Add a new view with a stack trace whenever the music loading process fails. */ class MainFragment : Fragment() { private val playbackModel: PlaybackViewModel by activityViewModels() diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt index 049d46892..021e60cd8 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt @@ -53,8 +53,10 @@ import org.oxycblt.auxio.util.logTraceOrThrow /** * The main "Launching Point" fragment of Auxio, allowing navigation to the detail views for each * respective item. - * @author OxygenCobalt TODO: Make tabs invisible when there is only one TODO: Add duration and song - * count sorts + * @author OxygenCobalt + * + * TODO: Make tabs invisible when there is only one + * TODO: Add duration and song count sorts */ class HomeFragment : Fragment() { private val playbackModel: PlaybackViewModel by activityViewModels() diff --git a/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt b/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt index 9a6002348..3851aeca0 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt @@ -35,13 +35,13 @@ import androidx.annotation.AttrRes import androidx.appcompat.widget.AppCompatTextView import androidx.core.math.MathUtils import androidx.core.view.isInvisible -import androidx.core.view.updatePadding import androidx.core.widget.TextViewCompat import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import kotlin.math.abs import org.oxycblt.auxio.R +import org.oxycblt.auxio.ui.EdgeRecyclerView import org.oxycblt.auxio.util.canScroll import org.oxycblt.auxio.util.getAttrColorSafe import org.oxycblt.auxio.util.getDimenOffsetSafe @@ -76,7 +76,7 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat class FastScrollRecyclerView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr: Int = 0) : - RecyclerView(context, attrs, defStyleAttr) { + EdgeRecyclerView(context, attrs, defStyleAttr) { /** Callback to provide a string to be shown on the popup when an item is passed */ var popupProvider: ((Int) -> String)? = null @@ -118,7 +118,6 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr } } - private val initialPadding = Rect(paddingLeft, paddingTop, paddingRight, paddingBottom) private val scrollerPadding = Rect(0, 0, 0, 0) init { @@ -316,16 +315,9 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr } override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { + super.onApplyWindowInsets(insets) val bars = insets.systemBarInsetsCompat - - updatePadding( - initialPadding.left, - initialPadding.top, - initialPadding.right, - initialPadding.bottom + bars.bottom) - scrollerPadding.bottom = bars.bottom - return insets } diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/HomeListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/HomeListFragment.kt index 52749d9bf..887a75886 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/HomeListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/HomeListFragment.kt @@ -56,7 +56,6 @@ abstract class HomeListFragment : Fragment() { onDragListener = { dragging -> homeModel.updateFastScrolling(dragging) } } - // Make sure that this RecyclerView has data before startup homeData.observe(viewLifecycleOwner) { data -> homeAdapter.updateData(data) } } diff --git a/app/src/main/java/org/oxycblt/auxio/home/tabs/TabDragCallback.kt b/app/src/main/java/org/oxycblt/auxio/home/tabs/TabDragCallback.kt index e0e071d08..037fec391 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/tabs/TabDragCallback.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/tabs/TabDragCallback.kt @@ -23,8 +23,10 @@ import androidx.recyclerview.widget.RecyclerView /** * A simple [ItemTouchHelper.Callback] that handles dragging items in the tab customization menu. - * Unlike QueueAdapter's ItemTouchHelper, this one is bare and simple. TODO: Consider unifying the - * shared behavior between this and QueueDragCallback into a single class. + * Unlike QueueAdapter's ItemTouchHelper, this one is bare and simple. + * + * TODO: Consider unifying the + * shared behavior between this and QueueDragCallback into a single class. */ class TabDragCallback(private val getTabs: () -> Array) : ItemTouchHelper.Callback() { private val tabs: Array diff --git a/app/src/main/java/org/oxycblt/auxio/music/Models.kt b/app/src/main/java/org/oxycblt/auxio/music/Models.kt index a1ebae9c4..e22ff0847 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Models.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/Models.kt @@ -33,8 +33,10 @@ sealed class Item { } /** - * [Item] variant that represents a music item. TODO: Make name the actual display name and move raw - * names (including file names) to a new field called rawName. + * [Item] variant that represents a music item. + * + * TODO: Make name the actual display name and move raw names (including file names) to a + * new field called rawName. */ sealed class Music : Item() { /** The raw name of this item. */ diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt index 5d927b4ce..71d0f722a 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt @@ -32,8 +32,9 @@ import org.oxycblt.auxio.util.logE /** * The main storage for music items. Getting an instance of this object is more complicated as it - * loads asynchronously. See the companion object for more. TODO: Add automatic rescanning [major - * change] + * loads asynchronously. See the companion object for more. + * + * TODO: Add automatic rescanning [major change] * @author OxygenCobalt */ class MusicStore private constructor() { @@ -111,7 +112,9 @@ class MusicStore private constructor() { /** * A response that [MusicStore] returns when loading music. And before you ask, yes, I do like - * rust. TODO: Add the exception to the "FAILED" ErrorKind + * rust. + * + * TODO: Add the exception to the "FAILED" ErrorKind */ sealed class Response { class Ok(val musicStore: MusicStore) : Response() diff --git a/app/src/main/java/org/oxycblt/auxio/music/excluded/ExcludedViewModel.kt b/app/src/main/java/org/oxycblt/auxio/music/excluded/ExcludedViewModel.kt index 48104a6fd..610a614b8 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/excluded/ExcludedViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/excluded/ExcludedViewModel.kt @@ -30,8 +30,10 @@ import org.oxycblt.auxio.util.logD /** * ViewModel that acts as a wrapper around [ExcludedDatabase], allowing for the addition/removal of - * paths. Use [Factory] to instantiate this. TODO: Unify with MusicViewModel + * paths. Use [Factory] to instantiate this. * @author OxygenCobalt + * + * TODO: Unify with MusicViewModel */ class ExcludedViewModel(private val excludedDatabase: ExcludedDatabase) : ViewModel() { private val mPaths = MutableLiveData(mutableListOf()) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt index 48296ac77..93ce82a10 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt @@ -37,7 +37,9 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat /** * A [Fragment] that displays more information about the song, along with more media controls. * Instantiation is done by the navigation component, **do not instantiate this fragment manually.** - * @author OxygenCobalt TODO: Handle RTL correctly in the playback buttons + * @author OxygenCobalt + * + * TODO: Handle RTL correctly in the playback buttons */ class PlaybackFragment : Fragment() { private val playbackModel: PlaybackViewModel by activityViewModels() diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt index fd4ccb88d..5314ace65 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt @@ -64,8 +64,9 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat * state and view magic. I tried my best to document it, but it's probably not the most friendly or * extendable. You have been warned. * - * @author OxygenCobalt (With help from Umano and Hai Zhang) TODO: Find a better way to handle - * PlaybackFragment in general (navigation, creation) + * @author OxygenCobalt (With help from Umano and Hai Zhang) + * + * TODO: Find a better way to handle PlaybackFragment in general (navigation, creation) */ class PlaybackLayout @JvmOverloads diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt index cca6bff89..93546a6f1 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt @@ -34,8 +34,9 @@ import org.oxycblt.auxio.util.stateList /** * A custom view that bundles together a seekbar with a current duration and a total duration. The * sub-views are specifically laid out so that the seekbar has an adequate touch height while still - * not having gobs of whitespace everywhere. TODO: Add smooth seeking [i.e seeking in sub-second - * values] + * not having gobs of whitespace everywhere. + * + * TODO: Add smooth seeking [i.e seeking in sub-second values] * @author OxygenCobalt */ @SuppressLint("RestrictedApi") diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt index f772843a6..25694cfbb 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt @@ -61,7 +61,8 @@ class AudioReactor(context: Context, private val callback: (Float) -> Unit) : private var pauseWasTransient = false - // It's good to keep the volume and the ducking multiplier separate so that we can + // It's good to keep the volume and the ducking multiplier separate so that we don't + // lose information private var multiplier = 1f set(value) { field = value @@ -87,8 +88,11 @@ class AudioReactor(context: Context, private val callback: (Float) -> Unit) : /** * Updates the rough volume adjustment for [Metadata] with ReplayGain tags. This is based off - * Vanilla Music's implementation. TODO: Add ReplayGain pre-amp TODO: Add positive ReplayGain - * values + * Vanilla Music's implementation. + * + * TODO: Add ReplayGain pre-amp + * + * TODO: Add positive ReplayGain */ fun applyReplayGain(metadata: Metadata?) { if (metadata == null) { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt index 485859d23..9fa263e4b 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt @@ -498,9 +498,10 @@ class PlaybackService : } /** - * Pause from a headset plug. TODO: Find a way to centralize this stuff into a single - * BroadcastReciever instead of the weird disjointed arrangement between MediaSession and - * this. + * Pause from a headset plug. + * + * TODO: Find a way to centralize this stuff into a single BroadcastReceiver instead of + * the weird disjointed arrangement between MediaSession and this. */ private fun pauseFromPlug() { if (playbackManager.song != null) { diff --git a/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt b/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt index 966f2cfd5..9b8948dd6 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt @@ -54,8 +54,10 @@ fun Fragment.newMenu(anchor: View, data: Item, flag: Int = ActionMenu.FLAG_NONE) * @param flag Any extra flags to accompany the data. See [FLAG_NONE], [FLAG_IN_ALBUM], * [FLAG_IN_ARTIST], [FLAG_IN_GENRE] for more details. * @throws IllegalStateException When there is no menu for this specific datatype/flag - * @author OxygenCobalt TODO: Stop scrolling when a menu is open TODO: Prevent duplicate menus from - * showing up TODO: Maybe replace this with a bottom sheet? + * @author OxygenCobalt + * + * TODO: Stop scrolling when a menu is open TODO: Prevent duplicate menus from showing up + * TODO: Maybe replace this with a bottom sheet? */ class ActionMenu( activity: AppCompatActivity, diff --git a/app/src/main/java/org/oxycblt/auxio/ui/EdgeRecyclerView.kt b/app/src/main/java/org/oxycblt/auxio/ui/EdgeRecyclerView.kt index fbda7331e..9a1d22079 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/EdgeRecyclerView.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/EdgeRecyclerView.kt @@ -18,6 +18,7 @@ package org.oxycblt.auxio.ui import android.content.Context +import android.graphics.Rect import android.util.AttributeSet import android.view.WindowInsets import androidx.annotation.AttrRes @@ -26,12 +27,25 @@ import androidx.recyclerview.widget.RecyclerView import org.oxycblt.auxio.util.systemBarInsetsCompat /** A [RecyclerView] that automatically applies insets to itself. */ -class EdgeRecyclerView +open class EdgeRecyclerView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr: Int = 0) : RecyclerView(context, attrs, defStyleAttr) { + private val initialPadding = Rect(paddingLeft, paddingTop, paddingRight, paddingBottom) + + init { + // Prevent children from being clipped by window insets + clipToPadding = false + } + override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - updatePadding(bottom = insets.systemBarInsetsCompat.bottom) + + updatePadding( + initialPadding.left, + initialPadding.top, + initialPadding.right, + initialPadding.bottom + insets.systemBarInsetsCompat.bottom) + return insets } } diff --git a/app/src/main/java/org/oxycblt/auxio/ui/LifecycleDialog.kt b/app/src/main/java/org/oxycblt/auxio/ui/LifecycleDialog.kt index c05c5e491..46abbd227 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/LifecycleDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/LifecycleDialog.kt @@ -32,9 +32,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder abstract class LifecycleDialog : AppCompatDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val builder = MaterialAlertDialogBuilder(requireActivity(), theme) - onConfigDialog(builder) - return builder.create() } diff --git a/app/src/main/java/org/oxycblt/auxio/ui/ViewHolders.kt b/app/src/main/java/org/oxycblt/auxio/ui/ViewHolders.kt index d36e9983d..4480905b5 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/ViewHolders.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/ViewHolders.kt @@ -68,7 +68,6 @@ abstract class BaseViewHolder( doOnLongClick?.let { onLongClick -> binding.root.setOnLongClickListener { view -> onLongClick(view, data) - true } } diff --git a/app/src/main/res/drawable/ic_song.xml b/app/src/main/res/drawable/ic_song.xml index 9a10408b2..b1c21fa85 100644 --- a/app/src/main/res/drawable/ic_song.xml +++ b/app/src/main/res/drawable/ic_song.xml @@ -5,7 +5,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorPrimary"> - + diff --git a/app/src/main/res/drawable/ui_indicator.xml b/app/src/main/res/drawable/ui_indicator.xml index cb851face..fdc7785c0 100644 --- a/app/src/main/res/drawable/ui_indicator.xml +++ b/app/src/main/res/drawable/ui_indicator.xml @@ -1,7 +1,8 @@ - diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml index 78746a7af..af7f8d7f9 100644 --- a/app/src/main/res/layout-land/fragment_playback.xml +++ b/app/src/main/res/layout-land/fragment_playback.xml @@ -23,8 +23,7 @@ + android:layout_height="match_parent"> + android:layout_height="match_parent"> + android:layout_height="match_parent"> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-w600dp-land/fragment_playback.xml b/app/src/main/res/layout-w600dp-land/fragment_playback.xml index 18e3c78b6..6f8851a8a 100644 --- a/app/src/main/res/layout-w600dp-land/fragment_playback.xml +++ b/app/src/main/res/layout-w600dp-land/fragment_playback.xml @@ -23,8 +23,7 @@ + android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/fragment_home_list.xml b/app/src/main/res/layout/fragment_home_list.xml index 8e12c60f1..caf5faa29 100644 --- a/app/src/main/res/layout/fragment_home_list.xml +++ b/app/src/main/res/layout/fragment_home_list.xml @@ -5,10 +5,9 @@ diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml index d8f582ac6..76638d630 100644 --- a/app/src/main/res/layout/fragment_playback.xml +++ b/app/src/main/res/layout/fragment_playback.xml @@ -22,8 +22,7 @@ + android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index f2110e80b..826773711 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -30,7 +30,6 @@ android:name="org.oxycblt.auxio.settings.SettingsListFragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:clipToPadding="false" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml index c8a42bde4..aa95b1e2a 100644 --- a/app/src/main/res/layout/item_song.xml +++ b/app/src/main/res/layout/item_song.xml @@ -21,7 +21,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:ignore="ContentDescription" tools:src="@drawable/ic_album" /> + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_detail_sort.xml b/app/src/main/res/menu/menu_detail_sort.xml index deb101207..ad974af63 100644 --- a/app/src/main/res/menu/menu_detail_sort.xml +++ b/app/src/main/res/menu/menu_detail_sort.xml @@ -15,7 +15,8 @@ android:title="@string/lbl_sort_year" /> - \ No newline at end of file diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml index e0404228e..43e693123 100644 --- a/app/src/main/res/menu/menu_home.xml +++ b/app/src/main/res/menu/menu_home.xml @@ -29,7 +29,8 @@ android:title="@string/lbl_sort_year" /> - diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index be8f00f18..9ae33569a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -30,7 +30,7 @@ "Přehrát z žánru" "Nyní hraje" "Fronta" - Další skladba + Další skladba "Přidat do fronty" "Přidáno do fronty" "Jít na umělce" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index ab00f5223..2a00d3b84 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -145,7 +145,7 @@ #C3C7D0 #E2E2E6 #1B1B1B - + #62D3FF #003546 #004D64 @@ -361,7 +361,7 @@ #D8C2BB #EDE0DC #201A18 - + #EEEEEE #424242 #757575 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7f5680dec..8263ed940 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -83,7 +83,7 @@ Звук Аудио-фокус Ставить на паузу при звонках - ReplayGain (экспериментально) + ReplayGain (экспериментально) Выкл. По треку По альбому diff --git a/app/src/main/res/values-sw640dp/styles_ui.xml b/app/src/main/res/values-sw640dp/styles_ui.xml index f72e10d34..0a84c9b6a 100644 --- a/app/src/main/res/values-sw640dp/styles_ui.xml +++ b/app/src/main/res/values-sw640dp/styles_ui.xml @@ -1,5 +1,10 @@ + + + diff --git a/app/src/main/res/values-v31/styles_android.xml b/app/src/main/res/values-v31/styles_android.xml index 82b614600..ac0ff871a 100644 --- a/app/src/main/res/values-v31/styles_android.xml +++ b/app/src/main/res/values-v31/styles_android.xml @@ -1,6 +1,7 @@ - \ No newline at end of file diff --git a/app/src/main/res/values-v31/styles_core.xml b/app/src/main/res/values-v31/styles_core.xml index 19fb67673..954403def 100644 --- a/app/src/main/res/values-v31/styles_core.xml +++ b/app/src/main/res/values-v31/styles_core.xml @@ -1,6 +1,7 @@ - diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index 413acece4..a68d4ddb4 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -44,7 +44,7 @@ + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ddaf67bcd..783896c98 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -159,7 +159,7 @@ @color/blue_primary_inverse @color/blue_primary_container @color/blue_on_primary_container - + @color/blue_secondary @color/blue_on_secondary @color/blue_secondary_container diff --git a/app/src/main/res/values/themes_black.xml b/app/src/main/res/values/themes_black.xml index 3258172e6..85a8936c1 100644 --- a/app/src/main/res/values/themes_black.xml +++ b/app/src/main/res/values/themes_black.xml @@ -1,6 +1,7 @@ - diff --git a/app/src/main/res/values/typography.xml b/app/src/main/res/values/typography.xml index 8950b68c9..eb4d6c0fa 100644 --- a/app/src/main/res/values/typography.xml +++ b/app/src/main/res/values/typography.xml @@ -116,14 +116,14 @@ normal 0.015 - + - +