From e68d8d1c1677b3771d83e4f4c922c3dcedbbc6e9 Mon Sep 17 00:00:00 2001
From: gregclermont <580609+gregclermont@users.noreply.github.com>
Date: Fri, 27 Sep 2019 17:56:48 +0200
Subject: [PATCH 1/6] try to fix the action address search
---
.../OTLocationSearchTableViewController.m | 10 ----------
.../Storyboards/LocationSelection.storyboard | 19 ++++++++-----------
entourage/entourage-Info.plist | 2 ++
3 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m b/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m
index 62d6863be..4e3143c53 100644
--- a/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m
+++ b/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m
@@ -75,14 +75,4 @@ - (void) updateSearchResultsForSearchController:(UISearchController *)searchCont
}];
}
-- (void)willPresentSearchController:(UISearchController *)searchController {
- // do something before the search controller is presented
- self.navigationController.navigationBar.translucent = YES;
-}
-
-- (void)willDismissSearchController:(UISearchController *)searchController
-{
- self.navigationController.navigationBar.translucent = NO;
-}
-
@end
diff --git a/Shared/Storyboards/LocationSelection.storyboard b/Shared/Storyboards/LocationSelection.storyboard
index b7d73911e..ef2e93c1d 100644
--- a/Shared/Storyboards/LocationSelection.storyboard
+++ b/Shared/Storyboards/LocationSelection.storyboard
@@ -1,19 +1,16 @@
-
-
-
+
-
-
+
@@ -23,13 +20,13 @@
-
+
-
-
+
+
@@ -100,7 +97,7 @@
-
+
-
+
diff --git a/entourage/entourage-Info.plist b/entourage/entourage-Info.plist
index 5bcfe3e64..dcbc4c19f 100644
--- a/entourage/entourage-Info.plist
+++ b/entourage/entourage-Info.plist
@@ -150,6 +150,8 @@
UIInterfaceOrientationPortrait
+ UIUserInterfaceStyle
+ light
UIViewControllerBasedStatusBarAppearance
From 8b5f854c85b84bb752e6729d119d5fcf0d687ceb Mon Sep 17 00:00:00 2001
From: gregclermont <580609+gregclermont@users.noreply.github.com>
Date: Mon, 7 Oct 2019 13:53:36 +0200
Subject: [PATCH 2/6] try to fix entourage address screen on iOS 13
---
.../OTLocationSearchTableViewController.m | 20 ++++++++++--------
.../OTLocationSelectorViewController.m | 2 --
Shared/Classes/Settings/OTAppConfiguration.m | 21 ++++++++++++++++---
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m b/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m
index 4e3143c53..e59ca6fdf 100644
--- a/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m
+++ b/Shared/Classes/Controller/LocationSelection/OTLocationSearchTableViewController.m
@@ -63,16 +63,18 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
#pragma mark UISearchResultsUpdating
- (void) updateSearchResultsForSearchController:(UISearchController *)searchController {
- MKLocalSearchRequest *request = [MKLocalSearchRequest new];
- request.naturalLanguageQuery = searchController.searchBar.text;
- request.region = self.mapView.region;
-
- MKLocalSearch *search = [[MKLocalSearch alloc] initWithRequest:request];
- [search startWithCompletionHandler:^(MKLocalSearchResponse * _Nullable response, NSError * _Nullable error) {
- self.matchingItems = response == nil ? @[] : response.mapItems;
- if(error == nil)
+ NSString *query = searchController.searchBar.text;
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.300 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ if (![query isEqualToString:searchController.searchBar.text]) return;
+ MKLocalSearchRequest *request = [MKLocalSearchRequest new];
+ request.naturalLanguageQuery = query;
+ request.region = self.mapView.region;
+ MKLocalSearch *search = [[MKLocalSearch alloc] initWithRequest:request];
+ [search startWithCompletionHandler:^(MKLocalSearchResponse * _Nullable response, NSError * _Nullable error) {
+ self.matchingItems = response == nil ? @[] : response.mapItems;
[self.tableView reloadData];
- }];
+ }];
+ });
}
@end
diff --git a/Shared/Classes/Controller/LocationSelection/OTLocationSelectorViewController.m b/Shared/Classes/Controller/LocationSelection/OTLocationSelectorViewController.m
index 5430336a0..7432df6f7 100644
--- a/Shared/Classes/Controller/LocationSelection/OTLocationSelectorViewController.m
+++ b/Shared/Classes/Controller/LocationSelection/OTLocationSelectorViewController.m
@@ -74,8 +74,6 @@ - (void)viewDidLoad {
[textField.leftView addSubview: leftImage];
}
}
- self.resultSearchController.hidesNavigationBarDuringPresentation = NO;
- self.resultSearchController.dimsBackgroundDuringPresentation = YES;
self.definesPresentationContext = YES;
self.locationSearchTable.mapView = self.mapView;
self.locationSearchTable.pinDelegate = self;
diff --git a/Shared/Classes/Settings/OTAppConfiguration.m b/Shared/Classes/Settings/OTAppConfiguration.m
index 58bf0a90b..abaa3b800 100644
--- a/Shared/Classes/Settings/OTAppConfiguration.m
+++ b/Shared/Classes/Settings/OTAppConfiguration.m
@@ -454,9 +454,24 @@ + (void)configureNavigationControllerAppearance:(UINavigationController*)navigat
[OTAppConfiguration configureApplicationAppearance];
navigationController.automaticallyAdjustsScrollViewInsets = NO;
- navigationController.navigationBar.backgroundColor = [[ApplicationTheme shared] primaryNavigationBarTintColor];
- navigationController.navigationBar.tintColor = [[ApplicationTheme shared] secondaryNavigationBarTintColor];
- navigationController.navigationBar.barTintColor = [[ApplicationTheme shared] primaryNavigationBarTintColor];
+
+ UINavigationBar *navigationBar = navigationController.navigationBar;
+ if (@available(iOS 13.0, *)) {
+ UINavigationBarAppearance *navBarAppearance = [UINavigationBarAppearance new];
+ [navBarAppearance configureWithOpaqueBackground];
+ navBarAppearance.backgroundColor = [[ApplicationTheme shared] primaryNavigationBarTintColor];
+ NSDictionary *textAttributes = @{
+ NSForegroundColorAttributeName: [[ApplicationTheme shared] secondaryNavigationBarTintColor]
+ };
+ navBarAppearance.titleTextAttributes = textAttributes;
+ navBarAppearance.largeTitleTextAttributes = textAttributes;
+ navigationBar.standardAppearance = navBarAppearance;
+ navigationBar.scrollEdgeAppearance = navBarAppearance;
+ } else {
+ navigationBar.backgroundColor = [[ApplicationTheme shared] primaryNavigationBarTintColor];
+ navigationBar.tintColor = [[ApplicationTheme shared] secondaryNavigationBarTintColor];
+ navigationBar.barTintColor = [[ApplicationTheme shared] primaryNavigationBarTintColor];
+ }
UIFont *selectedTabBarFont = [UIFont fontWithName:@"SFUIText-Bold" size:12];
NSDictionary *selectionTextAttributes = @{NSForegroundColorAttributeName:[[ApplicationTheme shared] backgroundThemeColor],
From 84c9e7ca470f4c583ce7789c3130b73a7f460e37 Mon Sep 17 00:00:00 2001
From: gregclermont <580609+gregclermont@users.noreply.github.com>
Date: Mon, 7 Oct 2019 14:27:01 +0200
Subject: [PATCH 3/6] XCode 10 compatibility
---
Shared/Classes/Settings/OTAppConfiguration.m | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Shared/Classes/Settings/OTAppConfiguration.m b/Shared/Classes/Settings/OTAppConfiguration.m
index abaa3b800..ba9d6b458 100644
--- a/Shared/Classes/Settings/OTAppConfiguration.m
+++ b/Shared/Classes/Settings/OTAppConfiguration.m
@@ -456,6 +456,7 @@ + (void)configureNavigationControllerAppearance:(UINavigationController*)navigat
navigationController.automaticallyAdjustsScrollViewInsets = NO;
UINavigationBar *navigationBar = navigationController.navigationBar;
+ #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
if (@available(iOS 13.0, *)) {
UINavigationBarAppearance *navBarAppearance = [UINavigationBarAppearance new];
[navBarAppearance configureWithOpaqueBackground];
@@ -467,7 +468,9 @@ + (void)configureNavigationControllerAppearance:(UINavigationController*)navigat
navBarAppearance.largeTitleTextAttributes = textAttributes;
navigationBar.standardAppearance = navBarAppearance;
navigationBar.scrollEdgeAppearance = navBarAppearance;
- } else {
+ } else
+ #endif
+ {
navigationBar.backgroundColor = [[ApplicationTheme shared] primaryNavigationBarTintColor];
navigationBar.tintColor = [[ApplicationTheme shared] secondaryNavigationBarTintColor];
navigationBar.barTintColor = [[ApplicationTheme shared] primaryNavigationBarTintColor];
From 4428a62104a29fe83c8f5d5cceaa172166d8e2f9 Mon Sep 17 00:00:00 2001
From: gregclermont <580609+gregclermont@users.noreply.github.com>
Date: Mon, 7 Oct 2019 18:40:13 +0200
Subject: [PATCH 4/6] chore(version) set version to 6.1.1
---
entourage/entourage-Info.plist | 2 +-
pfp/pfp-Info.plist | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/entourage/entourage-Info.plist b/entourage/entourage-Info.plist
index dcbc4c19f..b4530f4d9 100644
--- a/entourage/entourage-Info.plist
+++ b/entourage/entourage-Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 6.1
+ 6.1.1
CFBundleSignature
????
CFBundleURLTypes
diff --git a/pfp/pfp-Info.plist b/pfp/pfp-Info.plist
index ca871690d..24b695500 100644
--- a/pfp/pfp-Info.plist
+++ b/pfp/pfp-Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 6.1
+ 6.1.1
CFBundleSignature
????
CFBundleURLTypes
From 3f3e2a0a458747f1d320d14d4c2f8cb7903a1508 Mon Sep 17 00:00:00 2001
From: gregclermont <580609+gregclermont@users.noreply.github.com>
Date: Tue, 8 Oct 2019 09:24:19 +0200
Subject: [PATCH 5/6] fix disabling dark mode
---
entourage/entourage-Info.plist | 2 +-
pfp/pfp-Info.plist | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/entourage/entourage-Info.plist b/entourage/entourage-Info.plist
index b4530f4d9..575b7a28a 100644
--- a/entourage/entourage-Info.plist
+++ b/entourage/entourage-Info.plist
@@ -151,7 +151,7 @@
UIInterfaceOrientationPortrait
UIUserInterfaceStyle
- light
+ Light
UIViewControllerBasedStatusBarAppearance
diff --git a/pfp/pfp-Info.plist b/pfp/pfp-Info.plist
index 24b695500..4f0f632c2 100644
--- a/pfp/pfp-Info.plist
+++ b/pfp/pfp-Info.plist
@@ -138,6 +138,8 @@
UIInterfaceOrientationPortrait
+ UIUserInterfaceStyle
+ Light
UIViewControllerBasedStatusBarAppearance
From 073b6c58fafa05ebe28a38fc71bbca015e34e881 Mon Sep 17 00:00:00 2001
From: gregclermont <580609+gregclermont@users.noreply.github.com>
Date: Tue, 8 Oct 2019 10:31:45 +0200
Subject: [PATCH 6/6] remove UIUserInterfaceStyle for XCode 10
---
entourage/entourage-Info.plist | 2 --
pfp/pfp-Info.plist | 2 --
2 files changed, 4 deletions(-)
diff --git a/entourage/entourage-Info.plist b/entourage/entourage-Info.plist
index 575b7a28a..8f30adba1 100644
--- a/entourage/entourage-Info.plist
+++ b/entourage/entourage-Info.plist
@@ -150,8 +150,6 @@
UIInterfaceOrientationPortrait
- UIUserInterfaceStyle
- Light
UIViewControllerBasedStatusBarAppearance
diff --git a/pfp/pfp-Info.plist b/pfp/pfp-Info.plist
index 4f0f632c2..24b695500 100644
--- a/pfp/pfp-Info.plist
+++ b/pfp/pfp-Info.plist
@@ -138,8 +138,6 @@
UIInterfaceOrientationPortrait
- UIUserInterfaceStyle
- Light
UIViewControllerBasedStatusBarAppearance