mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Remove no longer temporary strings (#7260)
* Remove no longer temporary string These are now in localazy and the sync strings CI flow was failing because we have 2 conflicting values in `temporary.xml` and `localazy.xml` * Use the right placeholder value in `screen_local_network_opt_in_subtitle` * Update screenshots --------- Co-authored-by: ElementBot <android@element.io>
This commit is contained in:
committed by
GitHub
parent
61ea9cf2b3
commit
1595830541
@@ -85,6 +85,7 @@ fun LoggedInView(
|
|||||||
}
|
}
|
||||||
|
|
||||||
LocalNetworkPermissionDialogView(
|
LocalNetworkPermissionDialogView(
|
||||||
|
appName = state.appName,
|
||||||
dialog = state.localNetworkPermissionDialog,
|
dialog = state.localNetworkPermissionDialog,
|
||||||
onSubmit = { state.eventSink(LoggedInEvents.RequestLocationNetworkPermission) },
|
onSubmit = { state.eventSink(LoggedInEvents.RequestLocationNetworkPermission) },
|
||||||
onDismiss = { state.eventSink(LoggedInEvents.DismissLocalNetworkPermissionPrompt) },
|
onDismiss = { state.eventSink(LoggedInEvents.DismissLocalNetworkPermissionPrompt) },
|
||||||
|
|||||||
+1
@@ -123,6 +123,7 @@ fun ChangeServerView(
|
|||||||
AsyncData.Uninitialized -> Unit
|
AsyncData.Uninitialized -> Unit
|
||||||
}
|
}
|
||||||
LocalNetworkPermissionDialogView(
|
LocalNetworkPermissionDialogView(
|
||||||
|
appName = LocalBuildMeta.current.applicationName,
|
||||||
dialog = state.localNetworkPermissionDialog,
|
dialog = state.localNetworkPermissionDialog,
|
||||||
onSubmit = {
|
onSubmit = {
|
||||||
eventSink.invoke(ChangeServerEvents.RequestLocalNetworkPermission)
|
eventSink.invoke(ChangeServerEvents.RequestLocalNetworkPermission)
|
||||||
|
|||||||
+2
@@ -41,6 +41,7 @@ import io.element.android.libraries.designsystem.components.BigIcon
|
|||||||
import io.element.android.libraries.designsystem.components.button.BackButton
|
import io.element.android.libraries.designsystem.components.button.BackButton
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreview
|
import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
|
import io.element.android.libraries.designsystem.theme.LocalBuildMeta
|
||||||
import io.element.android.libraries.designsystem.theme.components.Button
|
import io.element.android.libraries.designsystem.theme.components.Button
|
||||||
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
import io.element.android.libraries.designsystem.theme.components.Scaffold
|
||||||
import io.element.android.libraries.designsystem.theme.components.TopAppBar
|
import io.element.android.libraries.designsystem.theme.components.TopAppBar
|
||||||
@@ -138,6 +139,7 @@ fun ChooseAccountProviderView(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
LocalNetworkPermissionDialogView(
|
LocalNetworkPermissionDialogView(
|
||||||
|
appName = LocalBuildMeta.current.applicationName,
|
||||||
dialog = state.loginModeState.localNetworkPermissionDialog,
|
dialog = state.loginModeState.localNetworkPermissionDialog,
|
||||||
onSubmit = {
|
onSubmit = {
|
||||||
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
||||||
|
|||||||
+2
@@ -47,6 +47,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
|
|||||||
import io.element.android.libraries.designsystem.components.avatar.BitmapAvatar
|
import io.element.android.libraries.designsystem.components.avatar.BitmapAvatar
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreview
|
import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
|
import io.element.android.libraries.designsystem.theme.LocalBuildMeta
|
||||||
import io.element.android.libraries.designsystem.theme.components.Button
|
import io.element.android.libraries.designsystem.theme.components.Button
|
||||||
import io.element.android.libraries.designsystem.theme.components.OutlinedButton
|
import io.element.android.libraries.designsystem.theme.components.OutlinedButton
|
||||||
import io.element.android.libraries.designsystem.theme.components.Text
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
@@ -207,6 +208,7 @@ fun LoginWithClassicView(
|
|||||||
onCreateAccountContinue = onCreateAccountContinue,
|
onCreateAccountContinue = onCreateAccountContinue,
|
||||||
)
|
)
|
||||||
LocalNetworkPermissionDialogView(
|
LocalNetworkPermissionDialogView(
|
||||||
|
appName = LocalBuildMeta.current.applicationName,
|
||||||
dialog = state.loginModeState.localNetworkPermissionDialog,
|
dialog = state.loginModeState.localNetworkPermissionDialog,
|
||||||
onSubmit = {
|
onSubmit = {
|
||||||
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
||||||
|
|||||||
+2
@@ -29,6 +29,7 @@ import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
|
|||||||
import io.element.android.libraries.designsystem.components.BigIcon
|
import io.element.android.libraries.designsystem.components.BigIcon
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreview
|
import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
|
import io.element.android.libraries.designsystem.theme.LocalBuildMeta
|
||||||
import io.element.android.libraries.designsystem.theme.components.Button
|
import io.element.android.libraries.designsystem.theme.components.Button
|
||||||
import io.element.android.libraries.designsystem.theme.components.TextButton
|
import io.element.android.libraries.designsystem.theme.components.TextButton
|
||||||
import io.element.android.libraries.matrix.api.auth.OAuthDetails
|
import io.element.android.libraries.matrix.api.auth.OAuthDetails
|
||||||
@@ -112,6 +113,7 @@ fun ConfirmAccountProviderView(
|
|||||||
}
|
}
|
||||||
|
|
||||||
LocalNetworkPermissionDialogView(
|
LocalNetworkPermissionDialogView(
|
||||||
|
appName = LocalBuildMeta.current.applicationName,
|
||||||
dialog = state.loginModeState.localNetworkPermissionDialog,
|
dialog = state.loginModeState.localNetworkPermissionDialog,
|
||||||
onSubmit = {
|
onSubmit = {
|
||||||
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
||||||
|
|||||||
+1
@@ -87,6 +87,7 @@ fun OnBoardingView(
|
|||||||
onCreateAccountContinue = onCreateAccountContinue,
|
onCreateAccountContinue = onCreateAccountContinue,
|
||||||
)
|
)
|
||||||
LocalNetworkPermissionDialogView(
|
LocalNetworkPermissionDialogView(
|
||||||
|
appName = state.productionApplicationName,
|
||||||
dialog = state.loginModeState.localNetworkPermissionDialog,
|
dialog = state.loginModeState.localNetworkPermissionDialog,
|
||||||
onSubmit = {
|
onSubmit = {
|
||||||
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
|
||||||
|
|||||||
+2
-1
@@ -15,6 +15,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LocalNetworkPermissionDialogView(
|
fun LocalNetworkPermissionDialogView(
|
||||||
|
appName: String,
|
||||||
dialog: LocalNetworkPermissionDialog,
|
dialog: LocalNetworkPermissionDialog,
|
||||||
onSubmit: () -> Unit,
|
onSubmit: () -> Unit,
|
||||||
onDismiss: () -> Unit,
|
onDismiss: () -> Unit,
|
||||||
@@ -27,7 +28,7 @@ fun LocalNetworkPermissionDialogView(
|
|||||||
}
|
}
|
||||||
ConfirmationDialog(
|
ConfirmationDialog(
|
||||||
title = stringResource(CommonStrings.screen_local_network_opt_in_title),
|
title = stringResource(CommonStrings.screen_local_network_opt_in_title),
|
||||||
content = stringResource(CommonStrings.screen_local_network_opt_in_subtitle),
|
content = stringResource(CommonStrings.screen_local_network_opt_in_subtitle, appName),
|
||||||
submitText = stringResource(submitTextRes),
|
submitText = stringResource(submitTextRes),
|
||||||
cancelText = stringResource(CommonStrings.action_not_now),
|
cancelText = stringResource(CommonStrings.action_not_now),
|
||||||
onSubmitClick = onSubmit,
|
onSubmitClick = onSubmit,
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
<string name="a11y_collapse_message_text_field">"Minimise message text field"</string>
|
<string name="a11y_collapse_message_text_field">"Minimise message text field"</string>
|
||||||
<string name="a11y_create_poll_votes_allowed_decrease">"Decrease votes allowed per person"</string>
|
<string name="a11y_create_poll_votes_allowed_decrease">"Decrease votes allowed per person"</string>
|
||||||
<string name="a11y_create_poll_votes_allowed_increase">"Increase votes allowed per person"</string>
|
<string name="a11y_create_poll_votes_allowed_increase">"Increase votes allowed per person"</string>
|
||||||
|
<string name="a11y_custom_emoji">"Custom emoji"</string>
|
||||||
<string name="a11y_delete">"Delete"</string>
|
<string name="a11y_delete">"Delete"</string>
|
||||||
<plurals name="a11y_digits_entered">
|
<plurals name="a11y_digits_entered">
|
||||||
<item quantity="one">"%1$d digit entered"</item>
|
<item quantity="one">"%1$d digit entered"</item>
|
||||||
@@ -64,6 +65,7 @@
|
|||||||
<string name="a11y_start_call">"Start a call"</string>
|
<string name="a11y_start_call">"Start a call"</string>
|
||||||
<string name="a11y_start_video_call">"Start a video call"</string>
|
<string name="a11y_start_video_call">"Start a video call"</string>
|
||||||
<string name="a11y_start_voice_call">"Start a voice call"</string>
|
<string name="a11y_start_voice_call">"Start a voice call"</string>
|
||||||
|
<string name="a11y_status">"Status"</string>
|
||||||
<string name="a11y_thread_in_room">"Thread in %1$s"</string>
|
<string name="a11y_thread_in_room">"Thread in %1$s"</string>
|
||||||
<string name="a11y_threads_in_room">"Threads in %1$s"</string>
|
<string name="a11y_threads_in_room">"Threads in %1$s"</string>
|
||||||
<string name="a11y_tombstoned_room">"Tombstoned room"</string>
|
<string name="a11y_tombstoned_room">"Tombstoned room"</string>
|
||||||
@@ -445,7 +447,7 @@ Reason: %1$s."</string>
|
|||||||
<string name="common_world_readable_history">"Anyone can see history"</string>
|
<string name="common_world_readable_history">"Anyone can see history"</string>
|
||||||
<string name="common_you">"You"</string>
|
<string name="common_you">"You"</string>
|
||||||
<string name="content_scanner_not_found">"Download not available."</string>
|
<string name="content_scanner_not_found">"Download not available."</string>
|
||||||
<string name="content_scanner_not_found_title">"File not found"</string>
|
<string name="content_scanner_not_found_title">"Something went wrong"</string>
|
||||||
<string name="content_scanner_scanning">"Scanning…"</string>
|
<string name="content_scanner_scanning">"Scanning…"</string>
|
||||||
<string name="content_scanner_unsafe_message">"Preview and download have been disabled."</string>
|
<string name="content_scanner_unsafe_message">"Preview and download have been disabled."</string>
|
||||||
<string name="content_scanner_unsafe_title">"The file is not safe"</string>
|
<string name="content_scanner_unsafe_title">"The file is not safe"</string>
|
||||||
@@ -517,7 +519,7 @@ Are you sure you want to continue?"</string>
|
|||||||
<item quantity="other">"%1$d people"</item>
|
<item quantity="other">"%1$d people"</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="screen_live_location_sheet_title">"On the map"</string>
|
<string name="screen_live_location_sheet_title">"On the map"</string>
|
||||||
<string name="screen_local_network_opt_in_subtitle">"Your homeserver is on your local network. To connect, Element needs permission to reach devices on this network."</string>
|
<string name="screen_local_network_opt_in_subtitle">"Your homeserver is on your local network. To connect, %1$s needs permission to reach devices on this network."</string>
|
||||||
<string name="screen_local_network_opt_in_title">"Allow access to local network"</string>
|
<string name="screen_local_network_opt_in_title">"Allow access to local network"</string>
|
||||||
<string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
|
<string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
|
||||||
<string name="screen_pinned_timeline_empty_state_description">"Press on a message and choose “%1$s” to include here."</string>
|
<string name="screen_pinned_timeline_empty_state_description">"Press on a message and choose “%1$s” to include here."</string>
|
||||||
@@ -550,6 +552,14 @@ Are you sure you want to continue?"</string>
|
|||||||
<string name="screen_room_pinned_banner_loading_description">"Loading message…"</string>
|
<string name="screen_room_pinned_banner_loading_description">"Loading message…"</string>
|
||||||
<string name="screen_room_pinned_banner_view_all_button_title">"View All"</string>
|
<string name="screen_room_pinned_banner_view_all_button_title">"View All"</string>
|
||||||
<string name="screen_room_title">"Chat"</string>
|
<string name="screen_room_title">"Chat"</string>
|
||||||
|
<string name="screen_settings_user_status_away">"Away"</string>
|
||||||
|
<string name="screen_settings_user_status_be_right_back">"Be right back"</string>
|
||||||
|
<string name="screen_settings_user_status_custom">"Custom…"</string>
|
||||||
|
<string name="screen_settings_user_status_custom_hint">"Custom status…"</string>
|
||||||
|
<string name="screen_settings_user_status_focus_time">"Focus time"</string>
|
||||||
|
<string name="screen_settings_user_status_in_a_meeting">"In a meeting"</string>
|
||||||
|
<string name="screen_settings_user_status_on_the_road">"On the road"</string>
|
||||||
|
<string name="screen_settings_user_status_placeholder">"What\'s your status?"</string>
|
||||||
<string name="screen_share_location_title">"Share location"</string>
|
<string name="screen_share_location_title">"Share location"</string>
|
||||||
<string name="screen_share_my_location_action">"Share my location"</string>
|
<string name="screen_share_my_location_action">"Share my location"</string>
|
||||||
<string name="screen_share_open_apple_maps">"Open in Apple Maps"</string>
|
<string name="screen_share_open_apple_maps">"Open in Apple Maps"</string>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Reference in New Issue
Block a user