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

Commit be7a9d51 authored by Katherine Kuan's avatar Katherine Kuan
Browse files

Pixel perfect phone landscape contact card 

- Make contact photo larger

- Detect the difference between stream item updates with text only versus
with text + photos --> In order to add padding between images + text without
affecting the other cases

- Make tabs in tab carousel have the right initial alpha value

- Add some constants for the maxLine values in ContactDetailFragment

- Make HtmlUtils not crash with NPE if the streamItem.getText() is null.

Bug: 5254628
Change-Id: I858b4cbfac13fe2105159cf13a4bc6b64442745e
parent 7a330308

res/layout-w470dp/contact_detail_fragment.xml

+3 −5
Original line number Diff line number Diff line
@@ -39,12 +39,10 @@ 


        <ImageView android:id="@+id/photo"

            android:scaleType="centerCrop"

            android:layout_width="100dip"

            android:layout_height="100dip"

            android:layout_width="128dip"

            android:layout_height="128dip"

            android:layout_marginLeft="@dimen/detail_contact_photo_margin"

            android:layout_marginRight="@dimen/detail_contact_photo_margin"

            android:layout_marginTop="@dimen/detail_contact_photo_margin"

            android:layout_marginBottom="@dimen/detail_contact_photo_margin"/>

            android:layout_marginTop="@dimen/detail_contact_photo_margin"/>



        <ListView android:id="@android:id/list"

            android:layout_width="0dip"

res/layout/stream_item_row_image_and_text.xml→res/layout/stream_item_row_one_image.xml

+0 −5
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/detail_update_section_between_items_padding"

        android:orientation="horizontal"

        android:weightSum="2">
@@ -48,8 +47,4 @@ 


    </LinearLayout>



    <include

        android:id="@+id/stream_item_second_text"

        layout="@layout/stream_item_row_text_only"/>



</LinearLayout>

res/layout/stream_item_row_text_only.xml→res/layout/stream_item_row_text.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/detail_update_section_between_items_padding"

    android:orientation="vertical">



    <TextView android:id="@+id/stream_item_html"

res/values-sw580dp-w1000dp/dimens.xml

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

<resources>

    <dimen name="group_detail_border_padding">32dip</dimen>

    <dimen name="detail_contact_photo_margin">16dip</dimen>

    <dimen name="contact_detail_list_top_padding">32dip</dimen>

</resources>

res/values/dimens.xml

+5 −2
Original line number Diff line number Diff line
@@ -61,17 +61,20 @@ 
    <!-- Vertical padding above and below individual stream items -->

    <dimen name="detail_update_section_item_vertical_padding">16dip</dimen>



    <!-- Vertical padding between text and images in a single stream item -->

    <dimen name="detail_update_section_between_items_vertical_padding">8dip</dimen>



    <!-- Horizontal padding for individual stream items -->

    <dimen name="detail_update_section_item_horizontal_padding">8dip</dimen>



    <!-- Padding between columns images and/or text in a single stream item -->

    <!-- Padding between images in a single stream item -->

    <dimen name="detail_update_section_between_items_padding">1dip</dimen>



    <!-- Horizontal padding between attribution and comments -->

    <dimen name="detail_update_section_attribution_comments_padding">4dip</dimen>



    <!-- Margin around the contact's photo on the contact card -->

    <dimen name="detail_contact_photo_margin">16dip</dimen>

    <dimen name="detail_contact_photo_margin">8dip</dimen>



    <!-- Width and height of the contact photo on the contact detail page -->

    <dimen name="detail_contact_photo_size">256dip</dimen>