Skip to content

Commit

Permalink
Merge branch 'release/1.6' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@funkenstrahlen
funkenstrahlen committed Nov 17, 2020
2 parents b7c11e9 + c2cc41d commit dc4a30b
Show file tree
Hide file tree
Showing 28 changed files with 664 additions and 418 deletions.
76 changes: 55 additions & 21 deletions ContactJournal/ContactJournal.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
F80BBDF0253732D4003DBE59 /* EditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80BBDEF253732D4003DBE59 /* EditView.swift */; };
F80BBDF5253732F0003DBE59 /* ItemRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80BBDF4253732F0003DBE59 /* ItemRow.swift */; };
F8163F90253B21210047870F /* ContactPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8163F8F253B21210047870F /* ContactPicker.swift */; };
F81FB2D625458C1D005C50E7 /* RiskLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81FB2D525458C1D005C50E7 /* RiskLevel.swift */; };
F84178F32549A707005456C3 /* LocationPoiPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84178F22549A707005456C3 /* LocationPoiPicker.swift */; };
F8543F682539CAE000583650 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8543F672539CAE000583650 /* Settings.swift */; };
F8659C6D2545F59A00469D75 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8659C6C2545F59A00469D75 /* AppDelegate.swift */; };
F897012D2536FAFE00EEDA18 /* ContactJournalApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F897012C2536FAFE00EEDA18 /* ContactJournalApp.swift */; };
Expand All @@ -23,10 +25,9 @@
F8970169253709FB00EEDA18 /* Item+CoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8970168253709FB00EEDA18 /* Item+CoreData.swift */; };
F8970176253716DB00EEDA18 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8970175253716DB00EEDA18 /* CloudKit.framework */; };
F8BBDDA7253F039200844894 /* MultilineTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BBDDA6253F039200844894 /* MultilineTextEditor.swift */; };
F8C13673254D7EBA0043E2D2 /* LocationSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C13672254D7EBA0043E2D2 /* LocationSearchBar.swift */; };
F8D492B02541E3AC00397339 /* UserSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8D492AF2541E3AC00397339 /* UserSettings.swift */; };
F8D492B52541E3B900397339 /* NotficationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8D492B42541E3B900397339 /* NotficationManager.swift */; };
F8DF29472545DA3500D86094 /* SKProductProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8DF29462545DA3500D86094 /* SKProductProvider.swift */; };
F8DF294C2545DB5F00D86094 /* DonationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8DF294B2545DB5F00D86094 /* DonationView.swift */; };
F8DF7170254053E500D3C1EA /* Exporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8DF716F254053E500D3C1EA /* Exporter.swift */; };
F8DF71752540581600D3C1EA /* ShareExportAktivityController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8DF71742540581600D3C1EA /* ShareExportAktivityController.swift */; };
/* End PBXBuildFile section */
Expand All @@ -52,7 +53,10 @@
F80BBDEF253732D4003DBE59 /* EditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditView.swift; sourceTree = "<group>"; };
F80BBDF4253732F0003DBE59 /* ItemRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemRow.swift; sourceTree = "<group>"; };
F8163F8F253B21210047870F /* ContactPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactPicker.swift; sourceTree = "<group>"; };
F81FB2D525458C1D005C50E7 /* RiskLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RiskLevel.swift; path = ../RiskLevel.swift; sourceTree = "<group>"; };
F81FB2EB2545B6FA005C50E7 /* ContactJournal 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ContactJournal 4.xcdatamodel"; sourceTree = "<group>"; };
F8275C5C253AAD2A007155B2 /* ContactJournal 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ContactJournal 3.xcdatamodel"; sourceTree = "<group>"; };
F84178F22549A707005456C3 /* LocationPoiPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationPoiPicker.swift; sourceTree = "<group>"; };
F8543F672539CAE000583650 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
F8659C6C2545F59A00469D75 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F89701292536FAFE00EEDA18 /* ContactJournal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ContactJournal.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -72,12 +76,13 @@
F8970168253709FB00EEDA18 /* Item+CoreData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Item+CoreData.swift"; sourceTree = "<group>"; };
F8970170253716D500EEDA18 /* ContactJournal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ContactJournal.entitlements; sourceTree = "<group>"; };
F8970175253716DB00EEDA18 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
F8A22D5C256457C400E5CD62 /* ContactJournal 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ContactJournal 6.xcdatamodel"; sourceTree = "<group>"; };
F8BBDDA6253F039200844894 /* MultilineTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultilineTextEditor.swift; sourceTree = "<group>"; };
F8C13671254D7DE50043E2D2 /* ContactJournal 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ContactJournal 5.xcdatamodel"; sourceTree = "<group>"; };
F8C13672254D7EBA0043E2D2 /* LocationSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationSearchBar.swift; sourceTree = "<group>"; };
F8CAA7BC2539777F00E18CF3 /* ContactJournal 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ContactJournal 2.xcdatamodel"; sourceTree = "<group>"; };
F8D492AF2541E3AC00397339 /* UserSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserSettings.swift; sourceTree = "<group>"; };
F8D492B42541E3B900397339 /* NotficationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotficationManager.swift; sourceTree = "<group>"; };
F8DF29462545DA3500D86094 /* SKProductProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SKProductProvider.swift; sourceTree = "<group>"; };
F8DF294B2545DB5F00D86094 /* DonationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DonationView.swift; sourceTree = "<group>"; };
F8DF716F254053E500D3C1EA /* Exporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Exporter.swift; sourceTree = "<group>"; };
F8DF71742540581600D3C1EA /* ShareExportAktivityController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareExportAktivityController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -111,13 +116,45 @@
F80BBDF9253735B7003DBE59 /* Model */ = {
isa = PBXGroup;
children = (
F8D492AF2541E3AC00397339 /* UserSettings.swift */,
F89701352536FB0000EEDA18 /* Persistence.swift */,
F8970168253709FB00EEDA18 /* Item+CoreData.swift */,
F81FB2D525458C1D005C50E7 /* RiskLevel.swift */,
F89701372536FB0000EEDA18 /* ContactJournal.xcdatamodeld */,
);
path = Model;
sourceTree = "<group>";
};
F811083B254B26BA00086CC6 /* Export */ = {
isa = PBXGroup;
children = (
F8DF71742540581600D3C1EA /* ShareExportAktivityController.swift */,
F8DF716F254053E500D3C1EA /* Exporter.swift */,
);
path = Export;
sourceTree = "<group>";
};
F811083C254B26F400086CC6 /* EditView */ = {
isa = PBXGroup;
children = (
F80BBDEF253732D4003DBE59 /* EditView.swift */,
F8BBDDA6253F039200844894 /* MultilineTextEditor.swift */,
F8163F8F253B21210047870F /* ContactPicker.swift */,
F84178F22549A707005456C3 /* LocationPoiPicker.swift */,
F8C13672254D7EBA0043E2D2 /* LocationSearchBar.swift */,
);
path = EditView;
sourceTree = "<group>";
};
F8110840254B270400086CC6 /* Settings */ = {
isa = PBXGroup;
children = (
F8543F672539CAE000583650 /* Settings.swift */,
F8D492B42541E3B900397339 /* NotficationManager.swift */,
);
path = Settings;
sourceTree = "<group>";
};
F89701202536FAFE00EEDA18 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -146,17 +183,10 @@
F8659C6C2545F59A00469D75 /* AppDelegate.swift */,
F897012C2536FAFE00EEDA18 /* ContactJournalApp.swift */,
F897012E2536FAFE00EEDA18 /* ContentView.swift */,
F8543F672539CAE000583650 /* Settings.swift */,
F80BBDF4253732F0003DBE59 /* ItemRow.swift */,
F80BBDEF253732D4003DBE59 /* EditView.swift */,
F8BBDDA6253F039200844894 /* MultilineTextEditor.swift */,
F8163F8F253B21210047870F /* ContactPicker.swift */,
F8DF71742540581600D3C1EA /* ShareExportAktivityController.swift */,
F8D492AF2541E3AC00397339 /* UserSettings.swift */,
F8D492B42541E3B900397339 /* NotficationManager.swift */,
F8DF716F254053E500D3C1EA /* Exporter.swift */,
F8DF29462545DA3500D86094 /* SKProductProvider.swift */,
F8DF294B2545DB5F00D86094 /* DonationView.swift */,
F8110840254B270400086CC6 /* Settings */,
F811083C254B26F400086CC6 /* EditView */,
F811083B254B26BA00086CC6 /* Export */,
F89701302536FB0000EEDA18 /* Assets.xcassets */,
F80BBDF9253735B7003DBE59 /* Model */,
F897013A2536FB0000EEDA18 /* Info.plist */,
Expand Down Expand Up @@ -332,19 +362,20 @@
F8163F90253B21210047870F /* ContactPicker.swift in Sources */,
F8D492B52541E3B900397339 /* NotficationManager.swift in Sources */,
F8970169253709FB00EEDA18 /* Item+CoreData.swift in Sources */,
F8DF294C2545DB5F00D86094 /* DonationView.swift in Sources */,
F89701362536FB0000EEDA18 /* Persistence.swift in Sources */,
F8D492B02541E3AC00397339 /* UserSettings.swift in Sources */,
F8543F682539CAE000583650 /* Settings.swift in Sources */,
F80BBDF0253732D4003DBE59 /* EditView.swift in Sources */,
F80BBDF5253732F0003DBE59 /* ItemRow.swift in Sources */,
F8BBDDA7253F039200844894 /* MultilineTextEditor.swift in Sources */,
F81FB2D625458C1D005C50E7 /* RiskLevel.swift in Sources */,
F8DF71752540581600D3C1EA /* ShareExportAktivityController.swift in Sources */,
F8DF29472545DA3500D86094 /* SKProductProvider.swift in Sources */,
F8C13673254D7EBA0043E2D2 /* LocationSearchBar.swift in Sources */,
F897012F2536FAFE00EEDA18 /* ContentView.swift in Sources */,
F89701392536FB0000EEDA18 /* ContactJournal.xcdatamodeld in Sources */,
F8659C6D2545F59A00469D75 /* AppDelegate.swift in Sources */,
F897012D2536FAFE00EEDA18 /* ContactJournalApp.swift in Sources */,
F84178F32549A707005456C3 /* LocationPoiPicker.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -503,7 +534,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = ContactJournal/ContactJournal.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 44;
DEVELOPMENT_ASSET_PATHS = "\"ContactJournal/Preview Content\"";
DEVELOPMENT_TEAM = Y85FVF2A97;
ENABLE_PREVIEWS = YES;
Expand All @@ -513,7 +544,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.4;
MARKETING_VERSION = 1.6;
PRODUCT_BUNDLE_IDENTIFIER = de.stefantrauth.ContactJournal;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -528,7 +559,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = ContactJournal/ContactJournal.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 44;
DEVELOPMENT_ASSET_PATHS = "\"ContactJournal/Preview Content\"";
DEVELOPMENT_TEAM = Y85FVF2A97;
ENABLE_PREVIEWS = YES;
Expand All @@ -538,7 +569,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.4;
MARKETING_VERSION = 1.6;
PRODUCT_BUNDLE_IDENTIFIER = de.stefantrauth.ContactJournal;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -675,11 +706,14 @@
F89701372536FB0000EEDA18 /* ContactJournal.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
F8A22D5C256457C400E5CD62 /* ContactJournal 6.xcdatamodel */,
F8C13671254D7DE50043E2D2 /* ContactJournal 5.xcdatamodel */,
F81FB2EB2545B6FA005C50E7 /* ContactJournal 4.xcdatamodel */,
F8275C5C253AAD2A007155B2 /* ContactJournal 3.xcdatamodel */,
F8CAA7BC2539777F00E18CF3 /* ContactJournal 2.xcdatamodel */,
F89701382536FB0000EEDA18 /* ContactJournal.xcdatamodel */,
);
currentVersion = F8275C5C253AAD2A007155B2 /* ContactJournal 3.xcdatamodel */;
currentVersion = F8A22D5C256457C400E5CD62 /* ContactJournal 6.xcdatamodel */;
path = ContactJournal.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
Expand Down
13 changes: 0 additions & 13 deletions ContactJournal/ContactJournal/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@ import StoreKit

class AppDelegate: NSObject, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
SKPaymentQueue.default().add(self)
return true
}
}

extension AppDelegate: SKPaymentTransactionObserver {
func paymentQueue(_ queue: SKPaymentQueue, updatedTransactions transactions: [SKPaymentTransaction]) {
for transaction in transactions {
switch transaction.transactionState {
case .purchasing, .deferred: break
case .failed, .purchased, .restored: queue.finishTransaction(transaction)
@unknown default: break
}
}
}
}
8 changes: 0 additions & 8 deletions ContactJournal/ContactJournal/ContactJournal.entitlements
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,5 @@
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.de.stefantrauth.ContactJournal</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
<string>CloudKit</string>
</array>
</dict>
</plist>
5 changes: 0 additions & 5 deletions ContactJournal/ContactJournal/ContactJournalApp.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ struct ContactJournalApp: App {
if UserDefaults.standard.bool(forKey: "shouldAutomaticallyDeleteDeprecatedItems") {
PersistenceController.deleteDeprecatedItems()
}
if let scene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene {
#if !DEBUG
SKStoreReviewController.requestReview(in: scene)
#endif
}
case .inactive: break
case .background:
PersistenceController.saveContext()
Expand Down
Loading

0 comments on commit dc4a30b

Please sign in to comment.