ios: SMP servers settings page layout (#711)

apps/ios/Shared/Views/UserSettings/SMPServers.swift

@@ -23,58 +23,72 @@ struct SMPServers: View {
     @FocusState private var keyboardVisible: Bool
 
     var body: some View {
-        return VStack(alignment: .leading) {
-            Toggle("Configure SMP servers", isOn: $isUserSMPServersToggle)
-                .onChange(of: isUserSMPServersToggle) { _ in
-                    if (isUserSMPServersToggle) {
-                        isUserSMPServers = true
-                    } else {
-                        let servers = chatModel.userSMPServers ?? []
-                        if (!servers.isEmpty) {
-                            showResetServersAlert = true
+        List {
+            Section {
+                Toggle("Configure SMP servers", isOn: $isUserSMPServersToggle)
+                    .onChange(of: isUserSMPServersToggle) { _ in
+                        if (isUserSMPServersToggle) {
+                            isUserSMPServers = true
                         } else {
-                            isUserSMPServers = false
-                            userSMPServersStr = ""
-                        }
-                    }
-                }
-                .padding(.bottom)
-                .alert(isPresented: $showResetServersAlert) {
-                    Alert(
-                        title: Text("Use SimpleX Chat servers?"),
-                        message: Text("Saved SMP servers will be removed"),
-                        primaryButton: .destructive(Text("Confirm")) {
-                            saveSMPServers(smpServers: [])
-                            isUserSMPServers = false
-                            userSMPServersStr = ""
-                        }, secondaryButton: .cancel() {
-                            withAnimation() {
-                                isUserSMPServersToggle = true
+                            let servers = chatModel.userSMPServers ?? []
+                            if (!servers.isEmpty) {
+                                showResetServersAlert = true
+                            } else {
+                                isUserSMPServers = false
+                                userSMPServersStr = ""
                             }
                         }
-                    )
+                    }
+                    .alert(isPresented: $showResetServersAlert) {
+                        Alert(
+                            title: Text("Use SimpleX Chat servers?"),
+                            message: Text("Saved SMP servers will be removed"),
+                            primaryButton: .destructive(Text("Confirm")) {
+                                saveSMPServers(smpServers: [])
+                                isUserSMPServers = false
+                                userSMPServersStr = ""
+                            }, secondaryButton: .cancel() {
+                                withAnimation() {
+                                    isUserSMPServersToggle = true
+                                }
+                            }
+                        )
+                    }
+            } header: {
+                Text("")
+            } footer: {
+                if !isUserSMPServers {
+                    Text("Using SimpleX Chat servers.")
                 }
+            }
             
-            if !isUserSMPServers {
-                Text("Using SimpleX Chat servers.")
-                    .frame(maxWidth: .infinity, alignment: .leading)
-            } else {
-                VStack(alignment: .leading) {
-                    Text("Enter one SMP server per line:")
+            if isUserSMPServers {
+                Section {
                     if editSMPServers {
                         TextEditor(text: $userSMPServersStr)
                             .focused($keyboardVisible)
                             .font(serversFont)
                             .disableAutocorrection(true)
                             .textInputAutocapitalization(.never)
-                            .padding(.horizontal, 5)
-                            .padding(.top, 2)
-                            .frame(height: 112)
-                            .overlay(
-                                RoundedRectangle(cornerRadius: 10)
-                                    .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-                            )
-                        HStack(spacing: 20) {
+                            .padding(.horizontal, -5)
+                            .padding(.top, -8)
+                            .frame(height: 160, alignment: .topLeading)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                    } else {
+                        ScrollView {
+                            Text(userSMPServersStr)
+                                .font(serversFont)
+                                .frame(minHeight: 0, alignment: .topLeading)
+                                .textSelection(.enabled)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                        }
+                        .frame(height: 160)
+                    }
+                } header: {
+                    Text("SMP servers (one per line)")
+                } footer: {
+                    HStack(spacing: 20) {
+                        if editSMPServers {
                             Button("Cancel") {
                                 initialize()
                             }
@@ -86,22 +100,7 @@ struct SMPServers: View {
                             }
                             Spacer()
                             howToButton()
-                        }
-                    } else {
-                        ScrollView {
-                            Text(userSMPServersStr)
-                                .font(serversFont)
-                                .padding(10)
-                                .frame(minHeight: 0, alignment: .topLeading)
-                                .textSelection(.enabled)
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                        }
-                        .frame(height: 160)
-                        .overlay(
-                            RoundedRectangle(cornerRadius: 10)
-                                .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-                        )
-                        HStack {
+                        } else {
                             Button("Edit") {
                                 editSMPServers = true
                             }
@@ -109,12 +108,10 @@ struct SMPServers: View {
                             howToButton()
                         }
                     }
+                    .font(.body)
                 }
-                .frame(maxWidth: .infinity)
             }
         }
-        .padding()
-        .frame(maxHeight: .infinity, alignment: .top)
         .onAppear { initialize() }
     }
     

apps/ios/Shared/Views/UserSettings/SettingsView.swift

@@ -23,7 +23,7 @@ let DEFAULT_WEBRTC_POLICY_RELAY = "webrtcPolicyRelay"
 let DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 let DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews"
 
-let appDefaults: [String:Any] = [
+let appDefaults: [String: Any] = [
     DEFAULT_SHOW_LA_NOTICE: false,
     DEFAULT_LA_NOTICE_SHOWN: false,
     DEFAULT_PERFORM_LA: false,

apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff

@@ -506,11 +506,6 @@
         <target>Enable notifications? (BETA)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter one SMP server per line:" xml:space="preserve">
-        <source>Enter one SMP server per line:</source>
-        <target>Enter one SMP server per line:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error deleting token" xml:space="preserve">
         <source>Error deleting token</source>
         <target>Error deleting token</target>
@@ -846,6 +841,11 @@ We will be adding server redundancy to prevent lost messages.</target>
         <target>SMP servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SMP servers (one per line)" xml:space="preserve">
+        <source>SMP servers (one per line)</source>
+        <target>SMP servers (one per line)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save" xml:space="preserve">
         <source>Save</source>
         <target>Save</target>

apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff

@@ -506,11 +506,6 @@
         <target>Включить уведомления? (БЕТА)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Enter one SMP server per line:" xml:space="preserve">
-        <source>Enter one SMP server per line:</source>
-        <target>Введите SMP серверы, каждый на отдельной строке:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error deleting token" xml:space="preserve">
         <source>Error deleting token</source>
         <target>Ошибка удаления токена</target>
@@ -846,6 +841,11 @@ We will be adding server redundancy to prevent lost messages.</source>
         <target>SMP серверы</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="SMP servers (one per line)" xml:space="preserve">
+        <source>SMP servers (one per line)</source>
+        <target>SMP серверы (один на строке)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Save" xml:space="preserve">
         <source>Save</source>
         <target>Сохранить</target>