Don’t dismiss keyboard when changing micropub textfields

hartlco · May 3, 2020 · 35404d5 · 35404d5
1 parent 6434b32
commit 35404d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/Icro/View/Settings/SettingsContentView.swift b/Icro/View/Settings/SettingsContentView.swift
@@ -100,7 +100,6 @@ struct MicropubSection: View {
                     }, label: {
                         Text("Indie Auth")
                     })
-                    .disabled(self.store.indieAuthMeURLString == "")
                 }
             })
         } else {

diff --git a/Icro/ViewModel/SettingsViewModel.swift b/Icro/ViewModel/SettingsViewModel.swift
@@ -16,8 +16,6 @@ final class SettingsViewModel: ObservableObject {
         case none
     }
 
-    var objectWillChange = ObservableObjectPublisher()
-
     private let userSettings: UserSettings
     private let notificationCenter: NotificationCenter
 
@@ -48,13 +46,11 @@ final class SettingsViewModel: ObservableObject {
 
     @objc private func updateValues() {
         self.micropubToken = userSettings.micropubToken ?? ""
-
-        objectWillChange.send()
     }
 
     let canSendMail: Bool
 
-    var isWordpressBlog: Bool {
+    @Published var isWordpressBlog: Bool {
         didSet {
             if isWordpressBlog, isMicropubBlog {
                 isMicropubBlog = false
@@ -81,7 +77,7 @@ final class SettingsViewModel: ObservableObject {
         }
     }
 
-    var isMicropubBlog: Bool {
+    @Published var isMicropubBlog: Bool {
         didSet {
             if isWordpressBlog, isMicropubBlog {
                 isWordpressBlog = false
@@ -96,7 +92,7 @@ final class SettingsViewModel: ObservableObject {
         }
     }
 
-    var micropubToken: String {
+    @Published var micropubToken: String {
         didSet {
             updateSetup()
         }
@@ -125,8 +121,6 @@ final class SettingsViewModel: ObservableObject {
     }
 
     private func updateSetup() {
-        objectWillChange.send()
-
         if isWordpressBlog,
             !wordpressURL.isEmpty,
             !wordpressUsername.isEmpty,
@@ -139,9 +133,7 @@ final class SettingsViewModel: ObservableObject {
             userSettings.setWordpressInfo(info: nil)
         }
 
-        if isMicropubBlog,
-            !micropubURL.isEmpty,
-            !micropubToken.isEmpty {
+        if isMicropubBlog {
             let micropubInfo = UserSettings.MicropubInfo(urlString: micropubURL,
                                                          micropubToken: micropubToken)
             userSettings.setMicropubInfo(info: micropubInfo)