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

Commit 28c05ee8 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Item layout tweaking, hook up more assets. 

Update layouts for items in both list and grid mode to reflect
latest UX.  Use new card background in grid mode, and apply gradient
treatment over thumbnails.

Visibly mark currently selected root.

Bug: 10510022
Change-Id: I36b290d7082b5cdfd7b3167df7d976032bc01bd6
parent 6d97d3c1

packages/DocumentsUI/res/drawable/item_doc_grid.xml

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

<!-- Copyright (C) 2013 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.

-->



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

    <item android:drawable="@drawable/ic_grid_card_background" />

</selector>

packages/DocumentsUI/res/drawable/item_root.xml

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

<!-- Copyright (C) 2013 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.

-->



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

    <item android:state_pressed="true" android:drawable="@color/item_root_activated" />

    <item android:state_activated="true" android:drawable="@color/item_root_activated" />

    <item android:state_focused="true" android:drawable="@color/item_root_activated" />

    <item android:drawable="@android:color/white" />

</selector>

packages/DocumentsUI/res/layout/fragment_directory.xml

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:listSelector="@android:color/transparent"

        android:paddingTop="?android:attr/listPreferredItemPaddingStart"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:visibility="gone" />



    <Button

packages/DocumentsUI/res/layout/item_doc_grid.xml

+82 −81
Original line number Diff line number Diff line
@@ -16,16 +16,9 @@ 


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

    android:layout_width="match_parent"

    android:layout_height="180dip"

    android:paddingBottom="?android:attr/listPreferredItemPaddingEnd"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/chip"

        android:foreground="@drawable/item_background"

        android:duplicateParentState="true">

    android:layout_height="@dimen/grid_height"

    android:background="@drawable/item_doc_grid"

    android:foreground="@drawable/item_background">



    <LinearLayout

        android:layout_width="match_parent"
@@ -33,87 +26,97 @@ 
        android:paddingBottom="6dp"

        android:orientation="vertical">



            <ImageView

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

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

                android:background="#bbb"

            android:background="#fff">



            <ImageView

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

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:scaleType="centerInside"

                android:contentDescription="@null" />



            <TextView

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

            <ImageView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:paddingTop="6dp"

                android:paddingStart="?android:attr/listPreferredItemPaddingStart"

                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:textAlignment="viewStart" />

                android:layout_height="match_parent"

                android:scaleType="fitXY"

                android:src="@drawable/ic_grid_gradient_bg"

                android:contentDescription="@null" />



        </FrameLayout>



        <LinearLayout

                android:id="@+id/summary_grid"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingTop="6dp"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



                <ImageView

                    android:id="@android:id/icon1"

                    android:layout_width="24dip"

                    android:layout_height="24dip"

                    android:layout_marginEnd="6dip"

                    android:scaleType="centerInside"

                    android:contentDescription="@null" />



            <TextView

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

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

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                    android:layout_gravity="center_vertical"

                android:singleLine="true"

                android:ellipsize="marquee"

                    android:textAlignment="viewStart"

                    android:textAppearance="?android:attr/textAppearanceSmall" />

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textAlignment="viewStart" />



            <ImageView

                android:id="@android:id/icon1"

                android:layout_width="@dimen/root_icon_size"

                android:layout_height="@dimen/root_icon_size"

                android:layout_marginStart="8dip"

                android:scaleType="centerInside"

                android:contentDescription="@null" />



        </LinearLayout>



        <LinearLayout

            android:id="@+id/line2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



                <View

                    android:layout_width="0dip"

                    android:layout_height="0dip"

                    android:layout_weight="1" />

            <TextView

                android:id="@+id/date"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:minWidth="80dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />



            <TextView

                android:id="@+id/size"

                    android:layout_width="70dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                    android:layout_marginEnd="8dp"

                android:layout_marginStart="8dp"

                android:minWidth="80dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                    android:textAlignment="viewEnd"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />



            <TextView

                    android:id="@+id/date"

                    android:layout_width="70dp"

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

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_gravity="center_vertical"

                android:layout_marginStart="8dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                    android:textAlignment="viewEnd"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />



        </LinearLayout>
@@ -121,5 +124,3 @@ 
    </LinearLayout>



</FrameLayout>
 


</FrameLayout>

packages/DocumentsUI/res/layout/item_doc_list.xml

+37 −26
Original line number Diff line number Diff line
@@ -27,9 +27,10 @@ 


    <ImageView

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

        android:layout_width="@android:dimen/app_icon_size"

        android:layout_height="@android:dimen/app_icon_size"

        android:layout_marginEnd="8dip"

        android:layout_width="@dimen/icon_size"

        android:layout_height="@dimen/icon_size"

        android:layout_marginStart="12dp"

        android:layout_marginEnd="20dp"

        android:layout_gravity="center_vertical"

        android:scaleType="centerInside"

        android:contentDescription="@null" />
@@ -41,36 +42,43 @@ 
        android:layout_gravity="center_vertical"

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">



            <TextView

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

            android:layout_width="match_parent"

                android:layout_width="0dip"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textAlignment="viewStart" />



        <LinearLayout

            android:id="@+id/summary_list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">



            <ImageView

                android:id="@android:id/icon1"

                android:layout_width="24dip"

                android:layout_height="24dip"

                android:layout_marginEnd="6dip"

                android:layout_width="@dimen/root_icon_size"

                android:layout_height="@dimen/root_icon_size"

                android:layout_marginStart="8dip"

                android:scaleType="centerInside"

                android:contentDescription="@null" />



        </LinearLayout>



        <LinearLayout

            android:id="@+id/line2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">



            <TextView

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

                android:layout_width="0dp"

                android:id="@+id/date"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_gravity="center_vertical"

                android:layout_marginEnd="8dp"

                android:minWidth="70dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"
@@ -78,23 +86,26 @@ 


            <TextView

                android:id="@+id/size"

                android:layout_width="70dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginEnd="8dp"

                android:minWidth="70dp"

                android:layout_marginStart="8dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewEnd"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />



            <TextView

                android:id="@+id/date"

                android:layout_width="70dp"

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

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_gravity="center_vertical"

                android:layout_marginStart="8dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewEnd"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />



        </LinearLayout>