zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
688 Commits 33 Branches 366 Tags 67 MiB
Commit Graph

503 Commits

Author SHA1 Message Date
CMK 9001289801 feat: add push notification 2021-04-25 12:48:29 +08:00
sunxiaojian e3001c772a fix: Handle keyboard return button in register scene 2021-04-24 20:39:21 -07:00
sunxiaojian 2bf40b3d09 fix: pick scene UI layout issue 2021-04-24 20:10:00 -07:00
sunxiaojian 490e168b7d fix: UI update in confirm email scene 2021-04-24 19:50:54 -07:00
sxiaojian88 bcdb55f9f0
Merge pull request #110 from tootsuite/feature/suggestion 
Feature/suggestion
 2021-04-23 04:49:06 -07:00
sunxiaojian d6d91180cb fix: the data source update queue , change activityIndicatorView color 2021-04-23 19:15:52 +08:00
sunxiaojian 61a26fbe66 fix: refresh block state when view will appear 2021-04-23 10:47:31 +08:00
ihugo 008bb49d2d fix: add selection state of report status 2021-04-23 09:37:18 +08:00
ihugo ce3f4f5e96 refactor: Use single file organization classes. 2021-04-22 23:02:24 +08:00
ihugo 21264fead1 refactor: To pass the ViewModel to coordinator 2021-04-22 23:01:07 +08:00
sunxiaojian 67f813a946 fix: update followState when view will appear 2021-04-22 20:35:41 +08:00
sunxiaojian e664722b13 chore: update UI/UX of suggestion account 2021-04-22 19:58:42 +08:00
sunxiaojian 64b4247706 chore: add a debug menu entry for testing EmptyView 2021-04-22 15:52:10 +08:00
sunxiaojian 326aea36cd fix: The empty view should not display when the user just sign-in the first time 2021-04-22 15:45:32 +08:00
sunxiaojian d4f4a3e086 fix: search scene UI update 2021-04-22 14:36:29 +08:00
ihugo d1e3039e38 fix: compile issue 2021-04-22 13:08:53 +08:00
ihugo 23d9853a71 Merge branch 'develop' into feature/report 
# Conflicts:
#	CoreDataStack/Entity/Status.swift
 2021-04-22 12:54:16 +08:00
ihugo e3df692c3f feat: report 2021-04-22 12:52:11 +08:00
sunxiaojian 7f6e9fb907 fix: suggestions account order 2021-04-22 10:29:53 +08:00
sunxiaojian 46fe59c920 chore: add debounce for refresh 2021-04-22 10:11:19 +08:00
sunxiaojian 106a5cc71a fix: homeTimeline refresh after follow people 2021-04-21 18:52:09 +08:00
sunxiaojian 9402dab97f fix: suggestion button tintColor 2021-04-21 18:08:07 +08:00
sunxiaojian 776263aaf2 chore: compatible with the old server 2021-04-21 18:03:44 +08:00
sunxiaojian c8474c6a7f feature: suggestion account scene 2021-04-21 16:17:42 +08:00
sunxiaojian 731b49aaa0 chore: suggestion use v2 api 2021-04-20 15:40:10 +08:00
CMK f6e785a894 feat: set GIF pause and auto resume when toggle content warning overlay 2021-04-20 13:40:14 +08:00
CMK 04d427ea93 feat: make content warning works in the notification scene 2021-04-20 13:18:27 +08:00
CMK f8127428dd Merge branch 'develop' into feature/content-warning 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
 2021-04-19 19:32:16 +08:00
CMK b7258dc7f2 fix: set reveal button hidden in the compose scene 2021-04-19 19:15:49 +08:00
CMK 4041929b3e feat: fulfill the content warning when compose reply post 2021-04-19 19:13:20 +08:00
CMK 81a1028f20 feat: pause video playback when set reveal state to false 2021-04-19 19:09:34 +08:00
sunxiaojian bd9860b792 Merge branch 'develop' into feature/notification 2021-04-19 18:07:21 +08:00
sunxiaojian da19f8f641 chore: remove Redundant codes 2021-04-19 18:06:02 +08:00
CMK f7aa5c123d fix: compose scene layout issue when presenting reply post 2021-04-19 17:50:58 +08:00
sunxiaojian bb03c10ef6 chore: apply review suggestions 2021-04-19 17:06:39 +08:00
sunxiaojian c814065edb fix: Scroll view has ambiguous scrollable content height and ViewDebug warning 2021-04-19 12:39:16 +08:00
sunxiaojian f6be51dd0f chore: remove UIView+Contraint 2021-04-19 12:25:01 +08:00
sunxiaojian 5ae2c44642 chore: remove useless code 2021-04-19 10:10:46 +08:00
sunxiaojian 462fafe706 chore: add navigation to ThreadScene 2021-04-18 22:10:36 +08:00
ihugo 8c7149af89 fix: server-side data is inconsistent with local 2021-04-18 02:02:08 +08:00
ihugo e42af11bf7 chore: generate strings and assets 2021-04-17 14:19:16 +08:00
ihugo f6dabb5e36 Merge branch 'develop' into feature/settings-rebase 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon/Generated/Assets.swift
#	Mastodon/Generated/Strings.swift
#	Mastodon/Resources/en.lproj/Localizable.strings
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
 2021-04-17 14:13:01 +08:00
ihugo 9be8b95aea fix: use right privacyURL 
- remove some redundancy code
 2021-04-17 14:01:57 +08:00
sunxiaojian 780025a3ce chore: use systemBackground color 2021-04-16 22:58:36 +08:00
sunxiaojian bc588e08db Merge branch 'develop' into feature/notification 2021-04-16 22:40:36 +08:00
sunxiaojian cfdd2ea670 chore: use stackView 2021-04-16 22:31:52 +08:00
CMK e3c6aaf64e fix: blurhash image render issue 2021-04-16 20:29:08 +08:00
CMK 680cf9a827 feat: add blurhash image and update content warning 2021-04-16 20:08:32 +08:00
sunxiaojian ca7eb7bb12 chore: code format 2021-04-16 13:45:54 +08:00
ihugo 0ebf86bd43 docs: add comments for hard code 2021-04-15 17:17:19 +08:00
sunxiaojian ecf622b866 fix: statusView layout issue 2021-04-15 12:35:40 +08:00
CMK ccb74b08f7 feat: make reply to foldable in compose scene 2021-04-15 12:10:43 +08:00
CMK 83904126dd chore: update face smiling icon 2021-04-15 11:38:47 +08:00
CMK 12a3164a21 fix: segmented control selection missing update issue 2021-04-15 11:21:33 +08:00
CMK 39c635705e chore: update background color 2021-04-15 11:21:07 +08:00
CMK 2507a7324e fix: set missing font for relationship action button 2021-04-15 11:05:19 +08:00
sunxiaojian 845080a69d fix: NotificationCell nameLabel and actionLabel layout issue 2021-04-15 10:53:03 +08:00
sunxiaojian 56d22e9c1c chore: use readableContentGuide 2021-04-15 10:37:46 +08:00
sunxiaojian 80d76acc27 chore: format file 2021-04-15 10:16:30 +08:00
sunxiaojian 2e86449c41 fix: bottom loader display aways 2021-04-14 20:02:41 +08:00
CMK aa3dff0770 feat: update thread dark mode background color 2021-04-14 19:49:50 +08:00
CMK 1723891099 chore: update background dark mode to follow system naming 2021-04-14 19:45:09 +08:00
sunxiaojian 687614d43a feat: add bottom loader 2021-04-14 19:04:11 +08:00
CMK 6c973ed17c fix: resolve #83 the text editor input content offset reset after input character issue 2021-04-14 18:11:59 +08:00
sunxiaojian bffb0a887b chore: rename searchBottomLoader , rename pure color 2021-04-14 18:00:43 +08:00
sunxiaojian f3394ff382 feat: add navigation to Notification Cell 2021-04-14 17:48:09 +08:00
sunxiaojian 2d71a48e36 chore: fix order of notification and layout issue 2021-04-14 17:13:23 +08:00
ihugo ceba2772c1 fix: remove magic numbers to make it clear and robust 2021-04-14 16:41:30 +08:00
sunxiaojian 288a8025ce chore: use NotificationStatusTableViewCell and NotificationTableViewCell 2021-04-14 16:24:40 +08:00
CMK 56bd6d0ae8 feat: set compose initial visibility following the account lock setting 2021-04-14 16:17:34 +08:00
CMK d5c9473528 feat: implement reply status entry and update query of API 2021-04-14 15:59:29 +08:00
sunxiaojian d99fb1af76 chore: make segment work in notification 2021-04-14 15:56:06 +08:00
sunxiaojian 66b07f41db chore: display status Content 2021-04-14 15:38:05 +08:00
CMK 0eff43e1d1 feat: update compose scene UI appearance 2021-04-14 15:24:54 +08:00
CMK 8df3b7d464 feat: make new reply display first 2021-04-14 11:23:19 +08:00
sunxiaojian 42628398e6 chore: display Notification Cell 2021-04-13 21:31:49 +08:00
sunxiaojian 773bfb6dd2 feature: notification API and CoreData 2021-04-13 19:56:35 +08:00
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
ihugo db3d16be41 fix: use readable guider to layout section header 2021-04-13 18:12:40 +08:00
ihugo 901176e14d fix: fix compile error caused by git merge 2021-04-13 17:37:13 +08:00
ihugo 262eeeccba add: clear media cache 2021-04-13 17:18:04 +08:00
ihugo 16fc1a85bd fix: fix some reveiw issues 2021-04-13 17:18:04 +08:00
ihugo 23a06f04ab fixed: subscription API call 2021-04-13 17:15:58 +08:00
ihugo b2b8b70707 fix: signout does not work 2021-04-13 17:15:58 +08:00
ihugo 191370e712 feature: settings 2021-04-13 17:15:58 +08:00
sunxiaojian 7bf6328252 chore: code format and add layer.cornerCurve = .continuous 2021-04-13 13:06:35 +08:00
sunxiaojian a59208a643 Merge branch 'develop' into feature/searching 2021-04-13 09:43:54 +08:00
sxiaojian88 c3070d9594
Merge pull request #98 from tootsuite/feature/searchFollow 
Feature/search follow
 2021-04-13 09:22:39 +08:00
sunxiaojian e784e123c9 fix: searchbar wasn't correct display in ipad 2021-04-12 12:49:01 +08:00
sunxiaojian a007b7a980 fix: color in Light Mode, fix search result disappear when push new page 2021-04-09 20:38:02 +08:00
sunxiaojian aa23ce398f fix: fix crash when unfollowing , fix cell reuse issue 2021-04-09 20:04:12 +08:00
CMK ff13121b18 feat: add title view for profile scene 2021-04-09 19:44:48 +08:00
sunxiaojian 567c2af0ee chore: add followAction 2021-04-09 19:39:35 +08:00
CMK 9184ec4ecf fix: combine event consumed issue 2021-04-09 17:46:20 +08:00
CMK 4faacdf1be feat: implement profile infos editing 2021-04-09 17:31:43 +08:00
sunxiaojian c74314ef11 chore: observe Follow state 2021-04-09 13:59:33 +08:00
sunxiaojian 0418ec1470 chore: recommend account use CoreData dateSource 2021-04-09 13:09:30 +08:00
CMK 2ce5c4db6b fix: pick server scene leaking issue 2021-04-09 11:05:10 +08:00
CMK 3b03ed63ce feat: add share action for profile scene 2021-04-08 18:52:35 +08:00
CMK 672db8f3c2 chore: use fake aspect protocol to group extension default implementations 2021-04-08 17:06:03 +08:00
CMK 14176be4ed feat: handle suspended account in profile scene 2021-04-08 17:06:03 +08:00
CMK ba48adb470 chore: make favorite and hashtag scene use next page token from response header 2021-04-08 17:06:03 +08:00
CMK 74ee93e983 chore: set title label for favorite scene 2021-04-08 17:06:02 +08:00
CMK a0a636917f feat: add title view for favorite scene 2021-04-08 17:06:02 +08:00
CMK b6269c7643 feat: add favorite scene 2021-04-08 17:06:02 +08:00
sunxiaojian ae20a29013 fix: make seeAll button and clear button highlight when user tapping 2021-04-08 16:12:04 +08:00
sunxiaojian 5c7a13e6b3 fix: displayNameLabel display beyound card 2021-04-08 14:19:59 +08:00
sunxiaojian c1971438cd fix: acctLabel display beyound card 2021-04-08 14:17:57 +08:00
sunxiaojian cc4290385d chore: rename recommend 2021-04-08 14:01:22 +08:00
sunxiaojian 4ffea58f71 fix: SearchCard UI update, change follow button border width, add card border when DarkMode, add shadow 2021-04-08 13:51:25 +08:00
sunxiaojian 803ff3a7fd chore: add navigation to profile, add recommend navigation 2021-04-08 12:47:13 +08:00
sunxiaojian 2331867758 chore: add navigation to hashtagViewController 2021-04-08 12:31:48 +08:00
sunxiaojian 0dab9acd91 fix: tag and searchHistory repeated save in CoreDate 2021-04-08 12:22:05 +08:00
sunxiaojian 27b698a97a chore: add backgroud.navigation.color. update colors in searching page 2021-04-07 21:42:43 +08:00
sunxiaojian c7eea5d8e6 Merge branch 'develop' into feature/searching 2021-04-07 21:08:41 +08:00
sunxiaojian 33016d9cf4 chore: rename hashTag to hashtag 2021-04-07 21:01:32 +08:00
sunxiaojian d800e10bd7 feature: add search history 2021-04-07 19:49:33 +08:00
CMK 08d105f7b7 chore: make hashtag inject with compose kind 2021-04-07 17:10:58 +08:00
CMK ecd595c6e8 chore: correct hashtag typo 2021-04-07 16:56:31 +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
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 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
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