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

Commit 680fce3a authored by Jason Chiu's avatar Jason Chiu
Browse files

Refine layouts for large screen 

- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
  of being highlighted
- Add an interface to support dynamic split layout for suggestion cards

Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
parent c4c923d1

res/drawable/homepage_highlighted_item_background.xml

+7 −10
Original line number Diff line number Diff line
@@ -14,13 +14,10 @@ 
  See the License for the specific language governing permissions and

  limitations under the License.

  -->

<inset xmlns:android="http://schemas.android.com/apk/res/android"

       android:insetLeft="@dimen/homepage_menu_entry_padding_horizontal"

       android:insetRight="@dimen/homepage_menu_entry_padding_horizontal">

    <shape android:shape="rectangle">

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <solid

        android:color="?android:attr/textColorPrimary" />

    <corners

            android:radius="@dimen/homepage_menu_entry_corner_radius" />

        android:radius="@dimen/homepage_preference_corner_radius" />

</shape>
 
 No newline at end of file
 
</inset>
 
 No newline at end of file

res/drawable/homepage_selectable_item_background.xml

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

<!--

  Copyright (C) 2022 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"

        android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid

                android:color="@android:color/white" />

            <corners

                android:radius="@dimen/homepage_preference_corner_radius" />

        </shape>

    </item>

</ripple>

res/layout/homepage_preference.xml

+10 −11
Original line number Diff line number Diff line
@@ -20,10 +20,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:minHeight="@dimen/homepage_preference_min_height"

    android:gravity="center_vertical"

    android:paddingStart="@dimen/homepage_menu_entry_padding_horizontal"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false"

    android:baselineAligned="false">
@@ -32,11 +30,10 @@ 
        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="56dp"

        android:gravity="center"

        android:minWidth="48dp"

        android:gravity="end|center_vertical"

        android:orientation="horizontal"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"

        android:paddingStart="@dimen/homepage_preference_icon_padding_start"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">
@@ -44,18 +41,20 @@ 
            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            app:maxWidth="40dp"

            app:maxHeight="40dp"/>

            app:maxWidth="48dp"

            app:maxHeight="48dp"/>



    </LinearLayout>



    <RelativeLayout

        android:id="@+id/text_frame"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:paddingEnd="16dp">

        android:paddingStart="@dimen/homepage_preference_text_padding_start"

        android:paddingEnd="24dp">



        <TextView

            android:id="@android:id/title"

res/layout/search_bar.xml

+3 −2
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
            android:id="@+id/search_action_bar"

            android:layout_width="match_parent"

            android:layout_height="@dimen/search_bar_height"

            android:paddingStart="4dp"

            android:paddingStart="@dimen/search_bar_padding_start"

            android:paddingEnd="@dimen/search_bar_padding_end"

            android:background="@drawable/search_bar_selected_background"

            android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"

            android:navigationIcon="@drawable/ic_homepage_search">
@@ -40,7 +41,7 @@ 
                style="@style/TextAppearance.SearchBar"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingStart="-4dp"

                android:paddingStart="@dimen/search_bar_title_padding_start"

                android:layout_gravity="start"

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

        </Toolbar>

res/layout/search_bar_two_pane_version.xml

+6 −3
Original line number Diff line number Diff line
@@ -21,20 +21,23 @@ 
    android:layout_width="0dp"

    android:layout_height="wrap_content"

    android:layout_weight="1"

    android:layout_margin="@dimen/search_bar_margin">

    android:layout_marginEnd="@dimen/search_bar_margin"

    android:layout_marginVertical="@dimen/search_bar_margin">

    <Toolbar

        android:id="@+id/search_action_bar_two_pane"

        android:layout_width="match_parent"

        android:layout_height="@dimen/search_bar_height"

        android:paddingStart="4dp"

        android:paddingStart="@dimen/search_bar_padding_start_two_pane"

        android:paddingEnd="@dimen/search_bar_padding_end_two_pane"

        android:background="@drawable/search_bar_selected_background"

        android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"

        android:navigationIcon="@drawable/ic_homepage_search">

        <TextView

            android:id="@+id/search_bar_title"

            style="@style/TextAppearance.SearchBar"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="-4dp"

            android:paddingStart="@dimen/search_bar_title_padding_start_regular_two_pane"

            android:layout_gravity="start"

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

    </Toolbar>