shadowfacts
/
frenzy-ios
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: shadowfacts:991a106907fd1a6b262f6c7a9d2c209d5d984334
Branches Tags
shadowfacts:main
..
compare: shadowfacts:197edc5e1a8b2fbdd8f7d3612384447c270bf61d
Branches Tags
shadowfacts:main

No commits in common. "991a106907fd1a6b262f6c7a9d2c209d5d984334" and "197edc5e1a8b2fbdd8f7d3612384447c270bf61d" have entirely different histories.
991a106907 ... 197edc5e1a

55 changed files with 248 additions and 841 deletions
Show Stats Expand all files Collapse all files

9
Fervor/.gitignore vendored
View File

@ -1,9 +0,0 @@
.DS_Store
/.build
/Packages
/*.xcodeproj
xcuserdata/
DerivedData/
.swiftpm/config/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc

0
Fervor/Sources/Fervor/ClientRegistration.swift → Fervor/ClientRegistration.swift
View File

0
Fervor/Sources/Fervor/Feed.swift → Fervor/Feed.swift
View File

18
Fervor/Fervor.h Normal file
View File

@ -0,0 +1,18 @@
//
// Fervor.h
// Fervor
//
// Created by Shadowfacts on 10/29/21.
//
#import <Foundation/Foundation.h>
//! Project version number for Fervor.
FOUNDATION_EXPORT double FervorVersionNumber;
//! Project version string for Fervor.
FOUNDATION_EXPORT const unsigned char FervorVersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <Fervor/PublicHeader.h>

0
Fervor/Sources/Fervor/Fervor.swift → Fervor/Fervor.swift
View File

0
Fervor/Sources/Fervor/FervorClient.swift → Fervor/FervorClient.swift
View File

0
Fervor/Sources/Fervor/Group.swift → Fervor/Group.swift
View File

0
Fervor/Sources/Fervor/Instance.swift → Fervor/Instance.swift
View File

0
Fervor/Sources/Fervor/Item.swift → Fervor/Item.swift
View File

0
Fervor/Sources/Fervor/ItemsSyncUpdate.swift → Fervor/ItemsSyncUpdate.swift
View File

31
Fervor/Package.swift
View File

@ -1,31 +0,0 @@
// swift-tools-version: 5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription
let package = Package(
name: "Fervor",
platforms: [
.iOS(.v15),
],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "Fervor",
targets: ["Fervor"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "Fervor",
dependencies: []),
.testTarget(
name: "FervorTests",
dependencies: ["Fervor"]),
]
)

3
Fervor/README.md
View File

@ -1,3 +0,0 @@
# Fervor
A description of this package.

0
Fervor/Sources/Fervor/Token.swift → Fervor/Token.swift
View File

0
Fervor/Sources/Fervor/URLRequest+Body.swift → Fervor/URLRequest+Body.swift
View File

9
Persistence/.gitignore vendored
View File

@ -1,9 +0,0 @@
.DS_Store
/.build
/Packages
/*.xcodeproj
xcuserdata/
DerivedData/
.swiftpm/config/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc

34
Persistence/Package.swift
View File

@ -1,34 +0,0 @@
// swift-tools-version: 5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription
let package = Package(
name: "Persistence",
platforms: [
.iOS(.v15),
],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "Persistence",
targets: ["Persistence"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
.package(path: "../Fervor"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "Persistence",
dependencies: [
"Fervor",
]),
.testTarget(
name: "PersistenceTests",
dependencies: ["Persistence"]),
]
)

3
Persistence/README.md
View File

@ -1,3 +0,0 @@
# Persistence
A description of this package.

313
Reader.xcodeproj/project.pbxproj
View File

@ -9,7 +9,12 @@
/* Begin PBXBuildFile section */
D608238D27DE729E00D7D5F9 /* ItemListType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D608238C27DE729E00D7D5F9 /* ItemListType.swift */; };
D65B18B22750469D004A9448 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18B12750469D004A9448 /* LoginViewController.swift */; };
D65B18B4275048D9004A9448 /* ClientRegistration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18B3275048D9004A9448 /* ClientRegistration.swift */; };
D65B18B627504920004A9448 /* FervorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18B527504920004A9448 /* FervorController.swift */; };
D65B18B82750495D004A9448 /* FervorClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18B72750495D004A9448 /* FervorClient.swift */; };
D65B18BA27504A21004A9448 /* URLRequest+Body.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18B927504A21004A9448 /* URLRequest+Body.swift */; };
D65B18BC27504FE7004A9448 /* Token.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18BB27504FE7004A9448 /* Token.swift */; };
D65B18BE275051A1004A9448 /* LocalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18BD275051A1004A9448 /* LocalData.swift */; };
D65B18C127505348004A9448 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B18C027505348004A9448 /* HomeViewController.swift */; };
D68408E827947D0800E327D2 /* PrefsSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68408E727947D0800E327D2 /* PrefsSceneDelegate.swift */; };
D68408ED2794803D00E327D2 /* PrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68408EC2794803D00E327D2 /* PrefsView.swift */; };
@ -20,17 +25,31 @@
D68B303D2792204B00E8B3FA /* read.js in Resources */ = {isa = PBXBuildFile; fileRef = D68B303C2792204B00E8B3FA /* read.js */; };
D68B30402792729A00E8B3FA /* AppSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68B303F2792729A00E8B3FA /* AppSplitViewController.swift */; };
D68B304227932ED500E8B3FA /* UserActivities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68B304127932ED500E8B3FA /* UserActivities.swift */; };
D6A8A33427766C2800CCEC72 /* PersistentContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A8A33327766C2800CCEC72 /* PersistentContainer.swift */; };
D6C687EC272CD27600874C10 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C687EB272CD27600874C10 /* AppDelegate.swift */; };
D6C687EE272CD27600874C10 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C687ED272CD27600874C10 /* SceneDelegate.swift */; };
D6C687F6272CD27600874C10 /* Reader.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D6C687F4272CD27600874C10 /* Reader.xcdatamodeld */; };
D6C687F8272CD27700874C10 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6C687F7272CD27700874C10 /* Assets.xcassets */; };
D6C687FB272CD27700874C10 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D6C687F9272CD27700874C10 /* LaunchScreen.storyboard */; };
D6C68806272CD27700874C10 /* ReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C68805272CD27700874C10 /* ReaderTests.swift */; };
D6C68810272CD27700874C10 /* ReaderUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C6880F272CD27700874C10 /* ReaderUITests.swift */; };
D6C68812272CD27700874C10 /* ReaderUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C68811272CD27700874C10 /* ReaderUITestsLaunchTests.swift */; };
D6D5FA24285FE9DB00BBF188 /* WidgetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D5FA23285FE9DB00BBF188 /* WidgetHelper.swift */; };
D6D5FA27285FEA6900BBF188 /* WidgetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D5FA26285FEA6900BBF188 /* WidgetData.swift */; };
D6D5FA28285FEA8A00BBF188 /* WidgetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D5FA26285FEA6900BBF188 /* WidgetData.swift */; };
D6C68826272CD2BA00874C10 /* Fervor.h in Headers */ = {isa = PBXBuildFile; fileRef = D6C68825272CD2BA00874C10 /* Fervor.h */; settings = {ATTRIBUTES = (Public, ); }; };
D6C68829272CD2BA00874C10 /* Fervor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6C68823272CD2BA00874C10 /* Fervor.framework */; };
D6C6882A272CD2BA00874C10 /* Fervor.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D6C68823272CD2BA00874C10 /* Fervor.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D6C68830272CD2CF00874C10 /* Instance.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C6882F272CD2CF00874C10 /* Instance.swift */; };
D6C68832272CD40600874C10 /* Feed.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C68831272CD40600874C10 /* Feed.swift */; };
D6C68834272CD44900874C10 /* Fervor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C68833272CD44900874C10 /* Fervor.swift */; };
D6C68856272CD7C600874C10 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C68855272CD7C600874C10 /* Item.swift */; };
D6C68858272CD8CD00874C10 /* Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C68857272CD8CD00874C10 /* Group.swift */; };
D6E2434C278B456A0005E546 /* ItemsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E2434B278B456A0005E546 /* ItemsViewController.swift */; };
D6E24352278B6DF90005E546 /* ItemsSyncUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E24351278B6DF90005E546 /* ItemsSyncUpdate.swift */; };
D6E24357278B96E40005E546 /* Feed+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E24355278B96E40005E546 /* Feed+CoreDataClass.swift */; };
D6E24358278B96E40005E546 /* Feed+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E24356278B96E40005E546 /* Feed+CoreDataProperties.swift */; };
D6E2435D278B97240005E546 /* Item+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E24359278B97240005E546 /* Item+CoreDataClass.swift */; };
D6E2435E278B97240005E546 /* Item+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E2435A278B97240005E546 /* Item+CoreDataProperties.swift */; };
D6E2435F278B97240005E546 /* Group+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E2435B278B97240005E546 /* Group+CoreDataClass.swift */; };
D6E24360278B97240005E546 /* Group+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E2435C278B97240005E546 /* Group+CoreDataProperties.swift */; };
D6E24363278BA1410005E546 /* ItemCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E24361278BA1410005E546 /* ItemCollectionViewCell.swift */; };
D6E24369278BABB40005E546 /* UIColor+App.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E24368278BABB40005E546 /* UIColor+App.swift */; };
D6E2436B278BB1880005E546 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E2436A278BB1880005E546 /* HomeCollectionViewCell.swift */; };
@ -39,18 +58,6 @@
D6E24373278BE2B80005E546 /* read.css in Resources */ = {isa = PBXBuildFile; fileRef = D6E24372278BE2B80005E546 /* read.css */; };
D6EB531D278C89C300AD2E61 /* AppNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EB531C278C89C300AD2E61 /* AppNavigationController.swift */; };
D6EB531F278E4A7500AD2E61 /* StretchyMenuInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EB531E278E4A7500AD2E61 /* StretchyMenuInteraction.swift */; };
D6EEDE87285FA75D009F854E /* Fervor in Frameworks */ = {isa = PBXBuildFile; productRef = D6EEDE86285FA75D009F854E /* Fervor */; };
D6EEDE89285FA75F009F854E /* Persistence in Frameworks */ = {isa = PBXBuildFile; productRef = D6EEDE88285FA75F009F854E /* Persistence */; };
D6EEDE8B285FA7FD009F854E /* LocalData+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EEDE8A285FA7FD009F854E /* LocalData+Migration.swift */; };
D6EEDE92285FA915009F854E /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6EEDE91285FA915009F854E /* WidgetKit.framework */; };
D6EEDE94285FA915009F854E /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6EEDE93285FA915009F854E /* SwiftUI.framework */; };
D6EEDE97285FA915009F854E /* Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EEDE96285FA915009F854E /* Widgets.swift */; };
D6EEDE9A285FA915009F854E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6EEDE99285FA915009F854E /* Assets.xcassets */; };
D6EEDE9C285FA915009F854E /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = D6EEDE98285FA915009F854E /* Widgets.intentdefinition */; };
D6EEDE9D285FA915009F854E /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = D6EEDE98285FA915009F854E /* Widgets.intentdefinition */; };
D6EEDEA0285FA915009F854E /* WidgetsExtension.appex in Embed PlugIns */ = {isa = PBXBuildFile; fileRef = D6EEDE90285FA915009F854E /* WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
D6EEDEA7285FAE4D009F854E /* Recents.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EEDEA5285FAD24009F854E /* Recents.swift */; };
D6EEDEA9285FAE60009F854E /* Persistence in Frameworks */ = {isa = PBXBuildFile; productRef = D6EEDEA8285FAE60009F854E /* Persistence */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -75,12 +82,12 @@
remoteGlobalIDString = D6C687E7272CD27600874C10;
remoteInfo = Reader;
};
D6EEDE9E285FA915009F854E /* PBXContainerItemProxy */ = {
D6C68827272CD2BA00874C10 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D6C687E0272CD27600874C10 /* Project object */;
proxyType = 1;
remoteGlobalIDString = D6EEDE8F285FA915009F854E;
remoteInfo = WidgetsExtension;
remoteGlobalIDString = D6C68822272CD2BA00874C10;
remoteInfo = Fervor;
};
/* End PBXContainerItemProxy section */
@ -91,7 +98,6 @@
dstPath = "";
dstSubfolderSpec = 13;
files = (
D6EEDEA0285FA915009F854E /* WidgetsExtension.appex in Embed PlugIns */,
D6840914279487DC00E327D2 /* ReaderMac.bundle in Embed PlugIns */,
);
name = "Embed PlugIns";
@ -103,6 +109,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
D6C6882A272CD2BA00874C10 /* Fervor.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@ -112,7 +119,12 @@
/* Begin PBXFileReference section */
D608238C27DE729E00D7D5F9 /* ItemListType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemListType.swift; sourceTree = "<group>"; };
D65B18B12750469D004A9448 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
D65B18B3275048D9004A9448 /* ClientRegistration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientRegistration.swift; sourceTree = "<group>"; };
D65B18B527504920004A9448 /* FervorController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FervorController.swift; sourceTree = "<group>"; };
D65B18B72750495D004A9448 /* FervorClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FervorClient.swift; sourceTree = "<group>"; };
D65B18B927504A21004A9448 /* URLRequest+Body.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequest+Body.swift"; sourceTree = "<group>"; };
D65B18BB27504FE7004A9448 /* Token.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Token.swift; sourceTree = "<group>"; };
D65B18BD275051A1004A9448 /* LocalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalData.swift; sourceTree = "<group>"; };
D65B18C027505348004A9448 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
D68408E727947D0800E327D2 /* PrefsSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsSceneDelegate.swift; sourceTree = "<group>"; };
D68408EC2794803D00E327D2 /* PrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsView.swift; sourceTree = "<group>"; };
@ -126,11 +138,11 @@
D68B303E27923C0000E8B3FA /* Reader.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Reader.entitlements; sourceTree = "<group>"; };
D68B303F2792729A00E8B3FA /* AppSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSplitViewController.swift; sourceTree = "<group>"; };
D68B304127932ED500E8B3FA /* UserActivities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivities.swift; sourceTree = "<group>"; };
D6AB5E9A285F6FE100157F2F /* Fervor */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Fervor; sourceTree = "<group>"; };
D6AB5E9B285F706F00157F2F /* Persistence */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Persistence; sourceTree = "<group>"; };
D6A8A33327766C2800CCEC72 /* PersistentContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistentContainer.swift; sourceTree = "<group>"; };
D6C687E8272CD27600874C10 /* Reader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Reader.app; sourceTree = BUILT_PRODUCTS_DIR; };
D6C687EB272CD27600874C10 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
D6C687ED272CD27600874C10 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
D6C687F5272CD27600874C10 /* Reader.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Reader.xcdatamodel; sourceTree = "<group>"; };
D6C687F7272CD27700874C10 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D6C687FA272CD27700874C10 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
D6C687FC272CD27700874C10 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -139,9 +151,21 @@
D6C6880B272CD27700874C10 /* ReaderUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReaderUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
D6C6880F272CD27700874C10 /* ReaderUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderUITests.swift; sourceTree = "<group>"; };
D6C68811272CD27700874C10 /* ReaderUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderUITestsLaunchTests.swift; sourceTree = "<group>"; };
D6D5FA23285FE9DB00BBF188 /* WidgetHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetHelper.swift; sourceTree = "<group>"; };
D6D5FA26285FEA6900BBF188 /* WidgetData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetData.swift; sourceTree = "<group>"; };
D6C68823272CD2BA00874C10 /* Fervor.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Fervor.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D6C68825272CD2BA00874C10 /* Fervor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fervor.h; sourceTree = "<group>"; };
D6C6882F272CD2CF00874C10 /* Instance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Instance.swift; sourceTree = "<group>"; };
D6C68831272CD40600874C10 /* Feed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Feed.swift; sourceTree = "<group>"; };
D6C68833272CD44900874C10 /* Fervor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fervor.swift; sourceTree = "<group>"; };
D6C68855272CD7C600874C10 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = "<group>"; };
D6C68857272CD8CD00874C10 /* Group.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group.swift; sourceTree = "<group>"; };
D6E2434B278B456A0005E546 /* ItemsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemsViewController.swift; sourceTree = "<group>"; };
D6E24351278B6DF90005E546 /* ItemsSyncUpdate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemsSyncUpdate.swift; sourceTree = "<group>"; };
D6E24355278B96E40005E546 /* Feed+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Feed+CoreDataClass.swift"; sourceTree = "<group>"; };
D6E24356278B96E40005E546 /* Feed+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Feed+CoreDataProperties.swift"; sourceTree = "<group>"; };
D6E24359278B97240005E546 /* Item+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Item+CoreDataClass.swift"; sourceTree = "<group>"; };
D6E2435A278B97240005E546 /* Item+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Item+CoreDataProperties.swift"; sourceTree = "<group>"; };
D6E2435B278B97240005E546 /* Group+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Group+CoreDataClass.swift"; sourceTree = "<group>"; };
D6E2435C278B97240005E546 /* Group+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Group+CoreDataProperties.swift"; sourceTree = "<group>"; };
D6E24361278BA1410005E546 /* ItemCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemCollectionViewCell.swift; sourceTree = "<group>"; };
D6E24368278BABB40005E546 /* UIColor+App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+App.swift"; sourceTree = "<group>"; };
D6E2436A278BB1880005E546 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = "<group>"; };
@ -149,16 +173,6 @@
D6E24372278BE2B80005E546 /* read.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = read.css; sourceTree = "<group>"; };
D6EB531C278C89C300AD2E61 /* AppNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppNavigationController.swift; sourceTree = "<group>"; };
D6EB531E278E4A7500AD2E61 /* StretchyMenuInteraction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StretchyMenuInteraction.swift; sourceTree = "<group>"; };
D6EEDE8A285FA7FD009F854E /* LocalData+Migration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LocalData+Migration.swift"; sourceTree = "<group>"; };
D6EEDE90285FA915009F854E /* WidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetsExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
D6EEDE91285FA915009F854E /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
D6EEDE93285FA915009F854E /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
D6EEDE96285FA915009F854E /* Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Widgets.swift; sourceTree = "<group>"; };
D6EEDE98285FA915009F854E /* Widgets.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = Widgets.intentdefinition; sourceTree = "<group>"; };
D6EEDE99285FA915009F854E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D6EEDE9B285FA915009F854E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D6EEDEA1285FA915009F854E /* WidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WidgetsExtension.entitlements; sourceTree = "<group>"; };
D6EEDEA5285FAD24009F854E /* Recents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Recents.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -173,8 +187,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D6EEDE89285FA75F009F854E /* Persistence in Frameworks */,
D6EEDE87285FA75D009F854E /* Fervor in Frameworks */,
D6C68829272CD2BA00874C10 /* Fervor.framework in Frameworks */,
D6E24371278BE1250005E546 /* HTMLEntities in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -193,13 +206,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D6EEDE8D285FA915009F854E /* Frameworks */ = {
D6C68820272CD2BA00874C10 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D6EEDEA9285FAE60009F854E /* Persistence in Frameworks */,
D6EEDE94285FA915009F854E /* SwiftUI.framework in Frameworks */,
D6EEDE92285FA915009F854E /* WidgetKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -257,23 +267,33 @@
isa = PBXGroup;
children = (
D68B3037279099FD00E8B3FA /* liblolhtml.a */,
D6EEDE91285FA915009F854E /* WidgetKit.framework */,
D6EEDE93285FA915009F854E /* SwiftUI.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
D6A8A33527766E9300CCEC72 /* CoreData */ = {
isa = PBXGroup;
children = (
D6C687F4272CD27600874C10 /* Reader.xcdatamodeld */,
D6A8A33327766C2800CCEC72 /* PersistentContainer.swift */,
D6E24355278B96E40005E546 /* Feed+CoreDataClass.swift */,
D6E24356278B96E40005E546 /* Feed+CoreDataProperties.swift */,
D6E2435B278B97240005E546 /* Group+CoreDataClass.swift */,
D6E2435C278B97240005E546 /* Group+CoreDataProperties.swift */,
D6E24359278B97240005E546 /* Item+CoreDataClass.swift */,
D6E2435A278B97240005E546 /* Item+CoreDataProperties.swift */,
);
path = CoreData;
sourceTree = "<group>";
};
D6C687DF272CD27600874C10 = {
isa = PBXGroup;
children = (
D6EEDEA1285FA915009F854E /* WidgetsExtension.entitlements */,
D6AB5E9B285F706F00157F2F /* Persistence */,
D6AB5E9A285F6FE100157F2F /* Fervor */,
D6C687EA272CD27600874C10 /* Reader */,
D6C68804272CD27700874C10 /* ReaderTests */,
D6C6880E272CD27700874C10 /* ReaderUITests */,
D6840911279486C400E327D2 /* ReaderMac */,
D6EEDE95285FA915009F854E /* Widgets */,
D6C68824272CD2BA00874C10 /* Fervor */,
D6C687E9272CD27600874C10 /* Products */,
D68B302E278FDCE200E8B3FA /* Frameworks */,
);
@ -285,8 +305,8 @@
D6C687E8272CD27600874C10 /* Reader.app */,
D6C68801272CD27700874C10 /* ReaderTests.xctest */,
D6C6880B272CD27700874C10 /* ReaderUITests.xctest */,
D6C68823272CD2BA00874C10 /* Fervor.framework */,
D684090D279486BF00E327D2 /* ReaderMac.bundle */,
D6EEDE90285FA915009F854E /* WidgetsExtension.appex */,
);
name = Products;
sourceTree = "<group>";
@ -300,14 +320,14 @@
D6C687ED272CD27600874C10 /* SceneDelegate.swift */,
D68408E727947D0800E327D2 /* PrefsSceneDelegate.swift */,
D65B18B527504920004A9448 /* FervorController.swift */,
D65B18BD275051A1004A9448 /* LocalData.swift */,
D6E24368278BABB40005E546 /* UIColor+App.swift */,
D6EB531E278E4A7500AD2E61 /* StretchyMenuInteraction.swift */,
D68B303527907D9200E8B3FA /* ExcerptGenerator.swift */,
D68B304127932ED500E8B3FA /* UserActivities.swift */,
D68408EE2794808E00E327D2 /* Preferences.swift */,
D608238C27DE729E00D7D5F9 /* ItemListType.swift */,
D6EEDE8A285FA7FD009F854E /* LocalData+Migration.swift */,
D6D5FA25285FEA5B00BBF188 /* Widgets */,
D6A8A33527766E9300CCEC72 /* CoreData */,
D65B18AF2750468B004A9448 /* Screens */,
D6C687F7272CD27700874C10 /* Assets.xcassets */,
D6C687F9272CD27700874C10 /* LaunchScreen.storyboard */,
@ -335,13 +355,22 @@
path = ReaderUITests;
sourceTree = "<group>";
};
D6D5FA25285FEA5B00BBF188 /* Widgets */ = {
D6C68824272CD2BA00874C10 /* Fervor */ = {
isa = PBXGroup;
children = (
D6D5FA23285FE9DB00BBF188 /* WidgetHelper.swift */,
D6D5FA26285FEA6900BBF188 /* WidgetData.swift */,
D6C68825272CD2BA00874C10 /* Fervor.h */,
D6C68833272CD44900874C10 /* Fervor.swift */,
D65B18B72750495D004A9448 /* FervorClient.swift */,
D65B18B927504A21004A9448 /* URLRequest+Body.swift */,
D65B18B3275048D9004A9448 /* ClientRegistration.swift */,
D6C68831272CD40600874C10 /* Feed.swift */,
D6C68857272CD8CD00874C10 /* Group.swift */,
D6C6882F272CD2CF00874C10 /* Instance.swift */,
D6C68855272CD7C600874C10 /* Item.swift */,
D6E24351278B6DF90005E546 /* ItemsSyncUpdate.swift */,
D65B18BB27504FE7004A9448 /* Token.swift */,
);
path = Widgets;
path = Fervor;
sourceTree = "<group>";
};
D6E2434A278B455C0005E546 /* Items */ = {
@ -361,20 +390,19 @@
path = Read;
sourceTree = "<group>";
};
D6EEDE95285FA915009F854E /* Widgets */ = {
isa = PBXGroup;
children = (
D6EEDE96285FA915009F854E /* Widgets.swift */,
D6EEDEA5285FAD24009F854E /* Recents.swift */,
D6EEDE98285FA915009F854E /* Widgets.intentdefinition */,
D6EEDE99285FA915009F854E /* Assets.xcassets */,
D6EEDE9B285FA915009F854E /* Info.plist */,
);
path = Widgets;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
D6C6881E272CD2BA00874C10 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
D6C68826272CD2BA00874C10 /* Fervor.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
D684090C279486BF00E327D2 /* ReaderMac */ = {
isa = PBXNativeTarget;
@ -407,14 +435,12 @@
buildRules = (
);
dependencies = (
D6C68828272CD2BA00874C10 /* PBXTargetDependency */,
D6840916279487DC00E327D2 /* PBXTargetDependency */,
D6EEDE9F285FA915009F854E /* PBXTargetDependency */,
);
name = Reader;
packageProductDependencies = (
D6E24370278BE1250005E546 /* HTMLEntities */,
D6EEDE86285FA75D009F854E /* Fervor */,
D6EEDE88285FA75F009F854E /* Persistence */,
);
productName = Reader;
productReference = D6C687E8272CD27600874C10 /* Reader.app */;
@ -456,25 +482,23 @@
productReference = D6C6880B272CD27700874C10 /* ReaderUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
D6EEDE8F285FA915009F854E /* WidgetsExtension */ = {
D6C68822272CD2BA00874C10 /* Fervor */ = {
isa = PBXNativeTarget;
buildConfigurationList = D6EEDEA2285FA915009F854E /* Build configuration list for PBXNativeTarget "WidgetsExtension" */;
buildConfigurationList = D6C6882B272CD2BA00874C10 /* Build configuration list for PBXNativeTarget "Fervor" */;
buildPhases = (
D6EEDE8C285FA915009F854E /* Sources */,
D6EEDE8D285FA915009F854E /* Frameworks */,
D6EEDE8E285FA915009F854E /* Resources */,
D6C6881E272CD2BA00874C10 /* Headers */,
D6C6881F272CD2BA00874C10 /* Sources */,
D6C68820272CD2BA00874C10 /* Frameworks */,
D6C68821272CD2BA00874C10 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = WidgetsExtension;
packageProductDependencies = (
D6EEDEA8285FAE60009F854E /* Persistence */,
);
productName = WidgetsExtension;
productReference = D6EEDE90285FA915009F854E /* WidgetsExtension.appex */;
productType = "com.apple.product-type.app-extension";
name = Fervor;
productName = Fervor;
productReference = D6C68823272CD2BA00874C10 /* Fervor.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@ -483,7 +507,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1400;
LastSwiftUpdateCheck = 1320;
LastUpgradeCheck = 1400;
TargetAttributes = {
D684090C279486BF00E327D2 = {
@ -501,8 +525,9 @@
CreatedOnToolsVersion = 13.2;
TestTargetID = D6C687E7272CD27600874C10;
};
D6EEDE8F285FA915009F854E = {
CreatedOnToolsVersion = 14.0;
D6C68822272CD2BA00874C10 = {
CreatedOnToolsVersion = 13.2;
LastSwiftMigration = 1320;
};
};
};
@ -525,8 +550,8 @@
D6C687E7272CD27600874C10 /* Reader */,
D6C68800272CD27700874C10 /* ReaderTests */,
D6C6880A272CD27700874C10 /* ReaderUITests */,
D6C68822272CD2BA00874C10 /* Fervor */,
D684090C279486BF00E327D2 /* ReaderMac */,
D6EEDE8F285FA915009F854E /* WidgetsExtension */,
);
};
/* End PBXProject section */
@ -564,11 +589,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D6EEDE8E285FA915009F854E /* Resources */ = {
D6C68821272CD2BA00874C10 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D6EEDE9A285FA915009F854E /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -609,25 +633,30 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D6A8A33427766C2800CCEC72 /* PersistentContainer.swift in Sources */,
D6E24357278B96E40005E546 /* Feed+CoreDataClass.swift in Sources */,
D608238D27DE729E00D7D5F9 /* ItemListType.swift in Sources */,
D65B18B627504920004A9448 /* FervorController.swift in Sources */,
D6D5FA27285FEA6900BBF188 /* WidgetData.swift in Sources */,
D68B304227932ED500E8B3FA /* UserActivities.swift in Sources */,
D6C687EC272CD27600874C10 /* AppDelegate.swift in Sources */,
D6C687F6272CD27600874C10 /* Reader.xcdatamodeld in Sources */,
D6E2436B278BB1880005E546 /* HomeCollectionViewCell.swift in Sources */,
D6E2435F278B97240005E546 /* Group+CoreDataClass.swift in Sources */,
D6E24369278BABB40005E546 /* UIColor+App.swift in Sources */,
D6EEDE8B285FA7FD009F854E /* LocalData+Migration.swift in Sources */,
D6E2435D278B97240005E546 /* Item+CoreDataClass.swift in Sources */,
D68408E827947D0800E327D2 /* PrefsSceneDelegate.swift in Sources */,
D6EB531D278C89C300AD2E61 /* AppNavigationController.swift in Sources */,
D6E24360278B97240005E546 /* Group+CoreDataProperties.swift in Sources */,
D6E2434C278B456A0005E546 /* ItemsViewController.swift in Sources */,
D6E2435E278B97240005E546 /* Item+CoreDataProperties.swift in Sources */,
D6EB531F278E4A7500AD2E61 /* StretchyMenuInteraction.swift in Sources */,
D6E24358278B96E40005E546 /* Feed+CoreDataProperties.swift in Sources */,
D68B30402792729A00E8B3FA /* AppSplitViewController.swift in Sources */,
D65B18BE275051A1004A9448 /* LocalData.swift in Sources */,
D65B18B22750469D004A9448 /* LoginViewController.swift in Sources */,
D6EEDE9D285FA915009F854E /* Widgets.intentdefinition in Sources */,
D68408ED2794803D00E327D2 /* PrefsView.swift in Sources */,
D68408EF2794808E00E327D2 /* Preferences.swift in Sources */,
D68B303627907D9200E8B3FA /* ExcerptGenerator.swift in Sources */,
D6D5FA24285FE9DB00BBF188 /* WidgetHelper.swift in Sources */,
D6E24363278BA1410005E546 /* ItemCollectionViewCell.swift in Sources */,
D6E2436E278BD8160005E546 /* ReadViewController.swift in Sources */,
D65B18C127505348004A9448 /* HomeViewController.swift in Sources */,
@ -652,14 +681,20 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D6EEDE8C285FA915009F854E /* Sources */ = {
D6C6881F272CD2BA00874C10 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D6EEDE9C285FA915009F854E /* Widgets.intentdefinition in Sources */,
D6D5FA28285FEA8A00BBF188 /* WidgetData.swift in Sources */,
D6EEDEA7285FAE4D009F854E /* Recents.swift in Sources */,
D6EEDE97285FA915009F854E /* Widgets.swift in Sources */,
D65B18BC27504FE7004A9448 /* Token.swift in Sources */,
D6C68856272CD7C600874C10 /* Item.swift in Sources */,
D6C68830272CD2CF00874C10 /* Instance.swift in Sources */,
D6E24352278B6DF90005E546 /* ItemsSyncUpdate.swift in Sources */,
D6C68832272CD40600874C10 /* Feed.swift in Sources */,
D6C68858272CD8CD00874C10 /* Group.swift in Sources */,
D6C68834272CD44900874C10 /* Fervor.swift in Sources */,
D65B18BA27504A21004A9448 /* URLRequest+Body.swift in Sources */,
D65B18B82750495D004A9448 /* FervorClient.swift in Sources */,
D65B18B4275048D9004A9448 /* ClientRegistration.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -682,10 +717,10 @@
target = D6C687E7272CD27600874C10 /* Reader */;
targetProxy = D6C6880C272CD27700874C10 /* PBXContainerItemProxy */;
};
D6EEDE9F285FA915009F854E /* PBXTargetDependency */ = {
D6C68828272CD2BA00874C10 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D6EEDE8F285FA915009F854E /* WidgetsExtension */;
targetProxy = D6EEDE9E285FA915009F854E /* PBXContainerItemProxy */;
target = D6C68822272CD2BA00874C10 /* Fervor */;
targetProxy = D6C68827272CD2BA00874C10 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@ -1042,63 +1077,68 @@
};
name = Release;
};
D6EEDEA3285FA915009F854E /* Debug */ = {
D6C6882C272CD2BA00874C10 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = V4WK9KR9U2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ZPBBSK8L8B;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Widgets/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Widgets;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.Reader.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.Fervor;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
D6EEDEA4285FA915009F854E /* Release */ = {
D6C6882D272CD2BA00874C10 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = V4WK9KR9U2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ZPBBSK8L8B;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Widgets/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Widgets;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.Reader.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.Fervor;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
@ -1150,11 +1190,11 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D6EEDEA2285FA915009F854E /* Build configuration list for PBXNativeTarget "WidgetsExtension" */ = {
D6C6882B272CD2BA00874C10 /* Build configuration list for PBXNativeTarget "Fervor" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D6EEDEA3285FA915009F854E /* Debug */,
D6EEDEA4285FA915009F854E /* Release */,
D6C6882C272CD2BA00874C10 /* Debug */,
D6C6882D272CD2BA00874C10 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@ -1178,19 +1218,20 @@
package = D6E2436F278BE1250005E546 /* XCRemoteSwiftPackageReference "swift-html-entities" */;
productName = HTMLEntities;
};
D6EEDE86285FA75D009F854E /* Fervor */ = {
isa = XCSwiftPackageProductDependency;
productName = Fervor;
};
D6EEDE88285FA75F009F854E /* Persistence */ = {
isa = XCSwiftPackageProductDependency;
productName = Persistence;
};
D6EEDEA8285FAE60009F854E /* Persistence */ = {
isa = XCSwiftPackageProductDependency;
productName = Persistence;
};
/* End XCSwiftPackageProductDependency section */
/* Begin XCVersionGroup section */
D6C687F4272CD27600874C10 /* Reader.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
D6C687F5272CD27600874C10 /* Reader.xcdatamodel */,
);
currentVersion = D6C687F5272CD27600874C10 /* Reader.xcdatamodel */;
path = Reader.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
/* End XCVersionGroup section */
};
rootObject = D6C687E0272CD27600874C10 /* Project object */;
}

3
Reader/AppDelegate.swift
View File

@ -9,7 +9,6 @@ import UIKit
import WebKit
import OSLog
import Combine
import Persistence
@main
class AppDelegate: UIResponder, UIApplicationDelegate {
@ -21,8 +20,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
#endif
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
LocalData.migrateIfNecessary()
swizzleWKWebView()
Preferences.shared.objectWillChange

2
Persistence/Sources/Persistence/Feed+CoreDataClass.swift → Reader/CoreData/Feed+CoreDataClass.swift
View File

@ -13,7 +13,7 @@ import Fervor
@objc(Feed)
public class Feed: NSManagedObject {
public func updateFromServer(_ serverFeed: Fervor.Feed) {
func updateFromServer(_ serverFeed: Fervor.Feed) {
guard self.id == nil || self.id == serverFeed.id else { return }
self.id = serverFeed.id
self.title = serverFeed.title

0
Persistence/Sources/Persistence/Feed+CoreDataProperties.swift → Reader/CoreData/Feed+CoreDataProperties.swift
View File

3
Persistence/Sources/Persistence/Group+CoreDataClass.swift → Reader/CoreData/Group+CoreDataClass.swift
View File

@ -13,11 +13,12 @@ import Fervor
@objc(Group)
public class Group: NSManagedObject {
public func updateFromServer(_ serverGroup: Fervor.Group) {
func updateFromServer(_ serverGroup: Fervor.Group) {
guard self.id == nil || self.id == serverGroup.id else { return }
self.id = serverGroup.id
self.title = serverGroup.title
// feeds relationships will be updated after feeds are created in PersistentContainer.sync
}
}

0
Persistence/Sources/Persistence/Group+CoreDataProperties.swift → Reader/CoreData/Group+CoreDataProperties.swift
View File

3
Persistence/Sources/Persistence/Item+CoreDataClass.swift → Reader/CoreData/Item+CoreDataClass.swift
View File

@ -13,7 +13,7 @@ import Fervor
@objc(Item)
public class Item: NSManagedObject {
public func updateFromServer(_ serverItem: Fervor.Item) {
func updateFromServer(_ serverItem: Fervor.Item) {
guard self.id == nil || self.id == serverItem.id else { return }
self.id = serverItem.id
self.author = serverItem.author
@ -29,4 +29,5 @@ public class Item: NSManagedObject {
}
}
}

0
Persistence/Sources/Persistence/Item+CoreDataProperties.swift → Reader/CoreData/Item+CoreDataProperties.swift
View File

51
Persistence/Sources/Persistence/PersistentContainer.swift → Reader/CoreData/PersistentContainer.swift
View File

@ -10,10 +10,10 @@ import Fervor
import OSLog
// todo: is this actually sendable?
public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
private static let managedObjectModel: NSManagedObjectModel = {
let url = Bundle.module.url(forResource: "Reader", withExtension: "momd")!
let url = Bundle.main.url(forResource: "Reader", withExtension: "momd")!
return NSManagedObjectModel(contentsOf: url)!
}()
@ -24,38 +24,15 @@ public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
return context
}()
weak var fervorController: FervorController?
private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "PersistentContainer")
public init(account: LocalData.Account) {
super.init(name: account.persistenceKey, managedObjectModel: PersistentContainer.managedObjectModel)
init(account: LocalData.Account) {
// slashes the base64 string turn into subdirectories which we don't want
let name = account.id.base64EncodedString().replacingOccurrences(of: "/", with: "_")
super.init(name: name, managedObjectModel: PersistentContainer.managedObjectModel)
let groupContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.net.shadowfacts.Reader")!
let containerAppSupportURL = groupContainerURL
.appendingPathComponent("Library", isDirectory: true)
.appendingPathComponent("Application Support", isDirectory: true)
try! FileManager.default.createDirectory(at: containerAppSupportURL, withIntermediateDirectories: true)
let containerStoreURL = containerAppSupportURL
.appendingPathComponent(name)
.appendingPathExtension("sqlite")
if let existingAppSupport = try? FileManager.default.url(for: .applicationSupportDirectory, in: .userDomainMask, appropriateFor: nil, create: false) {
let existingStore = existingAppSupport
.appendingPathComponent(name)
.appendingPathExtension("sqlite")
.relativePath
.removingPercentEncoding!
if FileManager.default.fileExists(atPath: existingStore) {
for ext in ["", "-shm", "-wal"] {
try! FileManager.default.moveItem(atPath: existingStore + ext, toPath: containerStoreURL.relativePath + ext)
}
}
}
let desc = NSPersistentStoreDescription(url: containerStoreURL)
desc.type = NSSQLiteStoreType
persistentStoreDescriptions = [desc]
loadPersistentStores { description, error in
if let error = error {
fatalError("Unable to load persistent store: \(error)")
@ -64,20 +41,20 @@ public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
}
@MainActor
public func saveViewContext() throws {
func saveViewContext() throws {
if viewContext.hasChanges {
try viewContext.save()
}
}
public func lastSyncDate() async throws -> Date? {
func lastSyncDate() async throws -> Date? {
return try await backgroundContext.perform {
let state = try self.backgroundContext.fetch(SyncState.fetchRequest()).first
return state?.lastSync
}
}
public func updateLastSyncDate(_ date: Date) async throws {
func updateLastSyncDate(_ date: Date) async throws {
try await backgroundContext.perform {
if let state = try self.backgroundContext.fetch(SyncState.fetchRequest()).first {
state.lastSync = date
@ -91,7 +68,7 @@ public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
try await self.saveViewContext()
}
public func sync(serverGroups: [Fervor.Group], serverFeeds: [Fervor.Feed]) async throws {
func sync(serverGroups: [Fervor.Group], serverFeeds: [Fervor.Feed]) async throws {
try await backgroundContext.perform {
let existingGroups = try self.backgroundContext.fetch(Group.fetchRequest())
for group in serverGroups {
@ -126,7 +103,7 @@ public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
try await self.saveViewContext()
}
public func syncItems(_ syncUpdate: ItemsSyncUpdate, setProgress: @escaping (_ current: Int, _ total: Int) -> Void) async throws {
func syncItems(_ syncUpdate: ItemsSyncUpdate, setSyncState: @escaping (FervorController.SyncState) -> Void) async throws {
try await backgroundContext.perform {
self.logger.debug("syncItems: deleting \(syncUpdate.delete.count, privacy: .public) items")
let deleteReq = Item.fetchRequest()
@ -147,7 +124,7 @@ public class PersistentContainer: NSPersistentContainer, @unchecked Sendable {
self.logger.debug("syncItems: updating \(existing.count, privacy: .public) items, inserting \(syncUpdate.upsert.count - existing.count, privacy: .public)")
// todo: this feels like it'll be slow when there are many items
for (index, item) in syncUpdate.upsert.enumerated() {
setProgress(index, syncUpdate.upsert.count)
setSyncState(.updateItems(current: index, total: syncUpdate.upsert.count))
if let existing = existing.first(where: { $0.id == item.id }) {
existing.updateFromServer(item)
} else {

0
Persistence/Sources/Persistence/Reader.xcdatamodeld/.xccurrentversion → Reader/CoreData/Reader.xcdatamodeld/.xccurrentversion
View File

3
Persistence/Sources/Persistence/Reader.xcdatamodeld/Reader.xcdatamodel/contents → Reader/CoreData/Reader.xcdatamodeld/Reader.xcdatamodel/contents
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21223.11" systemVersion="22A5266r" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="21C52" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="Feed" representedClassName="Feed" syncable="YES">
<attribute name="id" attributeType="String"/>
<attribute name="lastUpdated" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
@ -29,7 +29,6 @@
<entity name="SyncState" representedClassName="SyncState" syncable="YES" codeGenerationType="class">
<attribute name="lastSync" attributeType="Date" usesScalarValueType="NO"/>
</entity>
<fetchRequest name="FetchRequest" entity="Item" predicateString="TRUEPREDICATE"/>
<elements>
<element name="Feed" positionX="-54" positionY="9" width="128" height="119"/>
<element name="Group" positionX="-63" positionY="-18" width="128" height="74"/>

1
Reader/ExcerptGenerator.swift
View File

@ -8,7 +8,6 @@
import Foundation
import OSLog
import CoreData
import Persistence
// public so that it can be imported in ReaderTests even when Reader is compiled in release mode (w/ testing disabled)
public struct ExcerptGenerator {

13
Reader/FervorController.swift
View File

@ -9,7 +9,6 @@ import Foundation
import Fervor
import OSLog
import Combine
import Persistence
actor FervorController {
@ -43,6 +42,8 @@ actor FervorController {
} else {
self.persistentContainer = nil
}
persistentContainer?.fervorController = self
}
convenience init(account: LocalData.Account) async {
@ -84,13 +85,11 @@ actor FervorController {
let lastSync = try await persistentContainer.lastSyncDate()
logger.info("Syncing items with last sync date: \(String(describing: lastSync), privacy: .public)")
let update = try await client.syncItems(lastSync: lastSync)
try await persistentContainer.syncItems(update, setProgress: { count, total in self.setSyncState(.updateItems(current: count, total: total)) })
try await persistentContainer.syncItems(update, setSyncState: setSyncState(_:))
try await persistentContainer.updateLastSyncDate(update.syncTimestamp)
setSyncState(.excerpts)
await ExcerptGenerator.generateAll(self)
await WidgetHelper.updateWidgetData(fervorController: self)
}
@MainActor
@ -138,7 +137,7 @@ actor FervorController {
}
@MainActor
func markItem(_ item: Persistence.Item, read: Bool) async {
func markItem(_ item: Item, read: Bool) async {
item.read = read
do {
let f = read ? client.read(item:) : client.unread(item:)
@ -157,11 +156,11 @@ actor FervorController {
}
@MainActor
func fetchItem(id: String) async throws -> Persistence.Item? {
func fetchItem(id: String) async throws -> Item? {
guard let serverItem = try await client.item(id: id) else {
return nil
}
let item = Persistence.Item(context: persistentContainer.viewContext)
let item = Item(context: persistentContainer.viewContext)
item.updateFromServer(serverItem)
try persistentContainer.saveViewContext()
return item

13
Reader/Info.plist
View File

@ -4,15 +4,14 @@
<dict>
<key>NSUserActivityTypes</key>
<array>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.activate-account</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.add-account</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.preferences</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.read-unread</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.read-all</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.read-feed</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.read-group</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.read-item</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.read-unread</string>
<string>ConfigurationIntent</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.preferences</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.add-account</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER).activity.activate-account</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
@ -29,10 +28,10 @@
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
</dict>
<dict>
<key>UISceneConfigurationName</key>
<string>prefs</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).PrefsSceneDelegate</string>
<key>UISceneConfigurationName</key>
<string>prefs</string>
</dict>
</array>
</dict>

5
Reader/ItemListType.swift
View File

@ -7,7 +7,6 @@
import Foundation
import CoreData
import Persistence
enum ItemListType: Hashable {
case unread
@ -44,8 +43,8 @@ enum ItemListType: Hashable {
return req
}
var countFetchRequest: NSFetchRequest<Item>? {
let req = Item.fetchRequest()
var countFetchRequest: NSFetchRequest<Reader.Item>? {
let req = Reader.Item.fetchRequest()
switch self {
case .unread:
req.predicate = NSPredicate(format: "read = NO")

23
Reader/LocalData+Migration.swift
View File

@ -1,23 +0,0 @@
//
// LocalData+Migration.swift
// Reader
//
// Created by Shadowfacts on 6/19/22.
//
import Foundation
import Persistence
extension LocalData {
static func migrateIfNecessary() {
if let accounts = UserDefaults.standard.object(forKey: "accounts") {
UserDefaults.standard.removeObject(forKey: "accounts")
defaults.set(accounts, forKey: "accounts")
}
if let mostRecentAccountID = UserDefaults.standard.object(forKey: "mostRecentAccountID") {
UserDefaults.standard.removeObject(forKey: "mostRecentAccountID")
defaults.set(mostRecentAccountID, forKey: "mostRecentAccountID")
}
}
}

40
Persistence/Sources/Persistence/LocalData.swift → Reader/LocalData.swift
View File

@ -9,18 +9,16 @@ import Foundation
import Fervor
import CryptoKit
public struct LocalData {
struct LocalData {
private init() {}
private static let encoder = JSONEncoder()
private static let decoder = JSONDecoder()
public static var defaults = UserDefaults(suiteName: "group.net.shadowfacts.Reader")!
public static var accounts: [Account] {
static var accounts: [Account] {
get {
guard let data = defaults.data(forKey: "accounts"),
guard let data = UserDefaults.standard.data(forKey: "accounts"),
let accounts = try? decoder.decode([Account].self, from: data) else {
return []
}
@ -28,44 +26,38 @@ public struct LocalData {
}
set {
let data = try! encoder.encode(newValue)
defaults.set(data, forKey: "accounts")
UserDefaults.standard.set(data, forKey: "accounts")
}
}
public static var mostRecentAccountID: Data? {
static var mostRecentAccountID: Data? {
get {
return defaults.data(forKey: "mostRecentAccountID")
return UserDefaults.standard.data(forKey: "mostRecentAccountID")
}
set {
defaults.set(newValue, forKey: "mostRecentAccountID")
UserDefaults.standard.set(newValue, forKey: "mostRecentAccountID")
}
}
public static func mostRecentAccount() -> Account? {
static func mostRecentAccount() -> Account? {
guard let id = mostRecentAccountID else {
return nil
}
return account(with: id)
}
public static func account(with id: Data) -> Account? {
static func account(with id: Data) -> Account? {
return accounts.first(where: { $0.id == id })
}
public struct Account: Codable {
public let id: Data
public let instanceURL: URL
public let clientID: String
public let clientSecret: String
public let token: Token
struct Account: Codable {
let id: Data
let instanceURL: URL
let clientID: String
let clientSecret: String
let token: Token
/// A filename-safe string for this account
public var persistenceKey: String {
// slashes the base64 string turn into subdirectories which we don't want
id.base64EncodedString().replacingOccurrences(of: "/", with: "_")
}
public init(instanceURL: URL, clientID: String, clientSecret: String, token: Token) {
init(instanceURL: URL, clientID: String, clientSecret: String, token: Token) {
// we use a hash of instance host and account id rather than random ids so that
// user activites can uniquely identify accounts across devices
var hasher = SHA256()

4
Reader/Reader.entitlements
View File

@ -4,10 +4,6 @@
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.net.shadowfacts.Reader</string>
</array>
<key>com.apple.security.network.client</key>
<true/>
</dict>

36
Reader/SceneDelegate.swift
View File

@ -8,7 +8,6 @@
import Foundation
import UIKit
import OSLog
import Persistence
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
@ -95,9 +94,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
Task(priority: .userInitiated) {
await fervorController.syncReadToServer()
}
Task(priority: .userInitiated) {
await WidgetHelper.updateWidgetData(fervorController: fervorController)
}
}
}
@ -122,36 +118,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
}
}
func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
let url = URLContexts.first!.url
guard url.scheme == "reader",
url.host == "item",
let itemID = url.pathComponents.last else {
logger.error("Launched with unknown URL: \(url.absoluteString, privacy: .public)")
return
}
guard let split = window?.rootViewController as? AppSplitViewController else {
logger.error("Could not handle URL: missing split VC")
return
}
let req = Item.fetchRequest()
req.predicate = NSPredicate(format: "id = %@", itemID)
if let items = try? fervorController.persistentContainer.viewContext.fetch(req),
let item = items.first {
split.showItem(item)
Task {
await fervorController.markItem(item, read: true)
}
} else {
Task {
if let item = try? await fervorController.fetchItem(id: itemID) {
split.showItem(item)
await fervorController.markItem(item, read: true)
}
}
}
}
private func setupUI(from activity: NSUserActivity) async {
guard let split = window?.rootViewController as? AppSplitViewController else {
logger.error("Failed to setup UI for user activity: missing split VC")
@ -219,7 +185,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
// todo: why the fuck doesn't this work
// it always picks the most recently focused window
scene.activationConditions.prefersToActivateForTargetContentIdentifierPredicate = NSPredicate(format: "self == '\(account.id.base64EncodedString())'")
scene.activationConditions.canActivateForTargetContentIdentifierPredicate = NSPredicate(value: true)
scene.activationConditions.canActivateForTargetContentIdentifierPredicate = NSPredicate(value: false)
}
private func syncFromServer() {

2
Reader/Screens/AppSplitViewController.swift
View File

@ -9,7 +9,6 @@ import UIKit
#if targetEnvironment(macCatalyst)
import AppKit
#endif
import Persistence
class AppSplitViewController: UISplitViewController {
@ -87,7 +86,6 @@ class AppSplitViewController: UISplitViewController {
home.selectItem(type)
}
@discardableResult
func showItem(_ item: Item) -> ReadViewController {
if traitCollection.horizontalSizeClass == .compact {
let nav = viewController(for: .compact) as! UINavigationController

1
Reader/Screens/Home/HomeCollectionViewCell.swift
View File

@ -6,7 +6,6 @@
//
import UIKit
import Fervor
class HomeCollectionViewCell: UICollectionViewListCell {

1
Reader/Screens/Home/HomeViewController.swift
View File

@ -8,7 +8,6 @@
import UIKit
import CoreData
import Combine
import Persistence
protocol HomeViewControllerDelegate: AnyObject {
func switchToAccount(_ account: LocalData.Account)

1
Reader/Screens/Items/ItemCollectionViewCell.swift
View File

@ -6,7 +6,6 @@
//
import UIKit
import Persistence
protocol ItemCollectionViewCellDelegate: AnyObject {
var fervorController: FervorController { get }

1
Reader/Screens/Items/ItemsViewController.swift
View File

@ -8,7 +8,6 @@
import UIKit
import CoreData
import SafariServices
import Persistence
protocol ItemsViewControllerDelegate: AnyObject {
func showReadItem(_ item: Item)

6
Reader/Screens/Read/ReadViewController.swift
View File

@ -10,7 +10,6 @@ import WebKit
import HTMLEntities
import SafariServices
import Combine
import Persistence
class ReadViewController: UIViewController {
@ -61,8 +60,7 @@ class ReadViewController: UIViewController {
navigationItem.largeTitleDisplayMode = .never
view.backgroundColor = .appBackground
let menuInteraction = StretchyMenuInteraction(delegate: self)
view.addInteraction(menuInteraction)
view.addInteraction(StretchyMenuInteraction(delegate: self))
webView = WKWebView()
webView.translatesAutoresizingMaskIntoConstraints = false
@ -78,8 +76,6 @@ class ReadViewController: UIViewController {
if let content = itemContentHTML() {
webView.loadHTMLString(content, baseURL: item.url)
}
webView.scrollView.alwaysBounceHorizontal = false
webView.scrollView.panGestureRecognizer.require(toFail: menuInteraction.panRecognizer!)
view.addSubview(webView)
NSLayoutConstraint.activate([

3
Reader/StretchyMenuInteraction.swift
View File

@ -23,7 +23,6 @@ class StretchyMenuInteraction: NSObject, UIInteraction {
weak var delegate: StretchyMenuInteractionDelegate?
private(set) weak var view: UIView? = nil
private(set) var panRecognizer: UIPanGestureRecognizer?
private let menuHintView = MenuHintView()
fileprivate let feedbackGenerator = UIImpactFeedbackGenerator(style: .medium)
@ -57,7 +56,7 @@ class StretchyMenuInteraction: NSObject, UIInteraction {
panRecognizer.delegate = self
panRecognizer.allowedScrollTypesMask = [.continuous]
view.addGestureRecognizer(panRecognizer)
self.panRecognizer = panRecognizer
}
private var prevTranslation: CGFloat = 0

1
Reader/UserActivities.swift
View File

@ -6,7 +6,6 @@
//
import Foundation
import Persistence
extension NSUserActivity {

53
Reader/Widgets/WidgetData.swift
View File

@ -1,53 +0,0 @@
//
// WidgetData.swift
// Reader
//
// Created by Shadowfacts on 6/19/22.
//
import Foundation
import Persistence
struct WidgetData: Codable {
let recentItems: [Item]
private static func url(for account: LocalData.Account) -> URL {
let groupContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.net.shadowfacts.Reader")!
let appSupport = groupContainerURL
.appendingPathComponent("Library", isDirectory: true)
.appendingPathComponent("Application Support", isDirectory: true)
let widgetData = appSupport.appendingPathComponent("Widget Data", isDirectory: true)
return widgetData
.appendingPathComponent(account.persistenceKey)
.appendingPathExtension("plist")
}
static func load(account: LocalData.Account) -> WidgetData {
let url = url(for: account)
let decoder = PropertyListDecoder()
guard let data = try? Data(contentsOf: url),
let decoded = try? decoder.decode(WidgetData.self, from: data) else {
return WidgetData(recentItems: [])
}
return decoded
}
func save(account: LocalData.Account) {
let encoder = PropertyListEncoder()
let data = try! encoder.encode(self)
let url = WidgetData.url(for: account)
try! FileManager.default.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)
try! data.write(to: url, options: .noFileProtection)
}
struct Item: Codable, Identifiable {
let id: String
let feedTitle: String?
let title: String?
let published: Date?
var launchURL: URL {
return URL(string: "reader://item/\(id)")!
}
}
}

54
Reader/Widgets/WidgetHelper.swift
View File

@ -1,54 +0,0 @@
//
// WidgetHelper.swift
// Reader
//
// Created by Shadowfacts on 6/19/22.
//
import Foundation
import WidgetKit
import Persistence
struct WidgetHelper {
private init() {}
private static let maxDisplayableItems = 8
static func updateWidgetData(fervorController: FervorController) async {
// Accessing CoreData from the widget extension puts us over the memory limit, so we pre-generate all the data it needs and save it to disk
let prioritizedItems: [WidgetData.Item] = await fervorController.persistentContainer.performBackgroundTask { ctx in
let req = Item.fetchRequest()
req.sortDescriptors = [NSSortDescriptor(key: "published", ascending: false)]
req.fetchLimit = 32
req.predicate = NSPredicate(format: "read = NO")
var items = (try? ctx.fetch(req)) ?? []
var prioritizedItems: [Item] = []
while prioritizedItems.count < maxDisplayableItems {
let firstFromUnseenFeedIdx = items.firstIndex { item in
prioritizedItems.allSatisfy { existing in
existing.feed != item.feed
}
}
if let firstFromUnseenFeedIdx {
prioritizedItems.append(items.remove(at: firstFromUnseenFeedIdx))
} else if let item = items.first {
prioritizedItems.append(item)
items.removeFirst()
} else {
break
}
}
return prioritizedItems.map {
WidgetData.Item(id: $0.id!, feedTitle: $0.feed?.title, title: $0.title, published: $0.published)
}
}
WidgetData(recentItems: prioritizedItems).save(account: fervorController.account!)
WidgetCenter.shared.reloadAllTimelines()
}
}

11
Widgets/Assets.xcassets/AccentColor.colorset/Contents.json
View File

@ -1,11 +0,0 @@
{
"colors" : [
{
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

13
Widgets/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@ -1,13 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

6
Widgets/Assets.xcassets/Contents.json
View File

@ -1,6 +0,0 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

11
Widgets/Assets.xcassets/WidgetBackground.colorset/Contents.json
View File

@ -1,11 +0,0 @@
{
"colors" : [
{
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

11
Widgets/Info.plist
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.widgetkit-extension</string>
</dict>
</dict>
</plist>

196
Widgets/Recents.swift
View File

@ -1,196 +0,0 @@
//
// Recents.swift
// Reader
//
// Created by Shadowfacts on 6/19/22.
//
import WidgetKit
import SwiftUI
import Persistence
struct RecentsProvider: IntentTimelineProvider {
func placeholder(in context: Context) -> RecentsEntry {
RecentsEntry(items: [], configuration: ConfigurationIntent())
}
func getSnapshot(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (RecentsEntry) -> ()) {
let entry = RecentsEntry(items: getItems(), configuration: configuration)
completion(entry)
}
func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline<RecentsEntry>) -> ()) {
// TODO: get account from configuration intent
let entry = RecentsEntry(items: getItems(), configuration: configuration)
let refreshDate = Calendar.current.date(byAdding: .hour, value: 1, to: Date())!
let timeline = Timeline(entries: [entry], policy: .after(refreshDate))
completion(timeline)
}
private func getItems() -> [WidgetData.Item] {
guard let account = LocalData.mostRecentAccount() else {
return []
}
return WidgetData.load(account: account).recentItems
}
}
struct RecentsEntry: TimelineEntry {
let date = Date()
let items: [WidgetData.Item]
let configuration: ConfigurationIntent
}
struct RecentsEntryView: View {
let entry: RecentsEntry
@Environment(\.widgetFamily) var family
var body: some View {
if entry.items.isEmpty {
} else {
switch family {
case .systemSmall:
SquareItemView(item: entry.items[0])
.padding()
case .systemMedium, .systemLarge:
VStack {
ForEach(Array(entry.items.prefix(family.maxItemCount).enumerated()), id: \.element.id) { (index, item) in
if index != 0 {
Divider()
}
ItemListEntryView(item: item)
Spacer(minLength: 4)
}
}
.padding()
case .systemExtraLarge:
if #available(iOS 16.0, *) {
VStack {
ForEach(Array(stride(from: 0, to: min(entry.items.count, family.maxItemCount), by: 2)), id: \.self) { idx in
HStack {
ItemListEntryView(item: entry.items[idx])
if idx + 1 < entry.items.count {
Divider()
ItemListEntryView(item: entry.items[idx + 1])
}
}
if idx + 2 < entry.items.count {
Spacer()
Divider()
}
}
}
.padding()
} else {
Text("Requires iOS 16")
}
default:
fatalError("unreachable")
}
}
}
}
private extension WidgetFamily {
var maxItemCount: Int {
switch self {
case .systemSmall:
return 1
case .systemMedium:
return 2
case .systemLarge:
return 4
case .systemExtraLarge:
return 8
default:
return 0
}
}
}
private var feedFont = Font.subheadline.weight(.medium).italic()
private var titleUIFont: UIFont {
// TODO: this should use the compressed SF Pro variant, but there's no API to get at it
let descriptor = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .headline).withSymbolicTraits(.traitCondensed)!
return UIFont(descriptor: descriptor, size: 0)
}
private var titleFont = Font(titleUIFont).leading(.tight)
struct SquareItemView: View {
let item: WidgetData.Item
var body: some View {
VStack(alignment: .leading) {
HStack {
Text(verbatim: item.feedTitle ?? "")
.font(feedFont)
.foregroundColor(.red)
// force the vstack to be as wide as possible
Spacer(minLength: 0)
}
Text(verbatim: item.title ?? "")
.font(titleFont)
if let published = item.published {
Text(published, format: .relative(presentation: .numeric, unitsStyle: .narrow))
.font(.caption)
}
Spacer(minLength: 0)
}
.widgetURL(item.launchURL)
}
}
struct ItemListEntryView: View {
let item: WidgetData.Item
var body: some View {
Link(destination: item.launchURL) {
VStack(alignment: .leading) {
HStack {
Text(verbatim: item.feedTitle ?? "")
.font(feedFont)
.foregroundColor(.red)
Spacer()
if let published = item.published {
Text(published, format: .relative(presentation: .numeric, unitsStyle: .narrow))
.font(.caption)
}
}
Text(verbatim: item.title ?? "")
.font(titleFont)
.lineLimit(3)
Spacer(minLength: 0)
}
}
}
}
struct Recents_Previews: PreviewProvider {
static let item1 = WidgetData.Item(
id: "1",
feedTitle: "Daring Fireball",
title: "There's a Privacy Angle on Apple's Decision to Finance Apple Pay Layer On Its Own",
published: Calendar.current.date(byAdding: .hour, value: -1, to: Date())!
)
static let item2 = WidgetData.Item(
id: "2",
feedTitle: "Ars Technica",
title: "Senate bill would ban data brokers from selling location and health data",
published: Calendar.current.date(byAdding: .hour, value: -2, to: Date())!
)
static var previews: some View {
// RecentsEntryView(entry: RecentsEntry(items: [item1], configuration: ConfigurationIntent()))
// .previewContext(WidgetPreviewContext(family: .systemSmall))
RecentsEntryView(entry: RecentsEntry(items: [item1, item2], configuration: ConfigurationIntent()))
.previewContext(WidgetPreviewContext(family: .systemMedium))
}
}

61
Widgets/Widgets.intentdefinition
View File

@ -1,61 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>INEnums</key>
<array/>
<key>INIntentDefinitionModelVersion</key>
<string>1.2</string>
<key>INIntentDefinitionNamespace</key>
<string>88xZPY</string>
<key>INIntentDefinitionSystemVersion</key>
<string>22A5266r</string>
<key>INIntentDefinitionToolsBuildVersion</key>
<string>14A5228q</string>
<key>INIntentDefinitionToolsVersion</key>
<string>14.0</string>
<key>INIntents</key>
<array>
<dict>
<key>INIntentCategory</key>
<string>information</string>
<key>INIntentDescriptionID</key>
<string>tVvJ9c</string>
<key>INIntentEligibleForWidgets</key>
<true/>
<key>INIntentIneligibleForSuggestions</key>
<true/>
<key>INIntentLastParameterTag</key>
<integer>2</integer>
<key>INIntentName</key>
<string>Configuration</string>
<key>INIntentResponse</key>
<dict>
<key>INIntentResponseCodes</key>
<array>
<dict>
<key>INIntentResponseCodeName</key>
<string>success</string>
<key>INIntentResponseCodeSuccess</key>
<true/>
</dict>
<dict>
<key>INIntentResponseCodeName</key>
<string>failure</string>
</dict>
</array>
</dict>
<key>INIntentTitle</key>
<string>Configuration</string>
<key>INIntentTitleID</key>
<string>gpCwrM</string>
<key>INIntentType</key>
<string>Custom</string>
<key>INIntentVerb</key>
<string>View</string>
</dict>
</array>
<key>INTypes</key>
<array/>
</dict>
</plist>

23
Widgets/Widgets.swift
View File

@ -1,23 +0,0 @@
//
// Widgets.swift
// Widgets
//
// Created by Shadowfacts on 6/19/22.
//
import WidgetKit
import SwiftUI
import Intents
@main
struct Widgets: Widget {
var body: some WidgetConfiguration {
IntentConfiguration(kind: "recents", intent: ConfigurationIntent.self, provider: RecentsProvider()) { entry in
RecentsEntryView(entry: entry)
}
.configurationDisplayName("Recent Articles")
.description("Recently posted articles from your feeds.")
.supportedFamilies([.systemSmall, .systemMedium, .systemLarge, .systemExtraLarge])
}
}

14
WidgetsExtension.entitlements
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.net.shadowfacts.Reader</string>
</array>
</dict>
</plist>