diff --git a/Sources/App/Resources/en.lproj/Localizable.strings b/Sources/App/Resources/en.lproj/Localizable.strings index a24032063..739c1a862 100644 --- a/Sources/App/Resources/en.lproj/Localizable.strings +++ b/Sources/App/Resources/en.lproj/Localizable.strings @@ -125,7 +125,6 @@ "carPlay.lock.confirmation.title" = "Are you sure you want to perform lock action on %@?"; "carPlay.navigation.button.next" = "Next"; "carPlay.navigation.button.previous" = "Previous"; -"carPlay.navigation.tab.actions" = "Actions"; "carPlay.navigation.tab.areas" = "Areas"; "carPlay.navigation.tab.domains" = "Control"; "carPlay.navigation.tab.quick_access" = "Quick access"; @@ -560,7 +559,7 @@ Home Assistant is free and open source home automation software with a focus on "settings_details.actions.scenes.select_all" = "Select All"; "settings_details.actions.scenes.title" = "Scene Actions"; "settings_details.actions.server_controlled.update.title" = "Update server Actions"; -"settings_details.actions.title" = "Actions"; +"settings_details.legacy_actions.title" = "(Legacy) iOS Actions"; "settings_details.actions.use_custom_colors.title" = "Use custom colors"; "settings_details.actions.watch.available.title" = "Show in Watch"; "settings_details.general.app_icon.enum.beta" = "Beta"; @@ -1080,4 +1079,4 @@ Home Assistant is free and open source home automation software with a focus on "widgets.sensors.description" = "Display state of sensors"; "widgets.sensors.not_configured" = "No Sensors Configured"; "widgets.sensors.title" = "Sensors"; -"yes_label" = "Yes"; \ No newline at end of file +"yes_label" = "Yes"; diff --git a/Sources/App/Settings/SettingsDetailViewController.swift b/Sources/App/Settings/SettingsDetailViewController.swift index 4c67232df..8ef33b789 100644 --- a/Sources/App/Settings/SettingsDetailViewController.swift +++ b/Sources/App/Settings/SettingsDetailViewController.swift @@ -412,7 +412,7 @@ class SettingsDetailViewController: HAFormViewController, TypedRowControllerType } case .actions: - title = L10n.SettingsDetails.Actions.title + title = L10n.SettingsDetails.LegacyActions.title let actions = realm.objects(Action.self) .sorted(byKeyPath: "Position") .filter("Scene == nil") diff --git a/Sources/App/Settings/SettingsRootDataSource.swift b/Sources/App/Settings/SettingsRootDataSource.swift index 4edf87480..106f56058 100644 --- a/Sources/App/Settings/SettingsRootDataSource.swift +++ b/Sources/App/Settings/SettingsRootDataSource.swift @@ -133,7 +133,7 @@ enum SettingsRootDataSource { private static func actions() -> SettingsButtonRow { SettingsButtonRow { - $0.title = L10n.SettingsDetails.Actions.title + $0.title = L10n.SettingsDetails.LegacyActions.title $0.icon = .gamepadVariantOutlineIcon $0.presentationMode = .show(controllerProvider: ControllerProvider.callback { let view = SettingsDetailViewController() diff --git a/Sources/App/Settings/SettingsViewController.swift b/Sources/App/Settings/SettingsViewController.swift index 4d0f5f3ef..dd699bfaf 100644 --- a/Sources/App/Settings/SettingsViewController.swift +++ b/Sources/App/Settings/SettingsViewController.swift @@ -15,7 +15,8 @@ class SettingsViewController: HAFormViewController { static let integrations: ContentSection = 0b11 static let watch: ContentSection = 0b100 static let carPlay: ContentSection = 0b101 - static let help: ContentSection = 0b110 + static let legacy: ContentSection = 0b110 + static let help: ContentSection = 0b111 static let all = ContentSection(rawValue: ~0b0) } @@ -116,7 +117,6 @@ class SettingsViewController: HAFormViewController { if contentSections.contains(.integrations) { form +++ Section() - <<< SettingsRootDataSource.Row.actions.row <<< SettingsRootDataSource.Row.sensors.row <<< SettingsRootDataSource.Row.nfc.row <<< SettingsRootDataSource.Row.widgets.row @@ -147,6 +147,10 @@ class SettingsViewController: HAFormViewController { } } + if contentSections.contains(.legacy) { + form +++ Section() + <<< SettingsRootDataSource.Row.actions.row + } if contentSections.contains(.help) { form +++ Section() <<< SettingsRootDataSource.Row.help.row diff --git a/Sources/CarPlay/Templates/QuickAccess/CarPlayQuickAccessTemplate.swift b/Sources/CarPlay/Templates/QuickAccess/CarPlayQuickAccessTemplate.swift index 8a0493a5e..c31a7810c 100644 --- a/Sources/CarPlay/Templates/QuickAccess/CarPlayQuickAccessTemplate.swift +++ b/Sources/CarPlay/Templates/QuickAccess/CarPlayQuickAccessTemplate.swift @@ -49,7 +49,6 @@ final class CarPlayQuickAccessTemplate: CarPlayTemplateProvider { template.tabSystemItem = .more self.viewModel.templateProvider = self - template.emptyViewSubtitleVariants = [L10n.SettingsDetails.Actions.title] presentIntroductionItem() } diff --git a/Sources/Shared/Resources/Swiftgen/Strings.swift b/Sources/Shared/Resources/Swiftgen/Strings.swift index 6919454ed..b76d55463 100644 --- a/Sources/Shared/Resources/Swiftgen/Strings.swift +++ b/Sources/Shared/Resources/Swiftgen/Strings.swift @@ -564,8 +564,6 @@ public enum L10n { public static var previous: String { return L10n.tr("Localizable", "carPlay.navigation.button.previous") } } public enum Tab { - /// Actions - public static var actions: String { return L10n.tr("Localizable", "carPlay.navigation.tab.actions") } /// Areas public static var areas: String { return L10n.tr("Localizable", "carPlay.navigation.tab.areas") } /// Control @@ -1997,8 +1995,6 @@ public enum L10n { public static var footer: String { return L10n.tr("Localizable", "settings_details.actions.footer") } /// Actions are used in the application menu and widgets. public static var footerMac: String { return L10n.tr("Localizable", "settings_details.actions.footer_mac") } - /// Actions - public static var title: String { return L10n.tr("Localizable", "settings_details.actions.title") } public enum ActionsSynced { /// No Synced Actions public static var empty: String { return L10n.tr("Localizable", "settings_details.actions.actions_synced.empty") } @@ -2180,6 +2176,10 @@ public enum L10n { } } } + public enum LegacyActions { + /// (Legacy) iOS Actions + public static var title: String { return L10n.tr("Localizable", "settings_details.legacy_actions.title") } + } public enum Location { /// Location public static var title: String { return L10n.tr("Localizable", "settings_details.location.title") }