Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7d3ecde8 authored by Inhishonor's avatar Inhishonor Committed by Sebastiano Barezzi
Browse files

Twelve: Fix spacing around play buttons 

Change-Id: I2007dc81a5199beb3a085992ae7bc1e2e959e8cb
parent 3f0ff3d4

app/src/main/java/org/lineageos/twelve/fragments/AlbumFragment.kt

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import org.lineageos.twelve.ext.getViewProperty 
import org.lineageos.twelve.ext.loadThumbnail

import org.lineageos.twelve.ext.navigateSafe

import org.lineageos.twelve.ext.setProgressCompat

import org.lineageos.twelve.ext.updateMargin

import org.lineageos.twelve.ext.updatePadding

import org.lineageos.twelve.models.Error

import org.lineageos.twelve.models.FlowResult
@@ -218,7 +217,7 @@ class AlbumFragment : Fragment(R.layout.fragment_album) { 
        ) { v, windowInsets ->

            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())



            v.updateMargin(

            v.updatePadding(

                insets,

                bottom = true,

            )

app/src/main/java/org/lineageos/twelve/fragments/PlaylistFragment.kt

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import org.lineageos.twelve.ext.getViewProperty 
import org.lineageos.twelve.ext.loadThumbnail

import org.lineageos.twelve.ext.navigateSafe

import org.lineageos.twelve.ext.setProgressCompat

import org.lineageos.twelve.ext.updateMargin

import org.lineageos.twelve.ext.updatePadding

import org.lineageos.twelve.models.Audio

import org.lineageos.twelve.models.Error
@@ -188,7 +187,7 @@ class PlaylistFragment : Fragment(R.layout.fragment_playlist) { 
        ) { v, windowInsets ->

            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())



            v.updateMargin(

            v.updatePadding(

                insets,

                bottom = true,

            )

app/src/main/res/layout-land/fragment_album.xml

+3 −4
Original line number Diff line number Diff line
@@ -95,11 +95,10 @@ 
        android:indeterminate="true"

        app:layout_behavior="@string/appbar_scrolling_view_behavior" />



    <include layout="@layout/play_buttons"

        android:layout_width="wrap_content"

    <include

        layout="@layout/play_buttons"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginEnd="24dp"

        android:paddingBottom="16dp"

        app:layout_anchor="@+id/recyclerView"

        app:layout_anchorGravity="bottom|end"

        app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior" />

app/src/main/res/layout/fragment_album.xml

+5 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2024-2025 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

-->
@@ -95,11 +96,10 @@ 
        android:indeterminate="true"

        app:layout_behavior="@string/appbar_scrolling_view_behavior" />



    <include layout="@layout/play_buttons"

        android:layout_width="wrap_content"

    <include

        layout="@layout/play_buttons"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginEnd="24dp"

        android:paddingBottom="16dp"

        app:layout_anchor="@+id/recyclerView"

        app:layout_anchorGravity="bottom|end"

        app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior" />

app/src/main/res/layout/play_buttons.xml

+10 −4
Original line number Diff line number Diff line
@@ -7,16 +7,19 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/playButtonsLinearLayout"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:gravity="bottom|end"

    android:orientation="vertical">



    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton

        android:id="@+id/shufflePlayExtendedFloatingActionButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginBottom="12dp"

        android:layout_marginEnd="16dp"

        android:layout_marginBottom="18dp"

        android:textColor="?attr/colorOnTertiaryContainer"

        android:tooltipText="@string/shuffle_play"

        android:visibility="gone"
@@ -30,8 +33,11 @@ 
        android:id="@+id/playAllExtendedFloatingActionButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="16dp"

        android:layout_marginBottom="16dp"

        android:text="@string/play_all"

        android:visibility="gone"

        app:icon="@drawable/ic_play_arrow"

        tools:visibility="visible" />



</LinearLayout>