Commit Graph

1171 Commits

Author SHA1 Message Date
CMK 2e9af9c9cb Merge /develop into feature/poll
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Diffiable/Item/Item.swift
2021-03-07 22:26:05 +08:00
CMK c6103eed35 fix: add missing request retry logic 2021-03-06 14:59:27 +08:00
CMK 893dc2a668 feat: make diffable data source works with category picker 2021-03-06 14:46:04 +08:00
CMK 8568debab0 feat: make diffable data source work with search text 2021-03-06 14:21:52 +08:00
CMK 29653ca612 feat: set corner radius for the last cell layer 2021-03-06 13:30:06 +08:00
CMK e70fd532c4 feat: [WIP] display empty state when fetching server list 2021-03-06 12:55:52 +08:00
CMK 54c7610c7f chore: [WIP] refactor pick server scene with diffable data source 2021-03-06 00:46:53 +08:00
CMK 652c286c71 fix: password error prompt layout issue 2021-03-05 20:45:48 +08:00
CMK 087413009d chore: update function signature 2021-03-05 19:30:52 +08:00
CMK 7ad09468e2 fix: set image missing corner radius 2021-03-05 19:30:17 +08:00
CMK 07d3c3cbff chore: comment out animation logging 2021-03-05 15:56:20 +08:00
CMK a3f9b8c2ef Merge branch 'develop' into feature/poll
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-03-05 15:55:29 +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 54292d6b6a fix: typo. Remove period 2021-03-04 16:42:43 +08:00
CMK 2ed2a7d8a1 fix: make sign up error i18n display for each text filed. Fix memory leaking issue for pick server scene 2021-03-04 15:29:46 +08:00
CMK ba283bbdcb fix: appVersion not set issue 2021-03-04 10:51:49 +08:00
CMK d9428d1f82 Merge commit /develop into fix/html-server-description 2021-03-04 10:49:08 +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
sunxiaojian 492ad98d9b chore: change puls.circle.fill 2021-03-03 12:26:14 +08:00
sunxiaojian a0aa8b9194 chore: use instance method to observe highlighted property 2021-03-03 11:30:25 +08:00
sunxiaojian 384fe6018e chore: set the photoButton highlight with some value alpha 2021-03-03 10:59:44 +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
sunxiaojian f16b4ed1cb chore: update password hint, handle error when use PhotosUI 2021-03-02 17:24:04 +08:00
sunxiaojian eb2057d14e chore: make sure to crop the image into a square 2021-03-02 16:39:43 +08:00
sunxiaojian 211f5dd0e4 chore: code format 2021-03-02 16:27:58 +08:00
CMK 8b63c2fda1 feat: add PollSection and PollItem for diffable data source 2021-03-02 16:27:11 +08:00
sunxiaojian ea511c153f chore: set user avatar use PhotoUI 2021-03-02 16:19:20 +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 daba138c0e Merge branch 'develop' into feature/welcome-illustration 2021-03-02 12:53:33 +08:00
CMK eda3e95ad0 feat: add poll table view cell 2021-03-02 12:49:04 +08:00
CMK 33f1cfcc77 fix: server description may display in HTML format issue. resolve: #30 2021-03-02 12:01:11 +08:00
CMK 965756b0f8 chore: make background black and set alpha 0.9 for the artwork 2021-03-02 11:49:27 +08:00
CMK 08d9f67f00 fix: image name typo issue 2021-03-02 11:00:59 +08:00
sxiaojian88 fab3902561
Merge pull request #33 from tootsuite/feature/errorDetail
Feature/error detail
2021-03-02 10:26:55 +08:00
sunxiaojian f6d9b12722 chore: update the i18n suggests 2021-03-02 10:25:49 +08:00
CMK 94d1aae02c fix: Xcode dummy refactor rename namespace overflow issue 2021-03-01 19:34:24 +08:00
sunxiaojian 148a996129 chore: update the i18n suggests 2021-03-01 19:19:51 +08:00
CMK 9251b55106 feat: set artwork image bleeding 2021-03-01 18:32:31 +08:00
sunxiaojian 77a0708e7d chore: Make the server rules display before the sign-up form scene 2021-03-01 18:06:37 +08:00
sunxiaojian a659b35577 chore: display UI when username is taken error return by sign up 2021-03-01 17:45:02 +08:00
CMK 47abbadaba feat: draw welcome illustration 2021-03-01 17:38:45 +08:00
sunxiaojian 732c5392d4 chore: show error with 18n 2021-03-01 17:16:28 +08:00
jk234ert cff6a1d9ef fix: #30
fix: fix crash in server pick view when user input search text
fix: fix in pick server view, user cound is always zero
2021-03-01 17:08:31 +08:00
CMK 25c3d6e74d feat: add welcome illustration assets 2021-03-01 14:23:45 +08:00
CMK 72a446b22d fix: app version setup issue 2021-03-01 12:28:08 +08:00
CMK 21aad5cc4a fix: server rules scene do not alert error issue 2021-02-26 19:52:58 +08:00
CMK d57d30ac21 chore: set AppIcon and update version to 0.1.0 (2) 2021-02-26 19:32:25 +08:00
CMK b2c4d29d8d chore: update version to 0.1.0 (1) 2021-02-26 18:37:11 +08:00
CMK bab6832da3 feat: add app version and build infos into system app setting panel 2021-02-26 18:36:38 +08:00
CMK 7aa45ff230 chore: make onboarding ready 2021-02-26 18:27:47 +08:00
CMK 24fc57d982 Merge branch 'develop' into feature/onborading 2021-02-26 16:44:28 +08:00
CMK ccf599feaa chore: make UI appearance match between onboarding scenes 2021-02-26 16:43:59 +08:00
sunxiaojian 68d5365295 chore: make code clear 2021-02-26 15:39:05 +08:00
sunxiaojian 522702386c feat: add support for inviteEnabled instance 2021-02-26 12:52:37 +08:00
jk234ert c9f35ba9d2 Merge branch 'feat/serverPicker' of https://github.com/tootsuite/mastodon-ios into feat/serverPicker 2021-02-25 20:40:55 +08:00
jk234ert ea24ea6514 fix: expand/collapse animation.
fix: use instance's uri as domain
2021-02-25 20:39:56 +08:00
BradGao c9a63a9069
Merge branch 'develop' into feat/serverPicker 2021-02-25 17:59:43 +08:00
jk234ert 1024f37d5f chore: optimize expand animation 2021-02-25 17:58:40 +08:00
jk234ert a932749bda chore: optimize the expand & scroll animation 2021-02-25 17:40:11 +08:00
jk234ert 861a70993c fix: check if input domain is valid to avoid crash 2021-02-25 17:29:04 +08:00
jk234ert b67cb61fd8 chore: fix conflicts 2021-02-25 16:52:41 +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
sunxiaojian 9489fbfa1a chore: change button color to .white 2021-02-25 16:37:25 +08:00
sunxiaojian 74c19c9746 chore: fill email in MastodonResendEmailViewModelNavigationDelegateShim 2021-02-25 16:20:42 +08:00
sunxiaojian fa4b349e06 chore: update generated Strings 2021-02-25 16:04:14 +08:00
sunxiaojian 5fbb47470c chore: update generated Strings 2021-02-25 15:44:14 +08:00
sunxiaojian bf1a709548 Merge branch 'develop' into feature/confirmEmail 2021-02-25 15:41:13 +08:00
sunxiaojian 5dbd015b16 chore: add OnboardingAppearance 2021-02-25 15:39:48 +08:00
BradGao bcaff23704
Merge branch 'develop' into feat/serverPicker 2021-02-25 14:49:50 +08:00
jk234ert 7329a62582 chore: resolve conflicts 2021-02-25 14:41:41 +08:00
jk234ert 50035c1359 feat: implement pick server feature 2021-02-25 14:23:51 +08:00
jk234ert 027fec1cc9 feat: implement pick server view search cell & server list cell 2021-02-25 14:23:20 +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
sunxiaojian 35ef867adf chore: add account validation and webView email pre-fill 2021-02-24 20:12:15 +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 ca013f79da feat: add public timeline debug entry 2021-02-24 18:07:11 +08:00
CMK 1345db9d7e fix: status content warning UI for Dark Mode related issue 2021-02-24 18:07:00 +08:00
CMK 5bc8adfd43 fix: re-entry crash issue 2021-02-24 17:23:30 +08:00
CMK a79f5140b5 feat: profile timeline scroll performance 2021-02-24 17:23:01 +08:00
sunxiaojian 2f053ee323 Merge branch 'develop' into feature/confirmEmail 2021-02-24 17:19:33 +08:00
CMK 7e625f74d2 fix: content warning label set when spoiler text is empty issue 2021-02-24 16:18:39 +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
sunxiaojian 36e5fa3950 chore: add cancel action to alert 2021-02-24 10:49:50 +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 87a7a1e91f chore: make sign in works 2021-02-23 15:44:59 +08:00
sunxiaojian f5621991d8 feat: confirmEmail Page 2021-02-23 15:42:23 +08:00
CMK e6ad839d3c Merge commit 'ea79ca771d441f1d0af2cd19872e3bdd227838e7' into feature/home
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-02-23 15:25:48 +08:00
CMK a90643552a feat: display count for reply button 2021-02-23 15:23:18 +08:00
CMK 40a524434f feat: update status cell UI 2021-02-23 15:16:55 +08:00
jk234ert 2fa11b6595 chore: resolve conflicts 2021-02-23 12:41:56 +08:00
BradGao 8f5a52333a
Merge branch 'develop' into feat/welcomeView 2021-02-23 12:39:55 +08:00
jk234ert 4fafb3835d chore: update constraints 2021-02-23 11:19:10 +08:00
jk234ert 85ceb48003 chore: resolve requested changes 2021-02-22 23:16:13 +08:00
CMK db2761447b chore: remove ignore file 2021-02-22 17:55:43 +08:00
CMK 40a21a3a9f chore: make input responsible 2021-02-22 17:48:44 +08:00
CMK 832432f42f fix: make button display on the top of the keyboard 2021-02-22 16:37:13 +08:00
CMK abf2e673e1 Merge branch 'feature/signup' into feature/server-rule
# Conflicts:
#	Mastodon/Scene/Authentication/Register/MastodonRegisterViewController.swift
2021-02-22 16:26:50 +08:00
CMK 9a79b9a545 feat: add MastodonServerRules scene 2021-02-22 16:20:44 +08:00
CMK 34191c921a feat: add localization helper 2021-02-22 16:20:23 +08:00
sunxiaojian e4989cfe30 chore: add keyboardWillShowNotification to KeyboardResponderService 2021-02-22 12:51:35 +08:00
jk234ert 9d0c0fae90 chore: apply large title style to slogan title 2021-02-20 21:00:11 +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
CMK 6285cb95fa fix: AutoLayout issue. Update keyboard listener. Expose server error message 2021-02-20 19:54:08 +08:00
sunxiaojian 0e2aa4570d chore: remove useless code 2021-02-20 18:26:39 +08:00
sunxiaojian 243d3362e6 chore: add Combine style valid logic 2021-02-20 18:24:23 +08:00
CMK a74ac3a41a chore: add Combine style valid logic 2021-02-20 17:13:16 +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
BradGao 773a25e94a
Merge pull request #13 from tootsuite/feat/mastodonSDKRefactor
Feat/mastodon sdk refactor
2021-02-19 21:33:33 +08:00
jk234ert e44821bce8 feat: refactor the mastodonSDK
chore: update API docs
2021-02-19 17:40:05 +08:00
CMK 9e0a7bb352 feat: add stub categories 2021-02-19 12:17:12 +08:00
CMK c919a724ab feat: implement onboarding /servers and /categories endpoint 2021-02-19 11:56:51 +08:00
sunxiaojian 9670ad2924 chore: update toot relationship in CoreData 2021-02-18 14:32:29 +08:00
sunxiaojian 99f2e4a854 chore: code format and define onceRequestTootMaxCount 2021-02-18 13:09:40 +08:00
jk234ert 9395f689ce feat: refactor query type; add several Account APIs and tests 2021-02-10 14:56:16 +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 b417cc398b fix: TimelineMiddleLoaderTableViewCellDelegate in TimelineSection change to optional 2021-02-05 17:08:51 +08:00
sunxiaojian 5aa917e7bd fix : maintain contentOffset after refresh timeline 2021-02-05 16:50:40 +08:00
sunxiaojian 08dfe42aba fix: change Middle Loader load sequence ,use the toot before the gap as the anchor. 2021-02-05 16:05:34 +08:00
CMK 1b3c9b2099 feat: add sign out debug menu 2021-02-05 15:58:48 +08:00
sunxiaojian 61dc0cb2cd chore:change maxID to minID 2021-02-05 15:21:07 +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 1c3facf456 feat: display avatar bar button item for authenticated user 2021-02-04 19:37:38 +08:00
CMK 0abd8ab863 feat: add AvatarConfigurableView 2021-02-04 19:28:16 +08:00
CMK ef55edca10 feat: pin appearance to dark mode 2021-02-04 19:27:42 +08:00
CMK 45301fb72c fix: update ActiveLabel to v4.0.0 to fix url active entity may raise crash issue 2021-02-04 16:29:03 +08:00
CMK cb2b478bff chore: remove implicit optional unwrap 2021-02-04 14:57:16 +08:00
CMK 2ebb12b86e feat: add APIService.Persist.persistTimeline method and make public timeline load oldest works 2021-02-04 14:45:44 +08:00
CMK ade8b68a65 Merge branch 'develop' into feature/home-timeline-api 2021-02-04 13:51:52 +08:00
sunxiaojian ee663cc18f chore: code error fix 2021-02-04 11:35:25 +08:00
sunxiaojian 1f7819565e chore: implement Toot createOrMerge 2021-02-04 10:48:45 +08:00
CMK 6daccf5170 feat: add home timeline api 2021-02-03 18:52:47 +08:00
sunxiaojian 3557916747 chore: add application property in toot 2021-02-03 17:24:15 +08:00
sunxiaojian 04d4e7f33a feat: add bottomLoader 2021-02-03 17:23:25 +08:00
sunxiaojian 29439c9746 feat: add pull to refresh 2021-02-03 17:23:09 +08:00
CMK 2c6a0e383a feat: implement authentication scene 2021-02-03 16:01:08 +08:00
CMK 36c1807182 feat: [WIP] add authentication scene 2021-02-02 19:31:10 +08:00
CMK b749d0a7bc fix: Toot.emojis wrong keyPath issue 2021-02-02 16:19:46 +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
CMK 0f8ad0c444 feat: add authentication scene 2021-02-02 15:38:54 +08:00
sunxiaojian 03dd6a7329 code format and resolve all the comments. 2021-02-02 14:10:25 +08:00
sunxiaojian 7c19e569c9 Add Assets Color
Update public timeline cell's UI
add ActionToolBar
2021-02-02 10:29:48 +08:00
CMK 71de1ed9be feat: add OAuth API endpoint unit test 2021-01-29 19:38:11 +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
CMK 00173e5c30 feat: add Mastodon.API.App.create API 2021-01-27 16:01:20 +08:00
CMK 1a000b96a8 feat: add Core Data Stack 2021-01-27 14:50:13 +08:00
sunxiaojian 3d5afbd589 feat: add MastodonAPI 2021-01-26 17:38:30 +08:00
CMK 19ddb106ad chore: setup project 2021-01-22 14:28:58 +08:00
CMK 16d1a35b0e Initial Commit 2021-01-22 13:54:11 +08:00