Backport refactoring of theme sections (#1450)

keeshux · web-flow · commit 2d09a01ae9e4 · 2025-07-02T11:36:57.000+02:00
See #1426
diff --git a/Packages/App/Sources/AppUIMain/Views/Modules/DNSView.swift b/Packages/App/Sources/AppUIMain/Views/Modules/DNSView.swift
@@ -90,18 +90,16 @@ private extension DNSView {
     }
 
     var routingSection: some View {
-        Group {
-            Picker(Strings.Modules.Dns.routeThroughVpn, selection: $draft.module.routesThroughVPN) {
-                Text(Strings.Global.Nouns.default)
-                    .tag(nil as Bool?)
-                Text(Strings.Global.Nouns.yes)
-                    .tag(true as Bool?)
-                Text(Strings.Global.Nouns.no)
-                    .tag(false as Bool?)
-            }
-            .themeRowWithSubtitle(Strings.Modules.Dns.RouteThroughVpn.footer)
+        Picker(Strings.Modules.Dns.routeThroughVpn, selection: $draft.module.routesThroughVPN) {
+            Text(Strings.Global.Nouns.default)
+                .tag(nil as Bool?)
+            Text(Strings.Global.Nouns.yes)
+                .tag(true as Bool?)
+            Text(Strings.Global.Nouns.no)
+                .tag(false as Bool?)
         }
-        .themeSection(footer: Strings.Modules.Dns.RouteThroughVpn.footer)
+        .themeContainerWithSingleEntry(
+            footer: Strings.Modules.Dns.RouteThroughVpn.footer)
     }
 
     var domainSection: some View {
diff --git a/Packages/App/Sources/AppUIMain/Views/Modules/IPView.swift b/Packages/App/Sources/AppUIMain/Views/Modules/IPView.swift
@@ -94,15 +94,12 @@ private extension IPView {
 
     @ViewBuilder
     func ipSections(for ip: Binding<IPSettings>, family: Address.Family) -> some View {
-        Group {
-            ThemeTextField(
-                Strings.Global.Nouns.address,
-                text: $subnets[family] ?? "",
-                placeholder: Strings.Unlocalized.Placeholders.ipDestination(forFamily: family)
-            )
-            .themeRowWithSubtitle(Strings.Modules.Ip.Address.footer)
-        }
-        .themeSection(
+        ThemeTextField(
+            Strings.Global.Nouns.address,
+            text: $subnets[family] ?? "",
+            placeholder: Strings.Unlocalized.Placeholders.ipDestination(forFamily: family)
+        )
+        .themeContainerWithSingleEntry(
             header: family.localizedDescription,
             footer: Strings.Modules.Ip.Address.footer
         )
diff --git a/Packages/App/Sources/AppUIMain/Views/Modules/OnDemandView.swift b/Packages/App/Sources/AppUIMain/Views/Modules/OnDemandView.swift
@@ -93,7 +93,7 @@ private extension OnDemandView {
                 )
             }
         }
-        .themeSectionWithSingleRow(footer: policyFooterDescription)
+        .themeContainerWithSingleEntry(footer: policyFooterDescription)
     }
 
     var policyFooterDescription: String {
@@ -122,8 +122,7 @@ private extension OnDemandView {
         }
         .themeSection(
             header: Strings.Global.Nouns.networks,
-            footer: Strings.Modules.OnDemand.Networks.footer,
-            forcesFooter: true
+            footer: Strings.Modules.OnDemand.Networks.footer
         )
     }
 
@@ -233,17 +232,18 @@ private extension OnDemandView {
         "Two": false,
         "Three": false
     ]
-    return module.preview {
-        OnDemandView(
-            draft: $1[$0],
-            parameters: .init(
-                registry: Registry(),
-                editor: $1,
-                impl: nil
-            ),
-            observer: MockWifi()
-        )
-    }
+    return module.preview()
+//    return module.preview {
+//        OnDemandView(
+//            draft: $1[$0],
+//            parameters: .init(
+//                registry: Registry(),
+//                editor: $1,
+//                impl: nil
+//            ),
+//            observer: MockWifi()
+//        )
+//    }
 }
 
 private class MockWifi: WifiObserver {
diff --git a/Packages/App/Sources/AppUIMain/Views/Modules/Provider/ProviderView+OpenVPN.swift b/Packages/App/Sources/AppUIMain/Views/Modules/Provider/ProviderView+OpenVPN.swift
@@ -79,7 +79,7 @@ private extension ProviderView.OpenVPNCredentialsView {
                     .onSubmit(saveCredentials)
             }
         }
-        .themeSection(footer: guidanceString, forcesFooter: true)
+        .themeSection(footer: guidanceString)
     }
 
     var guidanceSection: some View {
diff --git a/Packages/App/Sources/AppUIMain/Views/Profile/ProfileBehaviorSection.swift b/Packages/App/Sources/AppUIMain/Views/Profile/ProfileBehaviorSection.swift
@@ -32,7 +32,7 @@ struct ProfileBehaviorSection: View {
 
     var body: some View {
         keepAliveToggle
-            .themeSectionWithSingleRow(
+            .themeContainerWithSingleEntry(
                 header: Strings.Modules.General.Sections.Behavior.header,
                 footer: Strings.Modules.General.Rows.KeepAliveOnSleep.footer
             )
diff --git a/Packages/App/Sources/AppUIMain/Views/Profile/ProfileStorageSection.swift b/Packages/App/Sources/AppUIMain/Views/Profile/ProfileStorageSection.swift
@@ -43,18 +43,15 @@ struct ProfileStorageSection: View {
         debugChanges()
         return Group {
             sharingToggle
-                .themeSectionWithSingleRow(
+                .themeContainerEntry(
                     header: header,
-                    footer: sharingDescription
+                    subtitle: sharingDescription
                 )
-
-            Group {
-                tvToggle
-                    .themeRowWithSubtitle(tvDescription)
-            }
-            .themeSection(footer: tvDescription)
-            .disabled(!profileEditor.isShared)
+            tvToggle
+                .themeContainerEntry(subtitle: tvDescription)
+                .disabled(!profileEditor.isShared)
         }
+        .themeContainer(header: header)
     }
 }
 
diff --git a/Packages/App/Sources/AppUIMain/Views/Profile/macOS/SendToTVFormView+macOS.swift b/Packages/App/Sources/AppUIMain/Views/Profile/macOS/SendToTVFormView+macOS.swift
@@ -60,7 +60,7 @@ private extension SendToTVFormView {
             Strings.Global.Nouns.profiles,
             Strings.Views.Tv.Profiles.importLocal,
             Strings.Unlocalized.appleTV
-        ), forcesFooter: true)
+        ))
     }
 
     var passcodeSection: some View {
diff --git a/Packages/App/Sources/UILibrary/Views/Modules/OpenVPNView+Credentials.swift b/Packages/App/Sources/UILibrary/Views/Modules/OpenVPNView+Credentials.swift
@@ -100,27 +100,18 @@ private extension OpenVPNCredentialsGroup {
                     )
                 }
             }
-            .themeRowWithSubtitle(interactiveFooter)
+            .themeContainerEntry(subtitle: Strings.Modules.Openvpn.Credentials.Interactive.footer)
 
             if distributionTarget.supportsPaidFeatures && draft.module.isInteractive && !isAuthenticating {
                 Picker(Strings.Unlocalized.otp, selection: $builder.otpMethod) {
                     ForEach(otpMethods, id: \.self) {
                         Text($0.localizedDescription(style: .entity))
                     }
                 }
+                .themeContainerEntry(subtitle: builder.otpMethod.localizedDescription(style: .approachDescription).nilIfEmpty)
             }
         }
-        .themeSection(footer: interactiveFooter)
-    }
-
-    var interactiveFooter: String? {
-        if draft.module.isInteractive {
-            return [
-                Strings.Modules.Openvpn.Credentials.Interactive.footer,
-                builder.otpMethod.localizedDescription(style: .approachDescription)
-            ].joined(separator: " ")
-        }
-        return nil
+        .themeContainer()
     }
 
     var inputSection: some View {
@@ -133,7 +124,7 @@ private extension OpenVPNCredentialsGroup {
                 otpField
             }
         }
-        .themeSection(footer: inputFooter, forcesFooter: true)
+        .themeSection(footer: inputFooter)
     }
 
     var inputFooter: String? {
diff --git a/Packages/App/Sources/UILibrary/Views/Paywall/PaywallView.swift b/Packages/App/Sources/UILibrary/Views/Paywall/PaywallView.swift
@@ -131,8 +131,7 @@ private extension PaywallView {
                 }
                 .themeSection(
                     header: Strings.Views.Paywall.Sections.Products.header,
-                    footer: Strings.Views.Paywall.Sections.Products.footer,
-                    forcesFooter: true
+                    footer: Strings.Views.Paywall.Sections.Products.footer
                 )
             }
     }
@@ -169,8 +168,7 @@ private extension PaywallView {
                     footer: [
                         Strings.Views.Paywall.Sections.FullProducts.footer,
                         Strings.Views.Paywall.Sections.Products.footer
-                    ].joined(separator: " "),
-                    forcesFooter: true
+                    ].joined(separator: " ")
                 )
             }
     }
@@ -189,10 +187,10 @@ private extension PaywallView {
 
     var restoreView: some View {
         RestorePurchasesButton(errorHandler: errorHandler)
-            .themeSectionWithSingleRow(
+            .themeContainerWithSingleEntry(
                 header: Strings.Views.Paywall.Sections.Restore.header,
                 footer: Strings.Views.Paywall.Sections.Restore.footer,
-                above: true
+                isAction: true
             )
     }
 
diff --git a/Packages/App/Sources/UILibrary/Views/Preferences/PreferencesView.swift b/Packages/App/Sources/UILibrary/Views/Preferences/PreferencesView.swift
@@ -109,34 +109,34 @@ private extension PreferencesView {
 #if os(iOS)
     var lockInBackgroundSection: some View {
         Toggle(Strings.Views.Preferences.locksInBackground, isOn: $locksInBackground)
-            .themeSectionWithSingleRow(footer: Strings.Views.Preferences.LocksInBackground.footer)
+            .themeContainerEntry(subtitle: Strings.Views.Preferences.LocksInBackground.footer)
     }
 
 #elseif os(macOS)
     var launchesOnLoginSection: some View {
         Toggle(Strings.Views.Preferences.launchesOnLogin, isOn: $settings.launchesOnLogin)
-            .themeSectionWithSingleRow(footer: Strings.Views.Preferences.LaunchesOnLogin.footer)
+            .themeContainerEntry(subtitle: Strings.Views.Preferences.LaunchesOnLogin.footer)
     }
 
     var keepsInMenuSection: some View {
         Toggle(Strings.Views.Preferences.keepsInMenu, isOn: $settings.keepsInMenu)
-            .themeSectionWithSingleRow(footer: Strings.Views.Preferences.KeepsInMenu.footer)
+            .themeContainerEntry(subtitle: Strings.Views.Preferences.KeepsInMenu.footer)
     }
 #endif
 
     var pinActiveProfileSection: some View {
         PinActiveProfileToggle()
-            .themeSectionWithSingleRow(footer: Strings.Views.Preferences.PinsActiveProfile.footer)
+            .themeContainerEntry(subtitle: Strings.Views.Preferences.PinsActiveProfile.footer)
     }
 
     var dnsFallsBackSection: some View {
         Toggle(Strings.Views.Preferences.dnsFallsBack, isOn: $dnsFallsBack)
-            .themeSectionWithSingleRow(footer: Strings.Views.Preferences.DnsFallsBack.footer)
+            .themeContainerEntry(subtitle: Strings.Views.Preferences.DnsFallsBack.footer)
     }
 
     var enablesPurchasesSection: some View {
         Toggle(Strings.Views.Preferences.enablesIap, isOn: $iapManager.isEnabled)
-            .themeRowWithSubtitle(Strings.Views.Preferences.EnablesIap.footer)
+            .themeContainerEntry(subtitle: Strings.Views.Preferences.EnablesIap.footer)
     }
 
     var eraseCloudKitSection: some View {
@@ -159,10 +159,10 @@ private extension PreferencesView {
                 isErasingiCloud = false
             }
         }
-        .themeSectionWithSingleRow(
+        .themeContainerWithSingleEntry(
             header: Strings.Unlocalized.iCloud,
             footer: Strings.Views.Preferences.EraseIcloud.footer,
-            above: true
+            isAction: true
         )
         .disabled(isErasingiCloud)
     }
diff --git a/Packages/App/Sources/UILibrary/Views/Settings/PurchasedView.swift b/Packages/App/Sources/UILibrary/Views/Settings/PurchasedView.swift
@@ -141,10 +141,10 @@ private extension PurchasedView {
 
     var restoreSection: some View {
         RestorePurchasesButton(errorHandler: errorHandler)
-            .themeSectionWithSingleRow(
+            .themeContainerWithSingleEntry(
                 header: Strings.Views.Paywall.Sections.Restore.header,
                 footer: Strings.Views.Paywall.Sections.Restore.footer,
-                above: true
+                isAction: true
             )
     }
 }
diff --git a/Packages/App/Sources/UILibrary/Views/Theme/Platforms/Theme+iOS.swift b/Packages/App/Sources/UILibrary/Views/Theme/Platforms/Theme+iOS.swift
@@ -115,25 +115,24 @@ extension ThemeManualInputModifier {
     }
 }
 
-extension ThemeSectionWithHeaderFooterModifier {
+extension ThemeContainerModifier {
+    func body(content: Content) -> some View {
+        content
+    }
+}
+
+extension ThemeContainerEntryModifier {
     func body(content: Content) -> some View {
         Section {
             content
         } header: {
             header.map(Text.init)
         } footer: {
-            footer.map(Text.init)
+            subtitle.map(Text.init)
         }
     }
 }
 
-extension ThemeRowWithSubtitleModifier {
-    func body(content: Content) -> some View {
-        content
-        // omit subtitle on iOS/tvOS, use ThemeSectionWithHeaderFooterModifier
-    }
-}
-
 // MARK: - Views
 
 extension ThemeTappableText {
diff --git a/Packages/App/Sources/UILibrary/Views/Theme/Platforms/Theme+macOS.swift b/Packages/App/Sources/UILibrary/Views/Theme/Platforms/Theme+macOS.swift
@@ -58,31 +58,39 @@ extension ThemeManualInputModifier {
     }
 }
 
-extension ThemeSectionWithHeaderFooterModifier {
+extension ThemeContainerModifier {
     func body(content: Content) -> some View {
         Section {
             content
-            if forcesFooter {
-                footer.map {
-                    Text($0)
-                        .themeSubtitle()
-                }
+            footer.map {
+                Text($0)
+                    .themeSubtitle()
             }
         } header: {
             header.map(Text.init)
         }
     }
 }
 
-extension ThemeRowWithSubtitleModifier {
+extension ThemeContainerEntryModifier {
     func body(content: Content) -> some View {
         VStack {
-            content
-                .frame(maxWidth: .infinity, alignment: .leading)
-
-            subtitle
-                .themeSubtitle()
+            if !isAction {
+                content
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
+            subtitle.map {
+                Text($0)
+                    .themeSubtitle()
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
+            if isAction {
+                HStack {
+                    Spacer()
+                    content
+                }
                 .frame(maxWidth: .infinity, alignment: .leading)
+            }
         }
     }
 }
diff --git a/Packages/App/Sources/UILibrary/Views/Theme/Platforms/Theme+tvOS.swift b/Packages/App/Sources/UILibrary/Views/Theme/Platforms/Theme+tvOS.swift
diff --git a/Packages/App/Sources/UILibrary/Views/Theme/Theme+Modifiers.swift b/Packages/App/Sources/UILibrary/Views/Theme/Theme+Modifiers.swift
diff --git a/Packages/App/Sources/UILibrary/Views/Theme/ThemeContainerModifier.swift b/Packages/App/Sources/UILibrary/Views/Theme/ThemeContainerModifier.swift
diff --git a/Packages/App/Sources/UILibrary/Views/Theme/ThemeNameSection.swift b/Packages/App/Sources/UILibrary/Views/Theme/ThemeNameSection.swift
diff --git a/Packages/App/Sources/UILibrary/Views/Theme/ThemeRowWithSubtitleModifier.swift b/Packages/App/Sources/UILibrary/Views/Theme/ThemeRowWithSubtitleModifier.swift

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private extension OnDemandView {`
`93`	`93`	`)`
`94`	`94`	`}`
`95`	`95`	`}`
`96`		`- .themeSectionWithSingleRow(footer: policyFooterDescription)`
	`96`	`+ .themeContainerWithSingleEntry(footer: policyFooterDescription)`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`var policyFooterDescription: String {`
`@@ -122,8 +122,7 @@ private extension OnDemandView {`
`122`	`122`	`}`
`123`	`123`	`.themeSection(`
`124`	`124`	`header: Strings.Global.Nouns.networks,`
`125`		`- footer: Strings.Modules.OnDemand.Networks.footer,`
`126`		`- forcesFooter: true`
	`125`	`+ footer: Strings.Modules.OnDemand.Networks.footer`
`127`	`126`	`)`
`128`	`127`	`}`
`129`	`128`
`@@ -233,17 +232,18 @@ private extension OnDemandView {`
`233`	`232`	`"Two": false,`
`234`	`233`	`"Three": false`
`235`	`234`	`]`
`236`		`- return module.preview {`
`237`		`- OnDemandView(`
`238`		`- draft: $1[$0],`
`239`		`- parameters: .init(`
`240`		`- registry: Registry(),`
`241`		`- editor: $1,`
`242`		`- impl: nil`
`243`		`- ),`
`244`		`- observer: MockWifi()`
`245`		`- )`
`246`		`- }`
	`235`	`+ return module.preview()`
	`236`	`+// return module.preview {`
	`237`	`+// OnDemandView(`
	`238`	`+// draft: $1[$0],`
	`239`	`+// parameters: .init(`
	`240`	`+// registry: Registry(),`
	`241`	`+// editor: $1,`
	`242`	`+// impl: nil`
	`243`	`+// ),`
	`244`	`+// observer: MockWifi()`
	`245`	`+// )`
	`246`	`+// }`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`private class MockWifi: WifiObserver {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ private extension ProviderView.OpenVPNCredentialsView {`
`79`	`79`	`.onSubmit(saveCredentials)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`		`- .themeSection(footer: guidanceString, forcesFooter: true)`
	`82`	`+ .themeSection(footer: guidanceString)`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`var guidanceSection: some View {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ struct ProfileBehaviorSection: View {`
`32`	`32`
`33`	`33`	`var body: some View {`
`34`	`34`	`keepAliveToggle`
`35`		`- .themeSectionWithSingleRow(`
	`35`	`+ .themeContainerWithSingleEntry(`
`36`	`36`	`header: Strings.Modules.General.Sections.Behavior.header,`
`37`	`37`	`footer: Strings.Modules.General.Rows.KeepAliveOnSleep.footer`
`38`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -43,18 +43,15 @@ struct ProfileStorageSection: View {`
`43`	`43`	`debugChanges()`
`44`	`44`	`return Group {`
`45`	`45`	`sharingToggle`
`46`		`- .themeSectionWithSingleRow(`
	`46`	`+ .themeContainerEntry(`
`47`	`47`	`header: header,`
`48`		`- footer: sharingDescription`
	`48`	`+ subtitle: sharingDescription`
`49`	`49`	`)`
`50`		`-`
`51`		`- Group {`
`52`		`- tvToggle`
`53`		`- .themeRowWithSubtitle(tvDescription)`
`54`		`- }`
`55`		`- .themeSection(footer: tvDescription)`
`56`		`- .disabled(!profileEditor.isShared)`
	`50`	`+ tvToggle`
	`51`	`+ .themeContainerEntry(subtitle: tvDescription)`
	`52`	`+ .disabled(!profileEditor.isShared)`
`57`	`53`	`}`
	`54`	`+ .themeContainer(header: header)`
`58`	`55`	`}`
`59`	`56`	`}`
`60`	`57`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private extension SendToTVFormView {`
`60`	`60`	`Strings.Global.Nouns.profiles,`
`61`	`61`	`Strings.Views.Tv.Profiles.importLocal,`
`62`	`62`	`Strings.Unlocalized.appleTV`
`63`		`- ), forcesFooter: true)`
	`63`	`+ ))`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`var passcodeSection: some View {`
Original file line number	Diff line number	Diff line change
`@@ -100,27 +100,18 @@ private extension OpenVPNCredentialsGroup {`
`100`	`100`	`)`
`101`	`101`	`}`
`102`	`102`	`}`
`103`		`- .themeRowWithSubtitle(interactiveFooter)`
	`103`	`+ .themeContainerEntry(subtitle: Strings.Modules.Openvpn.Credentials.Interactive.footer)`
`104`	`104`
`105`	`105`	`if distributionTarget.supportsPaidFeatures && draft.module.isInteractive && !isAuthenticating {`
`106`	`106`	`Picker(Strings.Unlocalized.otp, selection: $builder.otpMethod) {`
`107`	`107`	`ForEach(otpMethods, id: \.self) {`
`108`	`108`	`Text($0.localizedDescription(style: .entity))`
`109`	`109`	`}`
`110`	`110`	`}`
	`111`	`+ .themeContainerEntry(subtitle: builder.otpMethod.localizedDescription(style: .approachDescription).nilIfEmpty)`
`111`	`112`	`}`
`112`	`113`	`}`
`113`		`- .themeSection(footer: interactiveFooter)`
`114`		`- }`
`115`		`-`
`116`		`- var interactiveFooter: String? {`
`117`		`- if draft.module.isInteractive {`
`118`		`- return [`
`119`		`- Strings.Modules.Openvpn.Credentials.Interactive.footer,`
`120`		`- builder.otpMethod.localizedDescription(style: .approachDescription)`
`121`		`- ].joined(separator: " ")`
`122`		`- }`
`123`		`- return nil`
	`114`	`+ .themeContainer()`
`124`	`115`	`}`
`125`	`116`
`126`	`117`	`var inputSection: some View {`
`@@ -133,7 +124,7 @@ private extension OpenVPNCredentialsGroup {`
`133`	`124`	`otpField`
`134`	`125`	`}`
`135`	`126`	`}`
`136`		`- .themeSection(footer: inputFooter, forcesFooter: true)`
	`127`	`+ .themeSection(footer: inputFooter)`
`137`	`128`	`}`
`138`	`129`
`139`	`130`	`var inputFooter: String? {`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,7 @@ private extension PaywallView {`
`131`	`131`	`}`
`132`	`132`	`.themeSection(`
`133`	`133`	`header: Strings.Views.Paywall.Sections.Products.header,`
`134`		`- footer: Strings.Views.Paywall.Sections.Products.footer,`
`135`		`- forcesFooter: true`
	`134`	`+ footer: Strings.Views.Paywall.Sections.Products.footer`
`136`	`135`	`)`
`137`	`136`	`}`
`138`	`137`	`}`
`@@ -169,8 +168,7 @@ private extension PaywallView {`
`169`	`168`	`footer: [`
`170`	`169`	`Strings.Views.Paywall.Sections.FullProducts.footer,`
`171`	`170`	`Strings.Views.Paywall.Sections.Products.footer`
`172`		`- ].joined(separator: " "),`
`173`		`- forcesFooter: true`
	`171`	`+ ].joined(separator: " ")`
`174`	`172`	`)`
`175`	`173`	`}`
`176`	`174`	`}`
`@@ -189,10 +187,10 @@ private extension PaywallView {`
`189`	`187`
`190`	`188`	`var restoreView: some View {`
`191`	`189`	`RestorePurchasesButton(errorHandler: errorHandler)`
`192`		`- .themeSectionWithSingleRow(`
	`190`	`+ .themeContainerWithSingleEntry(`
`193`	`191`	`header: Strings.Views.Paywall.Sections.Restore.header,`
`194`	`192`	`footer: Strings.Views.Paywall.Sections.Restore.footer,`
`195`		`- above: true`
	`193`	`+ isAction: true`
`196`	`194`	`)`
`197`	`195`	`}`
`198`	`196`
Original file line number	Diff line number	Diff line change
`@@ -109,34 +109,34 @@ private extension PreferencesView {`
`109`	`109`	`#if os(iOS)`
`110`	`110`	`var lockInBackgroundSection: some View {`
`111`	`111`	`Toggle(Strings.Views.Preferences.locksInBackground, isOn: $locksInBackground)`
`112`		`- .themeSectionWithSingleRow(footer: Strings.Views.Preferences.LocksInBackground.footer)`
	`112`	`+ .themeContainerEntry(subtitle: Strings.Views.Preferences.LocksInBackground.footer)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`#elseif os(macOS)`
`116`	`116`	`var launchesOnLoginSection: some View {`
`117`	`117`	`Toggle(Strings.Views.Preferences.launchesOnLogin, isOn: $settings.launchesOnLogin)`
`118`		`- .themeSectionWithSingleRow(footer: Strings.Views.Preferences.LaunchesOnLogin.footer)`
	`118`	`+ .themeContainerEntry(subtitle: Strings.Views.Preferences.LaunchesOnLogin.footer)`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`var keepsInMenuSection: some View {`
`122`	`122`	`Toggle(Strings.Views.Preferences.keepsInMenu, isOn: $settings.keepsInMenu)`
`123`		`- .themeSectionWithSingleRow(footer: Strings.Views.Preferences.KeepsInMenu.footer)`
	`123`	`+ .themeContainerEntry(subtitle: Strings.Views.Preferences.KeepsInMenu.footer)`
`124`	`124`	`}`
`125`	`125`	`#endif`
`126`	`126`
`127`	`127`	`var pinActiveProfileSection: some View {`
`128`	`128`	`PinActiveProfileToggle()`
`129`		`- .themeSectionWithSingleRow(footer: Strings.Views.Preferences.PinsActiveProfile.footer)`
	`129`	`+ .themeContainerEntry(subtitle: Strings.Views.Preferences.PinsActiveProfile.footer)`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`var dnsFallsBackSection: some View {`
`133`	`133`	`Toggle(Strings.Views.Preferences.dnsFallsBack, isOn: $dnsFallsBack)`
`134`		`- .themeSectionWithSingleRow(footer: Strings.Views.Preferences.DnsFallsBack.footer)`
	`134`	`+ .themeContainerEntry(subtitle: Strings.Views.Preferences.DnsFallsBack.footer)`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`var enablesPurchasesSection: some View {`
`138`	`138`	`Toggle(Strings.Views.Preferences.enablesIap, isOn: $iapManager.isEnabled)`
`139`		`- .themeRowWithSubtitle(Strings.Views.Preferences.EnablesIap.footer)`
	`139`	`+ .themeContainerEntry(subtitle: Strings.Views.Preferences.EnablesIap.footer)`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`var eraseCloudKitSection: some View {`
`@@ -159,10 +159,10 @@ private extension PreferencesView {`
`159`	`159`	`isErasingiCloud = false`
`160`	`160`	`}`
`161`	`161`	`}`
`162`		`- .themeSectionWithSingleRow(`
	`162`	`+ .themeContainerWithSingleEntry(`
`163`	`163`	`header: Strings.Unlocalized.iCloud,`
`164`	`164`	`footer: Strings.Views.Preferences.EraseIcloud.footer,`
`165`		`- above: true`
	`165`	`+ isAction: true`
`166`	`166`	`)`
`167`	`167`	`.disabled(isErasingiCloud)`
`168`	`168`	`}`