zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity
7,054 Commits 33 Branches 456 Tags
Commit Graph

2486 Commits

Author SHA1 Message Date
Nathan Mattes
84236b1084 Merge branch 'develop' into ios-192-profile-about 2024-02-07 16:33:05 +01:00
Nathan Mattes
a236e114fd Load User-lists initially (#1227) 2024-02-07 16:30:14 +01:00
Nathan Mattes
f72de977de Enable domain-block for User-refactoring (IOS-192) 2024-01-31 23:25:57 +01:00
Nathan Mattes
53973bb4d9 Revert "Use guard (IOS-192)" 
This reverts commit 64dc97ab9bb50041146777248885a67dc1fcf73b.
 2024-01-31 22:49:56 +01:00
Nathan Mattes
b2dbcc8095 Merge branch 'develop' into ios-192-profile-about 
# Conflicts:
#	Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift
#	MastodonSDK/Sources/MastodonCore/DataController/FeedDataController.swift
#	MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift
 2024-01-31 15:36:53 +01:00
Marcus Kida
6af38ade27
Reload notifications after interacting with them (#1221) 2024-01-31 11:28:48 +01:00
Nathan Mattes
5773ceb2ad
Fix build (#1220) 2024-01-31 10:07:31 +01:00
Nathan Mattes
35bc04be51
update strings (#1219) 2024-01-31 10:04:22 +01:00
Marcus Kida
383a75ea48
Improve status updating mechanism (#1210) 2024-01-30 23:02:13 +01:00
Nathan Mattes
7dfa56507e Make follow-requests work again (IOS-192) 
Aaaaand remove obsolete viewmodel and put relationship to make menu work again (too)
 2024-01-30 11:13:39 +01:00
Nathan Mattes
f363316662 Move over a11y-actions for notifications (IOS-192) 2024-01-24 14:16:04 +01:00
Nathan Mattes
96c4fbfbdb Set a11y-label for notification-screen (IOS-192) 2024-01-24 11:58:08 +01:00
Nathan Mattes
304eb8b7ff Move notification-timestamp away from viewmodel (IOS-192) 2024-01-21 09:30:44 +01:00
Nathan Mattes
018cf54084 Don't use publisher for most properties in NotificationView (IOS-192) 
Timestamp and A11y are still missing (and A11y is broken atm)
 2024-01-20 20:03:45 +01:00
Nathan Mattes
ab2f54307f Group files and use simpler context (IOS-192) 2024-01-20 18:21:02 +01:00
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