diff --git a/app/src/main/res/layout/fragment_contributions_list.xml b/app/src/main/res/layout/fragment_contributions_list.xml
index 410c24c82..c68600f38 100644
--- a/app/src/main/res/layout/fragment_contributions_list.xml
+++ b/app/src/main/res/layout/fragment_contributions_list.xml
@@ -64,52 +64,56 @@
>
+ android:id="@+id/fab_camera"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/add_contribution_from_camera"
+ android:tint="@color/button_blue"
+ android:visibility="gone"
+ app:backgroundTint="@color/main_background_light"
+ app:elevation="@dimen/tiny_margin"
+ app:fabSize="mini"
+ app:srcCompat="@drawable/ic_photo_camera_white_24dp"
+ app:useCompatPadding="true" />
+ android:id="@+id/fab_gallery"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/add_contribution_from_photos"
+ android:tint="@color/button_blue"
+ android:visibility="gone"
+ app:backgroundTint="@color/main_background_light"
+ app:elevation="@dimen/tiny_margin"
+ app:fabSize="mini"
+ app:srcCompat="@drawable/ic_photo_white_24dp"
+ app:useCompatPadding="true" />
+ android:id="@+id/fab_custom_gallery"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/commons"
+ android:contentDescription="@string/add_contribution_from_contributions_gallery"
+ android:tint="@color/button_blue"
+ android:visibility="gone"
+ app:backgroundTint="@color/main_background_light"
+ app:elevation="@dimen/tiny_margin"
+ app:fabSize="mini"
+ app:srcCompat="@drawable/ic_custom_image_picker"
+ app:useCompatPadding="true" />
+ android:id="@+id/fab_plus"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/add_new_contribution"
+ android:gravity="center_vertical"
+ android:visibility="visible"
+ app:backgroundTint="@color/status_bar_blue"
+ app:elevation="@dimen/tiny_margin"
+ app:srcCompat="@drawable/ic_add_white_24dp"
+ app:useCompatPadding="true" />
diff --git a/app/src/main/res/layout/nearby_card_view.xml b/app/src/main/res/layout/nearby_card_view.xml
index ce301c3b9..c88daa12f 100644
--- a/app/src/main/res/layout/nearby_card_view.xml
+++ b/app/src/main/res/layout/nearby_card_view.xml
@@ -10,19 +10,20 @@
>
+ android:id="@+id/permission_request_button"
+ style="@style/Widget.AppCompat.Button.Borderless"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:layout_marginLeft="@dimen/activity_margin_horizontal"
+ android:layout_marginTop="@dimen/activity_margin_horizontal"
+ android:layout_marginRight="@dimen/activity_margin_horizontal"
+ android:contentDescription="@string/display_nearby_notification_summary"
+ android:minWidth="@dimen/fragment_height"
+ android:singleLine="true"
+ android:text="@string/display_nearby_notification_summary"
+ android:textColor="?attr/card_item_color"
+ android:theme="?attr/mainScreenNearbyPermissionbutton" />
+ android:layout_height="wrap_content"
+ android:layout_toStartOf="@+id/iv_toggle_chips"
+ android:background="@color/deleteRed"
+ android:contentDescription="@string/nearby_filter_state" />
+ android:layout_below="@id/chip_view"
+ android:layout_toStartOf="@+id/iv_toggle_chips"
+ android:contentDescription="@string/nearby_filter_search" />
+ android:scaleType="centerCrop"
+ android:tint="@color/white"
+ app:srcCompat="@drawable/ic_expand_less_black_24dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/nearby_filter_list.xml b/app/src/main/res/layout/nearby_filter_list.xml
index e1362c286..c567abf82 100644
--- a/app/src/main/res/layout/nearby_filter_list.xml
+++ b/app/src/main/res/layout/nearby_filter_list.xml
@@ -9,12 +9,12 @@
android:background="@color/white">
+ android:id="@+id/checkbox_tri_states"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/dimen_10"
+ android:contentDescription="@string/nearby_all"
+ android:text="@string/nearby_all" />
+ android:background="@color/status_bar_blue"
+ android:contentDescription="@string/advanced_options"
+ android:text="@string/advanced_options"
+ android:textColor="@color/white" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/nearby_permission_dialog.xml b/app/src/main/res/layout/nearby_permission_dialog.xml
index df62f3a9f..e122e5536 100644
--- a/app/src/main/res/layout/nearby_permission_dialog.xml
+++ b/app/src/main/res/layout/nearby_permission_dialog.xml
@@ -3,14 +3,15 @@
android:layout_height="wrap_content" >
+ android:id="@+id/never_ask_again"
+ style="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dimen_20"
+ android:layout_marginTop="@dimen/tiny_padding"
+ android:layout_marginEnd="@dimen/dimen_20"
+ android:layout_marginBottom="@dimen/tiny_padding"
+ android:contentDescription="@string/never_ask_again"
+ android:text="@string/never_ask_again" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/nearby_row_button.xml b/app/src/main/res/layout/nearby_row_button.xml
index b474b2b6a..97ab2b2da 100644
--- a/app/src/main/res/layout/nearby_row_button.xml
+++ b/app/src/main/res/layout/nearby_row_button.xml
@@ -11,58 +11,60 @@
xmlns:android="http://schemas.android.com/apk/res/android">
+ android:id="@+id/cameraButton"
+ android:layout_width="@dimen/dimen_0"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@drawable/button_background_selector"
+ android:clickable="true"
+ android:orientation="vertical"
+ android:padding="@dimen/standard_gap">
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:tint="?attr/bookmarkButtonColor"
+ app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
+
+ android:id="@+id/cameraButtonText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:paddingTop="@dimen/activity_margin_horizontal"
+ android:text="CAMERA"
+ android:visibility="gone" />
+
+ android:id="@+id/galleryButton"
+ android:layout_width="@dimen/dimen_0"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@drawable/button_background_selector"
+ android:clickable="true"
+ android:contentDescription="@string/nearby_row_image"
+ android:orientation="vertical"
+ android:padding="@dimen/standard_gap">
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:duplicateParentState="true"
+ android:tint="?attr/bookmarkButtonColor"
+ app:srcCompat="@drawable/ic_photo_white_24dp" />
+
+ android:id="@+id/galleryButtonText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:duplicateParentState="true"
+ android:paddingTop="@dimen/activity_margin_horizontal"
+ android:text="GALLERY"
+ android:visibility="gone" />
+ android:id="@+id/iconOverflow"
+ android:layout_width="@dimen/dimen_0"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:clickable="true"
+ android:orientation="vertical"
+ android:padding="@dimen/standard_gap">
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:duplicateParentState="true"
+ android:tint="?attr/bookmarkButtonColor"
+ app:srcCompat="@drawable/ic_overflow" />
+
+ android:id="@+id/iconOverflowText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:duplicateParentState="true"
+ android:paddingTop="@dimen/activity_margin_horizontal"
+ android:text="MORE"
+ android:visibility="gone" />
diff --git a/app/src/main/res/layout/nearby_search_list_item_dark.xml b/app/src/main/res/layout/nearby_search_list_item_dark.xml
index e62ab7b42..732e46620 100644
--- a/app/src/main/res/layout/nearby_search_list_item_dark.xml
+++ b/app/src/main/res/layout/nearby_search_list_item_dark.xml
@@ -8,9 +8,9 @@
android:background="@drawable/linearlayout_color_dark_selector">
+ android:id="@+id/place_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ android:id="@+id/cart_icon_image_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="@dimen/activity_margin_horizontal"
+ android:layout_marginRight="@dimen/activity_margin_horizontal"
+ android:gravity="center"
+ app:srcCompat="?attr/notification_icon_drawable" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/pic_of_day_app_widget.xml b/app/src/main/res/layout/pic_of_day_app_widget.xml
index bf222644a..46e00a0f4 100644
--- a/app/src/main/res/layout/pic_of_day_app_widget.xml
+++ b/app/src/main/res/layout/pic_of_day_app_widget.xml
@@ -12,21 +12,21 @@
android:layout_height="wrap_content">
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="@dimen/dimen_10"
+ android:text="@string/app_widget_heading"
+ android:textColor="@color/white"
+ android:textSize="@dimen/subheading_text_size" />
+ android:id="@+id/camera_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:padding="@dimen/dimen_20"
+ android:src="@drawable/ic_photo_camera_white_24dp" />
@@ -47,6 +47,6 @@
android:id="@+id/appwidget_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:contentDescription="@string/appwidget_img" />
+ android:contentDescription="@string/appwidget_img" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/popup_for_copyright.xml b/app/src/main/res/layout/popup_for_copyright.xml
index 79cd66199..0b4075b8d 100644
--- a/app/src/main/res/layout/popup_for_copyright.xml
+++ b/app/src/main/res/layout/popup_for_copyright.xml
@@ -35,5 +35,6 @@
android:layout_below="@+id/copyright_messege"
android:layout_centerHorizontal="true"
android:layout_marginTop="37dp"
+ android:contentDescription="@string/ok"
android:text="@string/ok" />
diff --git a/app/src/main/res/layout/question_layout.xml b/app/src/main/res/layout/question_layout.xml
index 71abb38b5..6af04de08 100644
--- a/app/src/main/res/layout/question_layout.xml
+++ b/app/src/main/res/layout/question_layout.xml
@@ -14,14 +14,14 @@
android:layout_marginVertical="@dimen/activity_margin_vertical" />
+ android:id="@+id/question_text"
+ style="?android:textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/activity_margin_horizontal"
+ android:layout_marginRight="@dimen/activity_margin_horizontal"
+ android:text="Is Photograph of an Artwork allowed?"
+ android:textColor="@color/secondaryTextColor" />
diff --git a/app/src/main/res/layout/row_item_caption.xml b/app/src/main/res/layout/row_item_caption.xml
index bb5b73284..14eab3ad7 100644
--- a/app/src/main/res/layout/row_item_caption.xml
+++ b/app/src/main/res/layout/row_item_caption.xml
@@ -6,13 +6,14 @@
android:weightSum="8">
+ android:id="@+id/spinner_caption_languages"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:contentDescription="@string/row_item_caption"
+ android:minWidth="1dp"
+ android:padding="0dp"
+ android:spinnerMode="dialog" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/show_captions_descriptions.xml b/app/src/main/res/layout/show_captions_descriptions.xml
index 26d1fbc7a..43ade6569 100644
--- a/app/src/main/res/layout/show_captions_descriptions.xml
+++ b/app/src/main/res/layout/show_captions_descriptions.xml
@@ -13,14 +13,16 @@
style="@style/MediaDetailTextLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Captions"
+ android:text="@string/show_captions"
android:textColor="?attr/caption_description_text_color" />
+ android:layout_below="@+id/caption_label"
+ android:contentDescription="@string/show_captions"
+ tools:ignore="DuplicateSpeakableTextCheck" />
+ app:layout_constraintTop_toBottomOf="@+id/location_picker_toolbar_primary_text_view" />
+
+
+ android:src="@drawable/mapbox_info_icon_default" />
+ app:allowFormatting="false" />
+
+ android:contentDescription="@string/previous"
+ android:text="@string/previous" />
+ android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/upload_depicts_fragment.xml b/app/src/main/res/layout/upload_depicts_fragment.xml
index cf4e4607e..6519a141d 100644
--- a/app/src/main/res/layout/upload_depicts_fragment.xml
+++ b/app/src/main/res/layout/upload_depicts_fragment.xml
@@ -35,11 +35,12 @@
android:textSize="@dimen/normal_text"
android:textStyle="bold"
tools:text="Step 1 of 15" />
+
+ android:src="@drawable/mapbox_info_icon_default" />
+ android:layout_alignParentBottom="true"
+ android:layout_marginEnd="24dp"
+ android:layout_marginRight="24dp"
+ android:layout_marginBottom="24dp"
+ android:contentDescription="@string/next"
+ android:text="@string/next"
+ android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml
index 7072f74f1..3aab675d0 100644
--- a/app/src/main/res/layout/welcome_final.xml
+++ b/app/src/main/res/layout/welcome_final.xml
@@ -7,73 +7,71 @@
>
-
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="vertical">
-
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ android:id="@+id/welcomeInfo"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="@dimen/standard_gap"
+ android:padding="@dimen/standard_gap"
+ android:text="@string/welcome_help_button_text"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/normal_text" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc032ef40..4fb470e32 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,29 @@
+
+ Commons Facebook Page
+ Commons Github Source Code
+ Commons Logo
+ Commons Website
+ Exit location picker
+ Submit
+ Add another description
+ Add new contribution
+ Add contribution from camera
+ Add contribution from Photos
+ Add contribution from previous contributions gallery
+ Captions
+ Language Description
+ Caption
+ Description
+ Image
+ All
+ Toggle Up
+ Search View
+ Place State
+ Pic of the Day
+
+
- %1$d file uploading
- %1$d files uploading
@@ -188,10 +212,6 @@
pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg
2FA Code
Do you really want to logout?
- Commons Logo
- Commons Website
- Commons Facebook Page
- Commons Github Source Code
Media Image Failed
No subcategories found
No parent categories found
@@ -286,7 +306,6 @@
Uploaded by: %1$s
Blocked
You are blocked from editing Commons
- Pic of the Day
Pic of the Day
Search
Search Commons
@@ -377,7 +396,6 @@
Step %1$d of %2$d: %3$s
Next
Previous
- Submit
A file with the file name %1$s exists. Are you sure you want to proceed?\n\nNote: A suitable suffix will be added to the file name automatically.
No compatible map application could be found on your device. Please install a map application to use this feature.
Pictures
@@ -657,7 +675,6 @@ Upload your first media by tapping on the add button.
In all languages
Choose a location
Pan and zoom to adjust
- Exit location picker
Select location
Show in map app
Edit location