mirror of
https://github.com/element-hq/element-x-ios.git
synced 2025-03-10 21:39:12 +00:00
Advanced settings fixes (#1857)
* vector-im/element-meta/issues/2042 - Fix advanced options ordering and capitalisation * Bump swiftlint's type_body_length warning to 1000, make it match error. * Fix unit tests
This commit is contained in:
parent
cd48fc10d4
commit
72a96b6850
@ -34,7 +34,7 @@ type_name:
|
|||||||
error: 1000
|
error: 1000
|
||||||
|
|
||||||
type_body_length:
|
type_body_length:
|
||||||
warning: 700
|
warning: 1000
|
||||||
error: 1000
|
error: 1000
|
||||||
|
|
||||||
function_body_length:
|
function_body_length:
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
"action_reply" = "Reply";
|
"action_reply" = "Reply";
|
||||||
"action_reply_in_thread" = "Reply in thread";
|
"action_reply_in_thread" = "Reply in thread";
|
||||||
"action_report_bug" = "Report bug";
|
"action_report_bug" = "Report bug";
|
||||||
"action_report_content" = "Report Content";
|
"action_report_content" = "Report content";
|
||||||
"action_retry" = "Retry";
|
"action_retry" = "Retry";
|
||||||
"action_retry_decryption" = "Retry decryption";
|
"action_retry_decryption" = "Retry decryption";
|
||||||
"action_save" = "Save";
|
"action_save" = "Save";
|
||||||
@ -69,7 +69,7 @@
|
|||||||
"action_start_verification" = "Start verification";
|
"action_start_verification" = "Start verification";
|
||||||
"action_static_map_load" = "Tap to load map";
|
"action_static_map_load" = "Tap to load map";
|
||||||
"action_take_photo" = "Take photo";
|
"action_take_photo" = "Take photo";
|
||||||
"action_view_source" = "View Source";
|
"action_view_source" = "View source";
|
||||||
"action_yes" = "Yes";
|
"action_yes" = "Yes";
|
||||||
"action.edit_poll" = "Edit poll";
|
"action.edit_poll" = "Edit poll";
|
||||||
"common_about" = "About";
|
"common_about" = "About";
|
||||||
@ -122,6 +122,7 @@
|
|||||||
"common_room_name_placeholder" = "e.g. your project name";
|
"common_room_name_placeholder" = "e.g. your project name";
|
||||||
"common_search_for_someone" = "Search for someone";
|
"common_search_for_someone" = "Search for someone";
|
||||||
"common_search_results" = "Search results";
|
"common_search_results" = "Search results";
|
||||||
|
"common_secure_backup" = "Secure backup";
|
||||||
"common_security" = "Security";
|
"common_security" = "Security";
|
||||||
"common_select_your_server" = "Select your server";
|
"common_select_your_server" = "Select your server";
|
||||||
"common_sending" = "Sending…";
|
"common_sending" = "Sending…";
|
||||||
|
@ -124,7 +124,7 @@ public enum L10n {
|
|||||||
public static var actionReplyInThread: String { return L10n.tr("Localizable", "action_reply_in_thread") }
|
public static var actionReplyInThread: String { return L10n.tr("Localizable", "action_reply_in_thread") }
|
||||||
/// Report bug
|
/// Report bug
|
||||||
public static var actionReportBug: String { return L10n.tr("Localizable", "action_report_bug") }
|
public static var actionReportBug: String { return L10n.tr("Localizable", "action_report_bug") }
|
||||||
/// Report Content
|
/// Report content
|
||||||
public static var actionReportContent: String { return L10n.tr("Localizable", "action_report_content") }
|
public static var actionReportContent: String { return L10n.tr("Localizable", "action_report_content") }
|
||||||
/// Retry
|
/// Retry
|
||||||
public static var actionRetry: String { return L10n.tr("Localizable", "action_retry") }
|
public static var actionRetry: String { return L10n.tr("Localizable", "action_retry") }
|
||||||
@ -154,7 +154,7 @@ public enum L10n {
|
|||||||
public static var actionStaticMapLoad: String { return L10n.tr("Localizable", "action_static_map_load") }
|
public static var actionStaticMapLoad: String { return L10n.tr("Localizable", "action_static_map_load") }
|
||||||
/// Take photo
|
/// Take photo
|
||||||
public static var actionTakePhoto: String { return L10n.tr("Localizable", "action_take_photo") }
|
public static var actionTakePhoto: String { return L10n.tr("Localizable", "action_take_photo") }
|
||||||
/// View Source
|
/// View source
|
||||||
public static var actionViewSource: String { return L10n.tr("Localizable", "action_view_source") }
|
public static var actionViewSource: String { return L10n.tr("Localizable", "action_view_source") }
|
||||||
/// Yes
|
/// Yes
|
||||||
public static var actionYes: String { return L10n.tr("Localizable", "action_yes") }
|
public static var actionYes: String { return L10n.tr("Localizable", "action_yes") }
|
||||||
@ -280,6 +280,8 @@ public enum L10n {
|
|||||||
public static var commonSearchForSomeone: String { return L10n.tr("Localizable", "common_search_for_someone") }
|
public static var commonSearchForSomeone: String { return L10n.tr("Localizable", "common_search_for_someone") }
|
||||||
/// Search results
|
/// Search results
|
||||||
public static var commonSearchResults: String { return L10n.tr("Localizable", "common_search_results") }
|
public static var commonSearchResults: String { return L10n.tr("Localizable", "common_search_results") }
|
||||||
|
/// Secure backup
|
||||||
|
public static var commonSecureBackup: String { return L10n.tr("Localizable", "common_secure_backup") }
|
||||||
/// Security
|
/// Security
|
||||||
public static var commonSecurity: String { return L10n.tr("Localizable", "common_security") }
|
public static var commonSecurity: String { return L10n.tr("Localizable", "common_security") }
|
||||||
/// Select your server
|
/// Select your server
|
||||||
|
@ -28,11 +28,11 @@ struct AdvancedSettingsScreen: View {
|
|||||||
kind: .picker(selection: $context.timelineStyle,
|
kind: .picker(selection: $context.timelineStyle,
|
||||||
items: TimelineStyle.allCases.map { (title: $0.name, tag: $0) }))
|
items: TimelineStyle.allCases.map { (title: $0.name, tag: $0) }))
|
||||||
|
|
||||||
ListRow(label: .default(title: L10n.actionViewSource, systemIcon: .mailAndTextMagnifyingglass),
|
|
||||||
kind: .toggle($context.viewSourceEnabled))
|
|
||||||
|
|
||||||
ListRow(label: .default(title: L10n.commonRichTextEditor, icon: Image(asset: Asset.Images.textFormat)),
|
ListRow(label: .default(title: L10n.commonRichTextEditor, icon: Image(asset: Asset.Images.textFormat)),
|
||||||
kind: .toggle($context.richTextEditorEnabled))
|
kind: .toggle($context.richTextEditorEnabled))
|
||||||
|
|
||||||
|
ListRow(label: .default(title: L10n.actionViewSource, systemIcon: .mailAndTextMagnifyingglass),
|
||||||
|
kind: .toggle($context.viewSourceEnabled))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.compoundList()
|
.compoundList()
|
||||||
|
BIN
UnitTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen.1.png
(Stored with Git LFS)
BIN
UnitTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen.1.png
(Stored with Git LFS)
Binary file not shown.
BIN
UnitTests/__Snapshots__/PreviewTests/test_reportContentScreen.1.png
(Stored with Git LFS)
BIN
UnitTests/__Snapshots__/PreviewTests/test_reportContentScreen.1.png
(Stored with Git LFS)
Binary file not shown.
BIN
UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
(Stored with Git LFS)
BIN
UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
(Stored with Git LFS)
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user