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

Commit ebc3a3e8 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang
Browse files

Refine search ui and avatar based on spec 

This is the first version, we will keep tweaking
the details later.

Bug: 171278055
Test: Screenshot - https://screenshot.googleplex.com/ApRgDZknkvX9PWo
Change-Id: Ie99cf9e187aa2440486cc2eae90e04287daf0a1d
parent c79680cb

res/layout/search_bar.xml

+33 −26
Original line number Diff line number Diff line
@@ -15,14 +15,20 @@ 
     limitations under the License.

-->



<com.google.android.material.card.MaterialCardView

<LinearLayout

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

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

    android:id="@+id/search_bar"

    style="@style/SearchBarStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="@dimen/search_bar_margin"

    app:layout_scrollFlags="scroll|enterAlways">



    <com.google.android.material.card.MaterialCardView

        android:id="@+id/search_bar"

        style="@style/SearchBarStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1">

        <Toolbar

            android:id="@+id/search_action_bar"

            android:layout_width="match_parent"
@@ -36,15 +42,16 @@ 
                style="@style/TextAppearance.SearchBar"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="start"

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

        </Toolbar>

    </com.google.android.material.card.MaterialCardView>



   <ImageView

        android:id="@+id/account_avatar"

        android:paddingEnd="@dimen/search_bar_avatar_end_padding"

        android:paddingTop="@dimen/search_bar_avatar_top_bottom_padding"

        android:paddingBottom="@dimen/search_bar_avatar_top_bottom_padding"

        android:layout_width="@dimen/search_bar_avatar_width"

        android:layout_height="@dimen/search_bar_height"

        android:layout_gravity="end"

        android:layout_width="@dimen/avatar_length"

        android:layout_height="@dimen/avatar_length"

        android:layout_gravity="center_vertical"

        android:contentDescription="@string/search_bar_account_avatar_content_description"/>

</com.google.android.material.card.MaterialCardView>
 
</LinearLayout>

res/values/dimens.xml

+3 −8
Original line number Diff line number Diff line
@@ -123,18 +123,13 @@ 
    <dimen name="switchbar_subsettings_margin_start">72dp</dimen>

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



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



    <dimen name="search_bar_margin">18dp</dimen>

    <dimen name="search_bar_height">48dp</dimen>

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

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

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

    <dimen name="search_bar_content_inset">64dp</dimen>

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

    <!-- 32dp (avatar size) + 16 dp (search_bar_avatar_end_padding) -->

    <dimen name="search_bar_avatar_width">48dp</dimen>

    <!-- (search_bar_height 48dp - avatar size 32dp) / 2  -->

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

    <dimen name="avatar_length">@dimen/search_bar_height</dimen>





    <!-- Dimensions for Wifi Assistant Card -->

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

res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ 
    </style>



    <style name="SearchBarStyle">

        <item name="android:layout_margin">@dimen/search_bar_margin</item>

        <item name="cardCornerRadius">@*android:dimen/config_dialogCornerRadius</item>

        <item name="android:layout_marginEnd">@dimen/search_bar_margin</item>

        <item name="cardCornerRadius">30dp</item>

        <item name="enforceMaterialTheme">true</item>

        <item name="cardElevation">3dp</item>

        <item name="shapeAppearance">@null</item>