diff options
author | Stefan Niedermann <info@niedermann.it> | 2020-06-13 14:20:12 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2020-06-13 14:20:12 +0300 |
commit | 1effe693db8873c37b3a661899a8d21815b56d02 (patch) | |
tree | 87243dea9902a357b1ffd1e2288fb9388cbfed3f /app/src/main | |
parent | e63eb19ce41f367895db4f5da4c811303d0153b4 (diff) |
Move sorting icon into toolbar
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/res/layout/activity_notes_list_view.xml | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml index 63233d8f..25ac8606 100644 --- a/app/src/main/res/layout/activity_notes_list_view.xml +++ b/app/src/main/res/layout/activity_notes_list_view.xml @@ -83,6 +83,16 @@ tools:text="@string/search_in_all" /> <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/sorting_method" + android:layout_width="?attr/actionBarSize" + android:layout_height="?attr/actionBarSize" + android:contentDescription="@string/action_sorting_method" + android:padding="@dimen/spacer_2x" + android:layout_gravity="center_vertical|end" + android:background="?attr/selectableItemBackgroundBorderless" + app:srcCompat="@drawable/alphabetical_asc" /> + + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/launchAccountSwitcher" android:layout_width="?attr/actionBarSize" android:layout_height="?attr/actionBarSize" @@ -101,44 +111,30 @@ android:layout_height="match_parent" tools:context="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity"> - <LinearLayout + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/sorting_method" + <include + android:id="@+id/empty_content_view" + layout="@layout/empty_content_view" /> + + <ProgressBar + android:id="@+id/progress_circular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:contentDescription="@string/action_sorting_method" - android:padding="@dimen/spacer_1hx" - app:srcCompat="@drawable/alphabetical_asc" /> + android:layout_gravity="center" + android:indeterminateTint="@color/defaultBrand" + tools:targetApi="lollipop" + tools:visibility="gone" /> - <FrameLayout + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include - android:id="@+id/empty_content_view" - layout="@layout/empty_content_view" /> - - <ProgressBar - android:id="@+id/progress_circular" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:indeterminateTint="@color/defaultBrand" - tools:targetApi="lollipop" - tools:visibility="gone" /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scrollbars="vertical" - tools:listitem="@layout/item_notes_list_note_item_with_excerpt" /> - </FrameLayout> - </LinearLayout> + android:layout_height="wrap_content" + android:scrollbars="vertical" + tools:listitem="@layout/item_notes_list_note_item_with_excerpt" /> + </FrameLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </LinearLayout> |