Commit Graph

486 Commits

Author SHA1 Message Date
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
Nathan Mattes 7432b6f22b Show account-information from entities 2023-10-20 17:49:48 +02:00
Nathan Mattes b92ffe8a46 Duplicate methods to work with Entity.Account
This is preparation, but as you know: Proper Preperation and Planning Prevent Piss Poor Performance
2023-10-19 14:39:07 +02:00
Nathan Mattes e640befd9e Get rid of FollowButton 2023-10-19 13:21:11 +02:00
Nathan Mattes 94c51eaed6 Migrate FollowButton to use UIButton.Configuration
also: Refactor Button-Background-Stuff
2023-10-19 13:10:14 +02:00
Nathan Mattes fdfed0a09b Refactor way to determine if translation is enabled 2023-10-18 14:34:20 +02:00
Nathan Mattes e1d1ef83e6 Don't show translation-option for statuses with the same language as the device 2023-10-17 12:51:45 +02:00
Nathan Mattes 3850c24b93 Remove duplicate properties 2023-10-16 18:19:52 +02:00
Nathan Mattes 87cb71da5d Get rid of translation-persistence 2023-10-16 13:28:12 +02:00
Nathan Mattes af9cce34eb Receive some actions on main-queue 2023-10-11 16:33:04 +02:00
Nathan Mattes 785751aca4 Merge branch 'develop' into performance_experiments 2023-10-11 13:04:29 +02:00
Nathan Mattes 6397a8329b Add a footerview that shows legal information (IOS-20)
This is kind of WIP as not the whole text is shown for unknown reasons
2023-10-10 13:55:57 +02:00
Nathan Mattes 28792eca4c Hide followers in preparation for (IOS-20) 2023-10-10 13:55:56 +02:00
Nathan Mattes 132af03bb2
Set Deployment Target to iOS 16 (#1125)
Co-authored-by: Marcus Kida <marcus.kida@bearologics.com>
2023-09-29 19:31:22 +02:00
Marcus Kida 943f3bc778
Merge branch 'develop' into performance_experiments 2023-09-29 12:43:34 +02:00
Nathan Mattes a27cb88400 Add mastodon-version to about-screen (IOS-14) 2023-09-27 15:12:43 +02:00
Nathan Mattes e473084038
Simplify Theme (#1121) 2023-09-27 15:08:12 +02:00
Marcus Kida 360bfd29f1
Merge branch 'develop' into performance_experiments 2023-09-26 10:25:26 +02:00
Nathan Mattes 7fa891308a Fix unused-warnings 2023-09-22 15:28:07 +02:00
Nathan Mattes 778b44ecf4 Fix warnings 2023-09-22 15:27:46 +02:00
Nathan Mattes fbde2a5833 More cleanup 2023-09-22 15:27:46 +02:00
Marcus Kida dcfe13ac36
Merge branch 'develop' into performance_experiments 2023-09-22 11:36:57 +02:00
Nathan Mattes e041a7e086 Add Hashtag-Regex (IOS-141) 2023-09-20 16:29:30 +02:00
Nathan Mattes 0c5b3a64cf Adopt search to follow mastodon-logic (IOS-141)
as defined here: https://github.com/mastodon/mastodon/blob/main/app/javascript/mastodon/features/compose/components/search.jsx#L280-L310
2023-09-20 16:03:46 +02:00
Nathan Mattes dd569fe0ac Put CondensedUserView into their own class (IOS-141) 2023-09-18 17:21:36 +02:00
Nathan Mattes ce37a8eb47 Copy condensed version of user-view to collection-view in search-history (IOS-141) 2023-09-18 17:05:29 +02:00
Nathan Mattes a7bab76f96 Add a cell for profiles in search results (IOS-141) 2023-09-18 16:12:42 +02:00
Nathan Mattes b74f17c6b6 Don't show follow-button for me (IOS-141) 2023-09-17 18:14:42 +02:00
Nathan Mattes 2e384f3cb5 WIP: Add some search-implementation and clean stuff (IOS-141)
Shame on me for such a big commit. I'm new to iOS-development, sorry :nerd:
2023-09-15 17:45:22 +02:00
Nathan Mattes bbda8c41b6 Add post-visibility to notifications (#594) 2023-08-28 12:58:46 +02:00
Nathan Mattes 2957408c0a
Merge pull request #943 from nossipova/594-post-visibility
Show post visibility indicator
2023-08-28 12:29:10 +02:00
Nathan Mattes 075b8a739a Fix some warnings 2023-08-21 11:32:00 +02:00
Nathan Mattes cc2f7f0b8c
Hide activity indicator in case of no emojis (#1088) 2023-07-04 16:08:11 +02:00
Jed Fox f8617ac8f2
Don’t insta-discard if there is a CW/poll/attachment 2023-06-30 17:44:44 -04:00
Jed Fox dd953d69ea
Fix comparison of current content with initial content 2023-06-30 17:38:55 -04:00
Jed Fox 5cf681e2d7
Set a solid background on the blurhash view in case it doesn’t load (#1069) 2023-06-26 11:08:18 +02:00
Nathan Mattes 7b08403035 Add menu-action to untranslate a translated status (IOS-103) 2023-06-13 15:30:30 +02:00
Nathan Mattes d455da85d2 Add follow/unfollow-option to user-section (IOS-103) 2023-06-13 15:30:30 +02:00
Nathan Mattes 9b422a95ac Sprinkle in some localization (IOS-103) 2023-06-13 15:30:30 +02:00
Nathan Mattes 6b2fe91112 Put existing actions into their section (IOS-103) 2023-06-13 15:30:30 +02:00
Nathan Mattes 846fa44369 Refactor action-menu to better support sections (IOS-103) 2023-06-13 15:30:30 +02:00
Marcus Kida d570d3ef09 Replace MastodonAuthentication to not be backed by CoreData 2023-06-13 14:47:43 +02:00
Jed Fox 3a9e1aa716
+ backdrop for play triangle 2023-06-04 17:11:30 -04:00
Jed Fox 10303eee37
Move “play video” image to SwiftUI, adjust to match design spec 2023-06-04 16:39:59 -04:00
Jed Fox 290a62aa5e
Refactor: isGIF → mediaType 2023-06-04 16:17:34 -04:00
Jed Fox 5ff25e31d3
Rename: MediaBadgesContainer → InlineMediaOverlayContainer 2023-06-04 16:15:05 -04:00
Nathan Mattes 8804432b60
Fix Brand Color (IOS-160) (#1054) 2023-06-02 09:52:12 +02:00
Nathan Mattes 7a9c002fe8 Simplify overly complicated init (IOS-157)
Thank you @kimar!
2023-05-25 15:30:45 +02:00
Nathan Mattes 58e5686460 Extract follow-button into its own file (IOS-157) 2023-05-25 14:42:00 +02:00
Nathan Mattes 44f6fc9a5c Add request-follow/pending-states to follow-button (IOS-157, IOS-140) 2023-05-25 14:42:00 +02:00
Nathan Mattes a2729b17c5 Minor UI-improvements in UserView (IOS-157)
Make avatar-image bigger, fix position of follow-button
2023-05-25 14:42:00 +02:00
Natalia Ossipova e397191773 Show visibility icon also in notification view 2023-05-17 14:07:43 +02:00
Natalia Ossipova 00a8c7523b Merge branch 'develop' into 594-post-visibility 2023-05-17 13:11:13 +02:00