Merge branch 'master' into exif

Author: maskaravivek

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Wikimedia Commons for Android
 
+## v2.11.0
+- Refactored upload process, explore/media details, and peer review to use MVP architecture
+- Refactored all AsyncTasks to use RxAndroid
+- Partial migration to Retrofit
+- Allow users to remove EXIF tags from their uploads if desired
+- Multiple crash and bug fixes
+
 ## v2.10.2
 - Fixed remaining issues with date image taken
 - Fixed database crash

app/build.gradle

@@ -105,8 +105,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 243
-        versionName '2.10.2'
+        versionCode 475
+        versionName '2.11.0'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19

app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.java

@@ -48,8 +48,21 @@ public CategoriesModel(MediaWikiApi mwApi,
      */
     public Comparator<CategoryItem> sortBySimilarity(final String filter) {
         Comparator<String> stringSimilarityComparator = StringSortingUtils.sortBySimilarity(filter);
-        return (firstItem, secondItem) -> stringSimilarityComparator
-                .compare(firstItem.getName(), secondItem.getName());
+        return (firstItem, secondItem) -> {
+            //if the category is selected, it should get precedence
+            if (null != firstItem && firstItem.isSelected()) {
+                if (null != secondItem && secondItem.isSelected()) {
+                    return stringSimilarityComparator
+                            .compare(firstItem.getName(), secondItem.getName());
+                }
+                return -1;
+            }
+            if (null != secondItem && secondItem.isSelected()) {
+                return 1;
+            }
+            return stringSimilarityComparator
+                    .compare(firstItem.getName(), secondItem.getName());
+        };
     }
 
     /**
@@ -255,4 +268,38 @@ public void cleanUp() {
         this.categoriesCache.clear();
         this.selectedCategories.clear();
     }
+
+    /**
+     * Search for categories
+     */
+    public Observable<CategoryItem> searchCategories(String query, List<String> imageTitleList) {
+        if (TextUtils.isEmpty(query)) {
+            return gpsCategories()
+                    .concatWith(titleCategories(imageTitleList))
+                    .concatWith(recentCategories());
+        }
+
+        return mwApi
+                .searchCategories(query, SEARCH_CATS_LIMIT)
+                .map(s -> new CategoryItem(s, false));
+    }
+
+    /**
+     * Returns default categories
+     */
+    public Observable<CategoryItem> getDefaultCategories(List<String> titleList) {
+        Observable<CategoryItem> directCategories = directCategories();
+        if (hasDirectCategories()) {
+            Timber.d("Image has direct Categories");
+            return directCategories
+                    .concatWith(gpsCategories())
+                    .concatWith(titleCategories(titleList))
+                    .concatWith(recentCategories());
+        } else {
+            Timber.d("Image has no direct Categories");
+            return gpsCategories()
+                    .concatWith(titleCategories(titleList))
+                    .concatWith(recentCategories());
+        }
+    }
 }

app/src/main/java/fr/free/nrw/commons/nearby/NearbyFragment.java

@@ -705,6 +705,17 @@ public void onPause() {
         }
     }
 
+                      
+    /**
+     * Centers the map in nearby fragment to a given place
+     * @param place is new center of the map
+     */
+    public void centerMapToPlace(Place place) {
+        if (nearbyMapFragment != null) {
+            nearbyMapFragment.centerMapToPlace(place);
+        }
+    }
+
     public boolean isBottomSheetExpanded() { return bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED;
     }
 }

app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java

@@ -225,7 +225,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Timber.d("curLatLng found, setting up map view...");
             setupMapView(savedInstanceState);
         }
-
         setHasOptionsMenu(false);
 
         return mapView;
@@ -254,6 +253,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         });
     }
 
+
     /**
      * Updates map slightly means it doesn't updates all nearby markers around. It just updates
      * location tracker marker of user.
@@ -719,7 +719,6 @@ private void addNearbyMarkersToMapBoxMap(@Nullable List<NearbyBaseMarker> custom
                     passInfoToSheet(place);
                     bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
                     bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-
                 }
                 return false;
             });
@@ -1040,6 +1039,25 @@ public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
         }
     }
 
+    /**
+     * Centers the map in nearby fragment to a given place
+     * @param place is new center of the map
+     */
+    public void centerMapToPlace(Place place) {
+        mapView.getMapAsync(mapboxMap1 -> {
+            CameraPosition position = new CameraPosition.Builder()
+                    .target(isBottomListSheetExpanded ?
+                            new LatLng(place.location.getLatitude()- CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE,
+                                    place.getLocation().getLongitude())
+                            : new LatLng(place.getLocation().getLatitude(), place.getLocation().getLongitude(), 0)) // Sets the new camera position
+                    .zoom(isBottomListSheetExpanded ?
+                            ZOOM_LEVEL
+                            :mapboxMap.getCameraPosition().zoom) // Same zoom level
+                    .build();
+            mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
+        });
+    }
+
 
     public void updateMarker(boolean isBookmarked, Place place) {
 
@@ -1077,5 +1095,6 @@ public void updateMarker(boolean isBookmarked, Place place) {
 
     }
 
+
 }
 

app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java

@@ -17,6 +17,8 @@
 import fr.free.nrw.commons.utils.ViewUtil;
 import timber.log.Timber;
 
+import static fr.free.nrw.commons.contributions.MainActivity.NEARBY_TAB_POSITION;
+
 /**
  * Custom card view for nearby notification card view on main screen, above contributions list
  */
@@ -66,7 +68,6 @@ private void init() {
 
         progressBar = rootView.findViewById(R.id.progressBar);
 
-        setActionListeners();
     }
 
     @Override
@@ -81,8 +82,16 @@ protected void onAttachedToWindow() {
     }
 
 
-    private void setActionListeners() {
-        this.setOnClickListener(view -> ((MainActivity)getContext()).viewPager.setCurrentItem(1));
+    private void setActionListeners(Place place) {
+        this.setOnClickListener(view -> {
+            MainActivity m = (MainActivity) getContext();
+
+            // Change to nearby tab
+            m.viewPager.setCurrentItem(NEARBY_TAB_POSITION);
+
+            // Center the map to the place
+            ((NearbyFragment) m.contributionsActivityPagerAdapter.getItem(NEARBY_TAB_POSITION)).centerMapToPlace(place);
+        });
     }
 
     @Override public boolean onSwipe(View view) {
@@ -120,6 +129,7 @@ public void updateContent(Place place) {
         contentLayout.setVisibility(VISIBLE);
         // Make progress bar invisible once data is ready
         progressBar.setVisibility(GONE);
+        setActionListeners(place);
         // And content views visible since they are ready
         notificationTitle.setVisibility(VISIBLE);
         notificationDistance.setVisibility(VISIBLE);

app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java

@@ -116,9 +116,12 @@ protected void hookListeners(View view) {
                     ((LinearLayoutManager) recyclerView.getLayoutManager()).scrollToPositionWithOffset(lastPosition, buttonLayout.getHeight());
                 }
             }
-
+            if (onBookmarkClick == null) {
+                ((NearbyFragment) fragment.getParentFragment()).centerMapToPlace(place);
+            }
         };
         view.setOnClickListener(listener);
+
         view.requestFocus();
         view.setOnFocusChangeListener((view1, hasFocus) -> {
             if (!hasFocus && buttonLayout.isShown()) {

app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java

@@ -225,6 +225,7 @@ private void setAdapter(List<Notification> notificationList) {
             public void notificationClicked(Notification notification) {
                 Timber.d("Notification clicked %s", notification.link);
                 handleUrl(notification.link);
+                removeNotification(notification);
             }
 
             @Override

app/src/main/java/fr/free/nrw/commons/notification/NotificationRenderer.java

@@ -9,7 +9,6 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.daimajia.swipe.SwipeLayout;
 import com.google.android.material.animation.ArgbEvaluatorCompat;
 import com.pedrogomez.renderers.Renderer;
 
@@ -32,12 +31,8 @@ public class NotificationRenderer extends Renderer<Notification> {
     TextView time;
     @BindView(R.id.icon)
     ImageView icon;
-    @BindView(R.id.swipeLayout)
-    SwipeLayout swipeLayout;
-    @BindView(R.id.bottom)
-    LinearLayout bottomLayout;
-    @BindView(R.id.notification_view)
-    RelativeLayout notificationView;
+    /*@BindView(R.id.bottom)
+    LinearLayout bottomLayout;*/
 
     private NotificationClicked listener;
     private boolean isarchivedvisible = false;
@@ -53,13 +48,6 @@ void onNotificationClicked() {
         listener.notificationClicked(getContent());
     }
 
-    @OnClick(R.id.bottom)
-    void onBottomLayoutClicked(){
-        Notification notification = getContent();
-        Timber.d("NotificationID: %s", notification.notificationId);
-        listener.markNotificationAsRead(notification);
-    }
-
     @Override
     protected void setUpView(View rootView) {
 
@@ -74,21 +62,6 @@ protected void hookListeners(View rootView) {
     protected View inflate(LayoutInflater layoutInflater, ViewGroup viewGroup) {
         View inflatedView = layoutInflater.inflate(R.layout.item_notification, viewGroup, false);
         ButterKnife.bind(this, inflatedView);
-        if (isarchivedvisible) {
-            swipeLayout.setSwipeEnabled(false);
-        }else {
-            swipeLayout.setSwipeEnabled(true);
-        }
-        swipeLayout.addDrag(SwipeLayout.DragEdge.Top, bottomLayout);
-        swipeLayout.addRevealListener(R.id.bottom_wrapper_child1, (child, edge, fraction, distance) -> {
-            View star = child.findViewById(R.id.star);
-            float d = child.getHeight() / 2 - star.getHeight() / 2;
-            star.setTranslationY(d * fraction);
-            star.setScaleX(fraction + 0.6f);
-            star.setScaleY(fraction + 0.6f);
-            int c = ArgbEvaluatorCompat.getInstance().evaluate(fraction, Color.parseColor("#dddddd"), Color.parseColor("#90960a0a"));
-            child.setBackgroundColor(c);
-        });
         return inflatedView;
     }
 

app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java

@@ -11,10 +11,8 @@
 import fr.free.nrw.commons.upload.UploadModel.UploadItem;
 import io.reactivex.Observable;
 import io.reactivex.Single;
-
 import java.util.Comparator;
 import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -167,7 +165,7 @@ public Observable<UploadItem> preProcessImage(UploadableFile uploadableFile, Pla
     }
 
     /**
-     * ask the UplaodModel for the image quality of the UploadItem
+     * ask the UploadModel for the image quality of the UploadItem
      *
      * @param uploadItem
      * @param shouldValidateTitle
@@ -176,4 +174,21 @@ public Observable<UploadItem> preProcessImage(UploadableFile uploadableFile, Pla
     public Single<Integer> getImageQuality(UploadItem uploadItem, boolean shouldValidateTitle) {
         return uploadModel.getImageQuality(uploadItem, shouldValidateTitle);
     }
+
+    /**
+     * Ask the CategoriesModel to search categories
+     * @param query
+     * @param imageTitleList
+     * @return
+     */
+    public Observable<CategoryItem> searchCategories(String query, List<String> imageTitleList) {
+        return categoriesModel.searchCategories(query, imageTitleList);
+    }
+
+    /**
+     * Ask the CategoriesModel for default categories
+     */
+    public Observable<CategoryItem> getDefaultCategories(List<String> imageTitleList) {
+        return categoriesModel.getDefaultCategories(imageTitleList);
+    }
 }