Commit Graph

52 Commits

Author SHA1 Message Date
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 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
CMK af4fcf9dfd Merge branch 'develop' into feature/profile-coordinator
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-04-07 14:44:58 +08:00
CMK 824d214ce7 chore: update color asset 2021-04-06 16:42:45 +08:00
CMK 5d3b6d1943 feat: handle profile follow, block, and mute actions 2021-04-02 18:13:45 +08:00
sunxiaojian e1696134a8 Merge branch 'develop' into feature/searchRecommend 2021-04-02 17:04:08 +08:00
sunxiaojian 458ab6bcda feature: search recommend page 2021-04-02 11:48:22 +08:00
CMK 43ee11b863 feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
CMK e3fa472f3f feat: implement post publishing progress bar UI and publish failure retry logic 2021-03-29 17:44:52 +08:00
CMK 87a6a4df77 feat: add counter and emoji picker activity indicator 2021-03-26 19:16:32 +08:00
CMK b8e062c92e feat: add poll UI/UX for compose scene 2021-03-23 18:47:21 +08:00
CMK 1b3ba1ccfb feat: add pick compose image attachment logic 2021-03-18 15:16:35 +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 c5582c7aaf Merge branch /develop into feature/compose
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-03-16 15:59:26 +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
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
sunxiaojian 50a30cd18e chore: export colors from zeplin 2021-03-16 10:12:03 +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 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
CMK 2ac2eb7c77 Merge commit /develop into feature/reblog 2021-03-10 10:30:07 +08:00
CMK 441a6aee9e feat: implement boost for toot 2021-03-09 15:18:43 +08:00
sunxiaojian 30d03a3894 chore: add audio support for toot 2021-03-09 14:37:55 +08:00
CMK a3f9b8c2ef Merge branch 'develop' into feature/poll
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-03-05 15:55: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
sunxiaojian 492ad98d9b chore: change puls.circle.fill 2021-03-03 12:26:14 +08:00
CMK 80954b0492 feat: add Poll and PollOption entity to CoreDataStack 2021-03-02 15:51:16 +08:00
CMK fc9310de20 feat: add motion effect for welcome illustration elements 2021-03-02 13:45:47 +08:00
CMK eda3e95ad0 feat: add poll table view cell 2021-03-02 12:49:04 +08:00
CMK 47abbadaba feat: draw welcome illustration 2021-03-01 17:38:45 +08:00
CMK ccf599feaa chore: make UI appearance match between onboarding scenes 2021-02-26 16:43:59 +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
BradGao 8f5a52333a
Merge branch 'develop' into feat/welcomeView 2021-02-23 12:39:55 +08:00
CMK 40a21a3a9f chore: make input responsible 2021-02-22 17:48:44 +08:00
CMK 9a79b9a545 feat: add MastodonServerRules scene 2021-02-22 16:20:44 +08:00
sunxiaojian 8ef5a34a40 feat: finish sign up page 2021-02-20 15:26:03 +08:00
jk234ert 8970231381 feat: add welcome view 2021-02-20 13:56:34 +08:00
sunxiaojian efc2a05db1 chore: export Colors from Zeplin 2021-02-20 11:14:13 +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
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 9c54095f40 Merge '/develop' into feature/authentication
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
2021-02-02 15:53:17 +08:00
sunxiaojian 7c19e569c9 Add Assets Color
Update public timeline cell's UI
add ActionToolBar
2021-02-02 10:29:48 +08:00