From c467b7a40c1f3709d18b0471e7bff0c6074cfab9 Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Thu, 29 Aug 2019 22:30:06 +0300
Subject: [PATCH] [bookmarks][android] Added sorting progress bar.

---
 android/res/layout/toolbar_menu_progressbar.xml    |  8 ++++++++
 .../maps/bookmarks/BookmarksListFragment.java      | 14 ++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 android/res/layout/toolbar_menu_progressbar.xml

diff --git a/android/res/layout/toolbar_menu_progressbar.xml b/android/res/layout/toolbar_menu_progressbar.xml
new file mode 100644
index 0000000000..97eda7c623
--- /dev/null
+++ b/android/res/layout/toolbar_menu_progressbar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProgressBar
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/Widget.AppCompat.ProgressBar"
+  android:layout_width="@dimen/height_block_base"
+  android:layout_height="@dimen/height_block_base"
+  android:padding="@dimen/margin_half"
+  android:background="@null"/>
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index 79152338c4..fff77918ee 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -342,6 +342,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
     BookmarkListAdapter adapter = getAdapter();
     adapter.setSortedResults(sortedBlocks);
     adapter.notifyDataSetChanged();
+
+    updateSortingProgressBar();
   }
 
   @Override
@@ -354,6 +356,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
     BookmarkListAdapter adapter = getAdapter();
     adapter.setSortedResults(null);
     adapter.notifyDataSetChanged();
+
+    updateSortingProgressBar();
   }
 
   @Override
@@ -373,6 +377,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
     BookmarkManager.INSTANCE.setLastSortingType(catId, sortingType);
     BookmarkManager.INSTANCE.getSortedCategory(catId, sortingType, hasMyPosition, lat, lon,
                                                mLastSortTimestamp);
+
+    updateSortingProgressBar();
   }
 
   @Override
@@ -481,6 +487,11 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
     return !isDownloadedCategory() && BookmarkManager.INSTANCE.isSearchAllowed(category.getId());
   }
 
+  private void updateSortingProgressBar()
+  {
+    requireActivity().invalidateOptionsMenu();
+  }
+
   public void onItemClick(int position)
   {
     final Intent i = new Intent(requireActivity(), MwmActivity.class);
@@ -655,6 +666,9 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
 
     MenuItem itemMore = menu.findItem(R.id.bookmarks_more);
     itemMore.setVisible(visible);
+
+    if (mLastSortTimestamp != 0)
+      itemMore.setActionView(R.layout.toolbar_menu_progressbar);
   }
 
   @Override