Merge pull request #52 from opendocument-app/feature/lite-version

TomTasche · web-flow · commit a09159899023 · 2020-04-29T20:38:51.000+02:00
Add Lite version with Ads.
diff --git a/.github/workflows/ios_main.yml b/.github/workflows/ios_main.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
         matrix:
           destination: ['platform=iOS Simulator,name=iPhone 11']
-          scheme: [OpenDocumentReader]
+          scheme: [ODR Full]
     steps:
       - uses: actions/checkout@v1
       - name: Checkout submodule
diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj
diff --git a/OpenDocumentReader.xcodeproj/xcshareddata/xcschemes/ODR Full.xcscheme b/OpenDocumentReader.xcodeproj/xcshareddata/xcschemes/ODR Full.xcscheme
@@ -82,6 +82,7 @@
    </AnalyzeAction>
    <ArchiveAction
       buildConfiguration = "Release"
+      customArchiveName = "OpenDocumentReader Full"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/OpenDocumentReader.xcodeproj/xcshareddata/xcschemes/ODR Lite.xcscheme b/OpenDocumentReader.xcodeproj/xcshareddata/xcschemes/ODR Lite.xcscheme
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1130"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E2F7ED4E220B54D600D63515"
+               BuildableName = "OpenDocumentReader.app"
+               BlueprintName = "OpenDocumentReader"
+               ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug Lite"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug Lite"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E2F7ED4E220B54D600D63515"
+            BuildableName = "OpenDocumentReader.app"
+            BlueprintName = "OpenDocumentReader"
+            ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release Lite"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E2F7ED4E220B54D600D63515"
+            BuildableName = "OpenDocumentReader.app"
+            BlueprintName = "OpenDocumentReader"
+            ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug Lite">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release Lite"
+      customArchiveName = "OpenDocumentReader Lite"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/OpenDocumentReader/AppType.swift b/OpenDocumentReader/AppType.swift
@@ -0,0 +1,6 @@
+import Foundation
+
+enum AppType: String {
+    case full = "at.tomtasche.reader"
+    case lite = "at.tomtasche.reader.lite1"
+}
diff --git a/OpenDocumentReader/ConfigurationManager.swift b/OpenDocumentReader/ConfigurationManager.swift
@@ -0,0 +1,14 @@
+import Foundation
+
+struct ConfigurationManager {
+    static let manager = ConfigurationManager()
+    
+    private(set) var configuration: AppType!
+    
+    private init () {
+        
+        if let productId = Bundle.main.bundleIdentifier {
+            configuration = AppType(rawValue: productId.lowercased()) ?? .lite
+        }
+    }
+}
diff --git a/OpenDocumentReader/Constants.swift b/OpenDocumentReader/Constants.swift
@@ -22,4 +22,6 @@ class Constants {
     static let onboarding_image_2 = "onboard2"
     static let onboarding_image_3 = "onboard3"
     static let key_was_intro_watched = "wasIntroWatched"
+    static let configurationFull = "Full"
+    static let configurationLite = "Lite"
 }
diff --git a/OpenDocumentReader/DocumentViewController.swift b/OpenDocumentReader/DocumentViewController.swift
@@ -10,9 +10,10 @@ import WebKit
 import ScrollableSegmentedControl
 import UIKit.UIPrinter
 import Firebase
+import GoogleMobileAds
 
 // taken from: https://developer.apple.com/documentation/uikit/view_controllers/building_a_document_browser-based_app
-class DocumentViewController: UIViewController, DocumentDelegate {
+class DocumentViewController: UIViewController, DocumentDelegate, GADBannerViewDelegate {
     
     private var browserTransition: DocumentBrowserTransitioningDelegate?
     public var transitionController: UIDocumentBrowserTransitionController? {
@@ -37,8 +38,9 @@ class DocumentViewController: UIViewController, DocumentDelegate {
     
     @IBOutlet weak var webview: WKWebView!
     @IBOutlet weak var progressBar: UIProgressView!
-    
     @IBOutlet weak var menuButton: UIBarButtonItem!
+    @IBOutlet weak var bannerView: GADBannerView!
+    @IBOutlet weak var bannerViewHeight: NSLayoutConstraint!
     
     private var isFullscreen = false
     
@@ -61,8 +63,41 @@ class DocumentViewController: UIViewController, DocumentDelegate {
         initialSelect = false
         
         document?.webview = self.webview
+        
+        bannerView.delegate = self
+        bannerView.adUnitID = "ca-app-pub-3940256099942544/2934735716"
+        bannerView.rootViewController = self
+        
+        loadBannerAd()
+    }
+    
+    func loadBannerAd() {
+        if ConfigurationManager.manager.configuration == .lite {
+            let frame = { () -> CGRect in
+              if #available(iOS 11.0, *) {
+                return view.frame.inset(by: view.safeAreaInsets)
+              } else {
+                return view.frame
+              }
+            }()
+            let viewWidth = frame.size.width
+
+            bannerView.adSize = GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(viewWidth)
+            bannerView.load(GADRequest())
+        } else {
+            hideBannerView()
+        }
+    }
+
+    func hideBannerView() {
+        bannerView.isHidden = true
+        bannerViewHeight.constant = 0.0
     }
     
+    func adView(_ bannerView: GADBannerView, didFailToReceiveAdWithError error: GADRequestError) {
+        hideBannerView()
+    }
+
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
     }
diff --git a/OpenDocumentReader/Info.plist b/OpenDocumentReader/Info.plist
@@ -4,8 +4,6 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>OpenDocument Reader</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -54,6 +52,8 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>GADApplicationIdentifier</key>
+	<string>ca-app-pub-3940256099942544~1458002511</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
diff --git a/OpenDocumentReader/Main.storyboard b/OpenDocumentReader/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -71,31 +71,43 @@
                                 </subviews>
                             </stackView>
                             <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VF5-Do-xh9">
-                                <rect key="frame" x="0.0" y="88" width="414" height="808"/>
+                                <rect key="frame" x="0.0" y="138" width="414" height="758"/>
                                 <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <wkWebViewConfiguration key="configuration">
                                     <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
                                     <wkPreferences key="preferences"/>
                                 </wkWebViewConfiguration>
                             </wkWebView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yut-lR-gq5" customClass="GADBannerView">
+                                <rect key="frame" x="0.0" y="88" width="414" height="50"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="50" id="dMZ-rD-IOK"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
+                            <constraint firstItem="VF5-Do-xh9" firstAttribute="top" secondItem="yut-lR-gq5" secondAttribute="bottom" id="2UY-wY-5ad"/>
                             <constraint firstItem="9mi-yf-jXf" firstAttribute="leading" secondItem="HAk-oU-gAF" secondAttribute="leading" id="5Hh-GZ-aPw"/>
-                            <constraint firstItem="VF5-Do-xh9" firstAttribute="top" secondItem="9mi-yf-jXf" secondAttribute="bottom" id="8K3-ke-I1G"/>
                             <constraint firstItem="sKS-nk-f6M" firstAttribute="top" secondItem="SIE-Uh-Zny" secondAttribute="top" id="HjQ-CN-3cF"/>
+                            <constraint firstItem="HAk-oU-gAF" firstAttribute="trailing" secondItem="yut-lR-gq5" secondAttribute="trailing" id="NMY-4I-DYB"/>
                             <constraint firstItem="VF5-Do-xh9" firstAttribute="leading" secondItem="HAk-oU-gAF" secondAttribute="leading" id="OvL-SW-INd"/>
                             <constraint firstItem="VF5-Do-xh9" firstAttribute="trailing" secondItem="HAk-oU-gAF" secondAttribute="trailing" id="Qyj-ei-4NG"/>
+                            <constraint firstItem="yut-lR-gq5" firstAttribute="leading" secondItem="HAk-oU-gAF" secondAttribute="leading" id="WhK-2N-j4f"/>
                             <constraint firstItem="N1x-QM-Qks" firstAttribute="top" secondItem="9mi-yf-jXf" secondAttribute="top" id="Yiq-pe-hl5"/>
                             <constraint firstItem="N1x-QM-Qks" firstAttribute="bottom" secondItem="sKS-nk-f6M" secondAttribute="bottom" constant="44" id="fDF-Mx-Nxy"/>
                             <constraint firstItem="VF5-Do-xh9" firstAttribute="bottom" secondItem="SIE-Uh-Zny" secondAttribute="bottom" id="ftB-8D-F6n"/>
                             <constraint firstItem="sKS-nk-f6M" firstAttribute="bottom" secondItem="HAk-oU-gAF" secondAttribute="top" id="gWh-EO-FK9"/>
                             <constraint firstItem="9mi-yf-jXf" firstAttribute="top" secondItem="SIE-Uh-Zny" secondAttribute="top" id="rED-wA-6gv"/>
                             <constraint firstItem="9mi-yf-jXf" firstAttribute="trailing" secondItem="HAk-oU-gAF" secondAttribute="trailing" id="tPc-vX-Egd"/>
+                            <constraint firstItem="yut-lR-gq5" firstAttribute="top" secondItem="9mi-yf-jXf" secondAttribute="bottom" id="yhh-1s-AmR"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="HAk-oU-gAF"/>
                     </view>
                     <connections>
+                        <outlet property="bannerView" destination="yut-lR-gq5" id="28Z-1b-NAN"/>
+                        <outlet property="bannerViewHeight" destination="dMZ-rD-IOK" id="pi7-sH-NwC"/>
                         <outlet property="menuButton" destination="Vsd-IL-ujz" id="GoN-tp-egn"/>
                         <outlet property="progressBar" destination="ePk-bQ-fV8" id="nz6-qw-ouf"/>
                         <outlet property="segmentedControl" destination="sIx-zo-9kG" id="pCn-x0-Z01"/>
diff --git a/Podfile b/Podfile
@@ -7,6 +7,7 @@ target 'OpenDocumentReader' do
   pod 'ScrollableSegmentedControl'
   pod 'Firebase/Core'
   pod 'Firebase/Storage'
+  pod 'Google-Mobile-Ads-SDK'
   pod 'Firebase/Crashlytics'
   pod 'Firebase/Analytics'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -51,6 +51,8 @@ PODS:
     - FirebaseAuthInterop (~> 1.1)
     - FirebaseCore (~> 6.6)
     - GTMSessionFetcher/Core (~> 1.1)
+  - Google-Mobile-Ads-SDK (7.58.0):
+    - GoogleAppMeasurement (~> 6.0)
   - GoogleAppMeasurement (6.4.1):
     - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
     - GoogleUtilities/MethodSwizzler (~> 6.0)
@@ -93,6 +95,7 @@ DEPENDENCIES:
   - Firebase/Core
   - Firebase/Crashlytics
   - Firebase/Storage
+  - Google-Mobile-Ads-SDK
   - ScrollableSegmentedControl
 
 SPEC REPOS:
@@ -107,6 +110,7 @@ SPEC REPOS:
     - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseStorage
+    - Google-Mobile-Ads-SDK
     - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleDataTransportCCTSupport
@@ -127,6 +131,7 @@ SPEC CHECKSUMS:
   FirebaseCrashlytics: ad2e8527a7efd9a7e708d5abe57318ced2e1dbd1
   FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44
   FirebaseStorage: b43ee271294227e1a3225544b073f3b49b427f46
+  Google-Mobile-Ads-SDK: 7052557293c75c676db55feb707ace9b790f32c1
   GoogleAppMeasurement: e49be3954045b17d046f271b9cc1ec052bad9702
   GoogleDataTransport: 6ffa4dd0b6d547f8d27b91bd92fa9e197a3f5f1f
   GoogleDataTransportCCTSupport: 12f02e5c8f09c055615de90bcd5ba2c375546051
@@ -136,6 +141,6 @@ SPEC CHECKSUMS:
   PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
   ScrollableSegmentedControl: 2e64bbe8968a7fcd8aae5014434481464fcdfe60
 
-PODFILE CHECKSUM: 7a4ed31baede41e03a49f8b5f40c0b4f91e30a39
+PODFILE CHECKSUM: 29b95d485a27c81711e78d9b14662503a45807e8
 
 COCOAPODS: 1.9.1

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,6 @@ class Constants {`
`22`	`22`	`static let onboarding_image_2 = "onboard2"`
`23`	`23`	`static let onboarding_image_3 = "onboard3"`
`24`	`24`	`static let key_was_intro_watched = "wasIntroWatched"`
	`25`	`+ static let configurationFull = "Full"`
	`26`	`+ static let configurationLite = "Lite"`
`25`	`27`	`}`