From bd77c26cf713129bfdc6a05a19eb4104a73a201b Mon Sep 17 00:00:00 2001 From: Alexander Marchuk Date: Fri, 15 Apr 2016 19:29:40 +0300 Subject: [PATCH 01/17] [downloader][android] refactor: MyMaps in downloader hierarchy. --- .../jni/com/mapswithme/maps/MapManager.cpp | 12 ++- .../res/layout/downloader_bottom_panel.xml | 32 ------ android/res/layout/fragment_downloader.xml | 28 +++++- android/res/layout/recycler_default.xml | 8 +- android/res/layout/toolbar_with_search.xml | 12 +-- .../maps/downloader/BottomPanel.java | 97 +++++++++++++------ .../maps/downloader/CountryItem.java | 28 ++++-- .../maps/downloader/DownloaderAdapter.java | 53 ++++++---- .../maps/downloader/DownloaderFragment.java | 16 ++- .../DownloaderToolbarController.java | 14 +-- .../maps/downloader/MapManager.java | 5 +- 11 files changed, 183 insertions(+), 122 deletions(-) delete mode 100644 android/res/layout/downloader_bottom_panel.xml diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp index 05efb8d94f..afa00745c2 100644 --- a/android/jni/com/mapswithme/maps/MapManager.cpp +++ b/android/jni/com/mapswithme/maps/MapManager.cpp @@ -350,13 +350,13 @@ static void PutItemsToList(JNIEnv * env, jobject const list, TCountriesVec const } } -// static void nativeListItems(@Nullable String root, double lat, double lon, boolean hasLocation, List result); +// static void nativeListItems(@Nullable String root, double lat, double lon, boolean hasLocation, boolean myMapsMode, List result); JNIEXPORT void JNICALL -Java_com_mapswithme_maps_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz, jstring parent, jdouble lat, jdouble lon, jboolean hasLocation, jobject result) +Java_com_mapswithme_maps_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz, jstring parent, jdouble lat, jdouble lon, jboolean hasLocation, jboolean myMapsMode, jobject result) { PrepareClassRefs(env); - if (hasLocation) + if (hasLocation && !myMapsMode) { TCountriesVec near; g_framework->NativeFramework()->CountryInfoGetter().GetRegionsCountryId(MercatorBounds::FromLatLon(lat, lon), near); @@ -369,8 +369,10 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeListItems(JNIEnv * env, jcl TCountriesVec downloaded, available; GetStorage().GetChildrenInGroups(GetRootId(env, parent), downloaded, available); - PutItemsToList(env, result, downloaded, ItemCategory::DOWNLOADED, nullptr); - PutItemsToList(env, result, available, ItemCategory::AVAILABLE, nullptr); + if (myMapsMode) + PutItemsToList(env, result, downloaded, ItemCategory::DOWNLOADED, nullptr); + else + PutItemsToList(env, result, available, ItemCategory::AVAILABLE, nullptr); } // static void nativeUpdateItem(CountryItem item); diff --git a/android/res/layout/downloader_bottom_panel.xml b/android/res/layout/downloader_bottom_panel.xml deleted file mode 100644 index 9bcbb0691f..0000000000 --- a/android/res/layout/downloader_bottom_panel.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - -