Merge pull request commons-app#1319 from misaochan/category-suggestions-new

neslihanturan · web-flow · commit 4c192e48e0b1 · 2018-03-19T13:10:03.000+02:00
Category suggestions for direct nearby uploads
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
@@ -72,13 +72,16 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
 
     @Inject MediaWikiApi mwApi;
     @Inject @Named("default_preferences") SharedPreferences prefs;
+    @Inject @Named("prefs") SharedPreferences prefsPrefs;
+    @Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
     @Inject CategoryDao categoryDao;
 
     private RVRendererAdapter<CategoryItem> categoriesAdapter;
     private OnCategoriesSaveHandler onCategoriesSaveHandler;
     private HashMap<String, ArrayList<String>> categoriesCache;
     private List<CategoryItem> selectedCategories = new ArrayList<>();
     private TitleTextWatcher textWatcher = new TitleTextWatcher();
+    private boolean hasDirectCategories = false;
 
     private final CategoriesAdapterFactory adapterFactory = new CategoriesAdapterFactory(item -> {
         if (item.isSelected()) {
@@ -127,7 +130,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     }
 
     public void hideKeyboard(View view) {
-        InputMethodManager inputMethodManager =(InputMethodManager)getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
+        InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
         inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 
@@ -222,7 +225,7 @@ private void updateCategoryList(String filter) {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         s -> categoriesAdapter.add(s),
-                         Timber::e,
+                        Timber::e,
                         () -> {
                             categoriesAdapter.notifyDataSetChanged();
                             categoriesSearchInProgress.setVisibility(View.GONE);
@@ -257,9 +260,34 @@ private List<String> getStringList(List<CategoryItem> input) {
     }
 
     private Observable<CategoryItem> defaultCategories() {
-        return gpsCategories()
-                .concatWith(titleCategories())
-                .concatWith(recentCategories());
+
+        Observable<CategoryItem> directCat = directCategories();
+        if (hasDirectCategories) {
+            Timber.d("Image has direct Cat");
+            return directCat
+                    .concatWith(gpsCategories())
+                    .concatWith(titleCategories())
+                    .concatWith(recentCategories());
+        }
+        else {
+            Timber.d("Image has no direct Cat");
+            return gpsCategories()
+                    .concatWith(titleCategories())
+                    .concatWith(recentCategories());
+        }
+    }
+
+    private Observable<CategoryItem> directCategories() {
+        String directCategory = directPrefs.getString("Category", "");
+        List<String> categoryList = new ArrayList<>();
+        Timber.d("Direct category found: " + directCategory);
+
+        if (!directCategory.equals("")) {
+            hasDirectCategories = true;
+            categoryList.add(directCategory);
+            Timber.d("DirectCat does not equal emptyString. Direct Cat list has " + categoryList);
+        }
+        return Observable.fromIterable(categoryList).map(name -> new CategoryItem(name, false));
     }
 
     private Observable<CategoryItem> gpsCategories() {
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
@@ -39,6 +39,7 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
 
     @Override
     void inject(ApplicationlessInjection instance);
+
     void inject(PlaceRenderer placeRenderer);
 
     @Component.Builder
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -623,6 +623,7 @@ void storeSharedPrefs() {
         SharedPreferences.Editor editor = directPrefs.edit();
         editor.putString("Title", place.getName());
         editor.putString("Desc", place.getLongDescription());
+        editor.putString("Category", place.getCategory());
         editor.apply();
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
@@ -8,6 +8,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -100,13 +101,17 @@ private List<Place> getFromWikidataQuery(LatLng cur,
             }
 
             String[] fields = line.split("\t");
+            Timber.v("Fields: " + Arrays.toString(fields));
             String point = fields[0];
+            String wikiDataLink = Utils.stripLocalizedString(fields[1]);
             String name = Utils.stripLocalizedString(fields[2]);
             String type = Utils.stripLocalizedString(fields[4]);
+            String icon = fields[5];
             String wikipediaSitelink = Utils.stripLocalizedString(fields[7]);
             String commonsSitelink = Utils.stripLocalizedString(fields[8]);
-            String wikiDataLink = Utils.stripLocalizedString(fields[1]);
-            String icon = fields[5];
+            String category = Utils.stripLocalizedString(fields[9]);
+
+            Timber.v("Name: " + name + ", type: " + type + ", category: " + category + ", wikipediaSitelink: " + wikipediaSitelink + ", commonsSitelink: " + commonsSitelink);
 
             double latitude;
             double longitude;
@@ -128,6 +133,7 @@ private List<Place> getFromWikidataQuery(LatLng cur,
                     type, // details
                     Uri.parse(icon),
                     new LatLng(latitude, longitude, 0),
+                    category,
                     new Sitelinks.Builder()
                             .setWikipediaLink(wikipediaSitelink)
                             .setCommonsLink(commonsSitelink)
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java
@@ -17,6 +17,7 @@ public class Place {
     private final String longDescription;
     private final Uri secondaryImageUrl;
     public final LatLng location;
+    private final String category;
 
     public Bitmap image;
     public Bitmap secondaryImage;
@@ -25,12 +26,13 @@ public class Place {
 
 
     public Place(String name, Label label, String longDescription,
-                 Uri secondaryImageUrl, LatLng location, Sitelinks siteLinks) {
+                 Uri secondaryImageUrl, LatLng location, String category, Sitelinks siteLinks) {
         this.name = name;
         this.label = label;
         this.longDescription = longDescription;
         this.secondaryImageUrl = secondaryImageUrl;
         this.location = location;
+        this.category = category;
         this.siteLinks = siteLinks;
     }
 
@@ -42,6 +44,8 @@ public Label getLabel() {
 
     public String getLongDescription() { return longDescription; }
 
+    public String getCategory() {return category; }
+
     public void setDistance(String distance) {
         this.distance = distance;
     }
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
@@ -28,6 +28,7 @@
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionController;
+import fr.free.nrw.commons.di.ApplicationlessInjection;
 import timber.log.Timber;
 
 public class PlaceRenderer extends Renderer<Place> {
@@ -124,8 +125,8 @@ private void storeSharedPrefs() {
         Timber.d("directPrefs stored");
         editor.putString("Title", place.getName());
         editor.putString("Desc", place.getLongDescription());
+        editor.putString("Category", place.getCategory());
         editor.apply();
-
     }
 
     private void closeLayout(LinearLayout buttonLayout){
@@ -138,7 +139,8 @@ private void openLayout(LinearLayout buttonLayout){
 
     @Override
     public void render() {
-
+        ApplicationlessInjection.getInstance(getContext().getApplicationContext())
+                .getCommonsApplicationComponent().inject(this);
         place = getContent();
         tvName.setText(place.name);
         String descriptionText = place.getLongDescription();
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -114,6 +114,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         if (isNearbyUpload) {
             String imageTitle = directPrefs.getString("Title", "");
             String imageDesc = directPrefs.getString("Desc", "");
+            String imageCats = directPrefs.getString("Category", "");
+            Timber.d("Image title: " + imageTitle + ", image desc: " + imageDesc + ", image categories: " + imageCats);
             titleEdit.setText(imageTitle);
             descEdit.setText(imageDesc);
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java
@@ -54,7 +54,7 @@ public static Result checkIfImageIsTooDark(BitmapRegionDecoder bitmapRegionDecod
 
         while ((checkImageRightPosition <= loadImageWidth) && (checkImageLeftPosition < checkImageRightPosition)) {
             while ((checkImageBottomPosition <= loadImageHeight) && (checkImageTopPosition < checkImageBottomPosition)) {
-                Timber.d("left: " + checkImageLeftPosition + " right: " + checkImageRightPosition + " top: " + checkImageTopPosition + " bottom: " + checkImageBottomPosition);
+                Timber.v("left: " + checkImageLeftPosition + " right: " + checkImageRightPosition + " top: " + checkImageTopPosition + " bottom: " + checkImageBottomPosition);
 
                 Rect rect = new Rect(checkImageLeftPosition,checkImageTopPosition,checkImageRightPosition,checkImageBottomPosition);
                 totalDividedRectangles++;
diff --git a/app/src/main/resources/queries/nearby_query.rq b/app/src/main/resources/queries/nearby_query.rq
@@ -8,6 +8,7 @@ SELECT
      (SAMPLE(COALESCE(?emoji0, ?emoji1)) as ?emoji)
      ?wikipediaArticle
      ?commonsArticle
+     (SAMPLE(?Commons_category) as ?Commons_category)
    WHERE {
      # Around given location...
      SERVICE wikibase:around {
@@ -23,6 +24,9 @@ SELECT
      OPTIONAL {?item rdfs:label ?item_label_preferred_language. FILTER (lang(?item_label_preferred_language) = "${LANG}")}
      OPTIONAL {?item rdfs:label ?item_label_any_language}
 
+     # Get Commons category (P373)
+     OPTIONAL { ?item wdt:P373 ?Commons_category. }
+
      # Get the class label in the preferred language of the user, or any other language if no label is available in that language.
      OPTIONAL {
        ?item p:P31/ps:P31 ?classId.
@@ -35,10 +39,6 @@ SELECT
        # Get emoji
        OPTIONAL { ?classId wdt:P487 ?emoji0. }
        OPTIONAL { ?classId wdt:P279*/wdt:P487 ?emoji1. }
-       OPTIONAL {
-          ?sitelink schema:about ?item .
-          ?sitelink schema:inLanguage "en"
-       }
        OPTIONAL {
            ?wikipediaArticle   schema:about ?item ;
                                schema:isPartOf <https://en.wikipedia.org/> .

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,7 @@ void storeSharedPrefs() {`
`623`	`623`	`SharedPreferences.Editor editor = directPrefs.edit();`
`624`	`624`	`editor.putString("Title", place.getName());`
`625`	`625`	`editor.putString("Desc", place.getLongDescription());`
	`626`	`+ editor.putString("Category", place.getCategory());`
`626`	`627`	`editor.apply();`
`627`	`628`	`}`
`628`	`629`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,`
`114`	`114`	`if (isNearbyUpload) {`
`115`	`115`	`String imageTitle = directPrefs.getString("Title", "");`
`116`	`116`	`String imageDesc = directPrefs.getString("Desc", "");`
	`117`	`+ String imageCats = directPrefs.getString("Category", "");`
	`118`	`+ Timber.d("Image title: " + imageTitle + ", image desc: " + imageDesc + ", image categories: " + imageCats);`
`117`	`119`	`titleEdit.setText(imageTitle);`
`118`	`120`	`descEdit.setText(imageDesc);`
`119`	`121`	`}`