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

Commit 67e152d4 authored by Danny Lin's avatar Danny Lin Committed by Paul Keith
Browse files

Style search bar to match new Settings UI 

- Rounded pill shape
- Surface background colors
- No shadow
- Font size
- Height

Change-Id: I24d4725f3d759ea633768640995de16f9bdf2c55
parent b6cd6423

res/layout/search_panel.xml

+4 −5
Original line number Diff line number Diff line
@@ -25,20 +25,19 @@ 
        android:id="@+id/search_bar_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

        android:elevation="4dp">

        android:background="?android:attr/colorPrimary">

        <androidx.cardview.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/search_bar_margin"

            app:cardCornerRadius="@*android:dimen/config_dialogCornerRadius"

            app:cardElevation="3dp">

            app:cardCornerRadius="@dimen/search_bar_corner_radius"

            app:cardElevation="0dp">

            <Toolbar

                android:id="@+id/search_toolbar"

                android:layout_width="match_parent"

                android:layout_height="@dimen/search_bar_height"

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

                android:background="@color/search_panel_background"

                android:contentInsetStart="0dp"

                android:contentInsetStartWithNavigation="0dp"

                android:theme="?android:attr/actionBarTheme">

res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->



<resources>

    <color name="search_panel_background">@*android:color/material_grey_800</color>

    <color name="search_panel_background">@*android:color/surface_variant_dark</color>

</resources>

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
<resources>

    <color name="launcher_background_color">#ff008577</color>



    <color name="search_panel_background">@android:color/white</color>

    <color name="search_panel_background">@*android:color/surface_highlight_light</color>

</resources>

res/values/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ 
    <dimen name="search_bar_margin">16dp</dimen>

    <dimen name="search_bar_negative_margin">-16dp</dimen>



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

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

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

    <dimen name="search_bar_text_size">20sp</dimen>

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



    <!-- Dashboard image tile size -->

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