zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
6,194 Commits 35 Branches 348 Tags 65 MiB
Commit Graph

277 Commits

Author SHA1 Message Date
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 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
Marcus Kida 2018d7c764
Hide loading spinner after network requesty 2024-01-02 11:05:58 +01:00
Nathan Mattes 47986262bc Use relationships in Report-process (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 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 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 6aea178609 Add relationship to ProfileViewModel (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 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 2be8d5b8df WIP: Comment out and replace user with status (IOS-192) 2023-12-31 12:56:59 +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 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 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
Marcus Kida 31796f1680
Implement thread reload after publishing reply (IOS-176) 2023-12-13 15:09:37 +01:00
Marcus Kida c30fb73922
Fix status deletion not updating data model (IOS-205) 2023-12-05 12:28:36 +01:00
Marcus Kida 69a92c3d0f
Fix eventually incorrect domain used 2023-12-04 11:09:47 +01:00
Marcus Kida 63e45d65f9
Fix notifications show empty view (IOS-198) 2023-12-04 10:14:42 +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 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 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 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 315d15b256 Fix warnings 2023-11-23 15:47:51 +01:00
Nathan Mattes 59c6d31ca4 [WIP] Remove CoreData for Tags/Accounts in Search (IOS-196) 
- Add basic, json-based persistence (it's WIP and pragmatic aka dirty, see FileManager+SearchHistory)
 2023-11-23 13:58:56 +01:00
Marcus Kida e0671eb324
Reimplement favorite/reblog state (IOS-176) 2023-11-23 11:21:52 +01:00
Marcus Kida 9809e69751
Fix favorite action (IOS-176) 2023-11-22 21:18:25 +01:00
Marcus Kida e3f3e2c662
Merge branch 'develop' into remove_status 2023-11-22 13:22:49 +01:00
Marcus Kida b010b6112e
Remove usage of Status (IOS-176) 2023-11-22 12:32:04 +01:00
Nathan Mattes 6cf5134ff6 Properly update button-state when following people (IOS-194) 2023-11-20 13:59:25 +01:00
Nathan Mattes 4b298f6bd8 [WIP] Remove Core Data from Suggested Accounts/Familiar Followers (IOS-194) 2023-11-20 11:30:42 +01:00
Marcus Kida 5c834c7e09
IOS-175: Remove CoreData status edit (#1148) 2023-11-10 11:32:02 +01:00