Commit Graph

6434 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 224defcf27 Bump version 2024-02-07 14:48:45 +01:00
Nathan Mattes cabdc30be7 Merge branch 'develop' into ios-192-profile-about 2024-01-31 23:41:34 +01:00
Eugen Rochko 5e5b8ffec8
New Crowdin updates (#1223)
* New translations app.json (English)

* Fix english localization

Listen folks: Hungarian isn't english!

---------

Co-authored-by: Nathan Mattes <hallo@bullenscheisse.de>
2024-01-31 23:40:45 +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 64dc97ab9b.
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
Eugen Rochko 5ed5c2247c
New Crowdin updates (#1184)
* New translations app.json (Chinese Simplified)

* New translations app.json (German)

* New translations app.json (Greek)

* New translations app.json (Galician)

* New translations app.json (Galician)

* New translations app.json (Japanese)

* New translations app.json (Japanese)

* New translations app.json (Thai)

* New translations app.json (Thai)

* New translations app.json (Thai)

* New translations app.json (Armenian)

* New translations app.json (Armenian)

* New translations ios-infoplist.json (Armenian)

* New translations localizable.stringsdict (Armenian)

* New translations intents.strings (Armenian)

* New translations intents.stringsdict (Armenian)

* New translations app.json (Japanese)

* New translations app.json (Korean)

* New translations app.json (Korean)

* New translations app.json (German)

* New translations app.json (Polish)

* New translations app.json (Korean)

* New translations localizable.stringsdict (Korean)

* New translations intents.strings (Korean)

* New translations app.json (Korean)

* New translations app.json (Polish)

* New translations app.json (German)

* New translations app.json (Polish)

* New translations app.json (Korean)

* New translations app.json (Romanian)

* New translations app.json (French)

* New translations app.json (Spanish)

* New translations app.json (Arabic)

* New translations app.json (Belarusian)

* New translations app.json (Catalan)

* New translations app.json (Czech)

* New translations app.json (Danish)

* New translations app.json (Greek)

* New translations app.json (Basque)

* New translations app.json (Finnish)

* New translations app.json (Hebrew)

* New translations app.json (Armenian)

* New translations app.json (Italian)

* New translations app.json (Japanese)

* New translations app.json (Dutch)

* New translations app.json (Portuguese)

* New translations app.json (Russian)

* New translations app.json (Slovenian)

* New translations app.json (Swedish)

* New translations app.json (Turkish)

* New translations app.json (Ukrainian)

* New translations app.json (Chinese Simplified)

* New translations app.json (Chinese Traditional)

* New translations app.json (English)

* New translations app.json (Vietnamese)

* New translations app.json (Galician)

* New translations app.json (Icelandic)

* New translations app.json (Portuguese, Brazilian)

* New translations app.json (Indonesian)

* New translations app.json (Spanish, Argentina)

* New translations app.json (Thai)

* New translations app.json (Latvian)

* New translations app.json (Hindi)

* New translations app.json (English, United States)

* New translations app.json (Burmese)

* New translations app.json (Welsh)

* New translations app.json (Sinhala)

* New translations app.json (Scottish Gaelic)

* New translations app.json (Aragonese)

* New translations app.json (Kurmanji (Kurdish))

* New translations app.json (Sorani (Kurdish))

* New translations app.json (Kabyle)

* New translations app.json (German)

* New translations app.json (Galician)

* New translations app.json (Icelandic)

* New translations app.json (Japanese)

* New translations app.json (Galician)

* New translations app.json (Spanish, Argentina)

* New translations app.json (English)

* New translations app.json (Italian)

* New translations app.json (Swedish)

* New translations app.json (Slovenian)

* New translations app.json (Vietnamese)

* New translations app.json (Thai)

* New translations app.json (German)

* New translations app.json (Vietnamese)

* New translations app.json (German)

* New translations app.json (Chinese Traditional)

* New translations app.json (Korean)

* New translations app.json (Korean)

* New translations app.json (German)

* New translations app.json (German)

* New translations app.json (Thai)

* New translations app.json (Greek)

* New translations app.json (Belarusian)
2024-01-31 10:01:31 +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 c0c795e473
Merge pull request #1212 from mastodon/1138-edit-caption
Edit Caption
2024-01-23 12:51:34 +01:00
Nathan Mattes 3e200a7703 Minor cleanup (#1138) 2024-01-23 10:42:52 +01:00
Nathan Mattes f9ae531b48 Don't download edit-history (#1138)
It was needed in the past when `editHistory` also persisted the history in CoreData. But as we don't use CoreData anymore...
2024-01-23 10:31:05 +01:00
Nathan Mattes 08a932ddfc Use correct endpoint to add media-attributes for changes (#1138)
Also: Use JSON instead of Multipart
2024-01-23 10:30:15 +01:00
Nathan Mattes 80cd22a356 Update media if caption was changed (#1138)
Doesn't work yet as the `/api/v1/media/:id` returns 404?! wtf?!
2024-01-21 12:10:56 +01:00
Nathan Mattes 89b7df25ea Make caption changable (#1138) 2024-01-21 12:09:47 +01:00
Nathan Mattes 304eb8b7ff Move notification-timestamp away from viewmodel (IOS-192) 2024-01-21 09:30:44 +01:00
Nathan Mattes e720db2a31 Remove unused code (IOS-192) 2024-01-20 20:03:59 +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 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 35c017986a [WIP] Add relationships/user to notifications (IOS-192) 2024-01-16 17:12:47 +01:00
Marcus Kida d55800d71a
#1049 - fix max character limit and other server configs are not respected (#1207) 2024-01-12 14:33:48 +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 c6788f5a43 Split private/public into their own extension 2024-01-11 14:10:47 +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 120b9e18b1 Fix warnings 2024-01-05 12:59:59 +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