Fixes #3303 (#3322)

* Fixes #3303 * Refactor Nearby to alig lifecycle methods * Pass updated place list to listfragment * Added default zoom rate to mapbox * Removed NearbyListFragmet and added the ui login to handle the same in NearbyParentFragment * More code refactor * Make BottomSheetList hideable * onFragmentHide, hide the bottom sheets * BigFix, Fragmet visibility, register/un-register camera move based on fragments lifecycke * More code refactor * Let the ExecutorUtil have non-ui thread * Add Location Marker on non-ui thread (the non-ui stuffs) * BugFixes * Removed configchanges "orientation" from MainActivity in Manifest (That was messing with the fragment lifecycle) * Some null checks * Initialise lastknown location in onMapReady * UI Fixes * Adjusted UI to support dark and no-dark themes both (in nearby) * Do not update map on Location Slightly changed * Fix failing test case, let TestCommonsApplication extend Application instead of CommonsApplication * start map view when nearby is visible * start the map when NearbyFragmet is visible * More bugfixes * Added DUMMY view for NearbyPresenter's onDetach State * Added a wrapper frame layout parent for MapView to preven it from drawing above other views * More bugfixes (Fixes #3287) * Gray out the un-selected markers from the nearby filter list * BugFix, search this area should search the nearby places for the current camera position * More BugFixes * Handle null primitives with proxy * Current location marker flow via permission flow * onCameraMove should have null-check on NearbyController.latestSearchLocation instead of currentLocation * Search for places around last focus location * Handle location updates * If the user is browsing the map, donot update the map with current location
commons-app · Feb 4, 2020 · 05e9830 · 05e9830
1 parent a6d2523
commit 05e9830
Show file tree

Hide file tree

Showing 25 changed files with 909 additions and 1,248 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
     implementation 'com.github.pedrovgs:renderers:3.3.3'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.2.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.6.1'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v7:0.7.0'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
@@ -102,6 +102,7 @@ dependencies {
 
     //swipe_layout
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
+    implementation 'com.squareup.retrofit2:retrofit:2.7.1'
 }
 
 android {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -78,7 +78,7 @@
             android:name=".contributions.MainActivity"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize|keyboard" />
+            android:configChanges="screenSize|keyboard" />
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/title_activity_settings" />

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -19,6 +19,7 @@
 import com.facebook.imagepipeline.producers.FetchState;
 import com.facebook.imagepipeline.producers.NetworkFetcher;
 import com.facebook.imagepipeline.producers.ProducerContext;
+import com.mapbox.mapboxsdk.Mapbox;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
 
@@ -134,6 +135,7 @@ public void onCreate() {
 
         INSTANCE = this;
         ACRA.init(this);
+        Mapbox.getInstance(this, getString(R.string.mapbox_commons_app_token));
 
         ApplicationlessInjection
                 .getInstance(this)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
@@ -35,7 +35,6 @@
 import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.nearby.NearbyNotificationCardView;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
-import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
 import fr.free.nrw.commons.notification.Notification;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.notification.NotificationController;
@@ -78,6 +77,7 @@ public class MainActivity extends NavigationBaseActivity implements FragmentMana
 
     private MenuItem notificationsMenuItem;
     private TextView notificationCount;
+    private NearbyParentFragment nearbyParentFragment;
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -188,8 +188,6 @@ public void onPageSelected(int position) {
                         tabLayout.getTabAt(NEARBY_TAB_POSITION).select();
                         isContributionsFragmentVisible = false;
                         updateMenuItem();
-                        // Do all permission and GPS related tasks on tab selected, not on create
-                        NearbyParentFragmentPresenter.getInstance().onTabSelected();
                         break;
                     default:
                         tabLayout.getTabAt(CONTRIBUTIONS_TAB_POSITION).select();
@@ -265,7 +263,9 @@ public void onBackPressed() {
             }
         } else if (getSupportFragmentManager().findFragmentByTag(nearbyFragmentTag) != null && !isContributionsFragmentVisible) {
             // Means that nearby fragment is visible (not contributions fragment)
-            NearbyParentFragmentPresenter.getInstance().backButtonClicked();
+            if (null != nearbyParentFragment) {
+                nearbyParentFragment.backButtonClicked();
+            }
         } else {
             super.onBackPressed();
         }
@@ -380,12 +380,13 @@ public Fragment getItem(int position) {
                     }
 
                 case 1:
-                    NearbyParentFragment retainedNearbyFragment = getNearbyFragment(1);
-                    if (retainedNearbyFragment != null) {
-                        return retainedNearbyFragment;
+                    nearbyParentFragment = getNearbyFragment(1);
+                    if (nearbyParentFragment != null) {
+                        return nearbyParentFragment;
                     } else {
                         // If we reach here, retainedNearbyFragment is null
-                        return new NearbyParentFragment();
+                        nearbyParentFragment=new NearbyParentFragment();
+                        return nearbyParentFragment;
                     }
                 default:
                     return null;

diff --git a/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java
@@ -13,8 +13,6 @@
 import fr.free.nrw.commons.explore.recentsearches.RecentSearchesFragment;
 import fr.free.nrw.commons.media.MediaDetailFragment;
 import fr.free.nrw.commons.media.MediaDetailPagerFragment;
-import fr.free.nrw.commons.nearby.fragments.NearbyListFragment;
-import fr.free.nrw.commons.nearby.fragments.NearbyMapFragment;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
 import fr.free.nrw.commons.review.ReviewImageFragment;
 import fr.free.nrw.commons.settings.SettingsFragment;
@@ -40,9 +38,6 @@ public abstract class FragmentBuilderModule {
     @ContributesAndroidInjector
     abstract MediaDetailPagerFragment bindMediaDetailPagerFragment();
 
-    @ContributesAndroidInjector
-    abstract NearbyListFragment bindNearbyListFragment();
-
     @ContributesAndroidInjector
     abstract SettingsFragment bindSettingsFragment();
 
@@ -64,9 +59,6 @@ public abstract class FragmentBuilderModule {
     @ContributesAndroidInjector
     abstract ContributionsFragment bindContributionsFragment();
 
-    @ContributesAndroidInjector
-    abstract NearbyMapFragment bindNearbyMapFragment();
-
     @ContributesAndroidInjector
     abstract NearbyParentFragment bindNearbyParentFragment();
 

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java b/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java
@@ -9,6 +9,8 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatCheckBox;
 
+import java.util.List;
+
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
 
@@ -25,6 +27,16 @@ public class CheckBoxTriStates extends AppCompatCheckBox {
 
     private int state;
 
+    private Callback callback;
+
+    public interface Callback{
+        void filterByMarkerType(@Nullable List<Label> selectedLabels, int state, boolean b, boolean b1);
+    }
+
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
     /**
      * This is the listener set to the super class which is going to be evoke each
      * time the check state has changed.
@@ -87,7 +99,7 @@ public void setState(int state) {
             }
 
             if (NearbyController.currentLocation != null) {
-                NearbyParentFragmentPresenter.getInstance().filterByMarkerType(null, state, false, true);
+                callback.filterByMarkerType(null, state, false, true);
             }
             updateBtn();
         }

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
@@ -17,10 +17,6 @@ public class NearbyAdapterFactory {
     private Fragment fragment;
     private ContributionController controller;
 
-    NearbyAdapterFactory(){
-
-    }
-
     public NearbyAdapterFactory(Fragment fragment, ContributionController controller) {
         this.fragment = fragment;
         this.controller = controller;

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java
@@ -27,20 +27,24 @@ public class NearbyFilterSearchRecyclerViewAdapter
 
     private final LayoutInflater inflater;
     private Context context;
-    private RecyclerView recyclerView;
     private ArrayList<Label> labels;
     private ArrayList<Label> displayedLabels;
     public ArrayList<Label> selectedLabels = new ArrayList<>();
 
     private int state;
 
+    private Callback callback;
+
     RecyclerView.SmoothScroller smoothScroller;
 
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
     public NearbyFilterSearchRecyclerViewAdapter(Context context, ArrayList<Label> labels, RecyclerView recyclerView) {
         this.context = context;
         this.labels = labels;
         this.displayedLabels = labels;
-        this.recyclerView = recyclerView;
         smoothScroller = new
                 LinearSmoothScroller(context) {
                     @Override protected int getVerticalSnapPreference() {
@@ -66,7 +70,7 @@ public RecyclerViewHolder(View view) {
     @NonNull
     @Override
     public RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View itemView = inflater.inflate(R.layout.nearby_search_list_item, parent, false);
+        View itemView = inflater.inflate(callback.isDarkTheme()?R.layout.nearby_search_list_item_dark:R.layout.nearby_search_list_item, parent, false);
         return new RecyclerViewHolder(itemView);
     }
 
@@ -76,17 +80,17 @@ public void onBindViewHolder(@NonNull RecyclerViewHolder holder, int position) {
         holder.placeTypeIcon.setImageResource(label.getIcon());
         holder.placeTypeLabel.setText(label.toString());
 
-        holder.placeTypeLayout.setBackgroundColor(label.isSelected() ? ContextCompat.getColor(context, R.color.divider_grey) : Color.WHITE);
+        holder.placeTypeLayout.setBackgroundColor(label.isSelected() ? ContextCompat.getColor(context, R.color.divider_grey) : callback.isDarkTheme()?Color.BLACK:Color.WHITE);
         holder.placeTypeLayout.setOnClickListener(view -> {
-            NearbyParentFragmentPresenter.getInstance().setCheckboxUnknown();
+            callback.setCheckboxUnknown();
             if (label.isSelected()) {
                 selectedLabels.remove(label);
             } else {
                 selectedLabels.add(label);
             }
             label.setSelected(!label.isSelected());
             holder.placeTypeLayout.setBackgroundColor(label.isSelected() ? ContextCompat.getColor(context, R.color.divider_grey) : Color.WHITE);
-            NearbyParentFragmentPresenter.getInstance().filterByMarkerType(selectedLabels, 0, false, false);
+            callback.filterByMarkerType(selectedLabels, 0, false, false);
         });
     }
 
@@ -161,8 +165,13 @@ public void setRecyclerViewAdapterAllSelected() {
         notifyDataSetChanged();
     }
 
-    public void setRecyclerViewAdapterNeutral() {
-        state = CheckBoxTriStates.UNKNOWN;
+    public interface  Callback{
+
+        void setCheckboxUnknown();
+
+        void filterByMarkerType(ArrayList<Label> selectedLabels, int i, boolean b, boolean b1);
+
+        boolean isDarkTheme();
     }
 
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
@@ -34,11 +34,9 @@
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.nearby.fragments.NearbyMapFragment;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
 import timber.log.Timber;
 
-import static fr.free.nrw.commons.nearby.fragments.NearbyParentFragment.TAG_RETAINED_MAP_FRAGMENT;
 import static fr.free.nrw.commons.theme.NavigationBaseActivity.startActivityWithFlags;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 
@@ -121,7 +119,7 @@ protected void hookListeners(View view) {
                 }
             }
             if (onBookmarkClick == null) {
-                ((NearbyParentFragment) fragment.getParentFragment()).centerMapToPlace(place);
+                ((NearbyParentFragment) fragment).centerMapToPlace(place);
             }
         };
         view.setOnClickListener(listener);
@@ -194,8 +192,7 @@ protected void hookListeners(View view) {
                     onBookmarkClick.onClick();
                 }
                 else {
-                    ((NearbyMapFragment)(fragment.getParentFragment()).getChildFragmentManager().
-                            findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT)).
+                    ((NearbyParentFragment) (fragment.getParentFragment())).
                             updateMarker(isBookmarked, place, null);
                 }
             }

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyMapContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyMapContract.java