Merge remote-tracking branch 'refs/remotes/commons-app/master'

Author: misaochan

CREDITS

@@ -24,6 +24,8 @@ their contribution to the product.
 * Dmitry Brant
 * Adam Shorland
 * John Lubbock
+* Mikel Pascual
+* Jan Piotrowski
 
 3rd party open source libraries used:
 * Butterknife

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -11,6 +11,7 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.preference.PreferenceManager;
 import android.support.v4.util.LruCache;
+import android.util.Log;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.stetho.Stetho;
@@ -139,6 +140,10 @@ public void onCreate() {
         System.setProperty("in.yuvi.http.fluent.PROGRESS_TRIGGER_THRESHOLD", "3.0");
 
         Fresco.initialize(this);
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
+                CommonsApplication.getInstance());
+        // Increase counter by one, starts from 1
+        prefs.edit().putInt("app_start_counter", prefs.getInt("app_start_counter" ,0) + 1).commit();
 
         //For caching area -> categories
         cacheData  = new CacheController();

app/src/main/java/fr/free/nrw/commons/Media.java

@@ -142,7 +142,7 @@ public void setLicense(String license) {
         return coordinates;
     }
 
-    public void setCoordinates(LatLng coordinates) {
+    public void setCoordinates(@Nullable LatLng coordinates) {
         this.coordinates = coordinates;
     }
 
@@ -201,7 +201,7 @@ public Media(String filename) {
         this.filename = filename;
     }
 
-    public Media(Uri localUri, String imageUrl, String filename, String description, long dataLength, Date dateCreated, Date dateUploaded, String creator) {
+    public Media(Uri localUri, String imageUrl, String filename, String description, long dataLength, Date dateCreated, @Nullable Date dateUploaded, String creator) {
         this();
         this.localUri = localUri;
         this.imageUrl = imageUrl;

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

@@ -0,0 +1,24 @@
+package fr.free.nrw.commons.category;
+
+import com.pedrogomez.renderers.ListAdapteeCollection;
+import com.pedrogomez.renderers.RVRendererAdapter;
+import com.pedrogomez.renderers.RendererBuilder;
+
+import java.util.Collections;
+import java.util.List;
+
+class CategoriesAdapterFactory {
+    private final CategoriesRenderer.CategoryClickedListener listener;
+
+    CategoriesAdapterFactory(CategoriesRenderer.CategoryClickedListener listener) {
+        this.listener = listener;
+    }
+
+    public RVRendererAdapter<CategoryItem> create(List<CategoryItem> placeList) {
+        RendererBuilder<CategoryItem> builder = new RendererBuilder<CategoryItem>()
+                .bind(CategoryItem.class, new CategoriesRenderer(listener));
+        ListAdapteeCollection<CategoryItem> collection = new ListAdapteeCollection<>(
+                placeList != null ? placeList : Collections.<CategoryItem>emptyList());
+        return new RVRendererAdapter<>(builder, collection);
+    }
+}

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

@@ -0,0 +1,57 @@
+package fr.free.nrw.commons.category;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckedTextView;
+
+import com.pedrogomez.renderers.Renderer;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import fr.free.nrw.commons.R;
+
+class CategoriesRenderer extends Renderer<CategoryItem> {
+    @BindView(R.id.tvName) CheckedTextView checkedView;
+    private final CategoryClickedListener listener;
+
+    CategoriesRenderer(CategoryClickedListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    protected View inflate(LayoutInflater layoutInflater, ViewGroup viewGroup) {
+        return layoutInflater.inflate(R.layout.layout_categories_item, viewGroup, false);
+    }
+
+    @Override
+    protected void setUpView(View view) {
+        ButterKnife.bind(this, view);
+    }
+
+    @Override
+    protected void hookListeners(View view) {
+        view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CategoryItem item = getContent();
+                item.setSelected(!item.isSelected());
+                checkedView.setChecked(item.isSelected());
+                if (listener != null) {
+                    listener.categoryClicked(item);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void render() {
+        CategoryItem item = getContent();
+        checkedView.setChecked(item.isSelected());
+        checkedView.setText(item.getName());
+    }
+
+    interface CategoryClickedListener {
+        void categoryClicked(CategoryItem item);
+    }
+}