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

Commit db556612 authored by Raff Tsai's avatar Raff Tsai Committed by Emily Chuang
Browse files

Change homepage layout 

- merge PersonalSettingsFragment and TopLevelSettings together

Bug: 118224579
Test: manual
Change-Id: Ieee50a22babb25023e2a1767793e220862a38363
parent d7b9b367

res/layout/condition_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="36dp"

        android:layout_height="@dimen/condition_header_height"

        android:layout_centerHorizontal="true">



        <FrameLayout

res/layout/condition_tile.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="36dp"

        android:minHeight="@dimen/condition_header_height"

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

        android:orientation="horizontal">

res/layout/settings_homepage.xml

+38 −3
Original line number Diff line number Diff line
@@ -15,8 +15,43 @@ 
     limitations under the License.

-->



<androidx.recyclerview.widget.RecyclerView

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/card_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <RelativeLayout

        android:id="@+id/suggestion_footer"

        android:layout_width="match_parent"

        android:layout_height="@dimen/condition_header_height"

        android:layout_centerHorizontal="true">



        <ImageView

            android:id="@+id/expand_indicator"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentEnd="true"

            android:paddingTop="4dp"

            android:paddingStart="16dp"

            android:paddingEnd="16dp"/>



        <TextView

            android:id="@+id/expand_summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="8dp"

            android:layout_toStartOf="@id/expand_indicator"

            android:layout_centerVertical="true"

            android:gravity="end"

            android:textAppearance="@style/TextAppearance.SuggestionTitle"

            android:textColor="?android:attr/colorAccent"/>



    </RelativeLayout>

    <include layout="@layout/horizontal_divider"/>

</LinearLayout>

res/layout/settings_homepage_container.xml

+15 −31
Original line number Diff line number Diff line
@@ -15,44 +15,28 @@ 
     limitations under the License.

-->



<LinearLayout

<androidx.core.widget.NestedScrollView

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <androidx.coordinatorlayout.widget.CoordinatorLayout

    android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">

    android:layout_height="match_parent">



        <com.google.android.material.appbar.AppBarLayout

            android:id="@+id/homepage_appbar"

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

            app:elevation="0dp">

        android:orientation="vertical"

        android:descendantFocusability="blocksDescendants">



        <include layout="@layout/search_bar"/>



        </com.google.android.material.appbar.AppBarLayout>



        <FrameLayout

            android:id="@id/main_content"

            android:id="@+id/suggestion_content"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

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

    </androidx.coordinatorlayout.widget.CoordinatorLayout>

            android:layout_height="wrap_content"/>



    <com.google.android.material.bottomnavigation.BottomNavigationView

        android:id="@+id/bottom_nav"

        <FrameLayout

            android:id="@+id/main_content"

            android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginEnd="0dp"

        android:layout_marginStart="0dp"

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

        app:itemIconTint="@color/bottom_navigation_colors"

        app:itemTextColor="@color/bottom_navigation_colors"

        app:menu="@menu/home_bottom_navigation"/>

            android:layout_height="wrap_content"/>



    </LinearLayout>

</androidx.core.widget.NestedScrollView>

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ 
    <!-- Suggestion/condition header padding -->

    <dimen name="suggestion_condition_header_padding_collapsed">10dp</dimen>

    <dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>

    <dimen name="condition_header_height">36dp</dimen>



    <!-- Suggestion cards size and padding -->

    <dimen name="suggestion_card_icon_size">24dp</dimen>
@@ -357,4 +358,6 @@ 
    <!-- Signal icon in NetworkSelectSetting -->

    <dimen name="signal_strength_icon_size">24dp</dimen>







</resources>