zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity
6,284 Commits 33 Branches 88 Tags 63 MiB
Commit Graph

2171 Commits

Author SHA1 Message Date
Nathan Mattes 484f44e17c Remove code (IOS-192) 2024-01-20 14:18:26 +01:00
Nathan Mattes ca3fd69b62 [WIP] Preparation to get relationship into menu on notification-screen (IOS-192) 2024-01-18 16:59:14 +01:00
Nathan Mattes 35c017986a [WIP] Add relationships/user to notifications (IOS-192) 2024-01-16 17:12:47 +01:00
Nathan Mattes 127c3167b8 Fix profile-button (IOS-192) 2024-01-12 10:47:17 +01:00
Nathan Mattes 2c653320fb Refactor tab/MainTabBarController to add viewcontrollers as properties 
This is a WIP-step for account-stuff. Also: iPhone only, iPad should come next
 2024-01-11 23:38:06 +01:00
Nathan Mattes cea6129229 Download accounts at start and don't fail if there's no me (IOS-192) 
Known issue for know is that the profile-tab shows a blank screen. Still gotta fix that.
 2024-01-11 16:33:20 +01:00
Nathan Mattes 64dc97ab9b Use `guard` (IOS-192) 2024-01-11 15:30:35 +01:00
Nathan Mattes b8ba69b930 Reduce nested-ness of tasks (IOS-192) 
Thank you @kimar
 2024-01-11 15:28:18 +01:00
Nathan Mattes 9bf072e827 Remove unused code 2024-01-11 14:07:57 +01:00
Nathan Mattes cfa0e9a2bc Fix indention, fix warnings (IOS-192) 2024-01-09 17:58:48 +01:00
Nathan Mattes e70a67caf0 Move task and async/await to call-site (IOS-192) 2024-01-09 17:45:01 +01:00
Nathan Mattes 97d1ab4e5b Fix build (IOS-192) 2024-01-09 17:44:06 +01:00
Nathan Mattes 923ff39b04
Fix indention 
Co-authored-by: Marcus Kida <marcus.kida@bearologics.com>
 2024-01-09 17:02:55 +01:00
Nathan Mattes fe5c88254b Fix warnings 
I guess that they made their way back into the app due to the merge
 2024-01-08 22:48:35 +01:00
Nathan Mattes febbc6f22a Merge branch 'develop' into ios-192-profile-about 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift
#	Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift
#	Mastodon/Protocol/Provider/DataSourceFacade+Status.swift
#	Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift
#	Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift
#	Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift
#	Mastodon/Protocol/Provider/DataSourceProvider.swift
#	Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController+DataSourceProvider.swift
#	Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift
#	Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel.swift
#	Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController+DataSourceProvider.swift
#	Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift
#	Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift
#	Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift
#	Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift
#	Mastodon/Scene/Profile/Bookmark/BookmarkViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/Bookmark/BookmarkViewModel+State.swift
#	Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift
#	Mastodon/Scene/Profile/Favorite/FavoriteViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift
#	Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift
#	Mastodon/Scene/Profile/MeProfileViewModel.swift
#	Mastodon/Scene/Profile/ProfileViewController.swift
#	Mastodon/Scene/Profile/ProfileViewModel.swift
#	Mastodon/Scene/Profile/RemoteProfileViewModel.swift
#	Mastodon/Scene/Profile/Timeline/UserTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/Timeline/UserTimelineViewModel+State.swift
#	Mastodon/Scene/Profile/Timeline/UserTimelineViewModel.swift
#	Mastodon/Scene/Report/Report/ReportViewModel.swift
#	Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel+State.swift
#	Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
#	Mastodon/Scene/Root/MainTab/MainTabBarController.swift
#	Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController+DataSourceProvider.swift
#	Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel+State.swift
#	Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel.swift
#	Mastodon/Scene/Share/View/Content/NotificationView+Configuration.swift
#	Mastodon/Scene/Thread/ThreadViewModel.swift
#	MastodonSDK/Sources/MastodonCore/FetchedResultsController/FeedFetchedResultsController.swift
#	MastodonSDK/Sources/MastodonCore/FetchedResultsController/StatusFetchedResultsController.swift
#	MastodonSDK/Sources/MastodonCore/Persistence/FileManager+SearchHistory.swift
#	MastodonSDK/Sources/MastodonCore/Persistence/FileManager+Timeline.swift
#	MastodonSDK/Sources/MastodonCore/Persistence/Persistence.swift
#	MastodonSDK/Sources/MastodonCore/Service/API/APIService+HomeTimeline.swift
#	MastodonSDK/Sources/MastodonCore/Service/API/APIService+Search.swift
#	MastodonSDK/Sources/MastodonSDK/MastodonStatus.swift
#	MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift
#	MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Publisher/MastodonStatusPublisher.swift
#	MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift
 2024-01-08 22:32:57 +01:00
Marcus Kida 976f934df9
Remove Status from CoreData (#1167) 2024-01-08 11:17:40 +01:00
Nathan Mattes 0b959f5bca Remove private-note and notification from user (IOS-192) 2024-01-05 16:50:44 +01:00
Nathan Mattes 7ab194b15d
Remove remaining Tag-stuff (IOS-186) (#1205) 2024-01-05 16:46:49 +01:00
Nathan Mattes 22d0b45be7 Use account on account-switcher (IOS-192) 2024-01-05 12:56:08 +01:00
Nathan Mattes 6b6ed28134 Emojis aren't optional (IOS-192) 
meet []
 2024-01-05 12:30:36 +01:00
Nathan Mattes 58501da5fa Merge branch 'develop' into ios-192-profile-about 
# Conflicts:
#	Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/UserList/UserListViewModel+Diffable.swift
#	Mastodon/Scene/Profile/UserList/UserListViewModel+State.swift
 2024-01-03 17:30:56 +01:00
Nathan Mattes 2119c9de0b
Merge pull request #1196 from mastodon/ios-214-refactor-userlist 
Use accounts on FavoritedBy/RetootedBy-screens (IOS-214)
 2024-01-03 17:13:15 +01:00
Nathan Mattes 695d31720a Fix indention 2024-01-03 17:00:38 +01:00
Nathan Mattes b00625c99a Fix Typo (🙈) 2024-01-03 16:36:03 +01:00
Nathan Mattes 7f26dfa6d6 Fix warnings and remove unused code (IOS-192) 2024-01-02 15:37:07 +01:00
Nathan Mattes bdb1853b18 Merge branch 'remove_status' into ios-192-profile-about 2024-01-02 12:19:28 +01:00
Nathan Mattes 96fddaef27 192-profile-about 
# Conflicts:
#	Mastodon/Protocol/Provider/DataSourceFacade+Status.swift
#	Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift
#	Mastodon/Scene/Profile/ProfileViewController.swift
#	MastodonSDK/Sources/MastodonUI/ViewModel/RelationshipViewModel.swift
 2024-01-02 12:15:15 +01:00
Nathan Mattes 66c152754d Add missing localization (IOS-5) 2024-01-02 11:42:07 +01:00
Marcus Kida 2018d7c764
Hide loading spinner after network requesty 2024-01-02 11:05:58 +01:00
Nathan Mattes c152c7b3c7 Don't use user but account on Sidebar on iPad (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes a2c03bd6d1 Remove unused code (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 8e7e16870c Fix some warnings (IOS-192) 
As relationship-information isn't optional anymore, there' no need for ?? everywhere (I just missed some)
 2023-12-31 12:59:39 +01:00
Nathan Mattes 0f6f6adfba Update header after edit (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 47986262bc Use relationships in Report-process (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 11235f3f75 Re-enable pending-check (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes c0e08c4482 Fix warnings (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes f241232972 Remove user (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 460ede4852 User UserIdentification for search and accounts (IOS-192) 
Thanks to @kimar!
 2023-12-31 12:59:38 +01:00
Nathan Mattes 6225c50008 Add some actions to Relationship-action-button (IOS-192) 
Well, it's basically just unblock, unmute or follow/unfollow
 2023-12-31 12:57:56 +01:00
Nathan Mattes 59fe79fe49 Fix bug in follows-you-label (IOS-192) 
🤦 RTFM (and add some docs)
 2023-12-31 12:57:56 +01:00
Nathan Mattes 9e49775201 Make image clickable again (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 1b1274c2f7 Show correct account for "quoted" posts in notifications (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 76304e59e5 Configure Profile-button based on relationship and accounts (IOS-192) 
Also `me` is not optional anymore as we need it
 2023-12-31 12:57:56 +01:00
Nathan Mattes 393722a31d Reenable followers/followees (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes f9492e07a3 Kill some forced unwrapping and hide bio when blocked/blocking (IOS-192) 
First rule of optionals: Don't use forced unwrapping!
 2023-12-31 12:57:56 +01:00
Nathan Mattes 2f0614d9c9 Refactor Mute/Block/HideReblogs to work with relationships (IOS-192) 
Also: Connect Blocking/BlockedBy
 2023-12-31 12:57:56 +01:00
Nathan Mattes b7bb271b40 Re-enable blur-effect for pictures (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 0729fa41f2 Re-enable "Follows you"-indicator (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 099cb724d0 Configure barbutton-items on profile-screen (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes e7c1edbbc3 Persist user after login (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 6aea178609 Add relationship to ProfileViewModel (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 6cc069ec5b Try to fix domain (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes f373506aa3 Remove user from UserItem-lists (IOS-192) 
Also: Remove CoreData and replace User with Account in several places
 2023-12-31 12:57:56 +01:00
Nathan Mattes 3abb80a5df Migrate UserList to use Accounts (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes f51d5b7fe2 Replace MastodonUser.ID with string (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 60aafe6330 Add JSON-based account-persistence (IOS-192) 
This is per user.

Also: Fetch authenticated accounts regularly
Also: Move Persistence-stuff to MastodonCore because.
 2023-12-31 12:57:56 +01:00
Nathan Mattes d3c7ba2c7c Show header-meta-information about account (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 873f282ad1 Fix fields (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 34b962e3ca Remove me/remote-profile-viewmodel (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 2be8d5b8df WIP: Comment out and replace user with status (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 682fe27319 Sprinkle in some deprecations to see what needs to be done with MastodonUser (IOS-192, IOS-189) 2023-12-31 12:54:09 +01:00
Marcus Kida bf433e332f
Address PR Feedback (IOS-176) 2023-12-28 13:47:07 +01:00
Marcus Kida 405b175bdf
Implement alternative Author for DataSourceFacade.MenuContext (IOS-176) 2023-12-27 14:46:31 +01:00
Marcus Kida 80df919da1
Remove switch case 2023-12-27 10:42:56 +01:00
Marcus Kida 4874615739
Fix incorrectly named variable 2023-12-27 10:36:48 +01:00
Marcus Kida f6e5f539d6
Remove unused code 2023-12-27 10:35:49 +01:00
Marcus Kida 82cc0f2f3f
Tie JSON cache to domain based unique identifier 2023-12-27 10:35:00 +01:00
Marcus Kida 275fa53f80
Fix DataSourceFacade+Bookmark protocol constraints (IOS-176) 2023-12-27 10:32:14 +01:00
Nathan Mattes 4322607552 Localize Domain Block (IOS-5) 2023-12-19 13:12:32 +01:00
Nathan Mattes 8b02ba29dd UI/UX improvements and fixes (IOS-5) 
- Blur images and hide bio/timeline
- Show correct texts (localization is about to come)
 2023-12-19 12:14:58 +01:00
Nathan Mattes 7a67b595a3 Add block-action to profile-menu (IOS-5) 2023-12-18 20:26:27 +01:00
Nathan Mattes 910e101538 Add domain-block for MastodonUser (IOS-5) 2023-12-18 19:59:22 +01:00
Nathan Mattes 9a5b4a3621 Use accounts on FavoritedBy/RetootedBy-screens (IOS-214) 2023-12-15 15:51:35 +01:00
Marcus Kida 22324f4c1e
Fix Polls not showing up (IOS-213) 2023-12-14 16:33:50 +01:00
Marcus Kida d759a4b69a
Update posts on timeline and thread if edited (IOS-211) 2023-12-14 10:11:05 +01:00
Marcus Kida 9167260e30
Update datasource on delete statuses in timelines and thread (IOS-212) 2023-12-14 09:56:50 +01:00
Marcus Kida 31796f1680
Implement thread reload after publishing reply (IOS-176) 2023-12-13 15:09:37 +01:00
Marcus Kida 7fb8fcaca1
Fix issue caused by duplicate IDs after reloadingtimeline 2023-12-12 08:56:28 +01:00
Marcus Kida ab689d3c02
Fix status thread CW not shown and interacted status not updated (IOS-208, IOS-210) 2023-12-08 15:45:40 +01:00
Marcus Kida c30fb73922
Fix status deletion not updating data model (IOS-205) 2023-12-05 12:28:36 +01:00
Marcus Kida 0f3c50ba8a
Fix non-ui-thread modification in when editing poll (IOS-203) 2023-12-04 14:31:38 +01:00
Marcus Kida 69a92c3d0f
Fix eventually incorrect domain used 2023-12-04 11:09:47 +01:00
Marcus Kida a1cd1690fa
Implement cache for Notifications (IOS-200) 2023-12-04 11:04:00 +01:00
Marcus Kida 63e45d65f9
Fix notifications show empty view (IOS-198) 2023-12-04 10:14:42 +01:00
Marcus Kida 5532324f83
Implement caching for home timeline items (IOS-176) 2023-12-01 10:47:18 +01:00
Marcus Kida 837d8dd329
Fix user profile not loaded from status on home timeline (IOS-176) 2023-12-01 10:14:12 +01:00
Marcus Kida e6ba8db5b6
Merge branch 'develop' into remove_status 2023-12-01 09:59:37 +01:00
Marcus Kida 28cdd67e8a
Fix sensitive toggled state for reblogs (IOS-176) 2023-12-01 09:57:25 +01:00
Marcus Kida 38423a14ca
Preserve isSensitiveToggled state when interacting with posts (IOS-176) 2023-12-01 09:52:41 +01:00
Marcus Kida 112dce06f5
Improve flickering when interacting with posts (IOS-176) 2023-12-01 09:52:08 +01:00
Nathan Mattes 624c3226d5 Only search for relationships if there are accounts (#1187) 
Otherwise this would lead to a `badRequest`
 2023-11-30 16:23:41 +01:00
Marcus Kida 7ad0b15b32
Fix bookmarked state (IOS-176) 2023-11-28 11:13:13 +01:00
Marcus Kida 45accb29e6
Fix CW cannot be hidden (IOS-176) 2023-11-28 10:46:24 +01:00
Marcus Kida 9fed54db1f
Fix compile issues after resolving merge conflicts 2023-11-28 09:55:18 +01:00
Marcus Kida 03aeb1fa7e
Merge branch 'develop' into remove_status 2023-11-28 09:50:56 +01:00
Marcus Kida 167e0e4616
Fix translate not working (IOS-176) 2023-11-28 09:41:34 +01:00
Nathan Mattes 3ee2024c3b
Merge pull request #1177 from mastodon/ios-196-search 
Remove CoreData for Tags/Users on Search
 2023-11-27 15:04:21 +01:00
Nathan Mattes 7d8af4ef35 Reload search-results when entering the screen (IOS-196) 2023-11-27 14:56:38 +01:00
Marcus Kida 831665141c
Fix tabbar avatar not visible (IOS-176) 2023-11-27 14:19:17 +01:00
Marcus Kida cc3f1d030f
Merge branch 'develop' into remove_status 2023-11-27 14:02:39 +01:00