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

Commit 0831fa8d authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Landscape support 3/3 

Updated previews layouts to support landscape UI.
Changed theme_preview_card layout to ConstraintLayout to
allow better support of positioning the different elements
both for cover and for other preview cards.

Bug: 125903559
Change-Id: Id38ecf097d23c09b8431e56bf5127ba353723ef0
parent 1c4c67ec

res/layout/preview_card_color_content.xml

+82 −68
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ 
-->

<LinearLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="200dp"

    android:layout_height="200dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:gravity="center_horizontal|bottom"

    android:orientation="vertical"

    tools:showIn="@layout/theme_preview_card">

    android:gravity="center_horizontal"

    android:orientation="vertical">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -31,56 +29,72 @@ 
        android:orientation="horizontal">

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size">

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1">

            <ImageView

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size"

                android:layout_gravity="center"

                android:id="@+id/preview_color_qs_0_bg"/>

            <ImageView

                android:layout_width="@dimen/preview_theme_tile_size"

                android:layout_height="@dimen/preview_theme_tile_size"

                android:layout_gravity="center"

                android:id="@+id/preview_color_qs_0_icon"

                android:tint="@color/tile_enabled_icon_color"

                android:layout_gravity="center"/>

                android:tint="@color/tile_enabled_icon_color"/>

        </FrameLayout>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginHorizontal="28dp">

            android:layout_weight="1">

            <ImageView

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size"

                android:layout_gravity="center"

                android:id="@+id/preview_color_qs_1_bg"/>

            <ImageView

                android:layout_width="@dimen/preview_theme_tile_size"

                android:layout_height="@dimen/preview_theme_tile_size"

                android:layout_gravity="center"

                android:id="@+id/preview_color_qs_1_icon"

                android:tint="@color/tile_enabled_icon_color"

                android:layout_gravity="center"/>

                android:tint="@color/tile_enabled_icon_color"/>

        </FrameLayout>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size">

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1">

            <ImageView

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size"

                android:layout_gravity="center"

                android:id="@+id/preview_color_qs_2_bg"

                android:tint="@color/tile_disabled_background_color"/>

            <ImageView

                android:layout_width="@dimen/preview_theme_tile_size"

                android:layout_height="@dimen/preview_theme_tile_size"

                android:layout_gravity="center"

                android:id="@+id/preview_color_qs_2_icon"

                android:color="@color/tile_disabled_icon_color"

                android:layout_gravity="center"/>

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

        </FrameLayout>

    </LinearLayout>

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:orientation="horizontal"

        android:layout_marginTop="30dp"

        android:gravity="center|bottom">

        android:gravity="center">

        <SeekBar

            android:id="@+id/preview_seekbar"

            android:layout_height="wrap_content"
@@ -91,63 +105,63 @@ 
            android:clickable="true"

            android:max="3"/>

    </LinearLayout>

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:layout_marginTop="15dp"

        android:gravity="center"

        android:orientation="horizontal">

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1">

            <CheckBox

                android:id="@+id/preview_check_selected"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:checked="true"

                android:layout_gravity="center"

                android:checked="true"

                android:enabled="false"/>

        </FrameLayout>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1">

            <RadioButton

                android:id="@+id/preview_radio_selected"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:layout_marginLeft="30dp"

            android:layout_marginRight="22dp"

            android:checked="true"

                android:layout_gravity="center"

                android:checked="true"

                android:enabled="false"/>

        </FrameLayout>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1">

            <Switch

                android:id="@+id/preview_toggle_selected"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:checked="true"

                android:layout_gravity="center"

                android:checked="true"

                android:enabled="false"/>

        </FrameLayout>

    </LinearLayout>

    <LinearLayout

    <Space

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:layout_marginTop="20dp"

        android:gravity="center"

        android:orientation="horizontal">

        <CheckBox

            android:id="@+id/preview_check_unselected"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:enabled="false"/>

        <RadioButton

            android:id="@+id/preview_radio_unselected"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="30dp"

            android:layout_marginRight="22dp"

            android:layout_gravity="center"

            android:enabled="false"/>

        <Switch

            android:id="@+id/preview_toggle_unselected"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:enabled="false"/>

    </LinearLayout>

        android:layout_height="0dp"

        android:layout_weight="1" />

</LinearLayout>

res/layout/preview_card_cover_content.xml

+82 −72
Original line number Diff line number Diff line
@@ -14,26 +14,21 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

<RelativeLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:layout_marginHorizontal="@dimen/preview_theme_cover_content_extra_margin"

    android:gravity="center_horizontal"

    android:orientation="vertical"

    tools:showIn="@layout/theme_preview_card">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:layout_marginBottom="24dp"

        android:gravity="center|bottom"

        android:orientation="horizontal">

    <FrameLayout

        android:layout_width="@dimen/preview_theme_icon_size"

        android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginLeft="6dp">

        android:layout_marginLeft="6dp"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true">

        <ImageView

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"
@@ -48,10 +43,13 @@ 
    <FrameLayout

        android:layout_width="@dimen/preview_theme_icon_size"

        android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginHorizontal="50dp">

        android:layout_alignParentTop="true"

        android:layout_centerHorizontal="true"

        android:layout_gravity="center_horizontal">

        <ImageView

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_gravity="center"

            android:id="@+id/preview_color_qs_1_bg"/>

        <ImageView

            android:layout_width="@dimen/preview_theme_tile_size"
@@ -63,7 +61,9 @@ 
    <FrameLayout

        android:layout_width="@dimen/preview_theme_icon_size"

        android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginRight="6dp">

        android:layout_marginRight="6dp"

        android:layout_alignParentRight="true"

        android:layout_alignParentTop="true">

        <ImageView

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"
@@ -76,32 +76,42 @@ 
            android:color="@color/tile_disabled_icon_color"

            android:layout_gravity="center"/>

    </FrameLayout>

    </LinearLayout>

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="horizontal">



    <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_marginVertical="4dp"

        android:layout_alignParentLeft="true"

        android:layout_centerVertical="true"

        android:elevation="4dp"/>

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_centerHorizontal="true">

        <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_marginHorizontal="38dp"

            android:layout_gravity="center_horizontal"

            android:layout_marginVertical="4dp"

            android:elevation="4dp"/>

    </FrameLayout>

    <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_marginVertical="4dp"

        android:layout_marginRight="2dp"

        android:layout_alignParentRight="true"

        android:layout_centerVertical="true"

        android:elevation="4dp"/>

    </LinearLayout>



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true">

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

</LinearLayout>
 
 No newline at end of file
 
    </FrameLayout>

</RelativeLayout>
 
 No newline at end of file

res/layout/preview_card_font_content.xml

+2 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<LinearLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:gravity="center_horizontal"
@@ -28,14 +28,13 @@ 
        android:id="@+id/font_card_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:gravity="center_horizontal"

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

    <View

        android:id="@+id/font_card_divider"

        android:layout_width="15dp"

        android:layout_height="2dp"

        android:layout_marginVertical="30dp"

        android:layout_marginVertical="@dimen/font_preview_divider_gap"

        android:background="?android:colorAccent"/>

    <TextView

        style="@style/FontCardBodyTextStyle"

res/layout/preview_card_icon_content.xml

+37 −12
Original line number Diff line number Diff line
@@ -16,56 +16,81 @@ 
-->

<LinearLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="200dp"

    android:layout_height="136dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:gravity="center_horizontal"

    android:orientation="vertical"

    tools:showIn="@layout/theme_preview_card">

    android:orientation="vertical">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:orientation="horizontal">

        <ImageView

            android:id="@+id/preview_icon_0"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView

            android:id="@+id/preview_icon_1"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginHorizontal="40dp"

            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView

            android:id="@+id/preview_icon_2"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

    </LinearLayout>

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="bottom"

        android:layout_height="wrap_content"

        android:gravity="bottom|center_horizontal"

        android:orientation="horizontal">

        <ImageView

            android:id="@+id/preview_icon_3"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView

            android:id="@+id/preview_icon_4"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginHorizontal="40dp"

            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView

            android:id="@+id/preview_icon_5"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

    </LinearLayout>

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

</LinearLayout>
 
 No newline at end of file

res/layout/preview_card_shape_content.xml

+111 −57
Original line number Diff line number Diff line
@@ -16,63 +16,117 @@ 
-->

<LinearLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="wrap_content"

    android:layout_height="152dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:gravity="center_horizontal"

    android:orientation="vertical"

    tools:showIn="@layout/theme_preview_card">

    android:orientation="vertical">

        <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="horizontal">

                <FrameLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                        <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_gravity="center_horizontal"

                            android:layout_margin="4dp"

                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                        <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_marginHorizontal="22dp"

            android:layout_marginVertical="4dp"

                            android:layout_gravity="center_horizontal"

                            android:layout_margin="4dp"

                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                        <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_gravity="center_horizontal"

                            android:layout_margin="4dp"

                            android:elevation="4dp"/>

                </FrameLayout>

        </LinearLayout>

        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />

        <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_marginBottom="5dp"

        android:layout_weight="1"

        android:gravity="bottom"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="bottom|center_horizontal"

            android:orientation="horizontal">

                <FrameLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                        <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_gravity="center_horizontal"

                            android:layout_margin="4dp"

                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                        <ImageView

                            android:id="@+id/shape_preview_icon_4"

                            android:layout_width="@dimen/preview_theme_shape_size"

                            android:layout_height="@dimen/preview_theme_shape_size"

            android:layout_marginHorizontal="22dp"

            android:layout_marginVertical="4dp"

                            android:layout_gravity="center_horizontal"

                            android:layout_margin="4dp"

                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="1">

                        <ImageView

                            android:id="@+id/shape_preview_icon_5"

                            android:layout_width="@dimen/preview_theme_shape_size"

                            android:layout_height="@dimen/preview_theme_shape_size"

                            android:layout_margin="4dp"

                            android:layout_gravity="center_horizontal"

                            android:elevation="4dp"/>

                </FrameLayout>

        </LinearLayout>

        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />

</LinearLayout>
 
 No newline at end of file