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

Commit d9737761 authored by Mill Chen's avatar Mill Chen
Browse files

Fix distortion in conditional cards 

When setting device font and display size to largest, conditional cards
will get distorted. The fix is to add a different layout for screens that
have smaller than 360dp available width.

Change-Id: I8b61c9d8a568e79045e4a490aa387c801a57f9a7
Fixes: 119505249
Test: visual
parent 847c0660

res/layout-sw360dp/homepage_condition_full_tile.xml

0 → 100644
+74 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    style="@style/ContextualCardStyle">



    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/homepage_card_padding_start"

        android:paddingEnd="@dimen/homepage_card_padding_end"

        android:paddingTop="@dimen/homepage_condition_full_card_padding_top"

        android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"

        android:orientation="horizontal"

        android:gravity="center_vertical">



        <ImageView

            android:id="@android:id/icon"

            android:layout_width="@dimen/homepage_card_icon_size"

            android:layout_height="@dimen/homepage_card_icon_size"

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



        <LinearLayout

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingStart="@dimen/homepage_condition_full_card_padding_start"

            android:paddingEnd="@dimen/homepage_condition_full_card_padding_end"

            android:orientation="vertical">



            <TextView

                android:id="@android:id/title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>



            <TextView

                android:id="@android:id/summary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>



        </LinearLayout>



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



        <Button

            android:id="@+id/first_action"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="@style/ConditionFullCardBorderlessButton"/>



    </LinearLayout>



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

res/layout/homepage_condition_full_tile.xml

+26 −25
Original line number Diff line number Diff line
@@ -23,14 +23,17 @@ 


    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/homepage_condition_half_card_padding_top"

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingStart="@dimen/homepage_card_padding_start"

            android:paddingEnd="@dimen/homepage_card_padding_end"

        android:paddingTop="@dimen/homepage_condition_full_card_padding_top"

        android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"

        android:orientation="horizontal"

        android:gravity="center_vertical">

            android:orientation="vertical">



            <ImageView

                android:id="@android:id/icon"
@@ -38,36 +41,34 @@ 
                android:layout_height="@dimen/homepage_card_icon_size"

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



        <LinearLayout

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingStart="@dimen/homepage_condition_full_card_padding_start"

            android:paddingEnd="@dimen/homepage_condition_full_card_padding_end"

            android:orientation="vertical">



            <TextView

                android:id="@android:id/title"

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:maxLines="1"

                android:ellipsize="end"

                android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"

                android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"

                style="@style/TextAppearance.ConditionCardTitle"/>

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>



            <TextView

                android:id="@android:id/summary"

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/TextAppearance.ConditionCardSummary"/>

                android:maxLines="1"

                android:ellipsize="end"

                android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"

                android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>



        </LinearLayout>



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

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



        </LinearLayout>

        <Button

            android:id="@+id/first_action"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/ConditionFullCardBorderlessButton"/>

            android:scrollbars="none"

            style="@style/ConditionHalfCardBorderlessButton"/>



    </LinearLayout>

res/layout/homepage_condition_half_tile.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<com.google.android.material.card.MaterialCardView

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/homepage_condition_half_card_height"

    android:layout_height="wrap_content"

    style="@style/ContextualCardStyle">



    <LinearLayout
@@ -49,7 +49,7 @@ 
                android:ellipsize="end"

                android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"

                android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"

                style="@style/TextAppearance.ConditionCardTitle"/>

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>



            <TextView

                android:id="@android:id/summary"
@@ -58,7 +58,7 @@ 
                android:maxLines="1"

                android:ellipsize="end"

                android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"

                style="@style/TextAppearance.ConditionCardSummary"/>

                android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>



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

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ 


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

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

    <dimen name="homepage_condition_half_card_height">150dp</dimen>

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

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

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