Merge pull request #3 from Netfilter-Com/copilot/modernize-app-for-ios

ppaulojr · web-flow · commit 739dae59025d · 2026-03-09T13:20:48.000-03:00
Modernize app for new iOS versions
diff --git a/Podfile b/Podfile
@@ -1,4 +1,4 @@
-platform :ios, '8.0'
+platform :ios, '13.0'
 #use_frameworks!
 source 'https://github.com/CocoaPods/Specs.git'
 
diff --git a/PopulationClock.xcodeproj/project.pbxproj b/PopulationClock.xcodeproj/project.pbxproj
@@ -38,8 +38,8 @@
 		825C8BCF168B44E1009D357D /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825C8BCE168B44E1009D357D /* MessageUI.framework */; };
 		825C8BD1168B44E9009D357D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825C8BD0168B44E9009D357D /* SystemConfiguration.framework */; };
 		825C8BD3168B44EF009D357D /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825C8BD2168B44EF009D357D /* StoreKit.framework */; };
-		825C8BD6168B4C9D009D357D /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825C8BD4168B4C9D009D357D /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		825C8BD7168B4C9D009D357D /* Twitter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825C8BD5168B4C9D009D357D /* Twitter.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		825C8BD8168B4C9E009D357D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825C8BD9168B4C9E009D357D /* WebKit.framework */; };
+		825C8BDA168B4C9F009D357D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 825C8BDB168B4C9F009D357D /* LaunchScreen.storyboard */; };
 		8281CBD3169CB2E3008035C3 /* Description.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8281CBD2169CB2E3008035C3 /* Description.strings */; };
 		832487F117E8F59500FE6B17 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 832487F017E8F59500FE6B17 /* Images.xcassets */; };
 		ED0108A21680AC110067F88D /* rotate.png in Resources */ = {isa = PBXBuildFile; fileRef = ED0108A01680AC110067F88D /* rotate.png */; };
@@ -660,8 +660,8 @@
 		825C8BCE168B44E1009D357D /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		825C8BD0168B44E9009D357D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		825C8BD2168B44EF009D357D /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
-		825C8BD4168B4C9D009D357D /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
-		825C8BD5168B4C9D009D357D /* Twitter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; };
+		825C8BD9168B4C9E009D357D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		825C8BDB168B4C9F009D357D /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 		8281CBD2169CB2E3008035C3 /* Description.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Description.strings; sourceTree = "<group>"; };
 		832487F017E8F59500FE6B17 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		9521174D992B9488A5C8C907 /* Pods-PopulationClock.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PopulationClock.release.xcconfig"; path = "Pods/Target Support Files/Pods-PopulationClock/Pods-PopulationClock.release.xcconfig"; sourceTree = "<group>"; };
@@ -1293,8 +1293,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				ED0F6BE9169DE24000C34C3A /* Accelerate.framework in Frameworks */,
-				825C8BD6168B4C9D009D357D /* Social.framework in Frameworks */,
-				825C8BD7168B4C9D009D357D /* Twitter.framework in Frameworks */,
+				825C8BD8168B4C9E009D357D /* WebKit.framework in Frameworks */,
 				825C8BD3168B44EF009D357D /* StoreKit.framework in Frameworks */,
 				825C8BD1168B44E9009D357D /* SystemConfiguration.framework in Frameworks */,
 				825C8BCF168B44E1009D357D /* MessageUI.framework in Frameworks */,
@@ -1822,11 +1821,10 @@
 				EDA0C3A6167BAF1400CBECC4 /* Foundation.framework */,
 				825C8BCE168B44E1009D357D /* MessageUI.framework */,
 				ED0108C11680DB350067F88D /* QuartzCore.framework */,
-				825C8BD4168B4C9D009D357D /* Social.framework */,
 				825C8BD2168B44EF009D357D /* StoreKit.framework */,
 				825C8BD0168B44E9009D357D /* SystemConfiguration.framework */,
-				825C8BD5168B4C9D009D357D /* Twitter.framework */,
 				EDA0C3A4167BAF1400CBECC4 /* UIKit.framework */,
+				825C8BD9168B4C9E009D357D /* WebKit.framework */,
 				30DED07AB717E8D7FE43650B /* libPods-PopulationClock.a */,
 			);
 			name = Frameworks;
@@ -1865,6 +1863,7 @@
 				EDADD8011684D3E1007E8BD5 /* globals.m */,
 				EDF8D0801695BF3500FE02B1 /* InAppPurchaseManager.h */,
 				EDF8D0811695BF3500FE02B1 /* InAppPurchaseManager.m */,
+				825C8BDB168B4C9F009D357D /* LaunchScreen.storyboard */,
 				EDA0C3BC167BAF1400CBECC4 /* MainStoryboard.storyboard */,
 				ED7769D616C41D0B00BC486F /* MainStoryboard_iPhone.storyboard */,
 				EDA0C3D0167BB23800CBECC4 /* MainView.h */,
@@ -2113,6 +2112,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				EDA0C3BE167BAF1400CBECC4 /* MainStoryboard.storyboard in Resources */,
+				825C8BDA168B4C9F009D357D /* LaunchScreen.storyboard in Resources */,
 				EDA0C3E0167BB2F800CBECC4 /* colormap.plist in Resources */,
 				EDA0C3E1167BB2F800CBECC4 /* colormap.png in Resources */,
 				EDA0C3E2167BB2F800CBECC4 /* coords.plist in Resources */,
@@ -2829,7 +2829,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(inherited)";
 				PROVISIONING_PROFILE = "8E9AF256-1983-4D9D-B88D-38766ADD43C8";
@@ -2868,7 +2868,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = "$(inherited)";
 				PROVISIONING_PROFILE = "8E9AF256-1983-4D9D-B88D-38766ADD43C8";
@@ -2883,15 +2883,14 @@
 			baseConfigurationReference = 27FC292071771B679991D81C /* Pods-PopulationClock.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "PopulationClock/PopulationClock-Prefix.pch";
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				INFOPLIST_FILE = "PopulationClock/PopulationClock-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "br.com.netfilter.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2906,15 +2905,14 @@
 			baseConfigurationReference = 9521174D992B9488A5C8C907 /* Pods-PopulationClock.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "PopulationClock/PopulationClock-Prefix.pch";
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				INFOPLIST_FILE = "PopulationClock/PopulationClock-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "br.com.netfilter.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/PopulationClock/AppDelegate.m b/PopulationClock/AppDelegate.m
@@ -17,13 +17,6 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Style all toolbar buttons
-    if (SYSTEM_VERSION_LESS_THAN(@"7.0"))
-    {
-        UIImage *barButtonImage = [UIImage imageNamed:@"barBtn"];
-        UIEdgeInsets insets = UIEdgeInsetsMake(0, (barButtonImage.size.width - 1) / 2, 0, (barButtonImage.size.width - 1) / 2);
-        barButtonImage = [barButtonImage resizableImageWithCapInsets:insets];
-        [[UIBarButtonItem appearance] setBackgroundImage:barButtonImage forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    }
     NSDictionary *attrs = @{NSForegroundColorAttributeName : [UIColor nf_orangeTextColor]};
     [[UIBarButtonItem appearance] setTitleTextAttributes:attrs forState:UIControlStateNormal];
     
diff --git a/PopulationClock/CountryInfoViewController.m b/PopulationClock/CountryInfoViewController.m
@@ -7,6 +7,7 @@
 //
 
 #import "CountryInfoViewController.h"
+#import "CountryInfoWebView.h"
 #import "DataManager.h"
 
 @implementation CountryInfoViewController {
@@ -17,7 +18,7 @@ @implementation CountryInfoViewController {
     IBOutlet __weak UIView *_portraitWebViewBackground;
     IBOutlet __weak UIView *_landscapeFlag;
     IBOutlet __weak UILabel *_landscapeCountryName;
-    IBOutlet __weak UIWebView *_webView;
+    IBOutlet __weak CountryInfoWebView *_webView;
 }
 
 - (void)dealloc {
diff --git a/PopulationClock/CountryInfoViewController_iPhone.m b/PopulationClock/CountryInfoViewController_iPhone.m
@@ -91,15 +91,7 @@ - (NSArray *)extraToolbarItemsForCarouselViewController:(NFCarouselViewControlle
     [_segmentedControl setTitleTextAttributes:attrs forState:UIControlStateNormal];
     [_segmentedControl setTitleTextAttributes:attrs forState:UIControlStateHighlighted];
     
-    if (SYSTEM_VERSION_LESS_THAN(@"7.0")) {
-        UIImage *separator = [UIImage imageNamed:@"separadorAtiveInactive"];
-        [_segmentedControl setBackgroundImage:[UIImage imageNamed:@"bgBtHeadInactive"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-        [_segmentedControl setBackgroundImage:[UIImage imageNamed:@"bgBtHeadActive"] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];
-        [_segmentedControl setDividerImage:separator forLeftSegmentState:UIControlStateNormal rightSegmentState:UIControlStateSelected barMetrics:UIBarMetricsDefault];
-        [_segmentedControl setDividerImage:separator forLeftSegmentState:UIControlStateSelected rightSegmentState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    } else {
-        [_segmentedControl setTintColor:[UIColor nf_orangeTextColor]];
-    }
+    [_segmentedControl setTintColor:[UIColor nf_orangeTextColor]];
 
     if (_selectedCountry) {
         _segmentedControl.selectedSegmentIndex = [_selectedCountry isEqualToString:@"world"] ? 0 : 1;
diff --git a/PopulationClock/CountryInfoWebView.h b/PopulationClock/CountryInfoWebView.h
@@ -6,6 +6,12 @@
 //  Copyright (c) 2012 NetFilter. All rights reserved.
 //
 
-@interface CountryInfoWebView : UIWebView
+#import <WebKit/WebKit.h>
+
+@interface CountryInfoWebView : UIView
+
+@property (nonatomic, readonly) UIScrollView *scrollView;
+
+- (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL;
 
 @end
diff --git a/PopulationClock/CountryInfoWebView.m b/PopulationClock/CountryInfoWebView.m
@@ -7,12 +7,14 @@
 //
 
 #import <QuartzCore/QuartzCore.h>
+#import <WebKit/WebKit.h>
 
 #import "CountryInfoWebView.h"
 #import "DataManager.h"
 #import "StatsBuilder.h"
 
 @implementation CountryInfoWebView {
+    WKWebView *_webView;
     NSString *_selectedCountry;
     CALayer *_shadowLayer;
 
@@ -29,19 +31,23 @@ + (Class)layerClass
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+
+    // Create the internal WKWebView
+    WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
+    _webView = [[WKWebView alloc] initWithFrame:self.bounds configuration:config];
+    _webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    _webView.opaque = NO;
+    _webView.backgroundColor = [UIColor clearColor];
+    _webView.scrollView.backgroundColor = [UIColor clearColor];
+    [self addSubview:_webView];
+
     // Create the queue for background stuff
     _backgroundQueue = dispatch_queue_create("br.com.netfilter.CountryInfoWebView", 0);
     dispatch_queue_t lowPriorityQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0);
     dispatch_set_target_queue(_backgroundQueue, lowPriorityQueue);
 
     // Disable bouncing
-    self.scrollView.bounces = NO;
-    
-    // Remove some random shadows (where does this come from?)
-    for (UIView *subview in self.scrollView.subviews) {
-        if ([subview isKindOfClass:[UIImageView class]])
-            subview.hidden = YES;
-    }
+    _webView.scrollView.bounces = NO;
     
     // Observe changes to the country selection
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -71,6 +77,14 @@ - (void)awakeFromNib {
     [self.layer addSublayer:_shadowLayer];
 }
 
+- (UIScrollView *)scrollView {
+    return _webView.scrollView;
+}
+
+- (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL {
+    [_webView loadHTMLString:string baseURL:baseURL];
+}
+
 - (void)dealloc {
     // We are no longer observers
     [[NSNotificationCenter defaultCenter] removeObserver:self];
diff --git a/PopulationClock/LaunchScreen.storyboard b/PopulationClock/LaunchScreen.storyboard
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="AppleSDK" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ehk" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="0" y="0"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/PopulationClock/MainStoryboard_iPhone.storyboard b/PopulationClock/MainStoryboard_iPhone.storyboard
@@ -209,12 +209,11 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                                     </view>
-                                    <webView opaque="NO" contentMode="scaleToFill" id="U7w-0F-3g2" customClass="CountryInfoWebView">
+                                    <view opaque="NO" contentMode="scaleToFill" id="U7w-0F-3g2" customClass="CountryInfoWebView">
                                         <rect key="frame" x="16" y="16" width="208" height="288"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                        <dataDetectorType key="dataDetectorTypes"/>
-                                    </webView>
+                                    </view>
                                 </subviews>
                                 <color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
                             </view>
diff --git a/PopulationClock/PopulationClock-Info.plist b/PopulationClock/PopulationClock-Info.plist
@@ -22,19 +22,17 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.6.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>45</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile~ipad</key>
 	<string>MainStoryboard</string>
-	<key>UIPrerenderedIcon</key>
-	<true/>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>armv7</string>
+		<string>arm64</string>
 	</array>
 	<key>UIRequiresFullScreen</key>
 	<true/>
diff --git a/PopulationClock/PopulationClock-Prefix.pch b/PopulationClock/PopulationClock-Prefix.pch
@@ -4,8 +4,8 @@
 
 #import <Availability.h>
 
-#ifndef __IPHONE_5_0
-#warning "This project uses features only available in iOS SDK 5.0 and later."
+#ifndef __IPHONE_13_0
+#warning "This project uses features only available in iOS SDK 13.0 and later."
 #endif
 
 #ifdef __OBJC__
diff --git a/PopulationClock/TopBarView.m b/PopulationClock/TopBarView.m
@@ -25,15 +25,7 @@ - (void)awakeFromNib {
     [_modeSegmentedControl setTitleTextAttributes:attrs forState:UIControlStateHighlighted];
     
     // Style the segmented control
-    if (SYSTEM_VERSION_LESS_THAN(@"7.0")) {
-        UIImage *separator = [UIImage imageNamed:@"separadorAtiveInactive"];
-        [_modeSegmentedControl setBackgroundImage:[UIImage imageNamed:@"bgBtHeadInactive"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-        [_modeSegmentedControl setBackgroundImage:[UIImage imageNamed:@"bgBtHeadActive"] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];
-        [_modeSegmentedControl setDividerImage:separator forLeftSegmentState:UIControlStateNormal rightSegmentState:UIControlStateSelected barMetrics:UIBarMetricsDefault];
-        [_modeSegmentedControl setDividerImage:separator forLeftSegmentState:UIControlStateSelected rightSegmentState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    } else {
-        [_modeSegmentedControl setTintColor:[UIColor nf_orangeTextColor]];
-    }
+    [_modeSegmentedControl setTintColor:[UIColor nf_orangeTextColor]];
 
     
     // Observe changes to the country selection
diff --git a/PopulationClock/UIViewController+NFSharing.m b/PopulationClock/UIViewController+NFSharing.m
@@ -6,8 +6,6 @@
 //  Copyright (c) 2013 NetFilter. All rights reserved.
 //
 
-#import <Twitter/Twitter.h>
-
 #import "UIViewController+NFSharing.h"
 
 static NSString * const kGameShortURL = @"http://bit.ly/populationclock";
@@ -23,23 +21,17 @@ - (void)nf_presentShareViewControllerAnimated:(BOOL)animated
         gameName = [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString*)kCFBundleNameKey];
     message = [NSString stringWithFormat:message, gameName, kGameShortURL];
     
-    // If we have the activity view controller, use it
-    if (NSClassFromString(@"UIActivityViewController")) {
-        NSArray *items = @[ message, [UIImage imageNamed:@"Icon-72"] ];
-        NSArray *exclude = @[
-            UIActivityTypeAssignToContact,
-            UIActivityTypeSaveToCameraRoll,
-            UIActivityTypePrint,
-            UIActivityTypeCopyToPasteboard
-        ];
-        UIActivityViewController *controller = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];
-        controller.excludedActivityTypes = exclude;
-        [self presentViewController:controller animated:animated completion:Nil];
-        return;
-    }
-    
-    // No deal, this shouldn't normally happen as we target iOS 6
-    assert(NO);
+    // Use UIActivityViewController for sharing
+    NSArray *items = @[ message, [UIImage imageNamed:@"Icon-72"] ];
+    NSArray *exclude = @[
+        UIActivityTypeAssignToContact,
+        UIActivityTypeSaveToCameraRoll,
+        UIActivityTypePrint,
+        UIActivityTypeCopyToPasteboard
+    ];
+    UIActivityViewController *controller = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];
+    controller.excludedActivityTypes = exclude;
+    [self presentViewController:controller animated:animated completion:nil];
 }
 
 @end
diff --git a/PopulationClock/en.lproj/MainStoryboard.storyboard b/PopulationClock/en.lproj/MainStoryboard.storyboard
diff --git a/PopulationClock/globals.h b/PopulationClock/globals.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-platform :ios, '8.0'`
	`1`	`+platform :ios, '13.0'`
`2`	`2`	`#use_frameworks!`
`3`	`3`	`source 'https://github.com/CocoaPods/Specs.git'`
`4`	`4`