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

Commit 84acc566 authored by Yi-Ling Chuang's avatar Yi-Ling Chuang
Browse files

Update the layout of contextual card dismissal view 

- Swap the two buttons.
- Alter margins.

Bug: 113783548
Test: visual
Change-Id: I1d491d0bccb206331789e031310f0adfd34671fd
parent e5262dbc

res/layout/homepage_dismissal_view.xml

+9 −8
Original line number Diff line number Diff line
@@ -26,31 +26,32 @@ 
    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="@dimen/homepage_card_padding_start"

        android:layout_marginTop="@dimen/homepage_card_padding_start"

        android:layout_marginStart="@dimen/homepage_card_dismissal_side_margin"

        android:layout_marginTop="@dimen/homepage_card_dismissal_margin_top"

        android:text="@string/contextual_card_dismiss_confirm_message"

        android:textAppearance="@style/TextAppearance.ContextualCardDismissalText"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom"

        android:gravity="bottom|end">



        <Button

            android:id="@+id/keep"

            android:id="@+id/remove"

            style="@style/ContextualCardDismissalButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom"

            android:text="@string/contextual_card_dismiss_keep"/>

            android:text="@string/contextual_card_dismiss_remove"/>



        <Button

            android:id="@+id/remove"

            android:id="@+id/keep"

            style="@style/ContextualCardDismissalButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom"

            android:text="@string/contextual_card_dismiss_remove"/>

            android:layout_marginStart="@dimen/homepage_card_dismissal_button_side_margin"

            android:layout_marginEnd="@dimen/homepage_card_dismissal_button_side_margin"

            android:text="@string/contextual_card_dismiss_keep"/>



    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -332,7 +332,12 @@ 
    <dimen name="homepage_half_card_padding_top">12dp</dimen>

    <dimen name="homepage_half_card_padding_bottom">16dp</dimen>

    <dimen name="homepage_half_card_title_margin_top">12dp</dimen>



    <!-- Homepage dismissal cards size and padding -->

    <dimen name="homepage_card_dismissal_margin_top">16dp</dimen>

    <dimen name="homepage_card_dismissal_margin_bottom">2dp</dimen>

    <dimen name="homepage_card_dismissal_side_margin">16dp</dimen>

    <dimen name="homepage_card_dismissal_button_side_margin">6dp</dimen>



    <!-- Horizontal divider size and margin -->

    <dimen name="horizontal_divider_margin_top">4dp</dimen>

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ 


    <style name="ContextualCardDismissalButton"

           parent="android:Widget.DeviceDefault.Button.Borderless.Colored">

        <item name="android:minWidth">10dp</item>

        <item name="android:minHeight">16dp</item>

        <item name="android:textAllCaps">false</item>

    </style>