Commit Graph

525 Commits

Author SHA1 Message Date
Maurice Parker
06a1a5f28b Merge branch 'pr/2218' into swiftui 2020-07-06 16:39:36 -05:00
Maurice Parker
d1f7473a02 Moved items to match current layout 2020-07-06 16:30:50 -05:00
Maurice Parker
e5ad208730 Fix iOS background colors 2020-07-06 16:14:43 -05:00
Maurice Parker
fcf0c1ad1c Implement Settings About Section. Issue #2174 2020-07-06 15:30:32 -05:00
Rizwan Mohamed Ibrahim
cbac7a85cb
Add feeds settings import/export errors 2020-07-06 22:43:20 +05:30
Stuart Breckenridge
d8df24e997 removes reference to old appSettings var 2020-07-06 20:18:50 +08:00
Stuart Breckenridge
10924caf7f Fixes #2171
Slider is now used in lieu of a stepper. To do that, `timelineIconDimensions` had to be changed from an `Int` to a `Double`.
2020-07-06 17:54:11 +08:00
Maurice Parker
ac0153b71f Remove unused type alias 2020-07-06 01:46:12 -05:00
Maurice Parker
958de0c0d9 Remove VisualEffectBlur and split ArticleView into target specific files 2020-07-06 01:44:35 -05:00
Maurice Parker
6695fcfca7 Refactor sidebar styling to remove duplicate code 2020-07-06 01:32:43 -05:00
Maurice Parker
bcbb38c120 Change to initialize Refresh when the onAppear event happens so that we quit crashing on macOS 2020-07-05 19:49:07 -05:00
Maurice Parker
aca4cdf4ec fixed asset catalog 2020-07-05 19:36:43 -05:00
Maurice Parker
6c5655191e Implement hack to hide disclosure chevrons 2020-07-05 19:21:23 -05:00
Maurice Parker
9126ec424d Align unread counts on iOS 2020-07-05 19:09:23 -05:00
Maurice Parker
1389008b31 Add Article toolbar 2020-07-05 18:53:18 -05:00
Maurice Parker
5b0c397739 Add filter buttons to navigation bar 2020-07-05 15:11:45 -05:00
Maurice Parker
14601fc96b Change how next unread image is scaled up 2020-07-05 15:01:02 -05:00
Maurice Parker
eb8f6e0c03 Refactor the Timeline toolbar to be a modifier like Sidebar's is 2020-07-05 14:52:04 -05:00
Maurice Parker
8b81548457 Rename SidebarToolbar to SidebarToolbarModifer 2020-07-05 14:45:19 -05:00
Maurice Parker
3e2bf6f301
Merge pull request #2213 from stuartbreckenridge/swiftui
Add Feed Folder Picker
2020-07-05 14:23:23 -05:00
Stuart Breckenridge
ad4aaf9a19 Add Feed Folder Picker
Fixes #2193:

• Containers with indentation are supported
• Small icon provider is used
• AssetCatalog updated with SF Symbol images for desktop, iPad, iPhone.
• Title page doesn’t work at the current time.
2020-07-05 09:06:53 +08:00
Maurice Parker
49c86bd578 Add Get Info to Sidebar context menu 2020-07-04 14:13:12 -05:00
Maurice Parker
3f7401994d Made Sidebar context menu code simpler 2020-07-04 12:16:21 -05:00
Maurice Parker
5d43635780 Move directly referenced images to AppAssets 2020-07-04 11:57:51 -05:00
Maurice Parker
7cebe7e70f Fixed case for FaviconTemplateImage 2020-07-04 10:32:42 -05:00
Maurice Parker
4cb28cfc20 Fixed Favicon asset name. 2020-07-04 10:24:37 -05:00
Maurice Parker
208271d6b4
Merge pull request #2210 from philviso/swiftui-progressview
Implement iOS progress view
2020-07-04 10:23:20 -05:00
Phil Viso
9131056f2b Added refreshProgressState to SceneModel. Removed RefreshProgressModel from environment 2020-07-04 10:20:50 -05:00
Stuart Breckenridge
14c66f9c2b Add Feed Fix
Fixes #2209
2020-07-04 23:12:53 +08:00
Maurice Parker
21689bcbd3
Merge pull request #2211 from stuartbreckenridge/swiftui
Add Feed Fix
2020-07-04 10:10:48 -05:00
Stuart Breckenridge
3bf30fb6e2 Add Feed Fix
Fixes #2209
2020-07-04 23:08:12 +08:00
Phil Viso
299f3d421e Fixed refresh progress label truncating 2020-07-04 09:34:56 -05:00
Maurice Parker
5da851f937 Rebuild the sidebar when things are added or changed 2020-07-04 09:33:27 -05:00
Maurice Parker
e062ccc67e Restore object did change event 2020-07-04 09:21:53 -05:00
Phil Viso
16e7b23425 Fixed merge conflict 2020-07-04 09:20:51 -05:00
Maurice Parker
d07f42dc88
Merge pull request #2207 from alexcfaber/feature/add-folder
NEW: Add Folder functionality in SwiftUI
2020-07-04 09:19:59 -05:00
Alex Faber
7fc7bedf9e NEW: Add Folder functionality in SwiftUI 2020-07-04 16:19:03 +02:00
Maurice Parker
9fa003d545 Default Smart Feeds and Accounts to being expanded in Sidebar 2020-07-04 09:18:56 -05:00
Phil Viso
9b43994701 Merge branch 'swiftui' of https://github.com/brentsimmons/NetNewsWire into swiftui-progressview
# Conflicts:
#	Multiplatform/Shared/Sidebar/SidebarToolbar.swift
2020-07-04 09:15:08 -05:00
Phil Viso
03f28a4d98 Fixed crash as a result of mismatched asset name 2020-07-04 09:10:06 -05:00
Phil Viso
2ed0d66e42 Implement iOS progress view #2162 2020-07-04 09:09:49 -05:00
Maurice Parker
f16fd36e70
Merge pull request #2206 from stuartbreckenridge/swiftui
Add Web Feed macOS Layout
2020-07-04 09:05:49 -05:00
Maurice Parker
4bd6b3ac96 Refactor SettingsModel into its own swift file 2020-07-04 09:03:35 -05:00
Stuart Breckenridge
294591d154 Fixes compile crash with sidebar toolbar 2020-07-04 22:01:01 +08:00
Stuart Breckenridge
01a84a2a40 Sidebar toolbar no longer an overlay
Also moved view model to separate file and removed the view prefix.
2020-07-04 21:34:15 +08:00
Stuart Breckenridge
c0755fe55b Add Web Feed Layout
Fixes #2194

• Views are aligned using `LazyVGrid` and some `.padding()`
2020-07-04 21:07:18 +08:00
Rizwan Mohamed Ibrahim
dde9035592
Add feeds settings for import and export subscriptions 2020-07-04 13:39:08 +05:30
Maurice Parker
ba0093e07c Implement timeline toolbar using toolbar modifier 2020-07-03 22:14:36 -05:00
Maurice Parker
4486d2bd09 Add TimeilneToolbar. Issue #2195 2020-07-03 21:55:27 -05:00
Maurice Parker
6a0f9b63ac
Merge pull request #2200 from stuartbreckenridge/swiftui
Fixes #2199
2020-07-03 21:18:49 -05:00
Stuart Breckenridge
c66c386df7 2199
Fixes #2199

• Removes scheme from url checker.
2020-07-04 09:40:38 +08:00
Stuart Breckenridge
9491855fb8 2199
On iOS:
• Autocorrection and auto capitalisation is disabled on URL field

On macOS:
• Autocorrection is disabled.
2020-07-04 09:31:58 +08:00
Maurice Parker
b28fc913af Renamed because we just call out view models Models 2020-07-03 20:23:41 -05:00
Maurice Parker
883590b50f
Merge pull request #2198 from stuartbreckenridge/swiftui
Fixes #2196
2020-07-03 20:12:29 -05:00
Stuart Breckenridge
e99ff1346b Work on #2196
Fixes #2196

All logic has moved to `AddWebFeedViewModel`.
2020-07-04 09:07:55 +08:00
Maurice Parker
6b45a72707 Change unread indicator font and weight to match existing iOS parameters 2020-07-03 20:03:36 -05:00
Maurice Parker
4393e54a5c Fix unread indicator color 2020-07-03 19:41:38 -05:00
Maurice Parker
217d1ac880 Changed add button to be a menu. 2020-07-03 19:29:25 -05:00
Maurice Parker
dd9dca57de Update design to more closely match the existing iOS design and Big Sur look and feel 2020-07-03 19:19:40 -05:00
Maurice Parker
c761a083b5 Add Timeline vertical padding for macOS 2020-07-03 12:21:08 -05:00
Maurice Parker
a4537ec0d4 Merge branch 'swiftui' of https://github.com/Ranchero-Software/NetNewsWire into swiftui 2020-07-03 11:46:32 -05:00
Stuart Breckenridge
74438de343 Renames viewmodel 2020-07-04 00:10:47 +08:00
Stuart Breckenridge
8840bf535f Merges fixes from colorPalette work 2020-07-04 00:06:43 +08:00
Stuart Breckenridge
75166b404e Merge branch 'pr/7' into swiftui
# Conflicts:
#	Multiplatform/Shared/Sidebar/SidebarToolbar.swift
2020-07-03 23:47:21 +08:00
Maurice Parker
52a868ae7d Refactored PreferredColorSchemeModifier out into its own swift file 2020-07-03 10:45:12 -05:00
Stuart Breckenridge
d8914510f7 AddWebFeed
Fixes #2184

Adding Web Feeds is working for macOS and iOS. There are some alignment is.
2020-07-03 23:43:20 +08:00
Maurice Parker
45e702501e Change to set preferredColorScheme to nil which should make it automatic again (but doesn't) 2020-07-03 10:43:05 -05:00
Stuart Breckenridge
a4f53bc167 Using Form and monospace to keep alignment
Work in progress for #2184
2020-07-03 22:58:39 +08:00
Stuart Breckenridge
bfd5bd467d Credits for url parser
Work in progress for #2184
2020-07-03 21:53:43 +08:00
Stuart Breckenridge
467c16465f add feed changes
sorts alignment issues with monospaced fonts.
2020-07-03 21:43:55 +08:00
Stuart Breckenridge
6fb5af81af Removes Combine import. 2020-07-03 20:41:47 +08:00
Stuart Breckenridge
6b6ff7ce1c Work in progress for #2184 2020-07-03 20:31:48 +08:00
Rizwan Mohamed Ibrahim
7cc71eac95
Merge branch 'swiftui' into swiftui-color-palette
* swiftui:
  Register AppDefaults.  Issue #2190
  Removed obsolete AppDefaults values
  Revert to using List for timeline and use infinite scrolling technique to speed up timeline loads
  Add action sheet for adding feed resources
  Stub out Article code
  Delete dead code
  Fix bad merge where we were missing a file reference

# Conflicts:
#	NetNewsWire.xcodeproj/project.pbxproj
2020-07-03 13:45:03 +05:30
Rizwan Mohamed Ibrahim
fc548ac913
Try conditional modifier for preferredColorScheme 2020-07-03 12:35:12 +05:30
Maurice Parker
88d03586ae Register AppDefaults. Issue #2190 2020-07-03 01:24:35 -05:00
Maurice Parker
782ae1c5cd Removed obsolete AppDefaults values 2020-07-03 01:01:38 -05:00
Maurice Parker
2292d04f91 Revert to using List for timeline and use infinite scrolling technique to speed up timeline loads 2020-07-02 17:36:50 -05:00
Maurice Parker
c6bd4cd6e3 Add action sheet for adding feed resources 2020-07-02 16:18:59 -05:00
Maurice Parker
494bd85a37 Stub out Article code 2020-07-02 15:30:50 -05:00
Maurice Parker
248b6720fc Delete dead code 2020-07-02 13:38:02 -05:00
Rizwan Mohamed Ibrahim
959eef6a1a
Add color palette implementation for Appearance settings 2020-07-02 21:10:24 +05:30
Maurice Parker
313d3df573 Fix timeline so that it works with most recent AppDefaults code 2020-07-02 05:46:56 -05:00
Maurice Parker
cec866cf27
Merge branch 'swiftui' into swiftui 2020-07-02 04:53:43 -05:00
Stuart Breckenridge
c2149579c9 Converts AppDefaults to singleton 2020-07-02 09:58:25 +08:00
Maurice Parker
ee4d8b34b1 Make sure image loaders don't loop if onAppear gets repeatedly called 2020-07-01 19:50:40 -05:00
Stuart Breckenridge
4e8e792471 Defaults added from NetNewsWire macOS 2020-07-02 06:59:33 +08:00
Maurice Parker
e7e3a0d5d7 Change the timeline byline to be the webbed for now 2020-07-01 17:44:45 -05:00
Maurice Parker
269d9462fe Change byline to truncate and only use 1 line 2020-07-01 17:42:44 -05:00
Maurice Parker
0b36498ff8 Added date and byline to timeline 2020-07-01 17:39:27 -05:00
Maurice Parker
bacffbadbe Add icon image to Timeline 2020-07-01 17:21:58 -05:00
Maurice Parker
4c148e6eba Rename FeedImageLoader 2020-07-01 16:37:20 -05:00
Maurice Parker
781f24454e Add read/starred indicator to timeline 2020-07-01 16:33:07 -05:00
Maurice Parker
74f34b1c78 Add basic timeline fetching 2020-07-01 12:30:55 -05:00
Maurice Parker
c1eb9ab927 Add sidebar navigation 2020-07-01 11:13:11 -05:00
Stuart Breckenridge
0e0f46fa49 Refactors AppDefaults to AppSettings
This commit makes some assumptions:

- `AppSettings` is an `ObservableObject` that uses `@AppStorage` where possible, which sets default values.
- Each change to an property triggers an `objectWillChange.send()` call.
- `IconSize` is not used. Instead, it defaults to 40.0 with minimums and maximums of 20.0 and 60.0, controlled via Timeline settings.
2020-07-01 21:06:40 +08:00
Maurice Parker
e7a04804b4 Simplified the if/else logic in the getter 2020-07-01 03:46:00 -05:00
Stuart Breckenridge
c10207ecaa Merge branch 'swiftui' of https://github.com/stuartbreckenridge/NetNewsWire into swiftui 2020-07-01 09:52:59 +08:00
Maurice Parker
6ddf0f29fb Comment out SceneStorage since it crashes on launch on macOS 2020-06-30 20:38:55 -05:00
Maurice Parker
53a26f89fe Implement scene specific storage for Sidebar expanded state 2020-06-30 20:23:22 -05:00
Maurice Parker
e593f67429 Stub out Timeline code 2020-06-30 11:03:33 -05:00
Stuart Breckenridge
12a0d13971 Changes viewModel to @StateObject 2020-06-30 22:31:12 +08:00
Stuart Breckenridge
6cb4c46e4b Adds app version text to setting footer 2020-06-30 21:50:53 +08:00
Stuart Breckenridge
2342ef2b76 Adds Toolbar for Sidebar & SettingsViews for iOS 2020-06-30 21:22:23 +08:00
Stuart Breckenridge
f222dbd0fa SidebarItem updates
Several computed properties added to `SidebarItem` which `SidebarItemView` makes use of.
2020-06-30 12:37:29 +08:00
Stuart Breckenridge
c3e93980d1 Adds context menus to sidebar items 2020-06-30 10:31:50 +08:00
Stuart Breckenridge
2cedffd39c Removes sidebar commandgroup 2020-06-30 09:29:31 +08:00
Maurice Parker
835b04c53d Add feed icons 2020-06-29 20:09:11 -05:00
Maurice Parker
61ad0fbfa4 Add unread counts to Sidebar 2020-06-29 16:58:10 -05:00
Maurice Parker
29b5f426fd Add accounts to Sidebar 2020-06-29 15:03:17 -05:00
Maurice Parker
0886cffcff Refactor the SidebarView list into its own View so to reduce code duplication 2020-06-29 13:14:03 -05:00
Stuart Breckenridge
0907164627 Adapts to compact size classes 2020-06-29 22:06:00 +08:00
Stuart Breckenridge
8b7940492a Mac Toolbar
Placement of buttons is not quite right, but the search bar is in the right place!
2020-06-29 21:19:51 +08:00
Stuart Breckenridge
1f6f5fa054 Adds Mac Preferences
This makes use of `@AppStorage` for preferences. Severeral more need to migrated from AppDefaults etc.
2020-06-29 21:04:50 +08:00
Stuart Breckenridge
2e6e934b6f SceneBuilder & Key Commands
Placeholders for most existing key commands on macOS and iPad OS.
2020-06-29 20:36:54 +08:00
Maurice Parker
be39448e01 Change to sidebar list style 2020-06-29 06:31:50 -05:00
Maurice Parker
86b929743b Add SmartFeeds to outline 2020-06-29 06:16:48 -05:00
Maurice Parker
0bd4301df2 Add environment object to previews so that they work. 2020-06-28 21:17:00 -05:00
Maurice Parker
c40b7d8c05 Tweak the project settings to get previews working 2020-06-28 21:05:49 -05:00
Maurice Parker
8d5441759f Fix incorrect app icon asset 2020-06-28 19:21:48 -05:00
Maurice Parker
f669411b55 Update project settings so that we can compile under xcode previews 2020-06-28 17:43:20 -05:00
Maurice Parker
b82686e7b8 Change app identification so that we keep the same user defaults as the previous mac and ios versions 2020-06-28 14:40:01 -05:00
Maurice Parker
da9325a93b Remove request for notifications. We will implement this later in the preferences when a user opts in to them. 2020-06-28 14:30:13 -05:00
Maurice Parker
441bc072f3 Create rough app outline 2020-06-28 14:21:43 -05:00
Maurice Parker
67c0e00957 Make multiplatform compile shared app resources 2020-06-28 03:05:01 -05:00
Maurice Parker
7ceaa305e7 Initial multiplatform build 2020-06-27 11:22:01 -05:00