diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj index f07e389ac78ad62fc4479b8f8f6c9ede53c1950c..d4ffdf6d1d3f1972b94926a0368b8f7f159218b8 100644 --- a/enzevalos_iphone.xcodeproj/project.pbxproj +++ b/enzevalos_iphone.xcodeproj/project.pbxproj @@ -2438,6 +2438,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0.8.33; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = VJ9C93G68Y; FRAMEWORK_SEARCH_PATHS = ( @@ -2471,6 +2472,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/enzevalos_iphone/OpenSSL/lib", ); + MARKETING_VERSION = 0.8.33; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -2515,6 +2517,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0.8.33; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = VJ9C93G68Y; FRAMEWORK_SEARCH_PATHS = ( @@ -2548,6 +2551,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/enzevalos_iphone/OpenSSL/lib", ); + MARKETING_VERSION = 0.8.33; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/enzevalos_iphone/FolderViewController.swift b/enzevalos_iphone/FolderViewController.swift index 3d05cf5483082c1c4215809862c1f1c42bc9b8d3..ac0e659c2ea469c677c3d5e48ac415dc3b241a03 100644 --- a/enzevalos_iphone/FolderViewController.swift +++ b/enzevalos_iphone/FolderViewController.swift @@ -85,7 +85,6 @@ class FolderViewController: UITableViewController { } override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - navigationController?.isToolbarHidden = false tableView.reloadData() } diff --git a/enzevalos_iphone/PLists/enzevalos-Info.plist b/enzevalos_iphone/PLists/enzevalos-Info.plist index a298da490bf9586d2f7a956bffde1b70a9d8b2b0..dc2c11754b298e22486597dac723fcc186581312 100644 --- a/enzevalos_iphone/PLists/enzevalos-Info.plist +++ b/enzevalos_iphone/PLists/enzevalos-Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.8.30</string> + <string>$(MARKETING_VERSION)</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.8.30</string> + <string>$(CURRENT_PROJECT_VERSION)</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSAppTransportSecurity</key> diff --git a/enzevalos_iphone/SwiftUI/Inbox/Inbox.swift b/enzevalos_iphone/SwiftUI/Inbox/Inbox.swift index 97a2a50f6e44555faac8b7a1649feeabbb4e43ed..d60d23f84c60750afab0734f02575ae7029d150e 100644 --- a/enzevalos_iphone/SwiftUI/Inbox/Inbox.swift +++ b/enzevalos_iphone/SwiftUI/Inbox/Inbox.swift @@ -40,6 +40,9 @@ struct Inbox: View { } .navigationBarTitle(NSLocalizedString("Inbox", comment: "Inbox")) .navigationBarItems(leading: self.folderButton) + .onAppear(perform: { + self.updateMails() + }) } private var mailList: some View { diff --git a/enzevalos_iphone/SwiftUI/Inbox/InboxCoordinator.swift b/enzevalos_iphone/SwiftUI/Inbox/InboxCoordinator.swift index f1e3b56bfc5c6d0742427075165c93ac4b838f91..6a3663022e242f5f4f2b9e66fcc2dd3ebd9f29f8 100644 --- a/enzevalos_iphone/SwiftUI/Inbox/InboxCoordinator.swift +++ b/enzevalos_iphone/SwiftUI/Inbox/InboxCoordinator.swift @@ -75,7 +75,7 @@ class InboxCoordinator { if let vc = vc as? SendViewController { vc.wasPushed = true } - root.isToolbarHidden = false + root.isToolbarHidden = true root.pushViewController(vc, animated: true) } @@ -84,7 +84,7 @@ class InboxCoordinator { if let vc = vc as? ListViewController { vc.contact = record } - root.isToolbarHidden = false + root.isToolbarHidden = true root.pushViewController(vc, animated: true) } }