zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
520 Commits 32 Branches 393 Tags 69 MiB
Commit Graph

427 Commits

Author SHA1 Message Date
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
BradGao 502ceeabe2
Merge pull request #89 from tootsuite/feat/hastagTimeline 
Feat/hastag timeline
 2021-04-07 16:38:08 +08:00
jk234ert 2d65bda7fe chore: migrate HashtagViewModel to use `StatusFetchedResultsController` 2021-04-07 16:37:05 +08:00
CMK af4fcf9dfd Merge branch 'develop' into feature/profile-coordinator 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-04-07 14:44:58 +08:00
jk234ert a61e662f38 fix: resolve requested changes 2021-04-07 13:57:03 +08:00
sunxiaojian 90803fc544 chore: add bottom loader 2021-04-07 11:27:30 +08:00
sunxiaojian 6e10efc490 feature:searching page 
feature: searching Page
 2021-04-07 11:21:56 +08:00
CMK 1d6345b12b fix: text checker not learn reply post mention word issue 2021-04-06 17:52:37 +08:00
CMK 0822b222fc fix: debug running may assert fail issue 2021-04-06 17:48:20 +08:00
CMK e4199df42c feat: set background color for banner image view 2021-04-06 17:18:06 +08:00
CMK 021d6036cd chore: update dark mode color for background. Make blocking high priority then blocked 2021-04-06 17:12:25 +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
sunxiaojian 608e916320 chore: remove extension from MastodonSDK 2021-04-02 20:45:33 +08:00
CMK 28cfe96171 chore: rename Toot -> Status 2021-04-02 19:40:15 +08:00
CMK 2f89471c78 feat: add remote profile load logic for profile scene 2021-04-02 19:33:29 +08:00
CMK 3b576badeb feat: add reply entry for profile scene 2021-04-02 18:50:08 +08:00
CMK 5d3b6d1943 feat: handle profile follow, block, and mute actions 2021-04-02 18:13:45 +08:00
jk234ert 412a7dc508 Merge branch 'feat/hastagTimeline' of https://github.com/tootsuite/mastodon-ios into feat/hastagTimeline 2021-04-02 17:05:44 +08:00
jk234ert a9d35109fd feat: update mechanism of calculating number of people taking tags 2021-04-02 17:05:06 +08:00
sunxiaojian e1696134a8 Merge branch 'develop' into feature/searchRecommend 2021-04-02 17:04:08 +08:00
BradGao f40f62e573
Merge branch 'develop' into feat/hastagTimeline 2021-04-02 16:50:31 +08:00
sunxiaojian c0bd7c2497 chore: change .black to asset color. 2021-04-02 16:50:07 +08:00
jk234ert 4f77688d03 feat: add nativation title view 2021-04-02 16:38:33 +08:00
sunxiaojian f24aee739e chore: rename file name and code format 2021-04-02 12:10:12 +08:00
sunxiaojian 458ab6bcda feature: search recommend page 2021-04-02 11:48:22 +08:00
jk234ert b63a5ebe5f feat: use search api to fetch tag info 2021-04-02 10:21:51 +08:00
CMK bd89b19724 Merge branch 'develop' into feature/profile 2021-04-01 16:01:24 +08:00
CMK efbb32648c chore: update naming for StatusFetchedResultsController 2021-04-01 14:54:15 +08:00
CMK 499ddeb169 Merge branch 'develop' into feature/profile 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon.xcodeproj/project.pbxproj
 2021-04-01 14:53:24 +08:00
sunxiaojian 0584576055 fix: Update server rules scene UI design 2021-04-01 14:40:58 +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
sxiaojian88 379884b001
Merge pull request #84 from tootsuite/feature/searchAPI 
Feature/search api
 2021-04-01 11:52:17 +08:00
sunxiaojian 0f8e3dafe8 chore: remove useless code 2021-04-01 11:50:35 +08:00
sunxiaojian ada6d542f3 fix: decode error 2021-04-01 11:49:38 +08:00
sunxiaojian fde5baad2e chore: add translatesAutoresizingMaskIntoConstraints = false to all constrain method 2021-04-01 10:38:39 +08:00
sxiaojian88 21b50da2bf
Merge pull request #76 from tootsuite/feature/avatarSelect 
feature: Add context menu for avatar select for sign up page
 2021-04-01 09:59:55 +08:00
sunxiaojian dff874af76 feature: add SearchRecommendTagsCollectionViewCell 2021-03-31 20:56:11 +08:00
sunxiaojian 09320bf99c chore: add api to APIService 2021-03-31 19:30:21 +08:00
sunxiaojian 5ec07e617e feature: add Suggestions API 2021-03-31 15:39:41 +08:00
sunxiaojian 0033ea0680 feature: add trends API 2021-03-31 15:00:42 +08:00
sunxiaojian 9ddd8365d0 feature: add search API 2021-03-31 15:00:28 +08:00
sunxiaojian 85e77150b2 fix: avatar image delete and restore 2021-03-31 10:37:38 +08:00
BradGao f26857a311
Merge pull request #79 from tootsuite/fix/pickServerEmptyStateViewPadding 
fix: adjust empty state view horizontal padding
 2021-03-31 08:35:36 +08:00
jk234ert ed88923901 fix: adjust empty state view horizontal padding 2021-03-29 22:02:27 +08:00
CMK e3fa472f3f feat: implement post publishing progress bar UI and publish failure retry logic 2021-03-29 17:44:52 +08:00
sunxiaojian ca25d43f4f feature: Add context menu for avatar select for sign up page 2021-03-29 13:37:56 +08:00
CMK 87a6a4df77 feat: add counter and emoji picker activity indicator 2021-03-26 19:16:32 +08:00
CMK 59889cd683 fix: compose scene leading issue 2021-03-26 14:50:23 +08:00
CMK 00e7450bcc feat: add status visibility selector for status compose scene 2021-03-25 19:34:30 +08:00
CMK 610ee36835 feat: add content warning editor for status compose scene 2021-03-25 18:17:05 +08:00
CMK df66cc6b4a feat: implement emoji picker 2021-03-25 15:56:17 +08:00
CMK 135e88c650 feat: add poll option reorder supports 2021-03-24 15:46:40 +08:00
CMK 0e84b4c164 feat: implement poll supports for status compose 2021-03-24 15:08:00 +08:00
CMK d05f97951b feat: add expires duration selector for poll 2021-03-24 14:49:27 +08:00
CMK 3eb2b916a7 feat: add post publish validate state binding 2021-03-23 19:33:12 +08:00
CMK b8e062c92e feat: add poll UI/UX for compose scene 2021-03-23 18:47:21 +08:00
CMK c35fcfb08f feat: make image attachments uploading in the queue 2021-03-22 18:40:32 +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 b296b21ef0 feat: add image attachments reorder support for status compose scene 2021-03-22 17:48:35 +08:00
CMK 36b42ba3e7 feat: implement take photo and browser for image for compose scene 2021-03-19 19:49:48 +08:00
CMK 75d10b76c8 feat: implement image upload logic 2021-03-18 19:42:26 +08:00
CMK 296d29f3e0 feat: implement status publish API 2021-03-18 17:33:07 +08:00
CMK 1b3ba1ccfb feat: add pick compose image attachment logic 2021-03-18 15:16:35 +08:00
CMK 556964373e chore: code cleanup 2021-03-17 18:17:44 +08:00
CMK 5ecce85bfd feat: add image media attachment item for diffable data source 2021-03-17 18:09:38 +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 4873d8649b chore: renaming status 2021-03-17 11:33:25 +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 c51b2ea5ff Merge branch 'develop' into feature/timelineGap 2021-03-17 11:22:37 +08:00
sunxiaojian 8fc39edd85 feature: Update timeline gap appearance 2021-03-16 19:31:34 +08:00
CMK 0b1b3ecbbd Merge branch 'develop' into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 19:01:41 +08:00
CMK bda216626a Merge branch /develop into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 18:24:48 +08:00
CMK 07f3cc7a77 fix: author info UI layout issue 2021-03-16 16:17:11 +08:00
CMK 96c1488820 fix: hashtag regex exclude list issue 2021-03-16 16:16:44 +08:00
CMK c5582c7aaf Merge branch /develop into feature/compose 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 15:59:26 +08:00
sunxiaojian 12e2c5f0d5 chore: remove newPostsView when load gap toots 2021-03-16 15:54:03 +08:00
CMK f0b08e2b56 Merge branch 'develop' into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Extension/MastodonSDK/Mastodon+Entidy+ErrorDetailReason.swift
 2021-03-16 15:42:15 +08:00
sunxiaojian f7b4b5993a fix: tableView can't scrolling to the top 2021-03-16 15:37:21 +08:00
sunxiaojian 27307ed4dd chore: remove newBottomContent logic 2021-03-16 15:12:52 +08:00
sunxiaojian 1abe550745 chore: remove navigationBar newPostsView when loadmore 2021-03-16 14:41:42 +08:00
CMK fdcd1ffcd0 feat: implement inline emoji for text editor 2021-03-16 14:19:12 +08:00
CMK 21f4124747 fix: header icon missing issue 2021-03-16 11:48:33 +08:00
CMK 1a3cff8a3a chore: add debug entries 2021-03-16 11:48:14 +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 f69086e6c3 chore: move emoji preload to compose scene 2021-03-16 11:23:34 +08:00
CMK 7705e54e67 chore: renaming 2021-03-16 11:23:19 +08:00
sunxiaojian 50a30cd18e chore: export colors from zeplin 2021-03-16 10:12:03 +08:00
sunxiaojian 21362b56c3 chore: add gesture to scroll manually 2021-03-15 20:23:27 +08:00
sunxiaojian 0b046e4673 feature: add navigationBar state 2021-03-15 20:03:48 +08:00
CMK e6b9252e6c chore: remove redundant layout 2021-03-15 19:31:31 +08:00
CMK 1a60428f2a feat: implement emojis preloading logic 2021-03-15 19:25:44 +08:00
CMK fdf5b5fa66 chore: update i18n 2021-03-15 18:22:44 +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 988723691e fix: content warning overlay invalid due to cell reuse issue 2021-03-15 16:28:42 +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 9f02197873 feat: add custom emojis API endpoint 2021-03-15 14:40:10 +08:00
CMK 8eb24871c5 feat: add URL highlight for text editor 2021-03-15 13:44:42 +08:00
CMK a6e4b0bfb1 feat: set compose text editor keyboard type to supports @/# glyphs 2021-03-15 13:44:29 +08:00
CMK 6882788ccc fix: AutoLayout fail before view appear issue 2021-03-15 13:43:15 +08:00
CMK 8c48bce627 chore: rename toot 2021-03-15 13:42:46 +08:00
CMK 92a26b2f73 feat: [WIP] add mention and hashtag input highlight. Add emoji token replacing logic 2021-03-12 19:25:28 +08:00
CMK 36604d150f feat: show discard alert when user cancel toot composing 2021-03-12 15:57:58 +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 1746c1fc77 feat: add toolbar for compose scene 2021-03-12 15:23:28 +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 03496a4e97 chore: add missing renaming 2021-03-11 19:23:44 +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
CMK 97ecbb1bfb feat: add compose scene 2021-03-11 15:41:27 +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
CMK 71c5ca327a chore: make fetch free from exception 2021-03-11 14:34:10 +08:00
CMK 6b5bb4f178 chore: make the database request Fail-Fast 2021-03-11 14:08:00 +08:00
sunxiaojian 6c0a767435 chore: auto-pause when audio cell disappeared 2021-03-11 13:16:44 +08:00
CMK f4136d03ba fix: add missing fetchLimit 2021-03-11 11:43:49 +08:00
CMK 51ee576c24 fix: redundant execute path for avatar setting 2021-03-11 11:36:42 +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
CMK 807dfd9ea7 feat: profile persist logic. Add replyTo and replyFrom relationship for Toot 2021-03-10 16:38:14 +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 81c22fee24 fix: count not change after undo boost and undo favorite issue 2021-03-09 19:41:18 +08:00
CMK 51b6455c37 chore: rename reblog API 2021-03-09 19:40:32 +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 04d960c890 Merge branch 'develop' into feature/audio 2021-03-09 17:02:03 +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