mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Content description for UI elements -- accessibility (#4935)

Browse source 
* Started from welcome layout to main layout adding content descriptions

* Adds UI description section to strings.xml and adds a few content descrpitions

* Consolidates UI strings to top of file

* fixes nearby typos

* Removes content descriptions that clash with pr #4766

* Removes unused elements and reverts out-of-scope changes

* Restores pic-of-the-day content description

Co-authored-by: joshuamccluskey <jpiff57@gmail.com>
This commit is contained in:
Ben Mills 2022-05-24 04:36:06 -07:00 • committed by GitHub
parent e47d057bfe
commit 78bfd0986c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 335 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

84
app/src/main/res/layout/fragment_contributions_list.xml
View file

@ -64,52 +64,56 @@
>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_camera"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/button_blue"
android:visibility="gone"
app:backgroundTint="@color/main_background_light"
app:useCompatPadding="true"
app:elevation="@dimen/tiny_margin"
app:fabSize="mini"
app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
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" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_gallery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/button_blue"
android:visibility="gone"
app:backgroundTint="@color/main_background_light"
app:useCompatPadding="true"
app:elevation="@dimen/tiny_margin"
app:fabSize="mini"
app:srcCompat="@drawable/ic_photo_white_24dp" />
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" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_custom_gallery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/button_blue"
android:visibility="gone"
app:backgroundTint="@color/main_background_light"
app:useCompatPadding="true"
app:elevation="@dimen/tiny_margin"
app:fabSize="mini"
app:srcCompat="@drawable/ic_custom_image_picker"
android:background="@drawable/commons"/>
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" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:visibility="visible"
app:backgroundTint="@color/status_bar_blue"
app:useCompatPadding="true"
app:elevation="@dimen/tiny_margin"
app:srcCompat="@drawable/ic_add_white_24dp" />
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" />
</LinearLayout>

27
app/src/main/res/layout/nearby_card_view.xml
View file

@ -10,19 +10,20 @@
>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/permission_request_button"
android:text="@string/display_nearby_notification_summary"
android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:minWidth="@dimen/fragment_height"
android:textColor="?attr/card_item_color"
android:singleLine="true"
android:theme="?attr/mainScreenNearbyPermissionbutton"
style="@style/Widget.AppCompat.Button.Borderless"/>
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" />
<LinearLayout

23
app/src/main/res/layout/nearby_filter_all_items.xml
View file

@ -5,31 +5,34 @@
android:background="@color/status_bar_blue">
<include
android:layout_toStartOf="@+id/iv_toggle_chips"
android:id="@+id/chip_view"
layout="@layout/filter_chip_view"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:background="@color/deleteRed" />
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/iv_toggle_chips"
android:background="@color/deleteRed"
android:contentDescription="@string/nearby_filter_state" />
<include
android:layout_toStartOf="@+id/iv_toggle_chips"
android:id="@+id/search_view_layout"
layout="@layout/filter_search_view_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/chip_view" />
android:layout_below="@id/chip_view"
android:layout_toStartOf="@+id/iv_toggle_chips"
android:contentDescription="@string/nearby_filter_search" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_toggle_chips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_expand_less_black_24dp"
android:tint="@color/white"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/nearby_filter_toggle"
android:padding="12dp"
android:layout_gravity="center" />
android:scaleType="centerCrop"
android:tint="@color/white"
app:srcCompat="@drawable/ic_expand_less_black_24dp" />
</RelativeLayout>

21
app/src/main/res/layout/nearby_filter_list.xml
View file

@ -9,12 +9,12 @@
android:background="@color/white">
<fr.free.nrw.commons.nearby.CheckBoxTriStates
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/checkbox_tri_states"
android:layout_margin="@dimen/dimen_10"
android:text="All"
/>
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" />
<View
android:layout_width="match_parent"
@ -32,9 +32,10 @@
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_advanced_options"
android:layout_width="match_parent"
android:background="@color/status_bar_blue"
android:text="@string/advanced_options"
android:textColor="@color/white"
android:layout_height="48dp"
android:layout_marginTop="-48dp"
android:layout_height="48dp"/>
android:background="@color/status_bar_blue"
android:contentDescription="@string/advanced_options"
android:text="@string/advanced_options"
android:textColor="@color/white" />
</LinearLayout>

19
app/src/main/res/layout/nearby_permission_dialog.xml
View file

@ -3,14 +3,15 @@
android:layout_height="wrap_content" >
<CheckBox
android:id="@+id/never_ask_again"
style="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/never_ask_again"
android:layout_marginTop="@dimen/tiny_padding"
android:layout_marginBottom="@dimen/tiny_padding"
android:layout_marginEnd="@dimen/dimen_20"
android:layout_marginStart="@dimen/dimen_20"/>
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" />
</FrameLayout>

140
app/src/main/res/layout/nearby_row_button.xml
View file

@ -11,58 +11,60 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/cameraButton"
android:layout_width="@dimen/dimen_0"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/standard_gap"
android:clickable="true"
android:orientation="vertical"
android:background="@drawable/button_background_selector"
>
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">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/ic_photo_camera_white_24dp"
android:tint="?attr/bookmarkButtonColor"/>
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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/cameraButtonText"
android:paddingTop="@dimen/activity_margin_horizontal"
android:layout_gravity="center_horizontal"
android:text="CAMERA"
android:visibility="gone"
/>
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" />
</LinearLayout>
<LinearLayout
android:id="@+id/galleryButton"
android:layout_width="@dimen/dimen_0"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/standard_gap"
android:clickable="true"
android:orientation="vertical"
android:background="@drawable/button_background_selector"
>
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">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/ic_photo_white_24dp"
android:tint="?attr/bookmarkButtonColor"
android:duplicateParentState="true"/>
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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/galleryButtonText"
android:paddingTop="@dimen/activity_margin_horizontal"
android:layout_gravity="center_horizontal"
android:text="GALLERY"
android:duplicateParentState="true"
android:visibility="gone"
/>
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" />
</LinearLayout>
<LinearLayout
@ -95,31 +97,31 @@
</LinearLayout>
<LinearLayout
android:id="@+id/iconOverflow"
android:layout_width="@dimen/dimen_0"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/standard_gap"
android:clickable="true"
android:orientation="vertical"
>
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">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/ic_overflow"
android:tint="?attr/bookmarkButtonColor"
android:duplicateParentState="true"/>
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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/iconOverflowText"
android:paddingTop="@dimen/activity_margin_horizontal"
android:layout_gravity="center_horizontal"
android:text="MORE"
android:duplicateParentState="true"
android:visibility="gone"
/>
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" />
</LinearLayout>

6
app/src/main/res/layout/nearby_search_list_item_dark.xml
View file

@ -8,9 +8,9 @@
android:background="@drawable/linearlayout_color_dark_selector">
<ImageView
android:id="@+id/place_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:id="@+id/place_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/place_text"

46
app/src/main/res/layout/notification_icon.xml
View file

@ -11,28 +11,28 @@
tools:background="@color/black">
<ImageView
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:gravity="center"
android:layout_marginRight="@dimen/activity_margin_horizontal"
app:srcCompat="?attr/notification_icon_drawable" />
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" />
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/notification_count_badge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/cart_icon_image_view"
android:layout_alignEnd="@id/cart_icon_image_view"
android:layout_alignRight="@id/cart_icon_image_view"
android:background="@drawable/notification_badge"
android:gravity="center"
android:padding="@dimen/miniscule_margin"
android:textColor="?attr/notification_icon_text_color"
android:textSize="7sp"
android:textStyle="bold"
android:visibility="gone"
tools:text="9+"
tools:visibility="visible" />
<TextView
android:id="@+id/notification_count_badge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/cart_icon_image_view"
android:layout_alignEnd="@id/cart_icon_image_view"
android:layout_alignRight="@id/cart_icon_image_view"
android:background="@drawable/notification_badge"
android:gravity="center"
android:padding="@dimen/miniscule_margin"
android:textColor="?attr/notification_icon_text_color"
android:textSize="7sp"
android:textStyle="bold"
android:visibility="gone"
tools:text="9+"
tools:visibility="visible" />
</RelativeLayout>

28
app/src/main/res/layout/pic_of_day_app_widget.xml
View file

@ -12,21 +12,21 @@
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_10"
android:text="@string/app_widget_heading"
android:textColor="@color/white"
android:layout_centerHorizontal="true"
android:textSize="@dimen/subheading_text_size" />
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" />
<ImageView
android:id="@+id/camera_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dimen_20"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_photo_camera_white_24dp" />
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" />
</RelativeLayout>
@ -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" />
</LinearLayout>

1
app/src/main/res/layout/popup_for_copyright.xml
View file

@ -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" />
</RelativeLayout>

16
app/src/main/res/layout/question_layout.xml
View file

@ -14,14 +14,14 @@
android:layout_marginVertical="@dimen/activity_margin_vertical" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:textAppearanceMedium"
android:id="@+id/question_text"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:textColor="@color/secondaryTextColor"
android:text="Is Photograph of an Artwork allowed ?" />
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" />
</LinearLayout>

15
app/src/main/res/layout/row_item_caption.xml
View file

@ -6,13 +6,14 @@
android:weightSum="8">
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_caption_languages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:minWidth="1dp"
android:padding="0dp"
android:spinnerMode="dialog" />
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" />
</LinearLayout>

8
app/src/main/res/layout/show_captions_descriptions.xml
View file

@ -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" />
<ListView
android:id="@+id/caption_listview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/caption_label" />
android:layout_below="@+id/caption_label"
android:contentDescription="@string/show_captions"
tools:ignore="DuplicateSpeakableTextCheck" />
<TextView
android:id="@+id/description_label"
@ -29,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/caption_listview"
android:layout_marginTop="@dimen/dimen_10"
android:text="Descriptions"
android:text="@string/show_captions_description"
android:textColor="?attr/caption_description_text_color" />
<ProgressBar

3
app/src/main/res/layout/toolbar_location_picker.xml
View file

@ -27,13 +27,14 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="72dp"
android:contentDescription="@string/pan_and_zoom_to_adjust"
android:text="@string/pan_and_zoom_to_adjust"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/location_picker_toolbar_primary_text_view"/>
app:layout_constraintTop_toBottomOf="@+id/location_picker_toolbar_primary_text_view" />
<ImageView
android:id="@+id/mapbox_place_picker_toolbar_back_button"

13
app/src/main/res/layout/upload_categories_fragment.xml
View file

@ -19,6 +19,7 @@
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
@ -29,11 +30,12 @@
android:textSize="@dimen/normal_text"
android:textStyle="bold"
tools:text="Step 1 of 15" />
<ImageView
android:id="@+id/tooltip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/mapbox_info_icon_default"/>
android:src="@drawable/mapbox_info_icon_default" />
</LinearLayout>
<TextView
@ -66,7 +68,7 @@
android:imeOptions="actionSearch"
android:inputType="text"
android:maxLines="1"
app:allowFormatting="false"/>
app:allowFormatting="false" />
</com.google.android.material.textfield.TextInputLayout>
<ProgressBar
@ -107,21 +109,24 @@
android:padding="@dimen/standard_gap"
android:orientation="horizontal"
>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_previous"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/previous"/>
android:contentDescription="@string/previous"
android:text="@string/previous" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:contentDescription="@string/next"
android:text="@string/next"
android:textColor="@android:color/white"/>
android:textColor="@android:color/white" />
</LinearLayout>

23
app/src/main/res/layout/upload_depicts_fragment.xml
View file

@ -35,11 +35,12 @@
android:textSize="@dimen/normal_text"
android:textStyle="bold"
tools:text="Step 1 of 15" />
<ImageView
android:id="@+id/tooltip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/mapbox_info_icon_default"/>
android:src="@drawable/mapbox_info_icon_default" />
</LinearLayout>
<TextView
@ -129,26 +130,28 @@
android:id="@+id/depicts_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginEnd="24dp"
android:layout_marginRight="24dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:textColor="@android:color/white"
android:text="@string/next" />
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" />
<Button
android:id="@+id/depicts_previous"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/depicts_next"
android:layout_marginBottom="24dp"
android:layout_toStartOf="@id/depicts_next"
android:layout_toLeftOf="@id/depicts_next"
android:contentDescription="@string/previous"
android:text="@string/previous" />
</RelativeLayout>

124
app/src/main/res/layout/welcome_final.xml
View file

@ -7,73 +7,71 @@
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center_vertical">
<LinearLayout
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_height="180dp"
>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:src="@drawable/welcome_wikipedia"
android:id="@+id/welcome_wikipedia"
android:layout_width="150dp"
android:layout_height="180dp"
android:contentDescription="@string/welcome_image_welcome_wikipedia"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="180dp"
android:layout_gravity="center_horizontal"
android:gravity="center_vertical">
<ImageView
android:src="@drawable/welcome_copyright"
android:layout_width="@dimen/giant_height"
android:layout_height="120dp"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:contentDescription="@string/welcome_image_welcome_copyright"
/>
<ImageView
android:id="@+id/welcome_wikipedia"
android:layout_width="150dp"
android:layout_height="180dp"
android:contentDescription="@string/welcome_image_welcome_wikipedia"
android:src="@drawable/welcome_wikipedia" />
<ImageView
android:layout_width="@dimen/giant_height"
android:layout_height="120dp"
android:layout_gravity="center"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:contentDescription="@string/welcome_image_welcome_copyright"
android:src="@drawable/welcome_copyright" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:maxWidth="@dimen/very_large_height"
android:text="@string/welcome_final_text"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/normal_text"
android:textStyle="bold" />
<Button
android:id="@+id/finishTutorialButton"
android:layout_width="120dp"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_gravity="center"
android:layout_marginTop="@dimen/standard_gap"
android:background="@android:color/white"
android:contentDescription="@string/welcome_final_button_text"
android:text="@string/welcome_final_button_text"
android:textColor="#0c609c"
android:textSize="@dimen/normal_text"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/very_large_height"
android:text="@string/welcome_final_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textSize="@dimen/normal_text"
android:textAlignment="center"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>
<Button
android:layout_width="120dp"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_final_button_text"
android:id="@+id/finishTutorialButton"
android:textSize="@dimen/normal_text"
android:layout_gravity="center"
android:background="@android:color/white"
android:textColor="#0c609c"
android:textStyle="bold"
/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/welcomeInfo"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:textSize="@dimen/normal_text"
android:textColor="@android:color/white"
android:padding="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/welcome_help_button_text" />
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" />
</RelativeLayout>

31
app/src/main/res/values/strings.xml
View file

@ -1,5 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--accessibility UI description strings-->
<string name="commons_facebook">Commons Facebook Page</string>
<string name="commons_github">Commons Github Source Code</string>
<string name="commons_logo">Commons Logo</string>
<string name="commons_website">Commons Website</string>
<string name="exit_location_picker">Exit location picker</string>
<string name="submit">Submit</string>
<string name="add_another_description">Add another description</string>
<string name="add_new_contribution">Add new contribution</string>
<string name="add_contribution_from_camera">Add contribution from camera</string>
<string name="add_contribution_from_photos">Add contribution from Photos</string>
<string name="add_contribution_from_contributions_gallery">Add contribution from previous contributions gallery</string>
<string name="show_captions">Captions</string>
<string name="row_item_language_description">Language Description</string>
<string name="row_item_caption">Caption</string>
<string name="show_captions_description">Description</string>
<string name="nearby_row_image">Image</string>
<string name="nearby_all">All</string>
<string name="nearby_filter_toggle">Toggle Up</string>
<string name="nearby_filter_search">Search View</string>
<string name="nearby_filter_state">Place State</string>
<string name="appwidget_img">Pic of the Day</string>
<!--Other strings-->
<plurals name="uploads_pending_notification_indicator">
<item quantity="one">%1$d file uploading</item>
<item quantity="other">%1$d files uploading</item>
@ -188,10 +212,6 @@
<string name="mapbox_commons_app_token">pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg</string>
<string name="_2fa_code">2FA Code</string>
<string name="logout_verification">Do you really want to logout?</string>
<string name="commons_logo">Commons Logo</string>
<string name="commons_website">Commons Website</string>
<string name="commons_facebook">Commons Facebook Page</string>
<string name="commons_github">Commons Github Source Code</string>
<string name="mediaimage_failed">Media Image Failed</string>
<string name="no_subcategory_found">No subcategories found</string>
<string name="no_parentcategory_found">No parent categories found</string>
@ -286,7 +306,6 @@
<string name="image_uploaded_by">Uploaded by: %1$s</string>
<string name="block_notification_title">Blocked</string>
<string name="block_notification">You are blocked from editing Commons</string>
<string name="appwidget_img">Pic of the Day</string>
<string name="app_widget_heading">Pic of the Day</string>
<string name="menu_search_button">Search</string>
<string name="search_commons">Search Commons</string>
@ -377,7 +396,6 @@
<string name="step_count">Step %1$d of %2$d: %3$s</string>
<string name="next">Next</string>
<string name="previous">Previous</string>
<string name="submit">Submit</string>
<string name="upload_title_duplicate" formatted="true">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.</string>
<string name="map_application_missing">No compatible map application could be found on your device. Please install a map application to use this feature.</string>
<string name="title_page_bookmarks_pictures">Pictures</string>
@ -657,7 +675,6 @@ Upload your first media by tapping on the add button.</string>
<string name="media_detail_in_all_languages">In all languages</string>
<string name="choose_a_location">Choose a location</string>
<string name="pan_and_zoom_to_adjust">Pan and zoom to adjust</string>
<string name="exit_location_picker">Exit location picker</string>
<string name="select_location_location_picker">Select location</string>
<string name="show_in_map_app">Show in map app</string>
<string name="modify_location">Edit location</string>