Merge branch 'master' into media_detail_enhance

app/src/main/res/layout/fragment_categorization.xml

@@ -60,7 +60,7 @@
         android:visibility="gone"
         />
 
-    <ListView
+    <android.support.v7.widget.RecyclerView
         android:id="@+id/categoriesListBox"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_media_detail.xml

@@ -148,7 +148,6 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="start"
                         android:background="?attr/subBackground"
-                        android:foreground="?attr/selectableItemBackground"
                         android:text="@string/media_detail_license"
                         android:textColor="@android:color/white"
                         android:textSize="14sp"

app/src/main/res/layout/fragment_single_upload.xml

@@ -56,4 +56,14 @@
         android:gravity="center"
         android:layout_marginTop="16dp"
         />
+
+    <fr.free.nrw.commons.ui.widget.HtmlTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/media_upload_policy"
+        android:text="@string/media_upload_policy"
+        android:gravity="start"
+        android:layout_marginTop="16dp"
+        />
+
 </LinearLayout>

app/src/main/res/layout/layout_categories_item.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tvName"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="4dp"
     android:checkMark="?android:attr/textCheckMark"
     android:checked="false"
     android:gravity="center_vertical"
-    android:theme="@style/DarkAppTheme"
-    >
+    android:padding="4dp"
+    android:theme="@style/DarkAppTheme">
 
 </CheckedTextView>