Maurice Parker
91f2479b96
Merge pull request #2234 from stuartbreckenridge/fix/2193
...
Fix 2193
2020-07-09 08:10:42 -05:00
Maurice Parker
897474a637
Fixed the font for macOS article view
2020-07-09 07:47:47 -05:00
Rizwan Mohamed Ibrahim
2c7663870a
Add settings account details view and implementations
2020-07-09 16:14:53 +05:30
Stuart Breckenridge
771fe21422
Tidy up
2020-07-09 17:36:17 +08:00
Stuart Breckenridge
f4deab1361
Updates title to match current app
2020-07-09 17:04:04 +08:00
Stuart Breckenridge
9830a977a0
Add Web Feed Colours
...
Icons in the picker now use accent colour.
2020-07-09 16:58:04 +08:00
Maurice Parker
f5855f032d
Revert to a less obnoxious status bar color
2020-07-08 22:43:16 -05:00
Maurice Parker
f2e29de7b6
Trying a different color for the web status background
2020-07-08 22:41:13 -05:00
Maurice Parker
107a8fd550
Implement macOS web view mouse over events
2020-07-08 22:27:59 -05:00
Maurice Parker
5abf222c8a
Merge branch 'swiftui' of https://github.com/Ranchero-Software/NetNewsWire into swiftui
2020-07-08 20:13:08 -05:00
Maurice Parker
5583b21616
Merge pull request #2232 from stuartbreckenridge/swiftui
...
Multi-selection on macOS #2164
2020-07-08 20:12:23 -05:00
Stuart Breckenridge
4c11667ff7
Moves selection to SidebarModel
2020-07-09 07:15:47 +08:00
Maurice Parker
a87a692d7e
Fix class file name misspelling
2020-07-08 17:50:18 -05:00
Maurice Parker
79691a1988
Add reader view icon to macOS toolbar
2020-07-08 17:34:35 -05:00
Maurice Parker
0e3ee19e3a
Made Article View match system accent color
2020-07-08 17:26:53 -05:00
Maurice Parker
2ab82d5680
Make timeline unread indicator use the control accent color on macOS
2020-07-08 16:22:15 -05:00
Maurice Parker
739c14fb99
Don't remove from queue until completion handler is called
2020-07-08 16:00:48 -05:00
Maurice Parker
5efc02f969
Merge pull request #2230 from rizwankce/fix/settings-account-header-imageview
...
Settings account header imageview
2020-07-08 15:28:49 -05:00
Maurice Parker
3f036e91d3
Do not remove the view from the queue until it has navigated
2020-07-08 13:44:13 -05:00
Maurice Parker
f138908e43
Complete dequeue even if web view fails to initialize
2020-07-08 13:39:44 -05:00
Maurice Parker
cdb43404c5
Removed obsolete javascript setting
2020-07-08 10:48:05 -05:00
Maurice Parker
c1bf903bff
Suppress macOS menu items we don't want to show the user
2020-07-08 10:24:16 -05:00
Maurice Parker
6f055b5923
Implement ArticleView for macOS
2020-07-08 10:20:04 -05:00
Stuart Breckenridge
91bc4a0c30
fixes iOS build
2020-07-08 22:04:26 +08:00
Stuart Breckenridge
ab0fbc99c3
Merge branch 'multi-select' into swiftui
2020-07-08 21:41:59 +08:00
Stuart Breckenridge
18f7d82f7a
white space removal
2020-07-08 21:40:09 +08:00
Stuart Breckenridge
af4849642c
Adds multi-select to macOS sidebar
...
This hacks around property observers to get to a model that almost works.
2020-07-08 21:39:39 +08:00
Rizwan Mohamed Ibrahim
6958abb4ec
Fix account header image alignment and foreground color
2020-07-08 16:10:34 +05:30
Rizwan Mohamed Ibrahim
57dbe2b8ab
Fix header image white background
2020-07-08 16:09:49 +05:30
Rizwan Mohamed Ibrahim
8fb95f7900
Fix issues with account image being stretched
2020-07-08 15:13:10 +05:30
Rizwan Mohamed Ibrahim
ea3149d5bc
Add simplified Account Header image view without stacks
2020-07-08 14:44:27 +05:30
Rizwan Mohamed Ibrahim
48f212abcd
Add settings account header image view
2020-07-08 14:40:14 +05:30
Maurice Parker
909dcb3f93
Made ArticleExtractorButtonState a shared enum
2020-07-08 02:27:16 -05:00
Maurice Parker
1e03da8192
Merge branch 'swiftui' of https://github.com/Ranchero-Software/NetNewsWire into swiftui
2020-07-08 02:25:17 -05:00
Rizwan Mohamed Ibrahim
74f822f624
Add Feedbin account addition implementation
2020-07-08 12:38:27 +05:30
Maurice Parker
115f37e7cc
Remove unused copied code
2020-07-07 19:35:22 -05:00
Maurice Parker
7a663167f7
Remove commented code
2020-07-07 19:31:52 -05:00
Maurice Parker
59c3015fff
Made web view preloading code and scheme handler shared code
2020-07-07 19:31:24 -05:00
Maurice Parker
900766d780
Remove icons from macOS context menus since they aren't supported
2020-07-07 17:02:17 -05:00
Maurice Parker
cbdfaaaf22
Merge branch 'swiftui' of https://github.com/Ranchero-Software/NetNewsWire into swiftui
2020-07-07 16:05:33 -05:00
Maurice Parker
8064e65e68
Move Mac toolbar to SceneNavigationView so that it operates properly. Issue #2217
2020-07-07 16:05:26 -05:00
Maurice Parker
b84be77c45
Merge pull request #2228 from rizwankce/accounts-settings
...
Accounts settings : Add New Local Account
2020-07-07 12:26:29 -05:00
Rizwan Mohamed Ibrahim
5aa329bf1c
Adds Account settings and New Local account addition
2020-07-07 22:45:12 +05:30
Rizwan Mohamed Ibrahim
cbce799e01
Add title for About view
2020-07-07 12:22:55 +05:30
Maurice Parker
2e94ae9e8e
Add basic support for Article view on iOS
2020-07-06 21:14:05 -05:00
Maurice Parker
52f1b9d036
Merge branch 'swiftui' of https://github.com/Ranchero-Software/NetNewsWire into swiftui
2020-07-06 16:51:18 -05:00
Maurice Parker
43ea26ddc2
Standardize Asset Catalog case part 2
2020-07-06 16:50:48 -05:00
Maurice Parker
c829478aa6
Standardize Asset Catalog case part 1
2020-07-06 16:49:58 -05:00
Maurice Parker
7564ee33b1
Merge pull request #2223 from rizwankce/feeds-settings-errors
...
Add feeds settings import/export errors
2020-07-06 16:44:55 -05:00
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