Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge beta into master #2246

Merged
merged 481 commits into from
Jul 6, 2020
Merged

Merge beta into master #2246

merged 481 commits into from
Jul 6, 2020

Conversation

diegolmello
Copy link
Member

@RocketChat/ReactNative

phriedrich and others added 30 commits January 28, 2020 10:24
* [CHORE] Update RN to 0.61.5

* [CHORE] Update react-native patch

Co-authored-by: Djorkaeff Alexandre <[email protected]>
minor: also remove 'cd' calls

Co-authored-by: Diego Mello <[email protected]>
djorkaeffalexandre and others added 25 commits June 12, 2020 15:46
* react-navigation v5 installed

* compiling

* Outside working

* InsideStack compiling

* Switch stack

* Starting room

* RoomView header

* SafeAreaView

* Slide from right stack animation

* stash

* Fix params

* Create channel

* inapp notification

* Custom status

* Add server working

* Refactor appStart

* Attachment

* in-app notification

* AuthLoadingView

* Remove compat

* Navigation

* Outside animations

* Fix new server icon

* block modal

* AttachmentView header

* Remove unnecessary code

* SelectedUsersView header

* StatusView

* CreateDiscussionView

* RoomInfoView

* RoomInfoEditView style

* RoomMembersView

* RoomsListView header

* RoomView header

* Share extension

* getParam

* Focus/blur

* Trying to fix inapp

* Lint

* Simpler app container

* Update libs

* Revert "Simpler app container"

This reverts commit 1e49d80.

* Load messages faster

* Fix safearea on ReactionsModal

* Update safe area to v3

* lint

* Fix transition

* stash - drawer replace working

* stash - modal nav

* RoomActionsView as tablet modal

* RoomStack

* Stop showing RoomView header when there's no room

* Custom Header and different navigation based on stack

* Refactor setHeader

* MasterDetailContext

* RoomView header

* Fix isMasterDetail rule

* KeyCommands kind of working

* Create channel on tablet

* RoomView sCU

* Remove withSplit

* Settings opening as modal

* Settings

* StatusView headerLeft

* Admin panel

* TwoFactor style

* DirectoryView

* ServerDropdown and SortDropdown animations

* ThreadMessagesView

* Navigate to empty RoomView on server switch when in master detail

* ProfileView header

* Fix navigation issues

* Nav to any room info on tablet

* Room info

* Refactoring

* Fix rooms search

* Roomslist commands

* SearchMessagesView close modal

* Key commands

* Fix undefined subscription

* Disallow navigate to focused room

* isFocused state on RoomsListView

* Blur text inputs when focus is lost

* Replace animation

* Default nav theme

* Refactoring

* Always open Attachment with close modal button

* ModalContainer backdrop following themes

* Screen tracking

* Refactor get active route for in-app notification

* Only mark room as focused when in master detail layout

* Lint

* Open modals as fade from bottom on Android

* typo

* Fixing tests

* Fix in-app update

* Fixing goRoom issues

* Refactor stack names

* Fix unreadsCount

* Fix stack

* Fix header animation

* Refactor ShareNavigation

* Refactor navigation theme

* Make sure title is set

* Fix create discussion navigation

* Remove unused variable

* Create discussions from actions fixed

* Layout animation

* Screen lock on share extension

* Unnecessary change

* Admin border

* Set header after state callback

* Fix key commands on outside stack

* Fix back button pressed

* Remove layout animations from Android

* Tweak animations on Android

* Disable swipe gesture to open drawer

* Fix current item on RoomsListView

* Fix add server

* Fix drawer

* Fix broadcast

* LayoutAnimation instead of Transitions

* Fix onboarding back press

* Fix assorted tests

* Create discussion fix

* RoomInfoView header

* Drawer active item
* [WIP] New Action Sheet

* [NEW] Header Indicator

* [IMPROVEMENT] Header Logic

* [NEW] Use EventEmitter to show ActionSheet for while

* [FIX] Animation

* [IMPROVEMENT] Use provider

* [FIX] Add callback

* [FIX] Message Actions

* [FIX] Add MessageActions icons

* [NEW] MessageErrorActions

* [IMPROVEMENT] OnClose

* [FIX] Adjust height

* [FIX] Close/Reopen

* [CHORE] Remove react-native-action-sheet

* [CHORE] Move ActionSheet

* [FIX] Reply Message

* [IMPROVEMENT] Hide ActionSheet logic

* [WIP] Custom MessageActions Header

* [IMPROVEMENT] MessageActions Header

* [IMPROVEMENT] Enable Scroll

* [FIX] Scroll on Android

* Move to react-native-scroll-bottom-sheet

* Stash

* Refactor actions

* Revert some changes

* Trying react-native-modalize

* Back to HOC

* ActionSheet style

* HOC Header

* Reaction actionSheet

* Fix messageBox actions

* Fix add reaction

* Change to flatListProps

* fix modalize android scroll

* Use react-native-scroll-bottom-sheet

* [NEW] BottomSheet dismissable & [FIX] Android not opening

* [NEW] Show emojis based on screen width

* [WIP] Adjust to content height

* [IMPROVEMENT] Responsible

* [IMPROVEMENT] Use alert instead actionSheet at NewServerView

* [FIX] Handle tablet cases

* [IMPROVEMENT] Remove actionSheet of RoomMembersView

* [IMPROVEMENT] Min snap distance when its portrait

* [CHORE] Remove unused Components

* [IMPROVEMENT] Remove duplicated add-reaction

* [IMPROVEMENT] Refactor Icon Package

* [IMPROVEMENT] Use new icons

* [FIX] Select message at MessageActions before getOptions

* [FIX] Custom header height

* [CHORE] Remove patch & [FIX] Tablet bottom sheet

* [FIX] Use ListItem height to BottomSheet Height

* Some fixes

* [FIX] Custom MessageActions header

* [FIX] Android height adjust

* [IMPROVEMENT] Item touchable & [FIX] Respect pin permission

* [IMPROVEMENT] More than one snap point

* some size fixes

* improve code

* hide horizontal scroll indicator

* [FIX] Focus MessageBox on edit message

* [FIX] Ripple color

* [IMPROVEMENT] Backdrop must keep same opacity after 50% of the screen

* [TEST] Change animation config

* [IMPROVEMENT] BackHandler should close the ActionSheet

* [CHORE] Add react-native-safe-area-context

* [FIX] Provide a bottom padding at notch devices

* [IMPROVEMENT] Improve backdrop input/output range

* [FIX] Weird Android Snap behavior

* [PATCH] React-native-scroll-bottom-sheet

* [CI] Re-run build

* [FIX] Landscape android

* [IMPROVEMENT] Cover 50% of the screen at the landscape mode

* [FIX] Adjust emoji content to width size

* [IMPROVEMENT] Use hooks library

* [IMPROVEMENT] Close the actionSheet when orientation change

* deactivate safe-area-context for while

* [REVERT] Re-add react-native-safe-area-context (3.0.2)

* [IMPROVEMENT] Use focused background

* [TESTS] E2E Tests updated to new BottomSheet

* [NEW] Add cancel button

* [FIX] Cancel button at android

* [IMPROVEMENT] Use cancelable bottom sheet at room members view

* [IMPROVEMENT] Use better function names

* [IMPROVEMENT] Use getItemLayout

* [FIX][TEMP] Animation

* Review

* Build

* Header keyExtractor

* Rename function

* Tweak animation

* Refactoring

* useTheme

* Refactoring

* TestIDs

* Refactor

* Remove old lib

Co-authored-by: Diego Mello <[email protected]>
Signed-off-by: Ezequiel De Oliveira <[email protected]>

Co-authored-by: Diego Mello <[email protected]>
Signed-off-by: Ezequiel De Oliveira <[email protected]>

Co-authored-by: Diego Mello <[email protected]>
* [WIP] Use rest instead methodCall

* [WIP] Some method calls using wrapper

* [WIP] Wrap all necessary methodCalls

* fix

Co-authored-by: Diego Mello <[email protected]>
* [IMPROVEMENT] Mark a thread as read

* Use methodCallWrapper

* Check server version

Co-authored-by: Diego Mello <[email protected]>
# Conflicts:
#	.circleci/config.yml
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/assets/fonts/custom.ttf
#	android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
#	android/gradle.properties
#	app/actions/actionsTypes.js
#	app/actions/index.js
#	app/actions/notification.js
#	app/commands.js
#	app/constants/colors.js
#	app/constants/settings.js
#	app/constants/tablet.js
#	app/constants/types.js
#	app/containers/DisclosureIndicator.js
#	app/containers/EmojiPicker/EmojiCategory.js
#	app/containers/FormContainer.js
#	app/containers/HeaderButton.js
#	app/containers/LoginServices.js
#	app/containers/MessageActions.js
#	app/containers/MessageBox/CommandsPreview/Item.js
#	app/containers/MessageBox/LeftButtons.ios.js
#	app/containers/MessageBox/Recording.js
#	app/containers/MessageBox/ReplyPreview.js
#	app/containers/MessageBox/RightButtons.android.js
#	app/containers/MessageBox/UploadModal.js
#	app/containers/MessageBox/buttons/BaseButton.js
#	app/containers/MessageBox/buttons/CancelEditingButton.js
#	app/containers/MessageBox/buttons/SendButton.js
#	app/containers/MessageBox/index.js
#	app/containers/MessageErrorActions.js
#	app/containers/ReactionsModal.js
#	app/containers/RoomTypeIcon.js
#	app/containers/StatusBar.js
#	app/containers/TwoFactor/index.js
#	app/containers/TwoFactor/styles.js
#	app/containers/UIKit/MultiSelect/Chips.js
#	app/containers/UIKit/MultiSelect/Input.js
#	app/containers/UIKit/Select.js
#	app/containers/message/Audio.js
#	app/containers/message/CallButton.js
#	app/containers/message/Image.js
#	app/containers/message/RepliedThread.js
#	app/containers/message/Reply.js
#	app/containers/message/Thread.js
#	app/containers/message/Urls.js
#	app/containers/message/Video.js
#	app/containers/message/styles.js
#	app/i18n/locales/en.js
#	app/i18n/locales/pt-BR.js
#	app/index.js
#	app/lib/Navigation.js
#	app/lib/ShareNavigation.js
#	app/lib/methods/callJitsi.js
#	app/lib/methods/getSettings.js
#	app/lib/methods/subscriptions/room.js
#	app/lib/methods/subscriptions/rooms.js
#	app/lib/rocketchat.js
#	app/lib/selection.json
#	app/notifications/inApp/index.js
#	app/presentation/RoomItem/Actions.js
#	app/presentation/RoomItem/Touchable.js
#	app/presentation/RoomItem/index.js
#	app/reducers/index.js
#	app/reducers/room.js
#	app/sagas/createChannel.js
#	app/sagas/deepLinking.js
#	app/sagas/init.js
#	app/sagas/login.js
#	app/sagas/messages.js
#	app/sagas/room.js
#	app/sagas/selectServer.js
#	app/sagas/state.js
#	app/selectors/login.js
#	app/share.js
#	app/theme.js
#	app/utils/deviceInfo.js
#	app/utils/goRoom.js
#	app/utils/isReadOnly.js
#	app/utils/localAuthentication.js
#	app/utils/log.js
#	app/utils/media.js
#	app/views/AdminPanelView/index.js
#	app/views/AttachmentView.js
#	app/views/AuthLoadingView.js
#	app/views/AuthenticationWebView.js
#	app/views/AutoTranslateView/index.js
#	app/views/ChangePasscodeView.js
#	app/views/CreateChannelView.js
#	app/views/CreateDiscussionView/index.js
#	app/views/DefaultBrowserView.js
#	app/views/DirectoryView/Options.js
#	app/views/DirectoryView/index.js
#	app/views/DirectoryView/styles.js
#	app/views/ForgotPasswordView.js
#	app/views/ForwardLivechatView.js
#	app/views/InviteUsersEditView/index.js
#	app/views/InviteUsersEditView/styles.js
#	app/views/InviteUsersView/index.js
#	app/views/InviteUsersView/styles.js
#	app/views/JitsiMeetView.js
#	app/views/LanguageView/index.js
#	app/views/LegalView.js
#	app/views/LivechatEditView.js
#	app/views/LoginView.js
#	app/views/MarkdownTableView.js
#	app/views/MessagesView/index.js
#	app/views/ModalBlockView.js
#	app/views/NewMessageView.js
#	app/views/NewServerView.js
#	app/views/NotificationPreferencesView/index.js
#	app/views/OnboardingView/index.js
#	app/views/PickerView.js
#	app/views/ProfileView/index.js
#	app/views/ReadReceiptView/index.js
#	app/views/ReadReceiptView/styles.js
#	app/views/RegisterView.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomMembersView/index.js
#	app/views/RoomView/Banner.js
#	app/views/RoomView/Header/Header.js
#	app/views/RoomView/Header/Icon.js
#	app/views/RoomView/Header/RightButtons.js
#	app/views/RoomView/Header/RoomHeaderLeft.js
#	app/views/RoomView/Header/index.js
#	app/views/RoomView/List.js
#	app/views/RoomView/ReactionPicker.js
#	app/views/RoomView/UploadProgress.js
#	app/views/RoomView/index.js
#	app/views/RoomsListView/Header/Header.android.js
#	app/views/RoomsListView/Header/Header.ios.js
#	app/views/RoomsListView/ListHeader/Directory.js
#	app/views/RoomsListView/ListHeader/Sort.js
#	app/views/RoomsListView/ServerDropdown.js
#	app/views/RoomsListView/SortDropdown/index.js
#	app/views/RoomsListView/index.js
#	app/views/ScreenLockConfigView.js
#	app/views/SearchMessagesView/index.js
#	app/views/SearchMessagesView/styles.js
#	app/views/SelectServerView.js
#	app/views/SelectedUsersView.js
#	app/views/SetUsernameView.js
#	app/views/SettingsView/index.js
#	app/views/ShareListView/index.js
#	app/views/ShareListView/styles.js
#	app/views/ShareView/index.js
#	app/views/ShareView/styles.js
#	app/views/SidebarView/index.js
#	app/views/StatusView.js
#	app/views/Styles.js
#	app/views/ThemeView.js
#	app/views/ThreadMessagesView/index.js
#	app/views/VisitorNavigationView.js
#	app/views/WithoutServersView.js
#	app/views/WorkspaceView/index.js
#	e2e/helpers/app.js
#	e2e/tests/assorted/01-changeserver.spec.js
#	e2e/tests/assorted/02-broadcast.spec.js
#	e2e/tests/assorted/04-setting.spec.js
#	e2e/tests/room/01-createroom.spec.js
#	e2e/tests/room/02-room.spec.js
#	e2e/tests/room/03-roomactions.spec.js
#	e2e/tests/room/04-roominfo.spec.js
#	ios/Podfile.lock
#	ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json
#	ios/Pods/Local Podspecs/RNImageCropPicker.podspec.json
#	ios/Pods/Local Podspecs/rn-extensions-share.podspec.json
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/RSKImageCropper/README.md
#	ios/Pods/RSKImageCropper/RSKImageCropper/CGGeometry+RSKImageCropper.h
#	ios/Pods/RSKImageCropper/RSKImageCropper/RSKImageCropViewController.m
#	ios/Pods/RSKImageCropper/RSKImageCropper/RSKImageScrollView.m
#	ios/Pods/Target Support Files/EXVideoThumbnails/EXVideoThumbnails-prefix.pch
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-resources.sh
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-resources.sh
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/RNImageCropPicker/RNImageCropPicker.xcconfig
#	ios/Pods/Target Support Files/RNImageCropPicker/ResourceBundle-QBImagePicker-RNImageCropPicker-Info.plist
#	ios/Pods/Target Support Files/RSKImageCropper/RSKImageCropper-prefix.pch
#	ios/Pods/Target Support Files/RSKImageCropper/RSKImageCropper.xcconfig
#	ios/Pods/Target Support Files/React/React-prefix.pch
#	ios/Pods/Target Support Files/react-native-splash-screen/react-native-splash-screen-prefix.pch
#	ios/Pods/Target Support Files/yoga/yoga-dummy.m
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	ios/custom.ttf
#	package.json
#	patches/@rocket.chat+sdk+1.0.0-dj.15.patch
#	storybook/stories/RoomViewHeader.js
#	yarn.lock
@lgtm-com
Copy link

lgtm-com bot commented Jul 6, 2020

This pull request introduces 3 alerts and fixes 3 when merging 08b10c1 into 370128f - view on LGTM.com

new alerts:

  • 1 for Superfluous trailing arguments
  • 1 for Potentially inconsistent state update
  • 1 for Unsupported state update in lifecycle method

fixed alerts:

  • 2 for Use of returnless function
  • 1 for Unsupported state update in lifecycle method

@diegolmello diegolmello merged commit 0a67aae into master Jul 6, 2020
@diegolmello diegolmello deleted the beta branch July 6, 2020 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.