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

Commit 9de0da60 authored by Steve McKay's avatar Steve McKay
Browse files

Move sort headers out of directory layout. 

This allowed some simplification of the sort component lifecycle.
Also move progress bar.
Also, don't reset model when we get a loader-reset when last results
reported "loading". Fixes a bug where progress bar was being hidden too early.
Finally do a little pixel tweaking on sort headers and breadcrumb.

Change-Id: I49a2c70443edacfe911f692054e289bf1d5f6ecb
parent 50b04704

res/drawable/sort_widget_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        android:top="-1dp"

        android:left="-1dp"

        android:right="-1dp"

        android:bottom="1dp">

        android:bottom="0dp">

        <shape android:shape="rectangle">

            <stroke

                android:width="1dp"

res/layout-sw720dp-land/column_headers.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:layout_height="@dimen/doc_header_height"

    android:background="@drawable/sort_widget_background"

    android:visibility="gone">



    <!-- Placeholder for focus indicator -->

    <View

        android:layout_width="4dp"

res/layout/directory_cluster.xml

+12 −5
Original line number Diff line number Diff line
@@ -18,12 +18,19 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/container_message_bar"

    <!-- dropdown sort widget shows when column headers doesn't. -->

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



    <!-- column headers are empty on small screens, in portrait or in grid mode. -->

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



    <ProgressBar

        android:id="@+id/progressbar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="8dp"

        android:background="@color/material_grey_50"/>

        android:layout_height="@dimen/progress_bar_height"

        android:indeterminate="true"

        style="@style/TrimmedHorizontalProgressBar"

        android:visibility="gone"/>



    <FrameLayout

        android:id="@+id/container_directory"

res/layout/fragment_directory.xml

+3 −16
Original line number Diff line number Diff line
@@ -23,19 +23,11 @@ 
    android:elevation="4dp"

    android:orientation="vertical">



    <ProgressBar

        android:id="@+id/progressbar"

        android:layout_width="match_parent"

        android:layout_height="@dimen/progress_bar_height"

        android:indeterminate="true"

        style="@style/TrimmedHorizontalProgressBar"

        android:visibility="gone"/>



    <FrameLayout

        android:id="@+id/container_message_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="8dp"

        android:elevation="1dp"

        android:background="@color/material_grey_50"

        android:visibility="gone" />
@@ -47,6 +39,7 @@ 
        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent">



            <!-- The empty container view -->

            <FrameLayout

                android:id="@android:id/empty"
@@ -95,12 +88,6 @@ 
                android:layout_height="match_parent"

                android:orientation="vertical">



                <!-- dropdown sort widget shows when column headers doesn't. -->

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



                <!-- column headers are empty on small screens, in portrait or in grid mode. -->

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



                <android.support.v7.widget.RecyclerView

                    android:id="@+id/dir_list"

                    android:scrollbars="vertical"

res/layout/navigation_breadcrumb_item.xml

+1 −3
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_breadcrumb_arrow"

        android:layout_marginTop="2dp"

        android:layout_marginRight="3dp"

        android:layout_marginLeft="3dp" />

        android:layout_marginTop="2dp" />



</LinearLayout>
 
 No newline at end of file