1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-13 09:07:16 +01:00
Commit Graph

438 Commits

Author SHA1 Message Date
Nathan Mattes
6ffcdb2565 Remove unused property (IOS-192) 2024-01-20 14:05:08 +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
9bf072e827 Remove unused code 2024-01-11 14:07:57 +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
120b9e18b1 Fix warnings 2024-01-05 12:59:59 +01:00
Nathan Mattes
6b6ed28134 Emojis aren't optional (IOS-192)
meet []
2024-01-05 12:30:36 +01:00
Nathan Mattes
9a25d20e02 Replace another user with an account (IOS-192) 2024-01-02 23:10:17 +01:00
Nathan Mattes
d1b5b9fc98 Localize button-title for blocked domains (IOS-192) 2024-01-02 15:36:26 +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
54b020ff61
Remove dead code 2024-01-02 11:32:27 +01:00
Nathan Mattes
ab7b0584dd Replace more users with account (IOS-192)
In Edit and notification
2024-01-01 20:10:22 +01:00
Nathan Mattes
4764116efc Use account to determine status-visibility (IOS-192) 2024-01-01 20:10:00 +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
922f7116dd Use account for reblogged statuses (stati?) (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
71b28cb977 We don't use the author when composing toots (IOS-192) 2023-12-31 12:59:39 +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
dda0ae2d7c Show text on relationship-button based on relationship (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
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
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
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
bc915e2ef9 Fix context for menu (IOS-5) 2023-12-19 11:28:12 +01:00
Nathan Mattes
7a67b595a3 Add block-action to profile-menu (IOS-5) 2023-12-18 20:26:27 +01:00
Marcus Kida
b0bdaac8b4
Fix CW layout issues (IOS-207) 2023-12-08 14:29:01 +01:00
Marcus Kida
1754375644
Fix favorited post might lose repost header (IOS-206) 2023-12-07 15:16:13 +01:00
Marcus Kida
a4db8a2b90
Fix Poll appearance / layout / issues (IOS-201) 2023-12-05 11:52:47 +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
7323cb9d08
Fix missing poll information (IOS-201) 2023-12-04 11:48:48 +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
66b2bfd5cd
Fix missing case in StatusFetchedResultsController 2023-11-28 12:04:08 +01:00
Marcus Kida
7ad0b15b32
Fix bookmarked state (IOS-176) 2023-11-28 11:13:13 +01:00
Marcus Kida
03aeb1fa7e
Merge branch 'develop' into remove_status 2023-11-28 09:50:56 +01:00
Marcus Kida
a322a46fdf
Don't try to resolve self-relationship 2023-11-28 09:13:24 +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
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
873c5befe2 Re-enable A11y (IOS-194) 2023-11-20 13:00:37 +01:00
Nathan Mattes
4b298f6bd8 [WIP] Remove Core Data from Suggested Accounts/Familiar Followers (IOS-194) 2023-11-20 11:30:42 +01:00
Nathan Mattes
a2aa9b70d2 Fix some warnings 2023-11-16 10:28:20 +01:00
Marcus Kida
5c834c7e09
IOS-175: Remove CoreData status edit (#1148) 2023-11-10 11:32:02 +01:00
Nathan Mattes
e445564e0a Doublecheck fonts and constraints (IOS-130) 2023-11-09 11:25:57 +01:00
Nathan Mattes
59755b6d70 Adjust fonts, icon and colors for updated verified-design (IOS-130) 2023-11-09 11:25:57 +01:00
Nathan Mattes
242f351e10 Update follow-button-state after (un)following a person 2023-10-24 15:42:23 +02:00
Nathan Mattes
c26467c904 Add spinner to loading-state (and fix some colors) 2023-10-20 18:53:03 +02:00