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

Commit 088b7c97 authored by chihhangchuang's avatar chihhangchuang
Browse files

Update new spec for ThemePicker preview 

New spec: https://screenshot.googleplex.com/FqnN1azFvCy.png
Screenshot:
    Normal https://screenshot.googleplex.com/uJNijGGH8c5.png
    Largest font and display size https://screenshot.googleplex.com/p80aYxjYMoO.png

Test: Manually
Bug: 157402935
Change-Id: I5b9c3ddee215e83e925b5b332934f1596d247a92
parent aaa81e46

res/layout/theme_preview_app_icon_shape.xml

+12 −12
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


        <LinearLayout

            android:id="@+id/app_item_0"

            android:layout_width="@dimen/preview_theme_app_icon_shape_item_width"

            android:layout_width="@dimen/preview_theme_app_icon_size"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="vertical"
@@ -43,8 +43,8 @@ 
            app:layout_constraintBottom_toBottomOf="parent">

            <ImageView

                android:id="@+id/shape_preview_icon_0"

                android:layout_width="@dimen/preview_theme_shape_size"

                android:layout_height="@dimen/preview_theme_shape_size"

                android:layout_width="@dimen/preview_theme_app_icon_size"

                android:layout_height="@dimen/preview_theme_app_icon_size"

                android:elevation="4dp"/>

            <TextView

                android:id="@+id/shape_preview_icon_app_name_0"
@@ -58,7 +58,7 @@ 


        <LinearLayout

            android:id="@+id/app_item_1"

            android:layout_width="@dimen/preview_theme_app_icon_shape_item_width"

            android:layout_width="@dimen/preview_theme_app_icon_size"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="vertical"
@@ -68,8 +68,8 @@ 
            app:layout_constraintBottom_toBottomOf="parent">

            <ImageView

                android:id="@+id/shape_preview_icon_1"

                android:layout_width="@dimen/preview_theme_shape_size"

                android:layout_height="@dimen/preview_theme_shape_size"

                android:layout_width="@dimen/preview_theme_app_icon_size"

                android:layout_height="@dimen/preview_theme_app_icon_size"

                android:elevation="4dp"/>

            <TextView

                android:id="@+id/shape_preview_icon_app_name_1"
@@ -94,7 +94,7 @@ 
        app:layout_constraintBottom_toBottomOf="parent">

        <LinearLayout

            android:id="@+id/app_item_2"

            android:layout_width="@dimen/preview_theme_app_icon_shape_item_width"

            android:layout_width="@dimen/preview_theme_app_icon_size"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="vertical"
@@ -104,8 +104,8 @@ 
            app:layout_constraintBottom_toBottomOf="parent">

            <ImageView

                android:id="@+id/shape_preview_icon_2"

                android:layout_width="@dimen/preview_theme_shape_size"

                android:layout_height="@dimen/preview_theme_shape_size"

                android:layout_width="@dimen/preview_theme_app_icon_size"

                android:layout_height="@dimen/preview_theme_app_icon_size"

                android:elevation="4dp"/>

            <TextView

                android:id="@+id/shape_preview_icon_app_name_2"
@@ -119,7 +119,7 @@ 


        <LinearLayout

            android:id="@+id/app_item_3"

            android:layout_width="@dimen/preview_theme_app_icon_shape_item_width"

            android:layout_width="@dimen/preview_theme_app_icon_size"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="vertical"
@@ -129,8 +129,8 @@ 
            app:layout_constraintBottom_toBottomOf="parent">

            <ImageView

                android:id="@+id/shape_preview_icon_3"

                android:layout_width="@dimen/preview_theme_shape_size"

                android:layout_height="@dimen/preview_theme_shape_size"

                android:layout_width="@dimen/preview_theme_app_icon_size"

                android:layout_height="@dimen/preview_theme_app_icon_size"

                android:elevation="4dp"/>

            <TextView

                android:id="@+id/shape_preview_icon_app_name_3"

res/layout/theme_preview_content.xml

+6 −4
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="@dimen/preview_theme_content_padding_top"

    android:paddingHorizontal="@dimen/preview_theme_content_padding"

    android:paddingBottom="@dimen/preview_theme_content_padding"

    android:paddingBottom="@dimen/preview_theme_content_padding_bottom"

    android:clipChildren="false">



    <FrameLayout

        android:id="@+id/topbar_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="@dimen/preview_theme_topbar_container_margin_horizontal"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"
@@ -58,7 +58,7 @@ 
        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/smart_space_date"

        app:layout_constraintBottom_toTopOf="@id/color_icons_container"

        app:layout_constraintHeight_percent="0.4">

        app:layout_constraintHeight_percent="0.49">

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

    </FrameLayout>
@@ -66,11 +66,12 @@ 
        android:id="@+id/color_icons_container"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_marginHorizontal="@dimen/preview_theme_color_icons_container_margin_horizontal"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/app_icon_shape_container"

        app:layout_constraintBottom_toTopOf="@id/theme_qsb_container"

        app:layout_constraintHeight_percent="0.3">

        app:layout_constraintHeight_percent="0.28">

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

    </FrameLayout>
@@ -78,6 +79,7 @@ 
        android:id="@+id/theme_qsb_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="@dimen/preview_theme_qsb_container_margin_horizontal"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/color_icons_container"

res/values/dimens.xml

+6 −3
Original line number Diff line number Diff line
@@ -71,10 +71,13 @@ 
    <dimen name="preview_theme_content_bottom">@dimen/min_taptarget_height</dimen>



    <!--  For the new preview of theme picker.  -->

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

    <dimen name="preview_theme_content_padding">@dimen/preview_card_padding</dimen>

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

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

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

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

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

    <dimen name="preview_theme_smart_space_date_size">16sp</dimen>

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

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

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

    <dimen name="preview_theme_app_icon_shape_text_size">16sp</dimen>

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