From 4eba519c0a8eefeac799892989440039d7ca77c0 Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Sun, 22 Mar 2020 21:59:54 +0100
Subject: [PATCH] fix toolbar bug and update mails when inbox appears
---
enzevalos_iphone.xcodeproj/project.pbxproj | 4 ++++
enzevalos_iphone/FolderViewController.swift | 1 -
enzevalos_iphone/PLists/enzevalos-Info.plist | 4 ++--
enzevalos_iphone/SwiftUI/Inbox/Inbox.swift | 3 +++
enzevalos_iphone/SwiftUI/Inbox/InboxCoordinator.swift | 4 ++--
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index f07e389a..d4ffdf6d 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 3d05cf54..ac0e659c 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 a298da49..dc2c1175 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 97a2a50f..d60d23f8 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 f1e3b56b..6a366302 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)
}
}
--
GitLab