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

Commit 94509b5d authored by Michael W's avatar Michael W
Browse files

DeskClock: Fixes for landscape 

* In commit 23d7064d those things were forgotten:
  * A margin for the timer setup so it doesn't touch the bottom bar
  * Coloring the additional fabs identical to portrait mode
  * Giving the fab container a larger width

Change-Id: I1af6ab9ab266028c5e444cb7b8111e115dbd2fab
parent 13fec091

res/layout-land/desk_clock.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ 




        <androidx.constraintlayout.widget.ConstraintLayout

        <androidx.constraintlayout.widget.ConstraintLayout

            android:id="@+id/fab_container"

            android:id="@+id/fab_container"

            android:layout_width="wrap_content"

            android:layout_width="@dimen/fab_container_width"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:baselineAligned="false"

            android:baselineAligned="false"

            android:orientation="vertical"

            android:orientation="vertical"
@@ -87,7 +87,8 @@ 
                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/fab"

                app:layout_constraintTop_toBottomOf="@+id/fab"

                app:layout_constraintVertical_bias="0.35" />

                app:layout_constraintVertical_bias="0.35"

                android:backgroundTint="@color/accent_color2" />





            <com.google.android.material.floatingactionbutton.FloatingActionButton

            <com.google.android.material.floatingactionbutton.FloatingActionButton

                android:id="@+id/fab"

                android:id="@+id/fab"
@@ -113,7 +114,8 @@ 
                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintVertical_bias="0.65" />

                app:layout_constraintVertical_bias="0.65"

                android:backgroundTint="@color/accent_color2" />





        </androidx.constraintlayout.widget.ConstraintLayout>

        </androidx.constraintlayout.widget.ConstraintLayout>

res/layout/timer_setup_view.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -76,5 +76,6 @@ 
        app:layout_constraintHeight_max="420.0dip"

        app:layout_constraintHeight_max="420.0dip"

        app:layout_constraintWidth_max="315.0dip"

        app:layout_constraintWidth_max="315.0dip"

        android:paddingStart="16dp"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"/>

        android:paddingEnd="16dp"

        android:layout_marginBottom="16dp"/>

</androidx.constraintlayout.widget.ConstraintLayout>
 
</androidx.constraintlayout.widget.ConstraintLayout>

res/values-land/lineage_dimens.xml

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

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

<resources>

<resources>

    <dimen name="fab_container_height">0dp</dimen>

    <dimen name="fab_container_height">0dp</dimen>

    <dimen name="fab_container_width">180dp</dimen>

    <dimen name="tab_content_bottom_padding">8dp</dimen>

    <dimen name="tab_content_bottom_padding">8dp</dimen>

</resources>
 
</resources>
 
 No newline at end of file

res/values/dimens.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,7 @@ 
    <dimen name="fab_height">88dp</dimen>

    <dimen name="fab_height">88dp</dimen>





    <dimen name="fab_container_height">120dp</dimen>

    <dimen name="fab_container_height">120dp</dimen>

    <dimen name="fab_container_width">0dp</dimen>

    <dimen name="tab_content_bottom_padding">@dimen/fab_container_height</dimen>

    <dimen name="tab_content_bottom_padding">@dimen/fab_container_height</dimen>





    <dimen name="gutter_horizontal_padding">24.0dip</dimen>

    <dimen name="gutter_horizontal_padding">24.0dip</dimen>