Commit Graph

264 Commits

Author SHA1 Message Date
CMK fccf9ee080 Merge branch 'develop' into feature/post-thread
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-04-13 19:48:13 +08:00
CMK 5417e42757 feat: implement thread scene 2021-04-13 19:46:42 +08:00
sunxiaojian a59208a643 Merge branch 'develop' into feature/searching 2021-04-13 09:43:54 +08:00
sunxiaojian e784e123c9 fix: searchbar wasn't correct display in ipad 2021-04-12 12:49:01 +08:00
CMK 14176be4ed feat: handle suspended account in profile scene 2021-04-08 17:06:03 +08:00
CMK a0a636917f feat: add title view for favorite scene 2021-04-08 17:06:02 +08:00
CMK fbe3a8c419 Merge branch 'develop' into feature/profile-coordinator
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Coordinator/SceneCoordinator.swift
#	Mastodon/Scene/Share/View/Content/StatusView.swift
#	Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift
2021-04-07 16:55:07 +08:00
CMK 9612cc3902 feat: handle blocking and blocked state for profile 2021-04-06 16:43:08 +08:00
CMK 824d214ce7 chore: update color asset 2021-04-06 16:42:45 +08:00
CMK 2f89471c78 feat: add remote profile load logic for profile scene 2021-04-02 19:33:29 +08:00
BradGao f40f62e573
Merge branch 'develop' into feat/hastagTimeline 2021-04-02 16:50:31 +08:00
CMK 43ee11b863 feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
jk234ert d548840bd9 feat: implement hashtag timeline 2021-04-01 11:56:50 +08:00
CMK 610ee36835 feat: add content warning editor for status compose scene 2021-03-25 18:17:05 +08:00
CMK d05f97951b feat: add expires duration selector for poll 2021-03-24 14:49:27 +08:00
CMK b8e062c92e feat: add poll UI/UX for compose scene 2021-03-23 18:47:21 +08:00
CMK d64a06aa9d Merge branch 'develop' into feature/compose-attachment-image
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Service/APIService/APIService+Status.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift
2021-03-22 17:55:55 +08:00
CMK 1b3ba1ccfb feat: add pick compose image attachment logic 2021-03-18 15:16:35 +08:00
CMK 221ec27c47 fix: AutoLayout warning for media type indicator view 2021-03-17 18:09:12 +08:00
CMK de5279f20d Merge branch /develop into feature/in-reply-to-header
# Conflicts:
#	Mastodon/Resources/en.lproj/Localizable.strings
2021-03-17 17:01:24 +08:00
CMK ad2da554b5 feat: adapt Dark Mode. Fix bottom loader appearance 2021-03-17 16:16:55 +08:00
sunxiaojian 62ad86b313 chore: add sawToothView 2021-03-17 12:17:48 +08:00
CMK 6e87b581b9 Merge branch /develop into feature/in-reply-to-header
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
#	Mastodon/State/AppContext.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
2021-03-17 11:24:25 +08:00
sunxiaojian 8fc39edd85 feature: Update timeline gap appearance 2021-03-16 19:31:34 +08:00
CMK 07f3cc7a77 fix: author info UI layout issue 2021-03-16 16:17:11 +08:00
CMK c5582c7aaf Merge branch /develop into feature/compose
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-03-16 15:59:26 +08:00
sunxiaojian b60fe36b25 chore: add publishing state in navigationBar 2021-03-16 11:45:30 +08:00
CMK 1c6f231fee Merge branch /develop into feature/in-reply-to-header
# Conflicts:
#	Localization/app.json
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Diffiable/Section/StatusSection.swift
#	Mastodon/Resources/en.lproj/Localizable.strings
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
2021-03-16 11:41:56 +08:00
CMK c8c296d1ba Merge branch /develop into feature/compose
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
#	Mastodon/State/AppContext.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
2021-03-16 11:28:32 +08:00
CMK e6b9252e6c chore: remove redundant layout 2021-03-15 19:31:31 +08:00
CMK 6eb3816bab chore: renaming reblog 2021-03-15 18:19:45 +08:00
CMK 4005581d24 chore: add Xcode previews 2021-03-15 18:02:42 +08:00
CMK ea5b05107d fix: add bottom-right corner radius and fix RTL layout issue for media indicator view 2021-03-15 17:59:11 +08:00
CMK b9cfd0d9e8 chore: remove magic number 2021-03-15 17:54:15 +08:00
CMK 5b45224f7b feat: make media indicator view hide when playing video 2021-03-15 17:53:06 +08:00
CMK 6a8dee037f fix: media not response for reblog issue 2021-03-15 17:52:28 +08:00
CMK 8c466b67aa Merge branch /develop into feature/reblog
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/Share/View/Content/StatusView.swift
#	Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift
2021-03-15 16:15:47 +08:00
sunxiaojian 20283d1878 chore: change video and audio notification string 2021-03-15 15:08:58 +08:00
CMK 8c48bce627 chore: rename toot 2021-03-15 13:42:46 +08:00
sunxiaojian 0c164a170c chore: use rounded font 2021-03-12 15:53:19 +08:00
sunxiaojian 6b5edff677 chore: add media type with gif and video 2021-03-12 15:41:57 +08:00
CMK d9e2453464 feat: make text editor automatic grow height during input 2021-03-12 14:18:07 +08:00
sunxiaojian 2e31280819 chore: extract the common blur effect part from MosaicImageViewContainer 2021-03-12 12:17:07 +08:00
CMK 2b2759c2cc feat: let text editor become first responder when compose scene appear 2021-03-11 19:26:10 +08:00
CMK 19a14b7761 chore: patch for delegate chain 2021-03-11 19:19:36 +08:00
sunxiaojian bbdd6926d6 chore: rename MosaicView to MosaicBlurView 2021-03-11 17:25:42 +08:00
sunxiaojian 1342471c5d chore: handle Video&Gif sensitive situation 2021-03-11 15:34:30 +08:00
sunxiaojian 6b9ae8d05d chore: add mosaicView 2021-03-11 15:10:41 +08:00
sunxiaojian 6c0a767435 chore: auto-pause when audio cell disappeared 2021-03-11 13:16:44 +08:00
CMK 0be862c6b3 chore: remove useless extension for UIControl.State. Correct AvatarStackContainerButton filename 2021-03-11 11:19:31 +08:00
sunxiaojian 2657dde184 chore: the play interrupts event could be sent with the notification 2021-03-10 21:19:56 +08:00
CMK 75d39aabf0 feat: add reply to header for toot 2021-03-10 19:12:53 +08:00
sunxiaojian 7556e57de9 fix: conflict between gif video and audio 2021-03-10 17:17:15 +08:00
sunxiaojian e1143b0ce4 feature: video & gifv support 2021-03-10 15:06:24 +08:00
CMK a5f2bf2334 chore: code cleanup 2021-03-10 14:09:38 +08:00
CMK cd112c5102 fix: reblog avatar RTL support issue 2021-03-10 14:06:08 +08:00
CMK 1256ef1d8e feat: implement boost toot. Add stacked style avatar 2021-03-10 13:36:01 +08:00
CMK 2ac2eb7c77 Merge commit /develop into feature/reblog 2021-03-10 10:30:07 +08:00
CMK defb0ae6e0 feat: make play button reflect with state change 2021-03-09 19:07:30 +08:00
CMK fd4e99907b fix: slider jumping after drag issue. Fix player can not play again issue 2021-03-09 18:54:21 +08:00
sunxiaojian 2b02b8deb6 fix: play audio between two toots 2021-03-09 17:13:17 +08:00
sunxiaojian 0ae89aff9f fix: can't play audio again when stoped 2021-03-09 16:54:05 +08:00
sunxiaojian 5a17b8a6ee chore: make slider enable state change with isPlaying 2021-03-09 16:25:47 +08:00
CMK 441a6aee9e feat: implement boost for toot 2021-03-09 15:18:43 +08:00
sunxiaojian 2d4dbad535 chore: fix slider shake, reset audioView when stoped 2021-03-09 15:18:36 +08:00
sunxiaojian 30d03a3894 chore: add audio support for toot 2021-03-09 14:37:55 +08:00
sunxiaojian 8bce197136 chore: make media_attachments.preview_url optional
It's null when toot has audio
So the document is wrong
2021-03-09 14:25:19 +08:00
CMK 07d3c3cbff chore: comment out animation logging 2021-03-05 15:56:20 +08:00
CMK 0df1a57865 feat: implement multiple poll 2021-03-05 15:53:36 +08:00
CMK d79666679a fix: poll option UI reuse issue 2021-03-05 14:23:26 +08:00
CMK 11cee6df35 feat: implement single vote poll 2021-03-05 13:41:48 +08:00
CMK 58c8eaabe8 feat: add animation for progress bar value change 2021-03-05 12:12:05 +08:00
CMK 06aac878c8 feat: [WIP] make the vote poll logic works 2021-03-04 18:53:29 +08:00
CMK 028f3a9404 feat: make poll cell label appearance update according to the underneath background 2021-03-03 19:34:29 +08:00
CMK 30c035e09a feat: implement auto refresh logic for Poll 2021-03-03 16:12:48 +08:00
CMK 1e691a2a76 fix: AutoLayout warning for poll UI 2021-03-03 12:46:38 +08:00
CMK 376cb3d58a feat: display toot poll status 2021-03-02 19:33:33 +08:00
CMK aea2ddc078 feat: make toot poll display 2021-03-02 19:10:45 +08:00
CMK 8b63c2fda1 feat: add PollSection and PollItem for diffable data source 2021-03-02 16:27:11 +08:00
CMK eda3e95ad0 feat: add poll table view cell 2021-03-02 12:49:04 +08:00
CMK 7aa45ff230 chore: make onboarding ready 2021-02-26 18:27:47 +08:00
CMK ccf599feaa chore: make UI appearance match between onboarding scenes 2021-02-26 16:43:59 +08:00
jk234ert ec96690ac9 Merge branch 'feat/serverPicker' of https://github.com/tootsuite/mastodon-ios into feat/serverPicker 2021-02-25 16:41:41 +08:00
jk234ert 8476fc0e38 feat: resolve requested changes 2021-02-25 16:38:24 +08:00
BradGao bcaff23704
Merge branch 'develop' into feat/serverPicker 2021-02-25 14:49:50 +08:00
jk234ert 50035c1359 feat: implement pick server feature 2021-02-25 14:23:51 +08:00
jk234ert eb7a33932e feat: implement pick server view category select 2021-02-25 14:23:20 +08:00
CMK 414aa086b4 feat: implement image media content warning overlay 2021-02-25 13:47:30 +08:00
CMK ccc8741ccd chore: set public timeline title and update loader height 2021-02-25 11:48:16 +08:00
CMK 0ad43fb0eb chore: update Xcode Preview for StatusView. Rename MosaicImageView to MosaicImageViewContainer 2021-02-24 19:19:16 +08:00
CMK b2706a50da chore: update sign up alert. Update gitignore for i18n files 2021-02-24 19:08:30 +08:00
CMK 10594d1eb6 feat: store view state to prevent redundant image rending 2021-02-24 18:41:40 +08:00
CMK 2988e71611 chore: update UI appearance. remove not used separator line component 2021-02-24 18:40:47 +08:00
CMK 1345db9d7e fix: status content warning UI for Dark Mode related issue 2021-02-24 18:07:00 +08:00
CMK 4d2e75f3ca feat: implement content warning dismiss action logic 2021-02-24 16:11:48 +08:00
CMK f455faa273 feat: add content warning (CW) for status text. 2021-02-24 15:29:16 +08:00
CMK 98ebddc438 feat: implement image media status cell UI 2021-02-23 19:18:34 +08:00
CMK cee84d95a0 feat: update navigation bar items 2021-02-23 16:45:00 +08:00
CMK e6ad839d3c Merge commit 'ea79ca771d441f1d0af2cd19872e3bdd227838e7' into feature/home
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-02-23 15:25:48 +08:00
CMK 40a524434f feat: update status cell UI 2021-02-23 15:16:55 +08:00
jk234ert 85ceb48003 chore: resolve requested changes 2021-02-22 23:16:13 +08:00
jk234ert 9fefdccef2 feat: add welcome view;
feat: modify window.rootViewController logic when app launches;
feat: enable ViewController-based status bar
2021-02-20 20:23:29 +08:00
sunxiaojian 99f2e4a854 chore: code format and define onceRequestTootMaxCount 2021-02-18 13:09:40 +08:00
sunxiaojian b55790fee8 feat: finish user favourite action 2021-02-08 18:29:27 +08:00
sunxiaojian 5f1800b353 feat: HomeTimeline 2021-02-07 16:19:33 +08:00
CMK e0cd9f7565 Merge branch 'develop' into feature/sign-up
# Conflicts:
#	Mastodon/Scene/PublicTimeline/PublicTimelineViewModel.swift
2021-02-05 17:55:40 +08:00
CMK 7d1c8e5be9 feat: [WIP] implement sign up scene 2021-02-05 17:53:00 +08:00
sunxiaojian 6ff1a0c88e feat: add MiddleLoader 2021-02-05 14:58:05 +08:00
CMK f2951d5b07 feat: add sign up button for authentication scene 2021-02-05 11:53:21 +08:00
CMK 0abd8ab863 feat: add AvatarConfigurableView 2021-02-04 19:28:16 +08:00
sunxiaojian 04d4e7f33a feat: add bottomLoader 2021-02-03 17:23:25 +08:00
sunxiaojian 7c19e569c9 Add Assets Color
Update public timeline cell's UI
add ActionToolBar
2021-02-02 10:29:48 +08:00
sunxiaojian 24ca4644de status content display 2021-01-29 16:47:32 +08:00
sunxiaojian cb690ffa4e add public timeline 2021-01-28 16:10:30 +08:00