From 150b338f92849bec33a58af591c47dc47f646dea Mon Sep 17 00:00:00 2001 From: Carson Katri Date: Tue, 13 Aug 2019 13:59:25 -0400 Subject: [PATCH 1/7] Add OAuth config --- Shared/API.plist | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Shared/API.plist diff --git a/Shared/API.plist b/Shared/API.plist new file mode 100644 index 0000000..6bfe230 --- /dev/null +++ b/Shared/API.plist @@ -0,0 +1,12 @@ + + + + + scope + + redirectURI + + clientId + + + From 08a8549ffb212f4a25b3f83a2d3c47ce6214d9b5 Mon Sep 17 00:00:00 2001 From: Carson Katri Date: Tue, 13 Aug 2019 14:17:01 -0400 Subject: [PATCH 2/7] Add default scopes and redirectUri --- Shared/API.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shared/API.plist b/Shared/API.plist index 6bfe230..13d7845 100644 --- a/Shared/API.plist +++ b/Shared/API.plist @@ -3,8 +3,8 @@ scope - - redirectURI + identity,vote + redirectUri clientId From 51dd098c946439c4cdc8dbf702b250e05a8fbfa6 Mon Sep 17 00:00:00 2001 From: Carson Katri Date: Tue, 13 Aug 2019 14:27:33 -0400 Subject: [PATCH 3/7] Git Ignore API info --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b16dae7..727ee42 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,6 @@ fastlane/test_output # https://github.com/johnno1962/injectionforxcode iOSInjectionProject/ + +# Private Info +Shared/API.plist From b525b50fa0abc88f6ba56e49e1dd45130f63c0e1 Mon Sep 17 00:00:00 2001 From: Carson Katri Date: Wed, 14 Aug 2019 19:11:58 -0400 Subject: [PATCH 4/7] Initial OAuth support --- README.md | 3 + Reddit-iOS/AppDelegate.swift | 6 + Reddit-iOS/ContentView.swift | 86 +++++----- Reddit-iOS/Info.plist | 23 ++- Reddit-iOS/Representable/SafariView.swift | 20 +++ Reddit-iOS/SceneDelegate.swift | 10 +- Reddit-iOS/Views/AddCommentView.swift | 41 +++++ Reddit-iOS/Views/PostList.swift | 2 +- Reddit-macOS/AppDelegate.swift | 27 +++- Reddit-macOS/Base.lproj/Main.storyboard | 23 ++- Reddit-macOS/Info.plist | 13 ++ Reddit-macOS/Reddit_macOS.entitlements | 2 +- Reddit-macOS/Representable/WebView.swift | 1 + Reddit-macOS/Views/AddCommentView.swift | 39 +++++ .../Helpers/DetailWindowController.swift | 10 +- Reddit-macOS/Views/PostList.swift | 2 +- Reddit.xcodeproj/project.pbxproj | 90 ++++++++++- .../xcshareddata/swiftpm/Package.resolved | 6 +- Shared/API.swift | 152 +++++++++++++++++- Shared/Helpers/KeyboardObserver.swift | 31 ++++ Shared/Models/Comment.swift | 3 + Shared/Models/OAuth/Me.swift | 15 ++ Shared/Views/CommentsView.swift | 4 +- Shared/Views/OAuth/KarmaView.swift | 36 +++++ Shared/Views/OAuth/ProfileView.swift | 62 +++++++ .../Views/OAuth/UserInfo/UserComments.swift | 32 ++++ Shared/Views/OAuth/UserInfo/UserPosts.swift | 34 ++++ Shared/Views/PostDetailView.swift | 67 +++++--- 28 files changed, 752 insertions(+), 88 deletions(-) create mode 100644 Reddit-iOS/Representable/SafariView.swift create mode 100644 Reddit-iOS/Views/AddCommentView.swift create mode 100644 Reddit-macOS/Views/AddCommentView.swift create mode 100644 Shared/Helpers/KeyboardObserver.swift create mode 100644 Shared/Models/OAuth/Me.swift create mode 100644 Shared/Views/OAuth/KarmaView.swift create mode 100644 Shared/Views/OAuth/ProfileView.swift create mode 100644 Shared/Views/OAuth/UserInfo/UserComments.swift create mode 100644 Shared/Views/OAuth/UserInfo/UserPosts.swift diff --git a/README.md b/README.md index 9525043..ffdeb65 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ To show off SwiftUI's strength in cross-platform development, I did **not** use Mac Catalyst for this project. Instead, common UI code is shared between iOS, macOS, and watchOS. +## Setup +To use this app, you need to create an app for the Reddit api. You can do that [here](https://www.reddit.com/prefs/apps). Choose "Installed app", and set the redirect URI to `redditswiftui://oauth_callback` + ## Project Structure * `Shared` - Models, helpers, API, and any shared Views. * `Reddit-[PLATFORM]` - Each target folder contains a `Views` and `Representable` folder. `Views` holds platform-specific views, and `Representable` contains `UIViewRepresentables` or `NSViewRepresentables`. diff --git a/Reddit-iOS/AppDelegate.swift b/Reddit-iOS/AppDelegate.swift index 2e29d5a..43aa2ca 100644 --- a/Reddit-iOS/AppDelegate.swift +++ b/Reddit-iOS/AppDelegate.swift @@ -21,6 +21,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func applicationWillTerminate(_ application: UIApplication) { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } + + // MARK: URL Scheme + func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool { + print(url) + return true + } // MARK: UISceneSession Lifecycle diff --git a/Reddit-iOS/ContentView.swift b/Reddit-iOS/ContentView.swift index 7e8d409..9a32d2b 100644 --- a/Reddit-iOS/ContentView.swift +++ b/Reddit-iOS/ContentView.swift @@ -8,6 +8,7 @@ import SwiftUI import Request +import Json struct ContentView : View { @State private var subreddit: String = "swift" @@ -17,49 +18,60 @@ struct ContentView : View { @State private var showSubredditSheet: Bool = false var body: some View { - NavigationView { - /// Load the posts - PostList(subreddit: subreddit, sortBy: sortBy) - /// Force inline `NavigationBar` - .navigationBarTitle(Text(""), displayMode: .inline) - .navigationBarItems(leading: HStack { - Button(action: { - self.showSubredditSheet.toggle() - }) { - Text("r/\(self.subreddit)") - } - }, trailing: HStack { - Button(action: { - self.showSortSheet.toggle() - }) { - HStack { - Image(systemName: "arrow.up.arrow.down") - Text(self.sortBy.rawValue) + TabView { + NavigationView { + /// Load the posts + PostList(subreddit: subreddit, sortBy: sortBy) + /// Force inline `NavigationBar` + .navigationBarTitle(Text(""), displayMode: .inline) + .navigationBarItems(leading: HStack { + Button(action: { + self.showSubredditSheet.toggle() + }) { + Text("r/\(self.subreddit)") } - } - }) - /// Sorting method `ActionSheet` - .actionSheet(isPresented: $showSortSheet) { - ActionSheet(title: Text("Sort By:"), buttons: [SortBy.hot, SortBy.top, SortBy.new, SortBy.controversial, SortBy.rising].map { method in - ActionSheet.Button.default(Text(method.rawValue.prefix(1).uppercased() + method.rawValue.dropFirst())) { - self.sortBy = method + }, trailing: HStack { + Button(action: { + self.showSortSheet.toggle() + }) { + HStack { + Image(systemName: "arrow.up.arrow.down") + Text(self.sortBy.rawValue) + } } }) - } - /// Subreddit selection `Popover` - .popover(isPresented: $showSubredditSheet, attachmentAnchor: .point(UnitPoint(x: 20, y: 20))) { - HStack(spacing: 0) { - Text("r/") - TextField("Subreddit", text: self.$subreddit) { - self.showSubredditSheet.toggle() + /// Sorting method `ActionSheet` + .actionSheet(isPresented: $showSortSheet) { + ActionSheet(title: Text("Sort By:"), buttons: [SortBy.hot, SortBy.top, SortBy.new, SortBy.controversial, SortBy.rising].map { method in + ActionSheet.Button.default(Text(method.rawValue.prefix(1).uppercased() + method.rawValue.dropFirst())) { + self.sortBy = method + } + }) + } + /// Subreddit selection `Popover` + .popover(isPresented: $showSubredditSheet, attachmentAnchor: .point(UnitPoint(x: 20, y: 20))) { + HStack(spacing: 0) { + Text("r/") + TextField("Subreddit", text: self.$subreddit) { + self.showSubredditSheet.toggle() + } } + .frame(width: 200) + .padding() + .background(Color("popover")) + .cornerRadius(10) } - .frame(width: 200) - .padding() - .background(Color("popover")) - .cornerRadius(10) + Text("Select a post") + } + .tabItem { + Image(systemName: "list.bullet.below.rectangle") + Text("Feed") + } + ProfileView() + .tabItem { + Image(systemName: "person.crop.circle") + Text("Profile") } - Text("Select a post") } } } diff --git a/Reddit-iOS/Info.plist b/Reddit-iOS/Info.plist index ce77778..fcd2d6b 100644 --- a/Reddit-iOS/Info.plist +++ b/Reddit-iOS/Info.plist @@ -2,11 +2,6 @@ - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -21,10 +16,28 @@ $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString 1.0 + CFBundleURLTypes + + + CFBundleTypeRole + Viewer + CFBundleURLName + com.carsonkatri.RedditSwiftUI + CFBundleURLSchemes + + redditswiftui + + + CFBundleVersion 1 LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/Reddit-iOS/Representable/SafariView.swift b/Reddit-iOS/Representable/SafariView.swift new file mode 100644 index 0000000..7f2bf0c --- /dev/null +++ b/Reddit-iOS/Representable/SafariView.swift @@ -0,0 +1,20 @@ +// +// SafariView.swift +// Reddit +// +// Created by Carson Katri on 8/14/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI +import SafariServices + +struct SafariView: UIViewControllerRepresentable { + let url: URL + + func makeUIViewController(context: UIViewControllerRepresentableContext) -> SFSafariViewController { + SFSafariViewController(url: url) + } + + func updateUIViewController(_ uiViewController: SFSafariViewController, context: UIViewControllerRepresentableContext) {} +} diff --git a/Reddit-iOS/SceneDelegate.swift b/Reddit-iOS/SceneDelegate.swift index d42e7d3..120bee0 100644 --- a/Reddit-iOS/SceneDelegate.swift +++ b/Reddit-iOS/SceneDelegate.swift @@ -21,10 +21,18 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { // Use a UIHostingController as window root view controller let window = UIWindow(windowScene: scene as! UIWindowScene) - window.rootViewController = UIHostingController(rootView: ContentView()) + window.rootViewController = UIHostingController(rootView: ContentView().environmentObject(KeyboardObserver())) self.window = window window.makeKeyAndVisible() } + + func scene(_ scene: UIScene, openURLContexts URLContexts: Set) { + if let url = URLComponents(string: URLContexts.first!.url.absoluteString) { + let state = url.queryItems?.first(where: { $0.name == "state" })?.value ?? "" + let code = url.queryItems?.first(where: { $0.name == "code" })?.value ?? "" + API.default.saveToken(code, state: state) + } + } func sceneDidDisconnect(_ scene: UIScene) { // Called as the scene is being released by the system. diff --git a/Reddit-iOS/Views/AddCommentView.swift b/Reddit-iOS/Views/AddCommentView.swift new file mode 100644 index 0000000..2be3995 --- /dev/null +++ b/Reddit-iOS/Views/AddCommentView.swift @@ -0,0 +1,41 @@ +// +// AddCommentView.swift +// Reddit +// +// Created by Carson Katri on 8/14/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI + +struct AddCommentView: View { + @Binding var text: String + let send: ((String) -> ()) + + var body: some View { + HStack { + TextField("Add Comment", text: $text) + .cornerRadius(4) + Image(systemName: "arrow.up.circle.fill") + .resizable() + .frame(width: 30, height: 30) + .foregroundColor(.blue) + .onTapGesture { + self.send(self.text) + } + } + .padding(10) + .background(Color("popover")) + } +} + +#if DEBUG +struct AddCommentView_Previews: PreviewProvider { + static var previews: some View { + AddCommentView(text: .constant("")) { comment in + + } + .environment(\.colorScheme, .dark) + } +} +#endif diff --git a/Reddit-iOS/Views/PostList.swift b/Reddit-iOS/Views/PostList.swift index 628dc66..8d3b2dc 100644 --- a/Reddit-iOS/Views/PostList.swift +++ b/Reddit-iOS/Views/PostList.swift @@ -16,7 +16,7 @@ struct PostList: View { var body: some View { /// Load posts from web and decode as `Listing` RequestView(Listing.self, Request { - Url(API.subredditURL(subreddit, sortBy)) + Url(API.default.subredditURL(subreddit, sortBy)) Query(["raw_json":"1"]) }) { listing in /// List of `PostView`s when loaded diff --git a/Reddit-macOS/AppDelegate.swift b/Reddit-macOS/AppDelegate.swift index 85687d7..5c78564 100644 --- a/Reddit-macOS/AppDelegate.swift +++ b/Reddit-macOS/AppDelegate.swift @@ -17,7 +17,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSToolbarDelegate, NSTextFie var toolbar: NSToolbar! @ObservedObject var state = ContentViewState() - + func applicationDidFinishLaunching(_ aNotification: Notification) { // Insert code here to initialize your application window = NSWindow( @@ -36,8 +36,31 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSToolbarDelegate, NSTextFie self.window.toolbar = toolbar window.makeKeyAndOrderFront(nil) + + if API.default.loggedIn { + loginItem.title = "View Profile" + } } - + + func application(_ application: NSApplication, open urls: [URL]) { + if let url = URLComponents(string: urls.first!.absoluteString) { + let state = url.queryItems?.first(where: { $0.name == "state" })?.value ?? "" + let code = url.queryItems?.first(where: { $0.name == "code" })?.value ?? "" + API.default.saveToken(code, state: state) + } + } + + /// OAuth login menu item + @IBOutlet weak var loginItem: NSMenuItem! + @IBAction func login(_ sender: Any) { + let controller = DetailWindowController(rootView: ProfileView(), width: 600, height: 500) + controller.window?.title = "Account" + controller.showWindow(nil) + } + @IBAction func logout(_ sender: Any) { + API.default.logout() + } + func applicationWillTerminate(_ aNotification: Notification) { // Insert code here to tear down your application } diff --git a/Reddit-macOS/Base.lproj/Main.storyboard b/Reddit-macOS/Base.lproj/Main.storyboard index 8825a08..fb20f7c 100644 --- a/Reddit-macOS/Base.lproj/Main.storyboard +++ b/Reddit-macOS/Base.lproj/Main.storyboard @@ -54,6 +54,23 @@ + + + + + + + + + + + + + + + + + @@ -673,7 +690,11 @@ - + + + + + diff --git a/Reddit-macOS/Info.plist b/Reddit-macOS/Info.plist index 8f9941c..0f8c46f 100644 --- a/Reddit-macOS/Info.plist +++ b/Reddit-macOS/Info.plist @@ -18,6 +18,19 @@ $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString 1.0 + CFBundleURLTypes + + + CFBundleTypeRole + Viewer + CFBundleURLName + com.carsonkatri.RedditSwiftUI + CFBundleURLSchemes + + redditswiftui + + + CFBundleVersion 1 LSMinimumSystemVersion diff --git a/Reddit-macOS/Reddit_macOS.entitlements b/Reddit-macOS/Reddit_macOS.entitlements index 6f0a227..0c67376 100644 --- a/Reddit-macOS/Reddit_macOS.entitlements +++ b/Reddit-macOS/Reddit_macOS.entitlements @@ -1,5 +1,5 @@ - + diff --git a/Reddit-macOS/Representable/WebView.swift b/Reddit-macOS/Representable/WebView.swift index f5c6910..a8a1f9f 100644 --- a/Reddit-macOS/Representable/WebView.swift +++ b/Reddit-macOS/Representable/WebView.swift @@ -20,3 +20,4 @@ struct WebView : NSViewRepresentable { nsView.load(URLRequest(url: url)) } } + diff --git a/Reddit-macOS/Views/AddCommentView.swift b/Reddit-macOS/Views/AddCommentView.swift new file mode 100644 index 0000000..faee486 --- /dev/null +++ b/Reddit-macOS/Views/AddCommentView.swift @@ -0,0 +1,39 @@ +// +// AddCommentView.swift +// Reddit-macOS +// +// Created by Carson Katri on 8/14/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI + +struct AddCommentView: View { + @Binding var text: String + let send: ((String) -> ()) + + var body: some View { + HStack { + TextField("Add Comment", text: $text) + .cornerRadius(4) + Button(action: { + self.send(self.text) + }) { + Text("Send") + } + } + .padding(10) + .background(Color("popover")) + } +} + +#if DEBUG +struct AddCommentView_Previews: PreviewProvider { + static var previews: some View { + AddCommentView(text: .constant("")) { comment in + + } + .environment(\.colorScheme, .dark) + } +} +#endif diff --git a/Reddit-macOS/Views/Helpers/DetailWindowController.swift b/Reddit-macOS/Views/Helpers/DetailWindowController.swift index c008786..aeb9e53 100644 --- a/Reddit-macOS/Views/Helpers/DetailWindowController.swift +++ b/Reddit-macOS/Views/Helpers/DetailWindowController.swift @@ -11,10 +11,14 @@ import SwiftUI /// A class to handle opening windows for posts when doubling clicking the entry class DetailWindowController: NSWindowController { - convenience init(rootView: RootView) { - let hostingController = NSHostingController(rootView: rootView.frame(width: 400, height: 500)) + convenience init(rootView: RootView, width: CGFloat? = 400, height: CGFloat? = 500) { + let hostingController = NSHostingController(rootView: rootView.frame(width: width, height: height)) let window = NSWindow(contentViewController: hostingController) - window.setContentSize(NSSize(width: 400, height: 500)) + if let width = width, let height = height { + window.setContentSize(NSSize(width: width, height: height)) + } else { + window.contentMinSize = NSSize(width: 400, height: 500) + } self.init(window: window) } } diff --git a/Reddit-macOS/Views/PostList.swift b/Reddit-macOS/Views/PostList.swift index 92605b2..cdf5259 100644 --- a/Reddit-macOS/Views/PostList.swift +++ b/Reddit-macOS/Views/PostList.swift @@ -18,7 +18,7 @@ struct PostList: View { Section(header: Text("\(subreddit) | \(sortBy.rawValue)")) { /// Load posts from web and decode as `Listing` RequestView(Listing.self, Request { - Url(API.subredditURL(subreddit, sortBy)) + Url(API.default.subredditURL(subreddit, sortBy)) Query(["raw_json":"1"]) }) { listing in /// List of `PostView`s when loaded diff --git a/Reddit.xcodeproj/project.pbxproj b/Reddit.xcodeproj/project.pbxproj index cdfe60e..b391c3a 100644 --- a/Reddit.xcodeproj/project.pbxproj +++ b/Reddit.xcodeproj/project.pbxproj @@ -44,9 +44,20 @@ B533A69322F2533900FD3FB2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B533A69122F2533900FD3FB2 /* Main.storyboard */; }; B538997122EFB0CD0008A937 /* SpinnerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B538996F22EFB0CD0008A937 /* SpinnerView.swift */; }; B538997222EFB0CD0008A937 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B538997022EFB0CD0008A937 /* WebView.swift */; }; + B53F238923037CD60038F5F5 /* UserComments.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53F238823037CD60038F5F5 /* UserComments.swift */; }; + B53F238A23037CD60038F5F5 /* UserComments.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53F238823037CD60038F5F5 /* UserComments.swift */; }; + B54242702304C42E00A1B313 /* AddCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542426F2304C42E00A1B313 /* AddCommentView.swift */; }; + B54242722304C5B300A1B313 /* AddCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54242712304C5B300A1B313 /* AddCommentView.swift */; }; + B557366B2303319100E41BE7 /* API.plist in Resources */ = {isa = PBXBuildFile; fileRef = B557366A2303319100E41BE7 /* API.plist */; }; + B557366C2303319700E41BE7 /* API.plist in Resources */ = {isa = PBXBuildFile; fileRef = B557366A2303319100E41BE7 /* API.plist */; }; + B557366D2303319800E41BE7 /* API.plist in Resources */ = {isa = PBXBuildFile; fileRef = B557366A2303319100E41BE7 /* API.plist */; }; + B557366E2303319900E41BE7 /* API.plist in Resources */ = {isa = PBXBuildFile; fileRef = B557366A2303319100E41BE7 /* API.plist */; }; + B557366F2303319900E41BE7 /* API.plist in Resources */ = {isa = PBXBuildFile; fileRef = B557366A2303319100E41BE7 /* API.plist */; }; B561DE3422F3965E003AB95B /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B561DE3322F3965E003AB95B /* API.swift */; }; B561DE3522F3965E003AB95B /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B561DE3322F3965E003AB95B /* API.swift */; }; B561DE3622F3965E003AB95B /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B561DE3322F3965E003AB95B /* API.swift */; }; + B56D30442304625C00CFCF2E /* SafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56D30432304625C00CFCF2E /* SafariView.swift */; }; + B56D30482304ABAC00CFCF2E /* KeyboardObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56D30472304ABAC00CFCF2E /* KeyboardObserver.swift */; }; B5712B9A22F2604D00DFF152 /* SharedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5712B9922F2604D00DFF152 /* SharedAssets.xcassets */; }; B5712B9B22F2606000DFF152 /* SharedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5712B9922F2604D00DFF152 /* SharedAssets.xcassets */; }; B5712B9C22F2606100DFF152 /* SharedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5712B9922F2604D00DFF152 /* SharedAssets.xcassets */; }; @@ -83,6 +94,14 @@ B5A7599822EFA696001FD4F1 /* Request in Frameworks */ = {isa = PBXBuildFile; productRef = B5A7599722EFA696001FD4F1 /* Request */; }; B5A7599B22EFA797001FD4F1 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A7599A22EFA797001FD4F1 /* WebView.swift */; }; B5A7599D22EFAAF0001FD4F1 /* SpinnerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A7599C22EFAAF0001FD4F1 /* SpinnerView.swift */; }; + B5C8389323035FB0003AF9FF /* KarmaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389223035FB0003AF9FF /* KarmaView.swift */; }; + B5C8389523035FB3003AF9FF /* KarmaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389223035FB0003AF9FF /* KarmaView.swift */; }; + B5C8389723036387003AF9FF /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389623036387003AF9FF /* ProfileView.swift */; }; + B5C838982303638C003AF9FF /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389623036387003AF9FF /* ProfileView.swift */; }; + B5C8389B23036936003AF9FF /* UserPosts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389A23036936003AF9FF /* UserPosts.swift */; }; + B5C8389C23036936003AF9FF /* UserPosts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389A23036936003AF9FF /* UserPosts.swift */; }; + B5C8389E23036B7B003AF9FF /* Me.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389D23036B7B003AF9FF /* Me.swift */; }; + B5C8389F23036B7B003AF9FF /* Me.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C8389D23036B7B003AF9FF /* Me.swift */; }; B5E60CB322EFCC5500A0075B /* PostDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E60CB222EFCC5500A0075B /* PostDetailView.swift */; }; B5E60CB722EFD2FB00A0075B /* MetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E60CB522EFD2A000A0075B /* MetadataView.swift */; }; /* End PBXBuildFile section */ @@ -162,7 +181,13 @@ B533A69522F2533900FD3FB2 /* Reddit_macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Reddit_macOS.entitlements; sourceTree = ""; }; B538996F22EFB0CD0008A937 /* SpinnerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpinnerView.swift; sourceTree = ""; }; B538997022EFB0CD0008A937 /* WebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = ""; }; + B53F238823037CD60038F5F5 /* UserComments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserComments.swift; sourceTree = ""; }; + B542426F2304C42E00A1B313 /* AddCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCommentView.swift; sourceTree = ""; }; + B54242712304C5B300A1B313 /* AddCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCommentView.swift; sourceTree = ""; }; + B557366A2303319100E41BE7 /* API.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = API.plist; sourceTree = ""; }; B561DE3322F3965E003AB95B /* API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = ""; }; + B56D30432304625C00CFCF2E /* SafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariView.swift; sourceTree = ""; }; + B56D30472304ABAC00CFCF2E /* KeyboardObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardObserver.swift; sourceTree = ""; }; B5712B9922F2604D00DFF152 /* SharedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = SharedAssets.xcassets; sourceTree = ""; }; B5712BA022F2610200DFF152 /* DetailWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailWindowController.swift; sourceTree = ""; }; B5712BA222F261F100DFF152 /* PostList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostList.swift; sourceTree = ""; }; @@ -189,6 +214,10 @@ B5A7597F22EF97D9001FD4F1 /* PushNotificationPayload.apns */ = {isa = PBXFileReference; lastKnownFileType = text; path = PushNotificationPayload.apns; sourceTree = ""; }; B5A7599A22EFA797001FD4F1 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = ""; }; B5A7599C22EFAAF0001FD4F1 /* SpinnerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerView.swift; sourceTree = ""; }; + B5C8389223035FB0003AF9FF /* KarmaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KarmaView.swift; sourceTree = ""; }; + B5C8389623036387003AF9FF /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = ""; }; + B5C8389A23036936003AF9FF /* UserPosts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPosts.swift; sourceTree = ""; }; + B5C8389D23036B7B003AF9FF /* Me.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Me.swift; sourceTree = ""; }; B5E60CB222EFCC5500A0075B /* PostDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostDetailView.swift; sourceTree = ""; }; B5E60CB522EFD2A000A0075B /* MetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -227,6 +256,7 @@ 26B69D1622E51448001AD18F /* Models */ = { isa = PBXGroup; children = ( + B5C8388C23035257003AF9FF /* OAuth */, 26B69D1722E51451001AD18F /* Post.swift */, 26B69D1922E51E96001AD18F /* Listing.swift */, 26746F0E22ECD94B00A57918 /* Comment.swift */, @@ -307,6 +337,7 @@ isa = PBXGroup; children = ( B561DE3322F3965E003AB95B /* API.swift */, + B557366A2303319100E41BE7 /* API.plist */, B5712BA622F262A300DFF152 /* Helpers */, 26B69D1622E51448001AD18F /* Models */, B511A2EC22EE8A900062B8D4 /* Views */, @@ -318,6 +349,7 @@ B511A2EC22EE8A900062B8D4 /* Views */ = { isa = PBXGroup; children = ( + B5C8389123035FA4003AF9FF /* OAuth */, 26B69D1C22E52B7F001AD18F /* PostView.swift */, 26BBF27022E66EAD006CC669 /* PostDetailView.swift */, 26746F0A22ECD4DC00A57918 /* CommentsView.swift */, @@ -332,6 +364,7 @@ children = ( B538996F22EFB0CD0008A937 /* SpinnerView.swift */, B538997022EFB0CD0008A937 /* WebView.swift */, + B56D30432304625C00CFCF2E /* SafariView.swift */, ); path = Representable; sourceTree = ""; @@ -357,6 +390,7 @@ children = ( B5712B9F22F260E400DFF152 /* Helpers */, B5712BAD22F2731600DFF152 /* PostList.swift */, + B54242712304C5B300A1B313 /* AddCommentView.swift */, ); path = Views; sourceTree = ""; @@ -398,6 +432,7 @@ isa = PBXGroup; children = ( 267E3D9A22ECED9C00675AC7 /* Helpers.swift */, + B56D30472304ABAC00CFCF2E /* KeyboardObserver.swift */, ); path = Helpers; sourceTree = ""; @@ -406,6 +441,7 @@ isa = PBXGroup; children = ( B5712BA222F261F100DFF152 /* PostList.swift */, + B542426F2304C42E00A1B313 /* AddCommentView.swift */, ); path = Views; sourceTree = ""; @@ -467,6 +503,33 @@ path = Representable; sourceTree = ""; }; + B5C8388C23035257003AF9FF /* OAuth */ = { + isa = PBXGroup; + children = ( + B5C8389D23036B7B003AF9FF /* Me.swift */, + ); + path = OAuth; + sourceTree = ""; + }; + B5C8389123035FA4003AF9FF /* OAuth */ = { + isa = PBXGroup; + children = ( + B5C8389923036902003AF9FF /* UserInfo */, + B5C8389623036387003AF9FF /* ProfileView.swift */, + B5C8389223035FB0003AF9FF /* KarmaView.swift */, + ); + path = OAuth; + sourceTree = ""; + }; + B5C8389923036902003AF9FF /* UserInfo */ = { + isa = PBXGroup; + children = ( + B5C8389A23036936003AF9FF /* UserPosts.swift */, + B53F238823037CD60038F5F5 /* UserComments.swift */, + ); + path = UserInfo; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -625,6 +688,7 @@ buildActionMask = 2147483647; files = ( 26C1D80122E33FD40057DED1 /* LaunchScreen.storyboard in Resources */, + B557366B2303319100E41BE7 /* API.plist in Resources */, 26C1D7FE22E33FD40057DED1 /* Preview Assets.xcassets in Resources */, B508E10022F8F6F7002C4C76 /* banner.jpeg in Resources */, 26C1D7FB22E33FD40057DED1 /* Assets.xcassets in Resources */, @@ -640,6 +704,7 @@ B533A69022F2533900FD3FB2 /* Preview Assets.xcassets in Resources */, B533A68D22F2533900FD3FB2 /* Assets.xcassets in Resources */, B5712B9B22F2606000DFF152 /* SharedAssets.xcassets in Resources */, + B557366F2303319900E41BE7 /* API.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -648,6 +713,7 @@ buildActionMask = 2147483647; files = ( B5712B9E22F2606200DFF152 /* SharedAssets.xcassets in Resources */, + B557366C2303319700E41BE7 /* API.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -656,6 +722,7 @@ buildActionMask = 2147483647; files = ( B5712B9D22F2606200DFF152 /* SharedAssets.xcassets in Resources */, + B557366D2303319800E41BE7 /* API.plist in Resources */, B5A7596422EF97D8001FD4F1 /* Assets.xcassets in Resources */, B5A7596222EF97D6001FD4F1 /* Interface.storyboard in Resources */, ); @@ -666,6 +733,7 @@ buildActionMask = 2147483647; files = ( B5712B9C22F2606100DFF152 /* SharedAssets.xcassets in Resources */, + B557366E2303319900E41BE7 /* API.plist in Resources */, B5A7597D22EF97D9001FD4F1 /* Preview Assets.xcassets in Resources */, B5A7597A22EF97D9001FD4F1 /* Assets.xcassets in Resources */, ); @@ -682,18 +750,26 @@ 26BBF27122E66EAD006CC669 /* PostDetailView.swift in Sources */, B5712BA422F2622500DFF152 /* PostList.swift in Sources */, 26C1D7F522E33FD30057DED1 /* AppDelegate.swift in Sources */, + B53F238923037CD60038F5F5 /* UserComments.swift in Sources */, 26C1D7F722E33FD30057DED1 /* SceneDelegate.swift in Sources */, 26B69D2122E53213001AD18F /* SortBy.swift in Sources */, 26B69D1A22E51E96001AD18F /* Listing.swift in Sources */, 26C1D7F922E33FD30057DED1 /* ContentView.swift in Sources */, B5145A1F22EFD4E6009237BD /* CommentsView.swift in Sources */, + B56D30482304ABAC00CFCF2E /* KeyboardObserver.swift in Sources */, B538997222EFB0CD0008A937 /* WebView.swift in Sources */, B5E60CB722EFD2FB00A0075B /* MetadataView.swift in Sources */, + B5C8389E23036B7B003AF9FF /* Me.swift in Sources */, + B56D30442304625C00CFCF2E /* SafariView.swift in Sources */, + B5C8389723036387003AF9FF /* ProfileView.swift in Sources */, B538997122EFB0CD0008A937 /* SpinnerView.swift in Sources */, + B54242702304C42E00A1B313 /* AddCommentView.swift in Sources */, 26746F0F22ECD94B00A57918 /* Comment.swift in Sources */, + B5C8389323035FB0003AF9FF /* KarmaView.swift in Sources */, 26B69D1D22E52B7F001AD18F /* PostView.swift in Sources */, 26B69D1822E51451001AD18F /* Post.swift in Sources */, B561DE3422F3965E003AB95B /* API.swift in Sources */, + B5C8389B23036936003AF9FF /* UserPosts.swift in Sources */, 267E3D9B22ECED9C00675AC7 /* Helpers.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -707,18 +783,24 @@ B51542E122F253C7000ADC16 /* MetadataView.swift in Sources */, B51542F122F25C80000ADC16 /* ContentView.swift in Sources */, B51542EC22F25C0E000ADC16 /* PostDetailView.swift in Sources */, + B53F238A23037CD60038F5F5 /* UserComments.swift in Sources */, B51542E022F253C7000ADC16 /* Helpers.swift in Sources */, B5712BA122F2610200DFF152 /* DetailWindowController.swift in Sources */, B51542DF22F253C7000ADC16 /* Comment.swift in Sources */, B5712BB022F2807800DFF152 /* ContentViewState.swift in Sources */, B51542DC22F253C7000ADC16 /* Post.swift in Sources */, B51542E722F25B75000ADC16 /* SpinnerView.swift in Sources */, + B5C8389F23036B7B003AF9FF /* Me.swift in Sources */, B51542DD22F253C7000ADC16 /* Listing.swift in Sources */, + B5C838982303638C003AF9FF /* ProfileView.swift in Sources */, B533A68922F2533800FD3FB2 /* AppDelegate.swift in Sources */, B51542ED22F25C14000ADC16 /* CommentsView.swift in Sources */, + B5C8389523035FB3003AF9FF /* KarmaView.swift in Sources */, B51542EB22F25C05000ADC16 /* PostView.swift in Sources */, B561DE3622F3965E003AB95B /* API.swift in Sources */, B51542EF22F25C23000ADC16 /* WebView.swift in Sources */, + B5C8389C23036936003AF9FF /* UserPosts.swift in Sources */, + B54242722304C5B300A1B313 /* AddCommentView.swift in Sources */, B57D131C22FD8F3B00E7642E /* FlairView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -922,7 +1004,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.carsonkatri.Reddit; + PRODUCT_BUNDLE_IDENTIFIER = com.carsonkatri.RedditSwiftUI; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTS_MACCATALYST = NO; @@ -947,7 +1029,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.carsonkatri.Reddit; + PRODUCT_BUNDLE_IDENTIFIER = com.carsonkatri.RedditSwiftUI; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTS_MACCATALYST = NO; @@ -1182,8 +1264,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/carson-katri/swift-request"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.1.1; + branch = base64; + kind = branch; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b1a2783..1a5e235 100644 --- a/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,9 +5,9 @@ "package": "Request", "repositoryURL": "https://github.com/carson-katri/swift-request", "state": { - "branch": null, - "revision": "5de85a849f22e56471af6cb0367bd575519b131f", - "version": "1.1.1" + "branch": "base64", + "revision": "c38ebea8fc84d986b9d18f8a971851754a63248f", + "version": null } } ] diff --git a/Shared/API.swift b/Shared/API.swift index def2163..495dd99 100644 --- a/Shared/API.swift +++ b/Shared/API.swift @@ -7,13 +7,159 @@ // import Foundation +import Request -struct API { - static func subredditURL(_ subreddit: String, _ sortBy: SortBy) -> String { +class API { + static let `default` = API() + + init() { + if let refreshToken = self.refreshToken { + Request { + Url("https://www.reddit.com/api/v1/access_token") + Method(.post) + Header.Authorization(.basic(username: clientId, password: "")) + Query(["grant_type":"refresh_token","refresh_token":refreshToken]) + } + .onJson { json in + print(json) + if let token = json.access_token.stringOptional { + self.token = token + } + } + .call() + } + } + + func subredditURL(_ subreddit: String, _ sortBy: SortBy) -> String { return "https://www.reddit.com/r/\(subreddit)/\(sortBy.rawValue).json" } - static func postURL(_ subreddit: String, _ id: String) -> String { + func userPostsURL(for username: String) -> String { + return "https://www.reddit.com/user/\(username)/submitted.json" + } + + func postURL(_ subreddit: String, _ id: String) -> String { return "https://www.reddit.com/r/\(subreddit)/\(id).json" } + + func userCommentsURL(for username: String) -> String { + return "https://www.reddit.com/user/\(username)/comments.json" + } + + // MARK: OAuth + private static let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" + let randomString: String = String((0..<10).map{ _ in letters.randomElement()! }) + + var config: [String:AnyObject] { + var format = PropertyListSerialization.PropertyListFormat.xml + let path = Bundle.main.path(forResource: "API", ofType: "plist") + if let xml = FileManager.default.contents(atPath: path!) { + do { + return try PropertyListSerialization.propertyList(from: xml, options: .mutableContainersAndLeaves, format: &format) as! [String:AnyObject] + } catch { + print(error) + } + } + return [:] + } + + var clientId: String { + config["clientId"] as! String + } + + var redirectUri: String { + config["redirectUri"] as! String + } + + var scope: String { + config["scope"] as! String + } + + func oauthLoginURL() -> String { + return "https://www.reddit.com/api/v1/authorize.compact?client_id=\(clientId)&response_type=code&state=\(randomString)&redirect_uri=\(redirectUri)&duration=permanent&scope=\(scope)" + } + + var token: String? { + get { + UserDefaults.standard.string(forKey: "oauth_token") + } + set { + UserDefaults.standard.set(newValue, forKey: "oauth_token") + } + } + + var refreshToken: String? { + get { + UserDefaults.standard.string(forKey: "refresh_token") + } + set { + UserDefaults.standard.set(newValue, forKey: "refresh_token") + } + } + + func saveToken(_ code: String, state: String) { + if state == randomString { + Request { + Url("https://www.reddit.com/api/v1/access_token") + Method(.post) + Header.Authorization(.basic(username: clientId, password: "")) + Query(["grant_type":"authorization_code","code":code,"redirect_uri":redirectUri]) + } + .onJson { json in + if let token = json.access_token.stringOptional { + self.token = token + } + if let refreshToken = json.refresh_token.stringOptional { + self.refreshToken = refreshToken + } + } + .call() + } else { + print("\(state) doesn't match \(randomString)") + } + } + + var loggedIn: Bool { + return token != nil && refreshToken != nil + } + + func logout() { + token = nil + refreshToken = nil + } + + func authedRequest(_ url: String) -> Request { + Request { + Url(url) + Header.Authorization(.bearer(API.default.token!)) + } + } + + var karma: Request { + authedRequest("https://oauth.reddit.com/api/v1/me/karma") + } + + var me: Request { + authedRequest("https://oauth.reddit.com/api/v1/me") + } + + func comment(_ text: String, on parentId: String) { + Request { + Url("https://oauth.reddit.com/api/comment") + Method(.post) + Header.Authorization(.bearer(API.default.token!)) + Body([ + "api_type": "json", + "thing_id": parentId, + "text": text + ]) + } + .onError { error in + print(error) + } + .onJson { json in + print(json) + } + .call() + } } diff --git a/Shared/Helpers/KeyboardObserver.swift b/Shared/Helpers/KeyboardObserver.swift new file mode 100644 index 0000000..21b80e9 --- /dev/null +++ b/Shared/Helpers/KeyboardObserver.swift @@ -0,0 +1,31 @@ +// +// KeyboardObserver.swift +// Reddit +// +// Created by Carson Katri on 8/14/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI +import Combine + +/// Watch for changes in the keyboard to adjust content positioning to fit onscreen. +final class KeyboardObserver: ObservableObject { + @Published var keyboardHeight: CGFloat = 0 + + init() { + NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil) + } + + @objc func keyboardWillShow(_ notification: Notification) { + if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue { + let keyboardRectangle = keyboardFrame.cgRectValue + keyboardHeight = keyboardRectangle.height + } + } + + @objc func keyboardWillHide(_ notification: Notification) { + keyboardHeight = 0 + } +} diff --git a/Shared/Models/Comment.swift b/Shared/Models/Comment.swift index a8ba8d2..2f1cb4d 100644 --- a/Shared/Models/Comment.swift +++ b/Shared/Models/Comment.swift @@ -14,6 +14,7 @@ struct Comment: Decodable { let author: String let score: Int let body: String? + let parent_id: String? let replies: CommentListing? enum CommentKeys: String, CodingKey { @@ -22,6 +23,7 @@ struct Comment: Decodable { case score case body case replies + case parent_id } init(from decoder: Decoder) throws { @@ -30,6 +32,7 @@ struct Comment: Decodable { author = try values.decode(String.self, forKey: .author) score = try values.decode(Int.self, forKey: .score) body = try? values.decode(String.self, forKey: .body) + parent_id = try? values.decode(String.self, forKey: .parent_id) if let replies = try? values.decode(CommentListing.self, forKey: .replies) { self.replies = replies diff --git a/Shared/Models/OAuth/Me.swift b/Shared/Models/OAuth/Me.swift new file mode 100644 index 0000000..7860ecf --- /dev/null +++ b/Shared/Models/OAuth/Me.swift @@ -0,0 +1,15 @@ +// +// Me.swift +// Reddit +// +// Created by Carson Katri on 8/13/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +struct Me: Decodable { + let name: String + let id: String + let comment_karma: Int + let link_karma: Int + let coins: Int +} diff --git a/Shared/Views/CommentsView.swift b/Shared/Views/CommentsView.swift index 774814a..d319214 100644 --- a/Shared/Views/CommentsView.swift +++ b/Shared/Views/CommentsView.swift @@ -20,7 +20,7 @@ struct CommentsView: View { var body: some View { // Load the comments RequestView([CommentListing].self, Request { - Url(API.postURL(post.subreddit, post.id)) + Url(API.default.postURL(post.subreddit, post.id)) Header.Accept(.json) }) { listings in if listings != nil { @@ -66,7 +66,7 @@ struct CommentView: View { } } .padding(.leading, CGFloat(self.nestLevel * 10)) - .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: Alignment.topLeading) + .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: .topLeading) /// Recursive comments if comment.replies != nil { ForEach(comment.replies!.data.children.map { $0.data }, id: \.id) { reply in diff --git a/Shared/Views/OAuth/KarmaView.swift b/Shared/Views/OAuth/KarmaView.swift new file mode 100644 index 0000000..f6938ec --- /dev/null +++ b/Shared/Views/OAuth/KarmaView.swift @@ -0,0 +1,36 @@ +// +// KarmaView.swift +// Reddit +// +// Created by Carson Katri on 8/13/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI + +struct KarmaView: View { + let link: Int + let comment: Int + + var body: some View { + HStack { + ForEach([("Post", link), ("Comment", comment)], id: \.0) { karma in + VStack { + Text("\(karma.1)") + .font(.largeTitle) + .bold() + Text("\(karma.0) Karma") + .foregroundColor(.secondary) + } + } + } + } +} + +#if DEBUG +struct KarmaView_Previews: PreviewProvider { + static var previews: some View { + return KarmaView(link: 2520, comment: 10) + } +} +#endif diff --git a/Shared/Views/OAuth/ProfileView.swift b/Shared/Views/OAuth/ProfileView.swift new file mode 100644 index 0000000..81a547c --- /dev/null +++ b/Shared/Views/OAuth/ProfileView.swift @@ -0,0 +1,62 @@ +// +// ProfileView.swift +// Reddit +// +// Created by Carson Katri on 8/13/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI +import Request + +struct ProfileView: View { + var body: some View { + NavigationView { + if API.default.loggedIn { + RequestView(Me.self, API.default.me) { me in + var list: AnyView! + if me != nil { + list = AnyView(List { + Section(header: Text("Karma")) { + KarmaView(link: me!.link_karma, comment: me!.comment_karma) + .frame(maxWidth: .infinity) + } + Section(header: Text("Overview")) { + ForEach([ + (name: "Posts", icon: "list.bullet.below.rectangle", destination: AnyView(UserPosts(username: me!.name))), + (name: "Comments", icon: "text.bubble", destination: AnyView(UserComments(username: me!.name))) + ], id: \.name) { item in + NavigationLink(destination: item.destination) { + HStack { + Image(systemName: item.icon) + Text(item.name) + } + } + } + } + }) + } else { + list = AnyView(SpinnerView()) + } + #if !os(macOS) + list = AnyView(list.navigationBarTitle(me != nil ? me!.name : "")) + #endif + return TupleView<(AnyView, SpinnerView)>((list, SpinnerView())) + } + } else { + #if os(macOS) + Button(action: { + NSWorkspace.shared.open(URL(string: API.default.oauthLoginURL())!) + }) { + Text("Login") + } + #else + SafariView(url: URL(string: API.default.oauthLoginURL())!) + .navigationBarTitle("Login") + #endif + } + Text("Select a category") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } + } +} diff --git a/Shared/Views/OAuth/UserInfo/UserComments.swift b/Shared/Views/OAuth/UserInfo/UserComments.swift new file mode 100644 index 0000000..2871304 --- /dev/null +++ b/Shared/Views/OAuth/UserInfo/UserComments.swift @@ -0,0 +1,32 @@ +// +// UserComments.swift +// Reddit +// +// Created by Carson Katri on 8/13/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI +import Request + +struct UserComments: View { + let username: String + + var body: some View { + let commentsList = RequestView(CommentListing.self, Request { + Url(API.default.userCommentsURL(for: username)) + Query(["raw_json":"1"]) + }) { (listing: CommentListing?) in + List(listing != nil ? listing!.data.children.map { $0.data } : [], id: \.id) { comment in + CommentView(comment: comment, nestLevel: 0) + } + .listStyle(DefaultListStyle()) + SpinnerView() + } + #if os(macOS) + return commentsList + #else + return commentsList.navigationBarTitle(Text("Comments"), displayMode: .inline) + #endif + } +} diff --git a/Shared/Views/OAuth/UserInfo/UserPosts.swift b/Shared/Views/OAuth/UserInfo/UserPosts.swift new file mode 100644 index 0000000..e057f05 --- /dev/null +++ b/Shared/Views/OAuth/UserInfo/UserPosts.swift @@ -0,0 +1,34 @@ +// +// UserList.swift +// Reddit +// +// Created by Carson Katri on 8/13/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI +import Request + +struct UserPosts: View { + let username: String + + var body: some View { + let postsList = RequestView(Listing.self, Request { + Url(API.default.userPostsURL(for: username)) + Query(["raw_json":"1"]) + }) { (listing: Listing?) in + List(listing != nil ? listing!.data.children.map { $0.data } : []) { post in + NavigationLink(destination: PostDetailView(post: post)) { + PostView(post: post) + } + } + .listStyle(DefaultListStyle()) + SpinnerView() + } + #if os(macOS) + return postsList + #else + return postsList.navigationBarTitle(Text("Posts"), displayMode: .inline) + #endif + } +} diff --git a/Shared/Views/PostDetailView.swift b/Shared/Views/PostDetailView.swift index 2fdf9b4..adf140f 100644 --- a/Shared/Views/PostDetailView.swift +++ b/Shared/Views/PostDetailView.swift @@ -11,6 +11,10 @@ import Request struct PostDetailView: View { let post: Post + @State private var comment: String = "" + #if os(iOS) + @EnvironmentObject private var keyboardObserver: KeyboardObserver + #endif var title: some View { let vstack = VStack(alignment: .leading) { @@ -25,39 +29,54 @@ struct PostDetailView: View { return vstack #elseif os(macOS) /// Fill window width - return vstack.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: Alignment.topLeading) + return vstack.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: .topLeading) #endif } var body: some View { - let list = List { - // Image - if post.url.contains(".jpg") || post.url.contains(".png") { - RequestImage(Url(post.url), contentMode: .fit) - .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: Alignment.topLeading) - } - // GIF - if post.url.contains(".gif") { - WebView(url: URL(string: post.url)!) - .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: Alignment.topLeading) - } - // Title - if post.selftext == "" { - NavigationLink(destination: WebView(url: URL(string: post.url)!)) { + let list = ZStack(alignment: Alignment.bottomLeading) { + List { + // Image + if post.url.contains(".jpg") || post.url.contains(".png") { + RequestImage(Url(post.url), contentMode: .fit) + .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: .topLeading) + } + // GIF + if post.url.contains(".gif") { + WebView(url: URL(string: post.url)!) + .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: .topLeading) + } + // Title + if post.selftext == "" { + NavigationLink(destination: WebView(url: URL(string: post.url)!)) { + title + } + } else { title } - } else { - title + // Body + if post.selftext != "" { + Text(post.selftext) + } + if post.flairs.count > 0 { + FlairView(flairs: post.flairs) + } + MetadataView(post: post, spaced: true) + CommentsView(post: post) } - // Body - if post.selftext != "" { - Text(post.selftext) + .padding(.bottom, 40) + /// Comment text field + #if os(macOS) + AddCommentView(text: $comment) { text in + API.default.comment(text, on: self.post.id) } - if post.flairs.count > 0 { - FlairView(flairs: post.flairs) + #else + AddCommentView(text: $comment) { text in + API.default.comment(text, on: self.post.id) } - MetadataView(post: post, spaced: true) - CommentsView(post: post) + .offset(y: keyboardObserver.keyboardHeight > 0 ? -(keyboardObserver.keyboardHeight - 50) : 0) + .animation(.spring()) + #endif } #if os(iOS) return list.navigationBarTitle(Text("r/\(post.subreddit)"), displayMode: .inline) From a7e85a49c7a5534b23aaef96741c1e5d8557a407 Mon Sep 17 00:00:00 2001 From: Carson Katri Date: Mon, 19 Aug 2019 12:11:56 -0400 Subject: [PATCH 5/7] Basic OAuth actions --- README.md | 2 +- Reddit-iOS/Views/AddCommentView.swift | 13 +- Reddit-iOS/Views/PostList.swift | 5 +- Reddit-macOS/AppDelegate.swift | 18 +++ Reddit-macOS/Base.lproj/Main.storyboard | 57 ++------ Reddit-macOS/ContentView.swift | 2 - Reddit-macOS/Views/AddCommentView.swift | 10 +- Reddit-macOS/Views/PostList.swift | 10 +- .../ContentView.swift | 5 +- .../Views/CommentsView.swift | 5 +- Reddit.xcodeproj/project.pbxproj | 36 +++++ Shared/API.plist | 2 +- Shared/API.swift | 63 +++++++-- Shared/Helpers/Helpers.swift | 7 +- Shared/Helpers/SFSymbols.swift | 133 ++++++++++++++++++ Shared/Models/Comment.swift | 13 +- Shared/Models/Post.swift | 3 +- Shared/Models/Protocols/Thing.swift | 13 ++ Shared/Models/Protocols/Votable.swift | 12 ++ Shared/Views/CommentsView.swift | 12 +- Shared/Views/MetadataView.swift | 5 +- Shared/Views/OAuth/ProfileView.swift | 8 ++ Shared/Views/OAuth/VoteView.swift | 49 +++++++ Shared/Views/PostDetailView.swift | 13 +- 24 files changed, 385 insertions(+), 111 deletions(-) create mode 100644 Shared/Helpers/SFSymbols.swift create mode 100644 Shared/Models/Protocols/Thing.swift create mode 100644 Shared/Models/Protocols/Votable.swift create mode 100644 Shared/Views/OAuth/VoteView.swift diff --git a/README.md b/README.md index ffdeb65..051cd01 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ To show off SwiftUI's strength in cross-platform development, I did **not** use Mac Catalyst for this project. Instead, common UI code is shared between iOS, macOS, and watchOS. ## Setup -To use this app, you need to create an app for the Reddit api. You can do that [here](https://www.reddit.com/prefs/apps). Choose "Installed app", and set the redirect URI to `redditswiftui://oauth_callback` +To use this app, you need to create an app for the Reddit API. You can do that [here](https://www.reddit.com/prefs/apps). Choose "Installed app", and set the redirect URI to `redditswiftui://oauth_callback`. Then input the information you got there into the `Shared/API.plist` file. Set the scope in the plist to whatever scope you need. Start with `read,identity,vote` and add more scopes as needed. ## Project Structure * `Shared` - Models, helpers, API, and any shared Views. diff --git a/Reddit-iOS/Views/AddCommentView.swift b/Reddit-iOS/Views/AddCommentView.swift index 2be3995..7e1aedf 100644 --- a/Reddit-iOS/Views/AddCommentView.swift +++ b/Reddit-iOS/Views/AddCommentView.swift @@ -10,7 +10,7 @@ import SwiftUI struct AddCommentView: View { @Binding var text: String - let send: ((String) -> ()) + let parentName: String var body: some View { HStack { @@ -21,21 +21,22 @@ struct AddCommentView: View { .frame(width: 30, height: 30) .foregroundColor(.blue) .onTapGesture { - self.send(self.text) + API.default.comment(self.text, on: self.parentName) { + self.text = "" + } } } .padding(10) .background(Color("popover")) + //.cornerRadius(5) } } #if DEBUG struct AddCommentView_Previews: PreviewProvider { static var previews: some View { - AddCommentView(text: .constant("")) { comment in - - } - .environment(\.colorScheme, .dark) + AddCommentView(text: .constant(""), parentName: "t3_helloworld") + //.environment(\.colorScheme, .dark) } } #endif diff --git a/Reddit-iOS/Views/PostList.swift b/Reddit-iOS/Views/PostList.swift index 8d3b2dc..e356f6a 100644 --- a/Reddit-iOS/Views/PostList.swift +++ b/Reddit-iOS/Views/PostList.swift @@ -15,10 +15,7 @@ struct PostList: View { var body: some View { /// Load posts from web and decode as `Listing` - RequestView(Listing.self, Request { - Url(API.default.subredditURL(subreddit, sortBy)) - Query(["raw_json":"1"]) - }) { listing in + RequestView(Listing.self, API.default.posts(subreddit, sortBy)) { listing in /// List of `PostView`s when loaded List(listing != nil ? listing!.data.children.map { $0.data } : []) { post in NavigationLink(destination: PostDetailView(post: post)) { diff --git a/Reddit-macOS/AppDelegate.swift b/Reddit-macOS/AppDelegate.swift index 5c78564..bdd44cc 100644 --- a/Reddit-macOS/AppDelegate.swift +++ b/Reddit-macOS/AppDelegate.swift @@ -61,6 +61,24 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSToolbarDelegate, NSTextFie API.default.logout() } + // TODO: Implement this + @IBAction func newPost(_ sender: Any) { + + } + // TODO: Implement this + @IBAction func sendComment(_ sender: Any) { + + } + // TODO: Implement this + @IBAction func upvote(_ sender: Any) { + print("Upvoted command") + } + // TODO: Implement this + @IBAction func downvote(_ sender: Any) { + print("Downvoted command") + } + + func applicationWillTerminate(_ aNotification: Notification) { // Insert code here to tear down your application } diff --git a/Reddit-macOS/Base.lproj/Main.storyboard b/Reddit-macOS/Base.lproj/Main.storyboard index fb20f7c..61be279 100644 --- a/Reddit-macOS/Base.lproj/Main.storyboard +++ b/Reddit-macOS/Base.lproj/Main.storyboard @@ -71,64 +71,31 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + +DQ + - + diff --git a/Reddit-macOS/ContentView.swift b/Reddit-macOS/ContentView.swift index 7b23bc9..a773d31 100644 --- a/Reddit-macOS/ContentView.swift +++ b/Reddit-macOS/ContentView.swift @@ -15,8 +15,6 @@ struct ContentView : View { @State private var showSortSheet: Bool = false @State private var showSubredditSheet: Bool = false - @State private var selectedPost: String? = nil - @EnvironmentObject private var state: ContentViewState var body: some View { diff --git a/Reddit-macOS/Views/AddCommentView.swift b/Reddit-macOS/Views/AddCommentView.swift index faee486..0b0eecd 100644 --- a/Reddit-macOS/Views/AddCommentView.swift +++ b/Reddit-macOS/Views/AddCommentView.swift @@ -10,14 +10,16 @@ import SwiftUI struct AddCommentView: View { @Binding var text: String - let send: ((String) -> ()) + let parentName: String var body: some View { HStack { TextField("Add Comment", text: $text) .cornerRadius(4) Button(action: { - self.send(self.text) + API.default.comment(self.text, on: self.parentName) { + self.text = "" + } }) { Text("Send") } @@ -30,9 +32,7 @@ struct AddCommentView: View { #if DEBUG struct AddCommentView_Previews: PreviewProvider { static var previews: some View { - AddCommentView(text: .constant("")) { comment in - - } + AddCommentView(text: .constant(""), parentName: "t3_helloworld") .environment(\.colorScheme, .dark) } } diff --git a/Reddit-macOS/Views/PostList.swift b/Reddit-macOS/Views/PostList.swift index cdf5259..115df39 100644 --- a/Reddit-macOS/Views/PostList.swift +++ b/Reddit-macOS/Views/PostList.swift @@ -13,19 +13,21 @@ struct PostList: View { let subreddit: String let sortBy: SortBy + //@Binding var currentPost: Post? + var body: some View { List { Section(header: Text("\(subreddit) | \(sortBy.rawValue)")) { /// Load posts from web and decode as `Listing` - RequestView(Listing.self, Request { - Url(API.default.subredditURL(subreddit, sortBy)) - Query(["raw_json":"1"]) - }) { listing in + RequestView(Listing.self, API.default.posts(subreddit, sortBy)) { listing in /// List of `PostView`s when loaded ForEach(listing != nil ? listing!.data.children.map { $0.data } : []) { post in NavigationLink(destination: PostDetailView(post: post)) { PostView(post: post) .tag(post.id) + /*.onTapGesture { + self.currentPost = post + }*/ /// Double-click to open a new window for the `PostDetailView` .onTapGesture(count: 2) { let controller = DetailWindowController(rootView: PostDetailView(post: post)) diff --git a/Reddit-watchOS WatchKit Extension/ContentView.swift b/Reddit-watchOS WatchKit Extension/ContentView.swift index 8a89d47..ca18130 100644 --- a/Reddit-watchOS WatchKit Extension/ContentView.swift +++ b/Reddit-watchOS WatchKit Extension/ContentView.swift @@ -17,10 +17,7 @@ struct ContentView: View { var body: some View { /// Load the `Post`s - RequestView(Listing.self, Request { - Url(API.subredditURL(subreddit, sortBy)) - Query(["raw_json":"1"]) - }) { listing in + RequestView(Listing.self, API.default.posts(subreddit, sortBy)) { listing in /// List of `PostView`s when loaded List { /// Settings `Button` diff --git a/Reddit-watchOS WatchKit Extension/Views/CommentsView.swift b/Reddit-watchOS WatchKit Extension/Views/CommentsView.swift index 8f9b968..2702abd 100644 --- a/Reddit-watchOS WatchKit Extension/Views/CommentsView.swift +++ b/Reddit-watchOS WatchKit Extension/Views/CommentsView.swift @@ -28,10 +28,7 @@ struct CommentsView: View { var body: some View { // Load the comments - RequestView([CommentListing].self, Request { - Url(API.postURL(post.subreddit, post.id)) - Header.Accept(.json) - }) { listings in + RequestView([CommentListing].self, API.default.post(post.subreddit, post.id)) { listings in if listings != nil { // `dropFirst` because `first` is the actual post if listings!.dropFirst().map({ $0.data.children }).flatMap({ $0.map { $0.data } }).count > 0 { diff --git a/Reddit.xcodeproj/project.pbxproj b/Reddit.xcodeproj/project.pbxproj index b391c3a..16e0727 100644 --- a/Reddit.xcodeproj/project.pbxproj +++ b/Reddit.xcodeproj/project.pbxproj @@ -46,6 +46,15 @@ B538997222EFB0CD0008A937 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B538997022EFB0CD0008A937 /* WebView.swift */; }; B53F238923037CD60038F5F5 /* UserComments.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53F238823037CD60038F5F5 /* UserComments.swift */; }; B53F238A23037CD60038F5F5 /* UserComments.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53F238823037CD60038F5F5 /* UserComments.swift */; }; + B5422495230649F600265473 /* VoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5422494230649F600265473 /* VoteView.swift */; }; + B5422496230649F600265473 /* VoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5422494230649F600265473 /* VoteView.swift */; }; + B5422497230649F600265473 /* VoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5422494230649F600265473 /* VoteView.swift */; }; + B542249923064B0A00265473 /* Votable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542249823064B0A00265473 /* Votable.swift */; }; + B542249A23064B0A00265473 /* Votable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542249823064B0A00265473 /* Votable.swift */; }; + B542249B23064B0A00265473 /* Votable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542249823064B0A00265473 /* Votable.swift */; }; + B542249D23064BAA00265473 /* Thing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542249C23064BAA00265473 /* Thing.swift */; }; + B542249E23064BAA00265473 /* Thing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542249C23064BAA00265473 /* Thing.swift */; }; + B542249F23064BAA00265473 /* Thing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542249C23064BAA00265473 /* Thing.swift */; }; B54242702304C42E00A1B313 /* AddCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B542426F2304C42E00A1B313 /* AddCommentView.swift */; }; B54242722304C5B300A1B313 /* AddCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54242712304C5B300A1B313 /* AddCommentView.swift */; }; B557366B2303319100E41BE7 /* API.plist in Resources */ = {isa = PBXBuildFile; fileRef = B557366A2303319100E41BE7 /* API.plist */; }; @@ -71,6 +80,7 @@ B57D131A22FD8F3500E7642E /* FlairView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57D131922FD8F3500E7642E /* FlairView.swift */; }; B57D131B22FD8F3A00E7642E /* FlairView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57D131922FD8F3500E7642E /* FlairView.swift */; }; B57D131C22FD8F3B00E7642E /* FlairView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57D131922FD8F3500E7642E /* FlairView.swift */; }; + B589D8842306E29B0034777C /* SFSymbols.swift in Sources */ = {isa = PBXBuildFile; fileRef = B589D8832306E29B0034777C /* SFSymbols.swift */; }; B597CBA022FCC86200389DF6 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B597CB9F22FCC86200389DF6 /* SettingsView.swift */; }; B5A7594822EE8EBA001FD4F1 /* Json in Frameworks */ = {isa = PBXBuildFile; productRef = B5A7594722EE8EBA001FD4F1 /* Json */; }; B5A7594A22EE8EBA001FD4F1 /* Request in Frameworks */ = {isa = PBXBuildFile; productRef = B5A7594922EE8EBA001FD4F1 /* Request */; }; @@ -182,6 +192,9 @@ B538996F22EFB0CD0008A937 /* SpinnerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpinnerView.swift; sourceTree = ""; }; B538997022EFB0CD0008A937 /* WebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = ""; }; B53F238823037CD60038F5F5 /* UserComments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserComments.swift; sourceTree = ""; }; + B5422494230649F600265473 /* VoteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoteView.swift; sourceTree = ""; }; + B542249823064B0A00265473 /* Votable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Votable.swift; sourceTree = ""; }; + B542249C23064BAA00265473 /* Thing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thing.swift; sourceTree = ""; }; B542426F2304C42E00A1B313 /* AddCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCommentView.swift; sourceTree = ""; }; B54242712304C5B300A1B313 /* AddCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCommentView.swift; sourceTree = ""; }; B557366A2303319100E41BE7 /* API.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = API.plist; sourceTree = ""; }; @@ -195,6 +208,7 @@ B5712BAF22F2807800DFF152 /* ContentViewState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentViewState.swift; sourceTree = ""; }; B574DF0B22EFB53B00A80981 /* PostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostView.swift; sourceTree = ""; }; B57D131922FD8F3500E7642E /* FlairView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlairView.swift; sourceTree = ""; }; + B589D8832306E29B0034777C /* SFSymbols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFSymbols.swift; sourceTree = ""; }; B597CB9F22FCC86200389DF6 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = ""; }; B59DE46B22F8CBD800D8BD1C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; B5A7595822EF97D6001FD4F1 /* Reddit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Reddit.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -256,6 +270,7 @@ 26B69D1622E51448001AD18F /* Models */ = { isa = PBXGroup; children = ( + B54224A023064BAF00265473 /* Protocols */, B5C8388C23035257003AF9FF /* OAuth */, 26B69D1722E51451001AD18F /* Post.swift */, 26B69D1922E51E96001AD18F /* Listing.swift */, @@ -420,6 +435,15 @@ path = "Preview Content"; sourceTree = ""; }; + B54224A023064BAF00265473 /* Protocols */ = { + isa = PBXGroup; + children = ( + B542249C23064BAA00265473 /* Thing.swift */, + B542249823064B0A00265473 /* Votable.swift */, + ); + path = Protocols; + sourceTree = ""; + }; B5712B9F22F260E400DFF152 /* Helpers */ = { isa = PBXGroup; children = ( @@ -433,6 +457,7 @@ children = ( 267E3D9A22ECED9C00675AC7 /* Helpers.swift */, B56D30472304ABAC00CFCF2E /* KeyboardObserver.swift */, + B589D8832306E29B0034777C /* SFSymbols.swift */, ); path = Helpers; sourceTree = ""; @@ -517,6 +542,7 @@ B5C8389923036902003AF9FF /* UserInfo */, B5C8389623036387003AF9FF /* ProfileView.swift */, B5C8389223035FB0003AF9FF /* KarmaView.swift */, + B5422494230649F600265473 /* VoteView.swift */, ); path = OAuth; sourceTree = ""; @@ -758,12 +784,15 @@ B5145A1F22EFD4E6009237BD /* CommentsView.swift in Sources */, B56D30482304ABAC00CFCF2E /* KeyboardObserver.swift in Sources */, B538997222EFB0CD0008A937 /* WebView.swift in Sources */, + B5422495230649F600265473 /* VoteView.swift in Sources */, B5E60CB722EFD2FB00A0075B /* MetadataView.swift in Sources */, B5C8389E23036B7B003AF9FF /* Me.swift in Sources */, B56D30442304625C00CFCF2E /* SafariView.swift in Sources */, B5C8389723036387003AF9FF /* ProfileView.swift in Sources */, B538997122EFB0CD0008A937 /* SpinnerView.swift in Sources */, B54242702304C42E00A1B313 /* AddCommentView.swift in Sources */, + B542249923064B0A00265473 /* Votable.swift in Sources */, + B542249D23064BAA00265473 /* Thing.swift in Sources */, 26746F0F22ECD94B00A57918 /* Comment.swift in Sources */, B5C8389323035FB0003AF9FF /* KarmaView.swift in Sources */, 26B69D1D22E52B7F001AD18F /* PostView.swift in Sources */, @@ -781,14 +810,18 @@ B51542DE22F253C7000ADC16 /* SortBy.swift in Sources */, B5712BAE22F2731600DFF152 /* PostList.swift in Sources */, B51542E122F253C7000ADC16 /* MetadataView.swift in Sources */, + B5422497230649F600265473 /* VoteView.swift in Sources */, B51542F122F25C80000ADC16 /* ContentView.swift in Sources */, B51542EC22F25C0E000ADC16 /* PostDetailView.swift in Sources */, B53F238A23037CD60038F5F5 /* UserComments.swift in Sources */, B51542E022F253C7000ADC16 /* Helpers.swift in Sources */, + B589D8842306E29B0034777C /* SFSymbols.swift in Sources */, B5712BA122F2610200DFF152 /* DetailWindowController.swift in Sources */, B51542DF22F253C7000ADC16 /* Comment.swift in Sources */, B5712BB022F2807800DFF152 /* ContentViewState.swift in Sources */, + B542249B23064B0A00265473 /* Votable.swift in Sources */, B51542DC22F253C7000ADC16 /* Post.swift in Sources */, + B542249F23064BAA00265473 /* Thing.swift in Sources */, B51542E722F25B75000ADC16 /* SpinnerView.swift in Sources */, B5C8389F23036B7B003AF9FF /* Me.swift in Sources */, B51542DD22F253C7000ADC16 /* Listing.swift in Sources */, @@ -823,10 +856,13 @@ B5A7597422EF97D8001FD4F1 /* ExtensionDelegate.swift in Sources */, B5145A2122EFD557009237BD /* MetadataView.swift in Sources */, B5A7598E22EFA627001FD4F1 /* Comment.swift in Sources */, + B542249E23064BAA00265473 /* Thing.swift in Sources */, B5A7597822EF97D8001FD4F1 /* NotificationView.swift in Sources */, B5E60CB322EFCC5500A0075B /* PostDetailView.swift in Sources */, + B542249A23064B0A00265473 /* Votable.swift in Sources */, B574DF0C22EFB53B00A80981 /* PostView.swift in Sources */, B561DE3522F3965E003AB95B /* API.swift in Sources */, + B5422496230649F600265473 /* VoteView.swift in Sources */, B5A7599B22EFA797001FD4F1 /* WebView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Shared/API.plist b/Shared/API.plist index 13d7845..2c6ae23 100644 --- a/Shared/API.plist +++ b/Shared/API.plist @@ -3,7 +3,7 @@ scope - identity,vote + read,identity,vote redirectUri clientId diff --git a/Shared/API.swift b/Shared/API.swift index 495dd99..a29dc9a 100644 --- a/Shared/API.swift +++ b/Shared/API.swift @@ -30,16 +30,30 @@ class API { } } - func subredditURL(_ subreddit: String, _ sortBy: SortBy) -> String { - return "https://www.reddit.com/r/\(subreddit)/\(sortBy.rawValue).json" + func posts(_ subreddit: String, _ sortBy: SortBy) -> Request { + if loggedIn { + return authedRequest("https://oauth.reddit.com/r/\(subreddit)/\(sortBy.rawValue)") + } else { + return Request { + Url("https://www.reddit.com/r/\(subreddit)/\(sortBy.rawValue).json") + Query(["raw_json":"1"]) + } + } } func userPostsURL(for username: String) -> String { return "https://www.reddit.com/user/\(username)/submitted.json" } - func postURL(_ subreddit: String, _ id: String) -> String { - return "https://www.reddit.com/r/\(subreddit)/\(id).json" + func post(_ subreddit: String, _ id: String) -> Request { + if loggedIn { + return authedRequest("https://oauth.reddit.com/r/\(subreddit)/comments/\(id)") + } else { + return Request { + Url("https://www.reddit.com/r/\(subreddit)/\(id).json") + Query(["raw_json":"1"]) + } + } } func userCommentsURL(for username: String) -> String { @@ -143,23 +157,52 @@ class API { authedRequest("https://oauth.reddit.com/api/v1/me") } - func comment(_ text: String, on parentId: String) { + func comment(_ text: String, on parentId: String, complete: @escaping (() -> Void)) { Request { Url("https://oauth.reddit.com/api/comment") Method(.post) Header.Authorization(.bearer(API.default.token!)) - Body([ + Query([ "api_type": "json", "thing_id": parentId, "text": text ]) + Header.Any(key: "User-Agent", value: "Reddit SwiftUI/v1") + } + .onData { _ in + complete() } - .onError { error in - print(error) + .call() + } + + // MARK: Voting + private func vote(_ id: String, direction: Int, complete: @escaping (() -> Void)) { + Request { + Url("https://oauth.reddit.com/api/vote") + Method(.post) + Header.Authorization(.bearer(API.default.token!)) + Query([ + "id": id, + "dir": "\(direction)", + "rank": "2" + ]) + Header.Any(key: "User-Agent", value: "Reddit SwiftUI/v1") } - .onJson { json in - print(json) + .onData { _ in + complete() } .call() } + + func upvote(_ id: String, complete: @escaping (() -> Void)) { + vote(id, direction: 1, complete: complete) + } + + func downvote(_ id: String, complete: @escaping (() -> Void)) { + vote(id, direction: -1, complete: complete) + } + + func unvote(_ id: String, complete: @escaping (() -> Void)) { + vote(id, direction: 0, complete: complete) + } } diff --git a/Shared/Helpers/Helpers.swift b/Shared/Helpers/Helpers.swift index 5f2bdd9..1bd9c91 100644 --- a/Shared/Helpers/Helpers.swift +++ b/Shared/Helpers/Helpers.swift @@ -17,9 +17,8 @@ func timeSince(_ interval: TimeInterval) -> String { /// `SwiftUI` compatibility #if os(macOS) -extension Image { - init(systemName: String) { - self.init(nsImage: NSImage()) - } +func Image(systemName: String) -> some View { + SFSymbol.named(systemName) + .frame(width: 15, height: 15) } #endif diff --git a/Shared/Helpers/SFSymbols.swift b/Shared/Helpers/SFSymbols.swift new file mode 100644 index 0000000..5f78dd1 --- /dev/null +++ b/Shared/Helpers/SFSymbols.swift @@ -0,0 +1,133 @@ +// +// SFSymbols.swift +// Reddit-macOS +// +// Created by Carson Katri on 8/16/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI + +struct SFSymbol { + static func named(_ name: String) -> AnyView { + switch name { + case "arrow.up": + return AnyView(UpArrow()) + case "arrow.down": + return AnyView(DownArrow()) + case "pin.fill": + return AnyView(Pin()) + case "text.bubble": + return AnyView(Bubble()) + case "clock": + return AnyView(Clock()) + default: + return AnyView(Text("")) + } + } + + struct UpArrow : View { + var body: some View { + ZStack { + Rectangle() + .frame(width: 15, height: 15) + .foregroundColor(Color.primary.opacity(0.1)) + .cornerRadius(4) + Rectangle() + .frame(width: 1, height: 8) + .cornerRadius(0.5) + Rectangle() + .frame(width: 1, height: 5) + .cornerRadius(0.5) + .offset(x: -3, y: -1) + .rotationEffect(Angle(degrees: 45)) + Rectangle() + .frame(width: 1, height: 5) + .cornerRadius(0.5) + .offset(x: 3, y: -1) + .rotationEffect(Angle(degrees: -45)) + } + } + } + struct DownArrow : View { + var body: some View { + UpArrow() + .rotationEffect(Angle(degrees: 180)) + } + } + + struct Pin : View { + var body: some View { + ZStack { + Path { path in + path.move(to: CGPoint(x: 4, y: 0)) + path.addLine(to: CGPoint(x: 8, y: 0)) + path.addLine(to: CGPoint(x: 6, y: 2)) + path.addLine(to: CGPoint(x: 5.5, y: 4)) + path.addLine(to: CGPoint(x: 7, y: 6)) + path.addLine(to: CGPoint(x: 4.5, y: 6)) + path.addLine(to: CGPoint(x: 4.5, y: 10)) + path.addLine(to: CGPoint(x: 3.5, y: 10)) + path.addLine(to: CGPoint(x: 3.5, y: 6)) + path.addLine(to: CGPoint(x: 1, y: 6)) + path.addLine(to: CGPoint(x: 2.5, y: 4)) + path.addLine(to: CGPoint(x: 2, y: 2)) + path.addLine(to: CGPoint(x: 0, y: 0)) + } + } + } + } + + struct Bubble : View { + var body: some View { + ZStack { + Rectangle() + .frame(width: 8, height: 7) + .foregroundColor(Color.primary.opacity(0)) + .border(Color.primary) + .cornerRadius(2) + Rectangle() + .frame(width: 1, height: 2) + .offset(x: -2, y: 4) + } + } + } + + struct Clock : View { + var body: some View { + ZStack { + Rectangle() + .frame(width: 10, height: 10) + .foregroundColor(Color.primary.opacity(0)) + .border(Color.primary) + .cornerRadius(3) + Rectangle() + .frame(width: 1, height: 5) + .offset(y: -2.5) + Rectangle() + .frame(width: 1, height: 5) + .offset(y: -2.5) + .rotationEffect(Angle(degrees: 90)) + } + } + } +} + +#if DEBUG +struct SFSymbols_Previews: PreviewProvider { + static var previews: some View { + Group { + SFSymbol.UpArrow() + .frame(width: 10, height: 10) + SFSymbol.DownArrow() + .frame(width: 10, height: 10) + SFSymbol.Pin() + .frame(width: 10, height: 10) + SFSymbol.Bubble() + .frame(width: 10, height: 10) + SFSymbol.Clock() + .frame(width: 10, height: 10) + } + } +} +#endif diff --git a/Shared/Models/Comment.swift b/Shared/Models/Comment.swift index 2f1cb4d..e51e95e 100644 --- a/Shared/Models/Comment.swift +++ b/Shared/Models/Comment.swift @@ -6,32 +6,39 @@ // Copyright © 2019 Carson Katri. All rights reserved. // -import Foundation - /// A comment from the Reddit API -struct Comment: Decodable { +struct Comment: Thing, Decodable { let id: String + let name: String let author: String let score: Int + var likes: Bool? let body: String? let parent_id: String? + let stickied: Bool let replies: CommentListing? enum CommentKeys: String, CodingKey { case id + case name case author case score + case likes case body case replies case parent_id + case stickied } init(from decoder: Decoder) throws { let values = try decoder.container(keyedBy: CommentKeys.self) id = try values.decode(String.self, forKey: .id) + name = try values.decode(String.self, forKey: .name) author = try values.decode(String.self, forKey: .author) score = try values.decode(Int.self, forKey: .score) + likes = try? values.decode(Bool.self, forKey: .likes) body = try? values.decode(String.self, forKey: .body) + stickied = try values.decode(Bool.self, forKey: .stickied) parent_id = try? values.decode(String.self, forKey: .parent_id) if let replies = try? values.decode(CommentListing.self, forKey: .replies) { diff --git a/Shared/Models/Post.swift b/Shared/Models/Post.swift index 99065df..1ab03ab 100644 --- a/Shared/Models/Post.swift +++ b/Shared/Models/Post.swift @@ -9,7 +9,7 @@ import Foundation /// A post from the Reddit API -struct Post: Decodable, Identifiable { +struct Post: Thing, Decodable, Identifiable { let title: String let name: String let id: String @@ -21,6 +21,7 @@ struct Post: Decodable, Identifiable { let author: String let subreddit: String let score: Int + var likes: Bool? let num_comments: Int let stickied: Bool let created_utc: Double diff --git a/Shared/Models/Protocols/Thing.swift b/Shared/Models/Protocols/Thing.swift new file mode 100644 index 0000000..0383a6d --- /dev/null +++ b/Shared/Models/Protocols/Thing.swift @@ -0,0 +1,13 @@ +// +// Thing.swift +// Reddit +// +// Created by Carson Katri on 8/15/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +protocol Thing: Votable { + var name: String { get } + var id: String { get } + var stickied: Bool { get } +} diff --git a/Shared/Models/Protocols/Votable.swift b/Shared/Models/Protocols/Votable.swift new file mode 100644 index 0000000..82a2b1f --- /dev/null +++ b/Shared/Models/Protocols/Votable.swift @@ -0,0 +1,12 @@ +// +// Votable.swift +// Reddit +// +// Created by Carson Katri on 8/15/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +protocol Votable { + var score: Int { get } + var likes: Bool? { get set } +} diff --git a/Shared/Views/CommentsView.swift b/Shared/Views/CommentsView.swift index d319214..6d42a52 100644 --- a/Shared/Views/CommentsView.swift +++ b/Shared/Views/CommentsView.swift @@ -19,10 +19,7 @@ struct CommentsView: View { var body: some View { // Load the comments - RequestView([CommentListing].self, Request { - Url(API.default.postURL(post.subreddit, post.id)) - Header.Accept(.json) - }) { listings in + RequestView([CommentListing].self, API.default.post(post.subreddit, post.id)) { listings in if listings != nil { // `dropFirst` because `first` is the actual post if listings!.dropFirst().map({ $0.data.children }).flatMap({ $0.map { $0.data } }).count > 0 { @@ -41,11 +38,11 @@ struct CommentsView: View { } struct CommentView: View { - let comment: Comment + @State var comment: Comment let nestLevel: Int var body: some View { - Group { + return Group { HStack { /// Left border for nested comments if nestLevel > 0 { @@ -57,8 +54,7 @@ struct CommentView: View { VStack(alignment: .leading) { HStack { Text(comment.author) - Image(systemName: "arrow.up") - Text("\(comment.score)") + VoteView(votable: $comment) } .font(.caption) .opacity(0.75) diff --git a/Shared/Views/MetadataView.swift b/Shared/Views/MetadataView.swift index 58a31e7..32f1228 100644 --- a/Shared/Views/MetadataView.swift +++ b/Shared/Views/MetadataView.swift @@ -9,7 +9,7 @@ import SwiftUI struct MetadataView: View { - let post: Post + @State var post: Post let spaced: Bool var stickied: some View { @@ -33,8 +33,9 @@ struct MetadataView: View { Spacer() } stickied + VoteView(votable: $post) /// Tuples store the SF Symbols, text, and color - ForEach([("arrow.up", "\(post.score)", Color.orange), ("text.bubble", "\(post.num_comments)", Color.primary), ("clock", "\(timeSince(post.created_utc))", Color.primary)], id: \.0) { data in + ForEach([("text.bubble", "\(post.num_comments)", Color.primary), ("clock", "\(timeSince(post.created_utc))", Color.primary)], id: \.0) { data in Group { Image(systemName: data.0) Text(data.1) diff --git a/Shared/Views/OAuth/ProfileView.swift b/Shared/Views/OAuth/ProfileView.swift index 81a547c..b2c7c05 100644 --- a/Shared/Views/OAuth/ProfileView.swift +++ b/Shared/Views/OAuth/ProfileView.swift @@ -34,6 +34,14 @@ struct ProfileView: View { } } } + Section { + Button(action: { + print("Logout") + API.default.logout() + }) { + Text("Logout") + } + } }) } else { list = AnyView(SpinnerView()) diff --git a/Shared/Views/OAuth/VoteView.swift b/Shared/Views/OAuth/VoteView.swift new file mode 100644 index 0000000..72abe0f --- /dev/null +++ b/Shared/Views/OAuth/VoteView.swift @@ -0,0 +1,49 @@ +// +// VoteView.swift +// Reddit +// +// Created by Carson Katri on 8/15/19. +// Copyright © 2019 Carson Katri. All rights reserved. +// + +import SwiftUI + +struct VoteView : View { + @Binding var votable: VotableThing + + var body: some View { + Group { + Image(systemName: "arrow.up") + .onTapGesture { + if API.default.loggedIn { + if self.votable.likes == true { + API.default.unvote(self.votable.name) { + self.votable.likes = nil + } + } else { + API.default.upvote(self.votable.name) { + self.votable.likes = true + } + } + } + } + .foregroundColor(votable.likes == true ? Color.orange : Color.primary) + Text("\(votable.score + (votable.likes == nil ? 0 : (votable.likes == true ? 1 : -1)))") + Image(systemName: "arrow.down") + .onTapGesture { + if API.default.loggedIn { + if self.votable.likes == false { + API.default.unvote(self.votable.name) { + self.votable.likes = nil + } + } else { + API.default.downvote(self.votable.name) { + self.votable.likes = false + } + } + } + } + .foregroundColor(votable.likes == false ? Color.blue : Color.primary) + } + } +} diff --git a/Shared/Views/PostDetailView.swift b/Shared/Views/PostDetailView.swift index adf140f..6abc65a 100644 --- a/Shared/Views/PostDetailView.swift +++ b/Shared/Views/PostDetailView.swift @@ -67,13 +67,9 @@ struct PostDetailView: View { .padding(.bottom, 40) /// Comment text field #if os(macOS) - AddCommentView(text: $comment) { text in - API.default.comment(text, on: self.post.id) - } + AddCommentView(text: $comment, parentName: self.post.name) #else - AddCommentView(text: $comment) { text in - API.default.comment(text, on: self.post.id) - } + AddCommentView(text: $comment, parentName: self.post.name) .offset(y: keyboardObserver.keyboardHeight > 0 ? -(keyboardObserver.keyboardHeight - 50) : 0) .animation(.spring()) #endif @@ -81,7 +77,10 @@ struct PostDetailView: View { #if os(iOS) return list.navigationBarTitle(Text("r/\(post.subreddit)"), displayMode: .inline) #else - return list + // TODO: Implement `onCommand` + return list/*.onCommand(#selector(AppDelegate.upvote(_:))) { + print("Command received in View") + }*/ #endif } } From 541e65457e5f347f27c13a890f799e6ee813f5e6 Mon Sep 17 00:00:00 2001 From: Carson Katri Date: Tue, 24 Sep 2019 15:15:43 -0400 Subject: [PATCH 6/7] Preparations for AppStore deployment (for TestFlight public beta) --- .../AppIcon-old.appiconset/Contents.json | 122 ++++++++++++++++++ .../Icon-App-20x20@1x.png | Bin .../Icon-App-20x20@2x.png | Bin .../Icon-App-20x20@3x.png | Bin .../Icon-App-29x29@1x.png | Bin .../Icon-App-29x29@2x.png | Bin .../Icon-App-29x29@3x.png | Bin .../Icon-App-40x40@1x.png | Bin .../Icon-App-40x40@2x.png | Bin .../Icon-App-40x40@3x.png | Bin .../Icon-App-60x60@2x.png | Bin .../Icon-App-60x60@3x.png | Bin .../Icon-App-76x76@1x.png | Bin .../Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../ItunesArtwork@2x.png | Bin .../AppIcon.appiconset/Contents.json | 42 +++--- .../AppIcon.appiconset/icon_1024@1x.png | Bin 0 -> 14959 bytes .../AppIcon.appiconset/icon_20@1x.png | Bin 0 -> 539 bytes .../AppIcon.appiconset/icon_20@2x.png | Bin 0 -> 1119 bytes .../AppIcon.appiconset/icon_20@3x.png | Bin 0 -> 1739 bytes .../AppIcon.appiconset/icon_29@1x.png | Bin 0 -> 836 bytes .../AppIcon.appiconset/icon_29@2x.png | Bin 0 -> 1680 bytes .../AppIcon.appiconset/icon_29@3x.png | Bin 0 -> 2576 bytes .../AppIcon.appiconset/icon_40@1x.png | Bin 0 -> 1119 bytes .../AppIcon.appiconset/icon_40@2x.png | Bin 0 -> 2302 bytes .../AppIcon.appiconset/icon_40@3x.png | Bin 0 -> 3661 bytes .../AppIcon.appiconset/icon_60@2x.png | Bin 0 -> 3661 bytes .../AppIcon.appiconset/icon_60@3x.png | Bin 0 -> 5682 bytes .../AppIcon.appiconset/icon_76@1x.png | Bin 0 -> 2215 bytes .../AppIcon.appiconset/icon_76@2x.png | Bin 0 -> 4696 bytes .../AppIcon.appiconset/icon_83.5@2x.png | Bin 0 -> 5192 bytes Reddit-iOS/Info.plist | 2 +- Reddit.xcodeproj/project.pbxproj | 16 ++- privacy_policy.md | 56 ++++++++ 35 files changed, 208 insertions(+), 30 deletions(-) create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Contents.json rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-20x20@1x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-20x20@2x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-20x20@3x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-29x29@1x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-29x29@2x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-29x29@3x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-40x40@1x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-40x40@2x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-40x40@3x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-60x60@2x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-60x60@3x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-76x76@1x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-76x76@2x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/Icon-App-83.5x83.5@2x.png (100%) rename Reddit-iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon-old.appiconset}/ItunesArtwork@2x.png (100%) create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_1024@1x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_20@1x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_20@2x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_20@3x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_29@1x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_29@2x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_29@3x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_40@1x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_40@2x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_40@3x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_60@2x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_60@3x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_76@1x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_76@2x.png create mode 100644 Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_83.5@2x.png create mode 100644 privacy_policy.md diff --git a/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Contents.json b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Contents.json new file mode 100644 index 0000000..8d8f4bb --- /dev/null +++ b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "ItunesArtwork@2x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-20x20@1x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-20x20@2x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-20x20@3x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-29x29@1x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-29x29@2x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-29x29@3x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-40x40@1x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-40x40@2x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-40x40@3x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-60x60@2x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-60x60@3x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-76x76@1x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-76x76@2x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/ItunesArtwork@2x.png similarity index 100% rename from Reddit-iOS/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png rename to Reddit-iOS/Assets.xcassets/AppIcon-old.appiconset/ItunesArtwork@2x.png diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json index 8d8f4bb..52bff2f 100644 --- a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -3,115 +3,109 @@ { "size" : "20x20", "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", + "filename" : "icon_20@2x.png", "scale" : "2x" }, { "size" : "20x20", "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", + "filename" : "icon_20@3x.png", "scale" : "3x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", + "filename" : "icon_29@2x.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", + "filename" : "icon_29@3x.png", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", + "filename" : "icon_40@2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", + "filename" : "icon_40@3x.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", + "filename" : "icon_60@2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", + "filename" : "icon_60@3x.png", "scale" : "3x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", + "filename" : "icon_20@1x.png", "scale" : "1x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", + "filename" : "icon_20@2x.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", + "filename" : "icon_29@1x.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", + "filename" : "icon_29@2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", + "filename" : "icon_40@1x.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", + "filename" : "icon_40@2x.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", + "filename" : "icon_76@1x.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", + "filename" : "icon_76@2x.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", + "filename" : "icon_83.5@2x.png", "scale" : "2x" }, { "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "ItunesArtwork@2x.png", + "filename" : "icon_1024@1x.png", "scale" : "1x" } ], diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_1024@1x.png b/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..375f5a141d63895b8438861d3344241b840de829 GIT binary patch literal 14959 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 literal 0 HcmV?d00001 diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_76@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_76@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..71ee2355674af0a353b2df31cf31fc4f7304692b GIT binary patch literal 4696 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 aMXMi{Tl7~drJV4q2%x8BbgxDO7WqF8`qFa% literal 0 HcmV?d00001 diff --git a/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_83.5@2x.png b/Reddit-iOS/Assets.xcassets/AppIcon.appiconset/icon_83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..318a5c29766c135f62b2445ca13b04082081c248 GIT binary patch literal 5192 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 C*ASxs literal 0 HcmV?d00001 diff --git a/Reddit-iOS/Info.plist b/Reddit-iOS/Info.plist index fcd2d6b..10d35ea 100644 --- a/Reddit-iOS/Info.plist +++ b/Reddit-iOS/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/Reddit.xcodeproj/project.pbxproj b/Reddit.xcodeproj/project.pbxproj index 16e0727..e601423 100644 --- a/Reddit.xcodeproj/project.pbxproj +++ b/Reddit.xcodeproj/project.pbxproj @@ -20,6 +20,7 @@ 26C1D7FB22E33FD40057DED1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 26C1D7FA22E33FD40057DED1 /* Assets.xcassets */; }; 26C1D7FE22E33FD40057DED1 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 26C1D7FD22E33FD40057DED1 /* Preview Assets.xcassets */; }; 26C1D80122E33FD40057DED1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 26C1D7FF22E33FD40057DED1 /* LaunchScreen.storyboard */; }; + 26EC1892233AA2A1007456B7 /* privacy_policy.md in Resources */ = {isa = PBXBuildFile; fileRef = 26EC1891233AA2A1007456B7 /* privacy_policy.md */; }; B508E10022F8F6F7002C4C76 /* banner.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = B508E0FF22F8F6F7002C4C76 /* banner.jpeg */; }; B5145A1F22EFD4E6009237BD /* CommentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26746F0A22ECD4DC00A57918 /* CommentsView.swift */; }; B5145A2122EFD557009237BD /* MetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E60CB522EFD2A000A0075B /* MetadataView.swift */; }; @@ -167,7 +168,7 @@ 26B69D1C22E52B7F001AD18F /* PostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostView.swift; sourceTree = ""; }; 26B69D2022E53213001AD18F /* SortBy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortBy.swift; sourceTree = ""; }; 26BBF27022E66EAD006CC669 /* PostDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostDetailView.swift; sourceTree = ""; }; - 26C1D7F122E33FD30057DED1 /* Reddit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Reddit.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 26C1D7F122E33FD30057DED1 /* Homepage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Homepage.app; sourceTree = BUILT_PRODUCTS_DIR; }; 26C1D7F422E33FD30057DED1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 26C1D7F622E33FD30057DED1 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; 26C1D7F822E33FD30057DED1 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -175,6 +176,7 @@ 26C1D7FD22E33FD40057DED1 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 26C1D80022E33FD40057DED1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 26C1D80222E33FD40057DED1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 26EC1891233AA2A1007456B7 /* privacy_policy.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = privacy_policy.md; sourceTree = ""; }; B508E0FF22F8F6F7002C4C76 /* banner.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = banner.jpeg; sourceTree = ""; }; B508E10322F8FA16002C4C76 /* SpinnerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerView.swift; sourceTree = ""; }; B508E10422F8FA16002C4C76 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = ""; }; @@ -284,6 +286,7 @@ isa = PBXGroup; children = ( B59DE46B22F8CBD800D8BD1C /* README.md */, + 26EC1891233AA2A1007456B7 /* privacy_policy.md */, B511A2EB22EE8A2D0062B8D4 /* Shared */, 26C1D7F322E33FD30057DED1 /* Reddit-iOS */, B5A7595F22EF97D6001FD4F1 /* Reddit-watchOS WatchKit App */, @@ -298,7 +301,7 @@ 26C1D7F222E33FD30057DED1 /* Products */ = { isa = PBXGroup; children = ( - 26C1D7F122E33FD30057DED1 /* Reddit.app */, + 26C1D7F122E33FD30057DED1 /* Homepage.app */, B5A7595822EF97D6001FD4F1 /* Reddit.app */, B5A7595B22EF97D6001FD4F1 /* Reddit-watchOS WatchKit App.app */, B5A7596A22EF97D8001FD4F1 /* Reddit-watchOS WatchKit Extension.appex */, @@ -577,7 +580,7 @@ B5A7594922EE8EBA001FD4F1 /* Request */, ); productName = Reddit; - productReference = 26C1D7F122E33FD30057DED1 /* Reddit.app */; + productReference = 26C1D7F122E33FD30057DED1 /* Homepage.app */; productType = "com.apple.product-type.application"; }; B533A68522F2533800FD3FB2 /* Reddit-macOS */ = { @@ -714,6 +717,7 @@ buildActionMask = 2147483647; files = ( 26C1D80122E33FD40057DED1 /* LaunchScreen.storyboard in Resources */, + 26EC1892233AA2A1007456B7 /* privacy_policy.md in Resources */, B557366B2303319100E41BE7 /* API.plist in Resources */, 26C1D7FE22E33FD40057DED1 /* Preview Assets.xcassets in Resources */, B508E10022F8F6F7002C4C76 /* banner.jpeg in Resources */, @@ -1032,6 +1036,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_ASSET_PATHS = "Reddit-iOS/Preview\\ Content"; DEVELOPMENT_TEAM = FH9CW55WY5; ENABLE_PREVIEWS = YES; @@ -1041,7 +1046,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.carsonkatri.RedditSwiftUI; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Homepage; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -1057,6 +1062,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_ASSET_PATHS = "Reddit-iOS/Preview\\ Content"; DEVELOPMENT_TEAM = FH9CW55WY5; ENABLE_PREVIEWS = YES; @@ -1066,7 +1072,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.carsonkatri.RedditSwiftUI; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Homepage; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; diff --git a/privacy_policy.md b/privacy_policy.md new file mode 100644 index 0000000..deede3a --- /dev/null +++ b/privacy_policy.md @@ -0,0 +1,56 @@ +## Privacy Policy (for AppStore deploys) + +Carson Katri built the Homepage for Reddit app as an Open Source app. This SERVICE is provided by Carson Katri at no cost and is intended for use as is. + +This page is used to inform visitors regarding my policies with the collection, use, and disclosure of Personal Information if anyone decided to use my Service. + +If you choose to use my Service, then you agree to the collection and use of information in relation to this policy. The Personal Information that I collect is used for providing and improving the Service. I will not use or share your information with anyone except as described in this Privacy Policy. + +The terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which is accessible at Homepage for Reddit unless otherwise defined in this Privacy Policy. + +**Information Collection and Use** + +For a better experience, while using our Service, I may require you to provide us with certain personally identifiable information. The information that I request will be retained on your device and is not collected by me in any way. + +**Log Data** + +I want to inform you that whenever you use my Service, in a case of an error in the app I collect data and information (through third party products) on your phone called Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing my Service, the time and date of your use of the Service, and other statistics. + +**Cookies** + +Cookies are files with a small amount of data that are commonly used as anonymous unique identifiers. These are sent to your browser from the websites that you visit and are stored on your device's internal memory. + +This Service does not use these “cookies” explicitly. However, the app may use third party code and libraries that use “cookies” to collect information and improve their services. You have the option to either accept or refuse these cookies and know when a cookie is being sent to your device. If you choose to refuse our cookies, you may not be able to use some portions of this Service. + +**Service Providers** + +I may employ third-party companies and individuals due to the following reasons: + +* To facilitate our Service; +* To provide the Service on our behalf; +* To perform Service-related services; or +* To assist us in analyzing how our Service is used. + +I want to inform users of this Service that these third parties have access to your Personal Information. The reason is to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose. + +**Security** + +I value your trust in providing us your Personal Information, thus we are striving to use commercially acceptable means of protecting it. But remember that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and I cannot guarantee its absolute security. + +**Links to Other Sites** + +This Service may contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by me. Therefore, I strongly advise you to review the Privacy Policy of these websites. I have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services. + +**Children’s Privacy** + +These Services do not address anyone under the age of 13. I do not knowingly collect personally identifiable information from children under 13\. In the case I discover that a child under 13 has provided me with personal information, I immediately delete this from our servers. If you are a parent or guardian and you are aware that your child has provided us with personal information, please contact me so that I will be able to do necessary actions. + +**Changes to This Privacy Policy** + +I may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. I will notify you of any changes by posting the new Privacy Policy on this page. These changes are effective immediately after they are posted on this page. + +**Contact Us** + +If you have any questions or suggestions about my Privacy Policy, do not hesitate to contact me at carson.katri@gmail.com. + +This privacy policy page was created at [privacypolicytemplate.net](https://privacypolicytemplate.net) and modified/generated by [App Privacy Policy Generator](https://app-privacy-policy-generator.firebaseapp.com/) From 4e0ae63b656bd2275e565127d7325b6136854cb9 Mon Sep 17 00:00:00 2001 From: Carson Katri Date: Fri, 5 Jun 2020 14:08:51 -0400 Subject: [PATCH 7/7] Resolve swift-request version --- Reddit.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Reddit.xcodeproj/project.pbxproj b/Reddit.xcodeproj/project.pbxproj index e601423..ee8135d 100644 --- a/Reddit.xcodeproj/project.pbxproj +++ b/Reddit.xcodeproj/project.pbxproj @@ -1306,8 +1306,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/carson-katri/swift-request"; requirement = { - branch = base64; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 1.2.2; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1a5e235..cdd893d 100644 --- a/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Reddit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,9 +5,9 @@ "package": "Request", "repositoryURL": "https://github.com/carson-katri/swift-request", "state": { - "branch": "base64", - "revision": "c38ebea8fc84d986b9d18f8a971851754a63248f", - "version": null + "branch": null, + "revision": "8d297a4cb8913beb463843c99751fd5671b35cef", + "version": "1.2.2" } } ]