mirror of
https://github.com/element-hq/element-android
synced 2024-11-27 20:06:51 +03:00
Using correct string resources for options
This commit is contained in:
parent
3bbb7167f1
commit
0707877b3c
2 changed files with 14 additions and 6 deletions
|
@ -16,12 +16,12 @@
|
||||||
app:icon="@drawable/ic_attachment_location_white"
|
app:icon="@drawable/ic_attachment_location_white"
|
||||||
app:iconBackground="@drawable/circle"
|
app:iconBackground="@drawable/circle"
|
||||||
app:iconBackgroundTint="?colorPrimary"
|
app:iconBackgroundTint="?colorPrimary"
|
||||||
app:iconDescription="@string/a11y_location_share_icon"
|
app:iconDescription="@string/a11y_location_share_option_pinned_icon"
|
||||||
app:layout_constraintBottom_toTopOf="@id/locationSharingOptionUserCurrentLocation"
|
app:layout_constraintBottom_toTopOf="@id/locationSharingOptionUserCurrentLocation"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:title="@string/location_share" />
|
app:title="@string/location_share_option_pinned" />
|
||||||
|
|
||||||
<im.vector.app.features.location.view.LocationSharingOptionView
|
<im.vector.app.features.location.view.LocationSharingOptionView
|
||||||
android:id="@+id/locationSharingOptionUserCurrentLocation"
|
android:id="@+id/locationSharingOptionUserCurrentLocation"
|
||||||
|
@ -30,12 +30,12 @@
|
||||||
app:icon="@drawable/ic_attachment_location_white"
|
app:icon="@drawable/ic_attachment_location_white"
|
||||||
app:iconBackground="@drawable/circle"
|
app:iconBackground="@drawable/circle"
|
||||||
app:iconBackgroundTint="?colorPrimary"
|
app:iconBackgroundTint="?colorPrimary"
|
||||||
app:iconDescription="@string/a11y_location_share_icon"
|
app:iconDescription="@string/a11y_location_share_option_user_current_icon"
|
||||||
app:layout_constraintBottom_toTopOf="@id/locationSharingOptionUserLiveLocation"
|
app:layout_constraintBottom_toTopOf="@id/locationSharingOptionUserLiveLocation"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/locationSharingOptionPinned"
|
app:layout_constraintTop_toBottomOf="@+id/locationSharingOptionPinned"
|
||||||
app:title="@string/location_share" />
|
app:title="@string/location_share_option_user_current" />
|
||||||
|
|
||||||
<im.vector.app.features.location.view.LocationSharingOptionView
|
<im.vector.app.features.location.view.LocationSharingOptionView
|
||||||
android:id="@+id/locationSharingOptionUserLiveLocation"
|
android:id="@+id/locationSharingOptionUserLiveLocation"
|
||||||
|
@ -44,12 +44,12 @@
|
||||||
app:icon="@drawable/ic_attachment_location_live_white"
|
app:icon="@drawable/ic_attachment_location_live_white"
|
||||||
app:iconBackground="@drawable/circle"
|
app:iconBackground="@drawable/circle"
|
||||||
app:iconBackgroundTint="?colorPrimary"
|
app:iconBackgroundTint="?colorPrimary"
|
||||||
app:iconDescription="@string/a11y_location_share_icon"
|
app:iconDescription="@string/a11y_location_share_option_user_live_icon"
|
||||||
app:iconPadding="3dp"
|
app:iconPadding="3dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/locationSharingOptionUserCurrentLocation"
|
app:layout_constraintTop_toBottomOf="@id/locationSharingOptionUserCurrentLocation"
|
||||||
app:title="@string/location_share" />
|
app:title="@string/location_share_option_user_live" />
|
||||||
|
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
@ -2924,9 +2924,17 @@
|
||||||
<!-- Location -->
|
<!-- Location -->
|
||||||
<string name="location_activity_title_static_sharing">Share location</string>
|
<string name="location_activity_title_static_sharing">Share location</string>
|
||||||
<string name="location_activity_title_preview">Location</string>
|
<string name="location_activity_title_preview">Location</string>
|
||||||
|
<!-- TODO delete -->
|
||||||
<string name="a11y_location_share_icon">Share location</string>
|
<string name="a11y_location_share_icon">Share location</string>
|
||||||
<string name="a11y_static_map_image">Map</string>
|
<string name="a11y_static_map_image">Map</string>
|
||||||
|
<!-- TODO delete -->
|
||||||
<string name="location_share">Share location</string>
|
<string name="location_share">Share location</string>
|
||||||
|
<string name="location_share_option_user_current">Share my current location</string>
|
||||||
|
<string name="a11y_location_share_option_user_current_icon">Share my current location</string>
|
||||||
|
<string name="location_share_option_user_live">Share live location</string>
|
||||||
|
<string name="a11y_location_share_option_user_live_icon">Share live location</string>
|
||||||
|
<string name="location_share_option_pinned">Share this location</string>
|
||||||
|
<string name="a11y_location_share_option_pinned_icon">Share this location</string>
|
||||||
<string name="location_not_available_dialog_title">${app_name} could not access your location</string>
|
<string name="location_not_available_dialog_title">${app_name} could not access your location</string>
|
||||||
<string name="location_not_available_dialog_content">${app_name} could not access your location. Please try again later.</string>
|
<string name="location_not_available_dialog_content">${app_name} could not access your location. Please try again later.</string>
|
||||||
<string name="location_share_external">Open with</string>
|
<string name="location_share_external">Open with</string>
|
||||||
|
|
Loading…
Reference in a new issue