Backport base Form style from Compound. (#1009)

Apply to all screens using the formBackground colour.

ElementX/Sources/Other/SwiftUI/Form Styles/FormSection.swift

@@ -16,32 +16,23 @@
 
 import SwiftUI
 
-/// Style for form section headers
+extension View {
-struct FormSectionHeaderStyle: ViewModifier {
+    /// Applies a standard style to forms.
-    func body(content: Content) -> some View {
+    func elementFormStyle() -> some View {
-        content
+        scrollContentBackground(.hidden)
-            .foregroundColor(.element.secondaryContent)
+            .background(Color.element.formBackground.ignoresSafeArea())
+    }
+    
+    /// Applies a standard style for form header text.
+    func formSectionHeader() -> some View {
+        foregroundColor(.element.secondaryContent)
             .font(.compound.bodyXS)
     }
-}
+    
-
+    /// Applies a standard style for form sections.
-/// Standard style for form sections
+    func formSectionStyle() -> some View {
-struct FormSectionStyle: ViewModifier {
+        listRowSeparator(.hidden)
-    func body(content: Content) -> some View {
-        content
-            .listRowSeparator(.hidden)
             .listRowInsets(FormRow.insets)
             .listRowBackground(Color.element.formRowBackground)
     }
 }
-
-extension View {
-    /// Applies the `FormSectionHeaderStyle` modifier to the view
-    func formSectionHeader() -> some View {
-        modifier(FormSectionHeaderStyle())
-    }
-    
-    func formSectionStyle() -> some View {
-        modifier(FormSectionStyle())
-    }
-}

ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift

@@ -28,8 +28,7 @@ struct CreateRoomScreen: View {
     var body: some View {
         mainContent
             .scrollDismissesKeyboard(.immediately)
-            .scrollContentBackground(.hidden)
+            .elementFormStyle()
-            .background(Color.element.formBackground.ignoresSafeArea())
             .navigationTitle(L10n.screenCreateRoomTitle)
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {

ElementX/Sources/Screens/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift

@@ -85,8 +85,7 @@ struct DeveloperOptionsScreen: View {
             }
         }
         .overlay(effectsView)
-        .scrollContentBackground(.hidden)
+        .elementFormStyle()
-        .background(Color.element.formBackground.ignoresSafeArea())
         .navigationTitle(L10n.commonDeveloperOptions)
         .navigationBarTitleDisplayMode(.inline)
     }

ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift

@@ -22,8 +22,7 @@ struct InviteUsersScreen: View {
     
     var body: some View {
         mainContent
-            .scrollContentBackground(.hidden)
+            .elementFormStyle()
-            .background(Color.element.formBackground.ignoresSafeArea())
             .navigationTitle(L10n.screenCreateRoomActionInvitePeople)
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {

ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift

@@ -27,8 +27,7 @@ struct RoomDetailsEditScreen: View {
     
     var body: some View {
         mainContent
-            .scrollContentBackground(.hidden)
+            .elementFormStyle()
-            .background(Color.element.formBackground.ignoresSafeArea())
             .scrollDismissesKeyboard(.immediately)
             .navigationTitle(L10n.screenRoomDetailsEditRoomTitle)
             .navigationBarTitleDisplayMode(.inline)

ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift

@@ -41,8 +41,7 @@ struct RoomDetailsScreen: View {
                 leaveRoomSection
             }
         }
-        .scrollContentBackground(.hidden)
+        .elementFormStyle()
-        .background(Color.element.formBackground.ignoresSafeArea())
         .alert(item: $context.alertInfo) { $0.alert }
         .alert(item: $context.leaveRoomAlertItem,
                actions: leaveRoomAlertActions,

ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift

@@ -27,8 +27,7 @@ struct RoomMemberDetailsScreen: View {
                 blockUserSection
             }
         }
-        .scrollContentBackground(.hidden)
+        .elementFormStyle()
-        .background(Color.element.formBackground.ignoresSafeArea())
         .alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
         .errorAlert(item: $context.errorAlert)
     }

ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift

@@ -28,8 +28,7 @@ struct StartChatScreen: View {
                 searchContent
             }
         }
-        .scrollContentBackground(.hidden)
+        .elementFormStyle()
-        .background(Color.element.formBackground.ignoresSafeArea())
         .navigationTitle(L10n.actionStartChat)
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {