app/src/main/AndroidManifest.xml

@@ -57,7 +57,8 @@
     tools:replace="android:appComponentFactory">
     <activity
       android:name=".activity.SingleWebViewActivity"
-      android:exported="false" />
+      android:exported="false"
+      android:label="@string/title_activity_single_web_view" />
     <activity
       android:name=".nearby.WikidataFeedback"
       android:exported="false" />

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

@@ -3,7 +3,6 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/category_layout"
-  android:layoutDirection="locale"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
@@ -11,31 +10,26 @@
     android:id="@+id/upload_category_checkbox"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minWidth="48dp"
-    android:minHeight="48dp"
     android:checkMark="?android:attr/textCheckMark"
     android:checked="false"
     android:gravity="center_vertical"
     android:padding="@dimen/tiny_gap"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toStartOf="@+id/category_image"
-    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
 
   <com.facebook.drawee.view.SimpleDraweeView
     android:id="@+id/category_image"
     android:layout_width="50dp"
     android:layout_height="50dp"
-    android:layout_marginStart="@dimen/tiny_gap"
-    android:layout_marginEnd="@dimen/tiny_gap"
+    android:paddingEnd="@dimen/tiny_gap"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintStart_toEndOf="@+id/upload_category_checkbox"
+    app:layout_constraintLeft_toRightOf="@+id/upload_category_checkbox"
     app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintEnd_toStartOf="@+id/text_container"
     app:placeholderImage="@drawable/commons" />
 
   <LinearLayout
-    android:id="@+id/text_container"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:orientation="vertical"

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

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/depicts_layout"
-  android:layoutDirection="locale"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
@@ -10,31 +9,26 @@
     android:id="@+id/depict_checkbox"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minWidth="48dp"
-    android:minHeight="48dp"
     android:checkMark="?android:attr/textCheckMark"
     android:checked="false"
     android:gravity="center_vertical"
     android:padding="@dimen/tiny_gap"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toStartOf="@+id/depicted_image"
-    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
 
   <com.facebook.drawee.view.SimpleDraweeView
     android:id="@+id/depicted_image"
     android:layout_width="50dp"
     android:layout_height="50dp"
-    android:layout_marginStart="@dimen/tiny_gap"
-    android:layout_marginEnd="@dimen/tiny_gap"
+    android:paddingRight="@dimen/tiny_gap"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintStart_toEndOf="@+id/depict_checkbox"
+    app:layout_constraintLeft_toRightOf="@+id/depict_checkbox"
     app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintEnd_toStartOf="@+id/text_container"
     app:placeholderImage="@drawable/ic_wikidata_logo_24dp" />
 
   <LinearLayout
-    android:id="@+id/text_container"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -47,14 +41,14 @@
       android:id="@+id/depicts_label"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="@string/depicts_label"
+      android:text="Label"
       android:textStyle="bold" />
 
     <TextView
       android:id="@+id/description"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="@string/depicts_description" />
+      android:text="Description" />
   </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -17,6 +17,7 @@
       android:layout_width="wrap_content"
       android:layout_height="@dimen/half_standard_height"
       android:layout_marginEnd="@dimen/standard_gap"
+      android:layout_marginRight="@dimen/standard_gap"
       android:orientation="horizontal">
 
       <TextView
@@ -24,6 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/half_standard_height"
         android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
         android:gravity="center_vertical"
         android:textSize="@dimen/normal_text"
         android:textStyle="bold"
@@ -75,6 +77,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/tiny_gap"
+        android:layout_marginRight="@dimen/tiny_gap"
         android:layout_gravity="center_vertical|end"
         android:indeterminate="true"
         android:indeterminateOnly="true"

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

@@ -22,6 +22,7 @@
           android:layout_marginEnd="@dimen/standard_gap"
           android:layout_marginRight="@dimen/standard_gap"
           android:layout_alignParentStart="true"
+          android:layout_alignParentLeft="true"
           android:layout_alignParentTop="true"
           android:orientation="horizontal">
             <TextView
@@ -29,6 +30,7 @@
               android:layout_width="wrap_content"
               android:layout_height="@dimen/half_standard_height"
               android:layout_marginEnd="@dimen/standard_gap"
+              android:layout_marginRight="@dimen/standard_gap"
               android:gravity="center_vertical"
               android:textSize="@dimen/normal_text"
               android:textStyle="bold"
@@ -97,6 +99,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/tiny_gap"
+            android:layout_marginRight="@dimen/tiny_gap"
             android:layout_gravity="center_vertical|end"
             android:indeterminate="true"
             android:indeterminateOnly="true"

app/src/main/res/values-qq/strings.xml

@@ -468,8 +468,6 @@
   <string name="map_attribution">{{Optional}}\n&lt;code&gt;&amp;amp;#169;&lt;/code&gt; is the copyright symbol (©).</string>
   <string name="categories_tooltip">{{Doc-commons-app-depicts}}</string>
   <string name="depicts_step_title">{{Doc-commons-app-depicts}}</string>
-  <string name="depicts_label">Label</string>
-  <string name="depicts_description">Description</string>
   <string name="pan_and_zoom_to_adjust">Panning means moving the map left/right/up/down, typically by touching the screen with one finger and moving it.\n\nZooming means making the map\'s scale bigger or smaller, typically by pinching with two fingers.\n\nExample in other app:\nhttps://igss.schneider-electric.com/features/pan-and-zoom-in-definition/</string>
   <string name="location_picker_image_view_shadow">A description of a visual element, location picker image shadow. Used for accesibility usually.</string>
   <string name="label">{{Identical|Label}}</string>

app/src/main/res/values/strings.xml

@@ -619,7 +619,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="place_state_exists">Exists</string>
   <string name="place_state_needs_photo">Needs Photo</string>
   <string name="place_type">Place type:</string>
-  <string name="nearby_search_hint">Bridge, museum, hotel, etc.</string>
+  <string name="nearby_search_hint">Bridge, museum, hotel etc.</string>
   <string name="you_must_reset_your_passsword">Something went wrong with log-in. You must reset your password!</string>
   <string name="title_for_media">MEDIA</string>
   <string name="title_for_child_classes">CHILD CLASSES</string>
@@ -710,8 +710,6 @@ Upload your first media by tapping on the add button.</string>
   <string name="categories_tooltip">Please select the appropriate categories. Unlike depictions, categories are only in English.</string>
   <string name="license_tooltip">Commons makes your pictures reusable and adapted by everyone. Do you want to waive all rights? Do you want to be attributed? Do you want adaptations to use the same license?</string>
   <string name="depicts_step_title">Depicts</string>
-  <string name="depicts_label">Label</string>
-  <string name="depicts_description">Description</string>
   <string name="license_step_title">Media License</string>
   <string name="media_detail_step_title">Media Details</string>
   <string name="menu_view_category_page">View category page</string>
@@ -827,12 +825,12 @@ Upload your first media by tapping on the add button.</string>
   <string name="invalid_login_message">Your log-in has expired. Please log in again.</string>
   <string name="no_application_available_to_open_gpx_files">No application available to open GPX files</string>
   <string name="file_saved_successfully">File Saved Successfully</string>
-  <string name="do_you_want_to_open_gpx_file">Do you want to open the GPX file?</string>
-  <string name="do_you_want_to_open_kml_file">Do you want to open the KML file?</string>
-  <string name="failed_to_save_kml_file">Failed to save the KML file.</string>
-  <string name="failed_to_save_gpx_file">Failed to save the GPX file.</string>
-  <string name="saving_kml_file">Saving as a KML file...</string>
-  <string name="saving_gpx_file">Saving as a GPX file...</string>
+  <string name="do_you_want_to_open_gpx_file">Do you want to open GPX file?</string>
+  <string name="do_you_want_to_open_kml_file">Do you want to open KML file?</string>
+  <string name="failed_to_save_kml_file">Failed to save KML file.</string>
+  <string name="failed_to_save_gpx_file">Failed to save GPX file.</string>
+  <string name="saving_kml_file">Saving KML File</string>
+  <string name="saving_gpx_file">Saving GPX File</string>
   <plurals name="custom_picker_images_selected_title_appendix">
     <item quantity="one">%d image selected</item>
     <item quantity="other">%d images selected</item>
@@ -875,6 +873,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="usages_on_other_wikis_heading">Other wikis</string>
   <string name="bullet_point">•</string>
   <string name="file_usages_container_heading">File usages</string>
+  <string name="title_activity_single_web_view">SingleWebViewActivity</string>
   <string name="account">Account</string>
   <string name="vanish_account">Vanish Account</string>
   <string name="account_vanish_request_confirm_title">Vanish account warning</string>