From 0c7a9b9518c820824f991c81a458ee167ba731e7 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Fri, 17 Jul 2020 11:23:28 -0300 Subject: [PATCH] Merge beta into master (#2309) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [i18n] Added Dutch translation (#1676) * [NEW] Omnichannel Beta (#1674) * [NEW] Confirm logout/clear cache (#1688) * [I18N] Add es-ES language (#1495) * [NEW] UiKit Beta (#1497) * [IMPROVEMENT] Use reselect (#1696) * [FIX] Notification in Android API level less than 24 (#1692) * [IMPROVEMENT] Send tmid on slash commands and media (#1698) * [FIX] Unhandled action on UIKit (#1703) * [NEW] Pull to refresh RoomsList (#1701) * [IMPROVEMENT] Reset app when language is changed (#1702) * [FIX] Small fixes on UIKit (#1709) * [FIX] Spotlight (#1719) * [CHORE] Update react-native-image-crop-picker (#1712) * [FIX] Messages Overlapping (Android) and MessageBox Scroll (iOS) (#1720) * [REGRESSION] Remove @ and # from mention (#1721) * [NEW] Direct message from user info (#1516) * [FIX] Delete slash commands (#1723) * [IMPROVEMENT] Hold URL to copy (#1684) * [FIX] Different sourcemaps generation for Hermes (#1724) * [FIX] Different sourcemaps generation for Hermes * Upload sourcemaps after build * [REVERT] Show emoji keyboard on Android (#1738) * [FIX] Stop logging react-native-image-crop-picker (#1745) * [FIX] Prevent toast ref error (#1744) * [FIX] Prevent reaction map error (#1743) * [FIX] Add missing calls to user info (#1741) * [FIX] Catch room unsubscribe error (#1739) * [i18n] Missing German keys (#1735) * [FIX] Missing i18n on MessagesView title (#1733) * [FIX] UIKit Modal: Weird behavior on Android Tablet (#1742) * [i18n] Missing key on German (#1747) Co-authored-by: Diego Mello * [i18n] Add Italian (#1736) * [CHORE] Memory leaks investigation (#1675) * [IMPROVEMENT] Alert verify email when enabled (#1725) * [NEW] Jitsi JWT added to URL (#1746) * [FIX] UIKit submit when connection lost (#1748) * Bump version to 4.5.0 (#1761) * [NEW] Default browser (#1752) Co-authored-by: Diego Mello * [FIX] HTTP Basic Auth (#1753) Co-authored-by: Diego Mello * [IMPROVEMENT] Honor profile fields edit settings (#1687) Co-authored-by: Diego Mello * [IMPROVEMENT] Room announcements (#1726) Co-authored-by: Diego Mello * [IMPROVEMENT] Honor Register/Login settings (#1727) Co-authored-by: Diego Mello * [IMPROVEMENT] Make links clickable on Room Info (#1730) Co-authored-by: Diego Mello * [NEW] Hide system messages (#1755) Co-authored-by: Diego Mello * [IMPROVEMENT] Honor "Message_AudioRecorderEnabled" (#1764) Co-authored-by: Diego Mello * [i18n] Missing de keys (#1765) Co-authored-by: Diego Mello * [FIX] Redirect user to SetUsernameView (#1728) Co-authored-by: Diego Mello * [FIX] Join Room (#1769) Co-authored-by: Diego Mello * [FIX] Accept all media types using * (#1770) Co-authored-by: Diego Mello * [FIX] Use RealName when necessary (#1758) Co-authored-by: Diego Mello * [FIX] Markdown Line Break (#1783) * [IMPROVEMENT] Remove useMarkdown (#1774) Co-authored-by: Diego Mello * [IMPROVEMENT] Open browser rather than webview on Create Workspace (#1788) Co-authored-by: Diego Mello * [IMPROVEMENT] Markdown perf (#1796) * [FIX] Stop video when modal is closed (#1787) Co-authored-by: Diego Mello * [FIX] Hide reply notification action when there are missing data (#1771) Co-authored-by: Diego Mello * [i18n] Added Japanese translation (#1781) Co-authored-by: Diego Mello * [FIX] Reset password error message (#1772) Co-authored-by: Diego Mello * [FIX] Close tablet modal (#1773) Co-authored-by: Diego Mello * [FIX] Setting not present (#1775) Co-authored-by: Diego Mello * [FIX] Thread header (#1776) Co-authored-by: Diego Mello * [FIX] Keyboard tracking loses input ref (#1784) Co-authored-by: Diego Mello * [NEW] Mark message as unread (#1785) Co-authored-by: Djorkaeff Alexandre * [IMPROVEMENT] Log server version (#1786) Co-authored-by: Diego Mello * [IMPROVEMENT] Add loading message on long running tasks (#1798) Co-authored-by: Diego Mello * [CHORE] Switch Apple account on Fastlane (#1810) * [FIX] Watermelon throwing "Cannot update a record with pending updates" (#1754) * [FIX] Detox tests (#1790) * [CHORE] Use markdown preview on RoomView Header (#1807) Co-authored-by: Diego Mello * [FIX] LoginSignup blink services (#1809) Co-authored-by: Diego Mello * [IMPROVEMENT] Request user presence on demand (#1813) Co-authored-by: Diego Mello * [FIX] Remove all invited users when create a channel (#1814) Co-authored-by: Diego Mello * [FIX] Pop from room which you have been removed (#1819) Co-authored-by: Diego Mello * [FIX] Room Info styles (#1820) Co-authored-by: Diego Mello * [i18n] Add missing German keys (#1800) Co-authored-by: Diego Mello * [FIX] Empty mentions for @all and @here when real name is enabled (#1822) Co-authored-by: Diego Mello * [TESTS] Markdown added to Storybook (#1812) Co-authored-by: Diego Mello * [REGRESSION] Room View header title (#1827) Co-authored-by: Diego Mello * [FIX] Storybook snapshots (#1831) Co-authored-by: Djorkaeff Alexandre * [FIX] Mentions (#1829) Co-authored-by: Diego Mello * [FIX] Thread message not found (#1830) Co-authored-by: Diego Mello * [FIX] Separate delete and remove channel (#1832) * Rename to delete room * Separate delete and remove channel * handleRemoved -> handleRoomRemoved * [FIX] Navigate to RoomsList & Handle tablet case Co-authored-by: Djorkaeff Alexandre * [NEW] Filter system messages per room (#1815) Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * [FIX] e2e tests (#1838) * [FIX] Consecutive clear cache calls freezing app (#1851) * Bump version to 4.5.1 (#1853) * [FIX][iOS] Ignore silent mode on audio player (#1862) * [IMPROVEMENT] Create App Group property on Info.plist (#1858) Co-authored-by: Diego Mello * [IMPROVEMENT] Make username clickable on message (#1618) Co-authored-by: Diego Mello * [FIX] Show proper error message on profile (#1768) Co-authored-by: Diego Mello * [IMPROVEMENT] Show toast when a message is starred/unstarred (#1616) Co-authored-by: Diego Mello * [FIX] Incorrect size params to avatar endpoint (#1875) Co-authored-by: Diego Mello * [FIX] Remove unrecognized emoji flags on android (#1887) Co-authored-by: Diego Mello * [FIX] Remove react-native global installs (#1886) Co-authored-by: Diego Mello * [FIX] Emojis transparent on android (#1881) Co-authored-by: Diego Mello * Bump acorn from 5.7.3 to 5.7.4 (#1876) Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Diego Mello * Bump version to 4.6.0 (#1911) * [FIX] Encode Image URI (#1909) * [FIX] Encode Image URI * [FIX] Check if Image is Valid Co-authored-by: Diego Mello * [NEW] Adaptive Icons (#1904) * Remove unnecessary stuff from debug build * Adaptive icon for experimental app * [FIX] Stop showing message on leave channel (#1896) * [FIX] Leave room don't show 'was removed' message * [FIX] Remove duplicated code Co-authored-by: Diego Mello * [i18n] Added missing German translations(#1900) Co-authored-by: Diego Mello * [FIX] Linkedin OAuth login (#1913) * [CHORE] Fix typo in CreateChannel View (#1930) * [FIX] Respect protocol in HTTP Auth IPs (#1933) Co-authored-by: Diego Mello * [FIX] Use new LinkedIn OAuth url (#1935) Co-authored-by: Diego Mello * [CHORE] Use storyboard on splash screen (#1939) * Update react-native-bootsplash * iOS * Fix android * [FIX] Check if avatar exists before create Icon (#1927) Co-authored-by: Diego Mello * [FIX] Ignore self typing event (#1950) Co-authored-by: Diego Mello * [FIX] Change default directory listing to Users (#1948) * fix: change default directory listing to Users * follow server settings * Fix state to props Co-authored-by: Diego Mello * [NEW] Onboarding layout (#1954) * Onboarding texts * OnboardingView * FormContainer * Minor fixes * NewServerView * Remove code * Refactor * WorkspaceView * Stash * Login with email working * Login with * Join open * Revert "Login with" This reverts commit d05dc507d2e9a2db76d433b9b1f62192eba35dbd. * Fix create account styles * Register * Refactor * LoginServices component * Refactor * Multiple servers * Remove native images * Refactor styles * Fix testid * Fix add server on tablet * i18n * Fix close modal * Fix TOTP * [FIX] Registration disabled * [FIX] Login Services separator * Fix logos * Fix AppVersion name * I18n * Minor fixes * [FIX] Custom Fields Co-authored-by: Djorkaeff Alexandre * [NEW] Create discussions (#1942) * [WIP][NEW] Create Discussion * [FIX] Clear multiselect & Translations * [NEW] Create Discussion at MessageActions * [NEW] Disabled Multiselect * [FIX] Initial channel * [NEW] Create discussion on MessageBox Actions * [FIX] Crashing on edit name * [IMPROVEMENT] New message layout * [CHORE] Update README * [NEW] Avatars on MultiSelect * [FIX] Select Users * [FIX] Add redirect and Handle tablet * [IMPROVEMENT] Split CreateDiscussionView * [FIX] Create a discussion inner discussion * [FIX] Create a discussion * [I18N] Add pt-br * Change icons * [FIX] Nav to discussion & header title * Fix header Co-authored-by: Diego Mello * [FIX] Load messages (#1910) * Create updateLastOpen param on readMessages * Remove InteractionManager from load messages * [NEW] Custom Status (#1811) * [NEW] Custom Status * [FIX] Subscribe to changes * [FIX] Improve code using Banner component * [IMPROVEMENT] Toggle modal * [NEW] Edit custom status from Sidebar * [FIX] Modal when tablet * [FIX] Styles * [FIX] Switch to react-native-promp-android * [FIX] Custom Status UI * [TESTS] E2E Custom Status * Fix banner * Fix banner * Fix subtitle * status text * Fix topic header * Fix RoomActionsView topic * Fix header alignment on Android * [FIX] RoomInfo crashes when without statusText * [FIX] Use users.setStatus * [FIX] Remove customStatus of ProfileView * [FIX] Room View Thread Header Co-authored-by: Diego Mello * [FIX] UI issues of Create Discussion View (#1965) * [NEW] Direct Message between multiple users (#1958) * [WIP] DM between multiple users * [WIP][NEW] Create new DM between multiple users * [IMPROVEMENT] Improve createChannel Sagas * [IMPROVEMENT] Selected Users view * [IMPROVEMENT] Room Actions of Group DM * [NEW] Create new DM between multiple users * [NEW] Group DM avatar * [FIX] Directory border * [IMPROVEMENT] Use isGroupChat * [CHORE] Remove legacy getRoomMemberId * [NEW] RoomTypeIcon * [FIX] No use legacy method on RoomInfoView * [FIX] Blink header when create new DM * [FIX] Only show create direct message option when allowed * [FIX] RoomInfoView * pt-BR * Few fixes * Create button name * Show create button only after a user is selected * Fix max users issues Co-authored-by: Diego Mello * [FIX] Add server and hide login (#1968) * Navigate to new server workspace from ServerDropdown if there's no token * Hide login button based on login services and Accounts_ShowFormLogin setting * [FIX] Lint Co-authored-by: Djorkaeff Alexandre * [FIX] MultiSelect Keyboard behavior (Android) (#1969) * fixed-modal-position * made-changes Co-authored-by: Djorkaeff Alexandre * [FIX] Bottom border style on DirectoryView (#1963) * [FIX] Border style * [FIX] Refactoring * [FIX] fix color of border * Undo Co-authored-by: Aroo Co-authored-by: Diego Mello * [FIX] Clear settings on server change (#1967) * [FIX] Deeplinking without RoomId (#1925) * [FIX] Deeplinking without rid * [FIX] Join channel * [FIX] Deep linking without rid * Update app/lib/methods/canOpenRoom.js Co-authored-by: Diego Mello * [NEW] Two Factor authentication via email (#1961) * First api call working * [NEW] REST API Post wrapper 2FA * [NEW] Send 2FA on Email * [I18n] Add translations * [NEW] Translations & Cancel totp * [CHORE] Totp -> TwoFactor * [NEW] Two Factor by email * [NEW] Tablet Support * [FIX] Text colors * [NEW] Password 2fa * [FIX] Encrypt password on 2FA * [NEW] MethodCall2FA * [FIX] Password fallback * [FIX] Wrap all post/methodCall with 2fa * [FIX] Wrap missed function * few fixes * [FIX] Use new TOTP on Login * [improvement] 2fa methodCall Co-authored-by: Djorkaeff Alexandre * [FIX] Correct message for manual approval user Registration (#1906) * [FIX] Correct message for manual approval from admin shown on Registeration * lint fix - added semicolon * Updated the translations * [FIX] Translations * i18n to match server Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * [FIX] Direct Message between multiple users REST (#1974) * [FIX] Investigate app losing connection issues (#1890) * [WIP] Reopen without timeOut & ping with 5 sec & Fix Unsubscribe * [FIX] Remove duplicated close * [FIX] Use no-dist lib * [FIX] Try minor fix * [FIX] Try reopen connection when app was put on foreground * [FIX] Remove timeout * [FIX] Build * [FIX] Patch * [FIX] Snapshot * [IMPROVEMENT] Decrease time to reopen * [FIX] Some fixes * [FIX] Update sdk version * [FIX] Subscribe Room Once * [CHORE] Update sdk * [FIX] Subscribe Room * [FIX] Try to resend missed subs * [FIX] Users never show status when start app without network * [FIX] Subscribe to room * [FIX] Multiple servers * [CHORE] Update SDK * [FIX] Don't duplicate streams on subscribeAll * [FIX] Server version when start the app offline * [FIX] Server version cached * [CHORE] Remove unnecessary code * [FIX] Offline server version * [FIX] Subscribe before connect * [FIX] Remove unncessary props * [FIX] Update sdk * [FIX] User status & Unsubscribe Typing * [FIX] Typing at incorrect room * [FIX] Multiple Servers * [CHORE] Update SDK * [REVERT] Undo some changes on SDK * [CHORE] Update sdk to prevent incorrect subscribes * [FIX] Prevent no reconnect * [FIX] Remove close on open * [FIX] Clear typing when disconnect/connect to SDK * [CHORE] Update SDK * [CHORE] Update SDK * Update SDK * fix merge develop Co-authored-by: Diego Mello * [FIX] Single message thread inserting thread without rid (#1999) * [FIX] ThreadMessagesView crashing on load (#1997) * [FIX] Saml (#1996) * [FIX] SAML incorrect close * [FIX] Pathname Co-authored-by: Diego Mello * [FIX] Change user own status (#1995) * [FIX] Change user own status * [IMPROVEMENT] Set activeUsers Co-authored-by: Diego Mello * [FIX] Loading all updated rooms after app resume (#1998) * [FIX] Loading all updated rooms after app resume * Fix room date on RoomItem Co-authored-by: Diego Mello * [FIX] Change notifications preferences (#2000) * [FIX] Change notifications preferences * [IMPROVEMENT] Picker View * [I18N] Translations * [FIX] Picker Selection * [FIX] List border * [FIX] Prevent crash * [FIX] Not-Pref tablet * [FIX] Use same style of LanguageView * [IMPROVEMENT] Send listItem title Co-authored-by: Diego Mello * Bump version to 4.6.1 (#2001) * [FIX] DM header blink (#2011) * [FIX] Split get settings into two requests (#2017) * [FIX] Split get settings into two requests * [FIX] Clear settings only when change server * [IMPROVEMENT] Move the way to clear settings * [REVERT] Revert some changes * [FIX] Server Icon Co-authored-by: Diego Mello * [REGRESSION] Invite Links (#2007) Co-authored-by: Diego Mello * [FIX] Read only channel/broadcast (#1951) * [FIX] Read only channel/broadcast * [FIX] Roles missing * [FIX] Check roles to readOnly * [FIX] Can post * [FIX] Respect post-readonly permission * [FIX] Search a room readOnly Co-authored-by: Diego Mello * [FIX] Cas auth (#2024) Co-authored-by: Diego Mello * [FIX] Login TOTP Compatibility to older servers (#2018) * [FIX] Login TOTP Compatibility to older servers * [FIX] Android crashes if use double negation Co-authored-by: Diego Mello * Bump version to 4.6.4 (#2029) Co-authored-by: Diego Mello * [FIX] Lint (#2030) * [FIX] UIKit with only one block (#2022) * [FIX] Message with only one block * [FIX] Update headers Co-authored-by: Diego Mello * Bump version to 4.7.0 (#2035) * [FIX] Action Tint Color on Black theme (#2081) * [FIX] Prevent crash when thread is not found (#2080) Co-authored-by: Diego Mello * [FIX] Prevent double click (#2079) Co-authored-by: Diego Mello * [FIX] Show slash commands when disconnected (#2078) Co-authored-by: Diego Mello * [FIX] Backhandler onboarding (#2077) Co-authored-by: Diego Mello * [FIX] Respect UI_Allow_room_names_with_special_chars setting (#2076) Co-authored-by: Diego Mello * [FIX] RoomsList update sometimes isn't fired (#2071) Co-authored-by: Diego Mello * [IMPROVEMENT] Stop inserting last message as message object from rooms stream if room is focused (#2069) * [IMPROVEMENT] No insert last message if the room is focused * fix discussion/threads Co-authored-by: Diego Mello * [FIX] Hide system messages (#2067) Co-authored-by: Diego Mello * [FIX] Pending update (#2066) Co-authored-by: Diego Mello * [FIX] Prevent crash when room.uids was not inserted yet (#2055) Co-authored-by: Diego Mello * [FEATURE] Save video (#2063) * added-feature-save-video * fix sha256 Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * [FIX] Send totp-code to meteor call (#2050) * fixed-issue * removed-variable-name-errors * reverted-last-commit Co-authored-by: Diego Mello * [FIX] MessageBox mention shouldn't show group DMs (#2049) * fixed-issue * [FIX] Filter users only if it's not a group chat Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * [FIX] AttachmentView (Android)(Tablet) (#2047) * [fix]Tablet attachment View and Room Navigation * fix weird navigation and margin bottom Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * [FIX] Allow special chars in Filename (#2020) * fixed-filename-issue * improve Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * [FIX] Recorded audio on Android doesn't play on iOS (#2073) * react-native-video -> expo-av * remove react-native-video * Add audio mode * update mocks * [FIX] Loading bigger than play/pause Co-authored-by: Diego Mello * [IMPROVEMENT] Message Touchable (#2082) * [FIX] Avatar touchable * [IMPROVEMENT] onLongPress on all Message Touchables * [IMPROVEMENT] User & baseUrl on MessageContext * [FIX] Context Access * [FIX] BaseURL * Fix User Co-authored-by: Diego Mello * [FIX] ReactionsModal (#2085) * [NEW] Delete Server (#1975) * [NEW] Delete server Co-authored-by: Bruno Dantas Co-authored-by: Calebe Rios * [FIX] Revert removed function Co-authored-by: Bruno Dantas Co-authored-by: Calebe Rios * pods * i18n * Revert "pods" This reverts commit 2854a1650538159aeeafe90fdb2118d12b76a82f. Co-authored-by: Bruno Dantas Co-authored-by: Calebe Rios Co-authored-by: Diego Mello * [IMPROVEMENT] Change server while connecting/updating (#1981) * [IMPROVEMENT] Change server while connecting * [FIX] Not login/reconnect to previous server * [FIX] Abort all fetch while connecting * [FIX] Abort sdk fetch * [FIX] Patch-package * Add comments Co-authored-by: Diego Mello * [IMPROVEMENT] Keep screen awake while recording/playing some audio (#2089) * [IMPROVEMENT] Keep screen awake while recording/playing some audio * [FIX] Add expo-keep-awake mock * [FIX] UIKit crashing when UIKitModal receive update event (#2088) Co-authored-by: Diego Mello * [IMPROVEMENT] Close announcement banner (#2064) * [NEW] Created new field in subscription table Signed-off-by: Ezequiel De Oliveira * [NEW] New field added to obeserver in room view Signed-off-by: Ezequiel De Oliveira * [NEW] Added icon and new design to banner Signed-off-by: Ezequiel De Oliveira * [NEW] Close banner function works Signed-off-by: Ezequiel De Oliveira * [IMPROVEMENT] closed banner status now update correctly Signed-off-by: Ezequiel De Oliveira * improve banner style Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * Update all dependencies (#2008) * Android RN 62 * First steps iOS * Second step iOS * iOS compiling * "New" build system * Finish iOS * Flipper * Update to RN 0.62.1 * expo libs * Hermes working * Fix lint * Fix android build * Patches * Dev patches * Patch WatermelonDB: https://github.com/Nozbe/WatermelonDB/pull/660 * Fix jitsi * Update several minors * Update dev minors and lint * react-native-keyboard-input * Few updates * device info * react-native-fast-image * Navigation bar color * react-native-picker-select * webview * reactotron-react-native * Watermelondb * RN 0.62.2 * Few updates * Fix selection * update gems * remove lib * finishing * tests * Use node 10 * Re-enable app bundle * iOS build * Update jitsi ios * [NEW] Passcode and biometric unlock (#2059) * Update expo libs * Configure expo-local-authentication * ScreenLockedView * Authenticate server change * Auth on app resume * localAuthentication util * Add servers.lastLocalAuthenticatedSession column * Save last session date on background * Use our own version of app state redux * Fix libs * Remove inactive * ScreenLockConfigView * Apply on saved data * Auto lock option label * Starting passcode * Basic passcode flow working * Change passcode * Check if biometry is enrolled * Use fork * Migration * Patch expo-local-authentication * Use async storage * Styling * Timer * Refactor * Lock orientation portrait when not on tablet * share extension * Deep linking * Share extension * Refactoring passcode * use state * Stash * Refactor * Change passcode * Animate dots on error * Matching passcodes * Shake * Remove lib * Delete button * Fade animation on modal * Refactoring * ItemInfo * I18n * I18n * Remove unnecessary prop * Save biometry column * Raise time to lock to 30 seconds * Vibrate on wrong confirmation passcode * Reset attempts and save last authentication on local passcode confirmation * Remove inline style * Save last auth * Fix header blink * Change function name * Fix android modal * Fix vibration permission * PasscodeEnter calls biometry * Passcode on the state * Biometry button on PasscodeEnter * Show whole passcode * Secure passcode * Save passcode with promise to prevent empty passcodes and immediately lock * Patch expo-local-authentication * I18n * Fix biometry being called every time * Blur screen on app inactive * Revert "Blur screen on app inactive" This reverts commit a4ce812934adcf6cf87eb1a92aec9283e2f26753. * Remove immediately because of how Activities work on Android * Pods * New layout * stash * Layout refactored * Fix icons * Force set passcode from server * Lint * Improve permission message * Forced passcode subtitle * Disable based on admin's choice * Require local authentication on login success * Refactor * Update tests * Update react-native-device-info to fix notch * Lint * Fix modal * Fix icons * Fix min auto lock time * Review * keep enabled on mobile * fix forced by admin when enable unlock with passcode * use DEFAULT_AUTO_LOCK when manual enable screenLock * fix check has passcode * request biometry on first password * reset auto time lock when disabled on server Co-authored-by: Djorkaeff Alexandre * [FIX] Messages View (#2090) * [FIX] Messages View * [FIX] Opening PDF from Files View * [FIX] Audio * [FIX] SearchMessagesView Co-authored-by: Diego Mello * [FIX] Big names overflow (#2072) * [FIX] Big names overflow * [FIX] Message time Co-authored-by: devyaniChoubey * [FIX] Some alignments * fix user item overflow * some adjustments Co-authored-by: devyaniChoubey Co-authored-by: Diego Mello * [FIX] Avatar of message as an emoji (#2038) * fixed-issue * removed-hardcoded-emoji * Merge develop * replaced markdown with emoji componenent * made-changes * use avatar onPress Co-authored-by: Djorkaeff Alexandre Co-authored-by: Diego Mello * [NEW] Livechat (#2004) * [WIP][NEW] Livechat info/actions * [IMPROVEMENT] RoomActionsView * [NEW] Visitor Navigation * [NEW] Get Department REST * [FIX] Borders * [IMPROVEMENT] Refactor RoomInfo View * [FIX] Error while navigate from mention -> roomInfo * [NEW] Livechat Fields * [NEW] Close Livechat * [WIP] Forward livechat * [NEW] Return inquiry * [WIP] Comment when close livechat * [WIP] Improve roomInfo * [IMPROVEMENT] Forward room * [FIX] Department picker * [FIX] Picker without results * [FIX] Superfluous argument * [FIX] Check permissions on RoomActionsView * [FIX] Livechat permissions * [WIP] Show edit to livechat * [I18N] Add pt-br translations * [WIP] Livechat Info * [IMPROVEMENT] Livechat info * [WIP] Livechat Edit * [WIP] Livechat edit * [WIP] Livechat Edit * [WIP] Livechat edit scroll * [FIX] Edit customFields * [FIX] Clean livechat customField * [FIX] Visitor Navigation * [NEW] Next input logic LivechatEdit * [FIX] Add livechat data to subscription * [FIX] Revert change * [NEW] Livechat user Status * [WIP] Livechat tags * [NEW] Edit livechat tags * [FIX] Prevent some crashes * [FIX] Forward * [FIX] Return Livechat error * [FIX] Prevent livechat info crash * [IMPROVEMENT] Use input style on forward chat * OnboardingSeparator -> OrSeparator * [FIX] Go to next input * [NEW] Added some icons * [NEW] Livechat close * [NEW] Forward Room Action * [FIX] Livechat edit style * [FIX] Change status logic * [CHORE] Remove unnecessary logic * [CHORE] Remove unnecessary code * [CHORE] Remove unecessary case * [FIX] Superfluous argument * [IMPROVEMENT] Submit livechat edit * [CHORE] Remove textInput type * [FIX] Livechat edit * [FIX] Livechat Edit * [FIX] Use same effect * [IMPROVEMENT] Tags input * [FIX] Add empty tag * Fix minor issues * Fix typo * insert livechat room data to our room object * review * add method calls server version Co-authored-by: Diego Mello * [FIX] Delete Subs (#2091) Co-authored-by: Diego Mello * [FIX] Android build (#2094) * [FIX] Blink header DM (#2093) * [FIX] Blink header DM * Remove query * [FIX] Push RoomInfoView * remove unnecessary try/catch * [FIX] RoomInfo > Message (Tablet) Co-authored-by: Diego Mello * [FIX] Default biometry enabled (#2095) Co-authored-by: Diego Mello * [IMPROVEMENT] Enable navigating to a room from auth deep linking (#2115) * Wait for login success to navigate * Enable auth and room deep linking at the same time * [FIX] NewMessageView Press Item should open DM (#2116) Co-authored-by: Diego Mello * [FIX] Roles throwing error (#2110) Co-authored-by: Diego Mello * [FIX] Wait attach activity before changeNavigationBarColor (#2111) * [FIX] Wait attach activity before changeNavigationBarColor * Remove timeout and add try/catch Co-authored-by: Diego Mello * [FIX] UIKit crash when some app send a list (#2117) * [FIX] StoryBook * [FIX] UIKit crash when some app send a list * [CHORE] Update snapshot * [CHORE] Remove token & id * [FIX] Change bar color while no activity attached (#2130) Co-authored-by: Diego Mello * [FIX] Screen Lock options i18n (#2120) Co-authored-by: Diego Mello * [i18n] Added missing German translation strings (#2105) Co-authored-by: Diego Mello * [FIX] Sometimes SDK is null when try to connect (#2131) Co-authored-by: Diego Mello * [FIX] Autocomplete position on Android (#2106) * [FIX] Autocomplete position on Android * [FIX] Set selection to 0 when needed Co-authored-by: Diego Mello * Revert "[FIX] Autocomplete position on Android (#2106)" (#2136) This reverts commit e8c38d6f6f69ae396a4aae6e37336617da739a6d. * [FIX] Here and all mentions shouldn't refer to users (#2137) * [FIX] No send data to bugsnag if it's an aborted request (#2133) Co-authored-by: Diego Mello * [TESTS] Update and separate E2E tests (#2126) * Tests passing until roomslist * create room * roominfo * change server * broadcast * profile * custom status * forgot password * working * room and onboarding * Tests separated * config.yml refactor * Revert "config.yml refactor" This reverts commit 0e984d3029e47612726bf199553f7abdf24843e5. * CI * lint * CI refactor * Onboarding tests * npx detox * Add all tests * Save brew cache * mac-env executor * detox-test command * Update readme * Remove folder * [FIX] Screen Lock Time respect local value (#2141) * [FIX] Screen Lock Time respect local value * [FIX] Enable biometry at the first passcode change * Bump version to 4.8.0 (#2147) * [IMPROVEMENT] Refactor icon package (#2146) * [IMPROVEMENT] Refactor Icon Package * some size fixes * [CHORE] Update WatermelonDB to 0.16.2 (#2166) * [CHORE] Update WatermelonDB to 0.16.2 * Patch watermelon * Markdown linting for e2e README (#2173) * Markdown linting for e2e README * Running a subset of tests * [FIX] Load messages when hideSystemMessages is enabled (#2101) * [WIP] Load messages when hideSystemMessages is enabled * Improve method name * Minor improvements Co-authored-by: Diego Mello * [FIX] Respect server HideSystemMessages (#2175) Co-authored-by: Diego Mello * [FIX] Screen Lock (#2177) * [FIX] Screen Lock * improve variable name Co-authored-by: Djorkaeff Alexandre * [FIX] Load messages issue when trying to get ts from empty results (#2185) * [FIX] Show registration form when add server by a invite link (#2187) Co-authored-by: Diego Mello * [FIX] 2FA email - send code again (#2188) Co-authored-by: Diego Mello * [CHORE] Update react-navigation to v5 (#2154) * 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 1e49d80bb49481c34f415831b9da5e9d53e66057. * 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 * [NEW] Action Sheet (#2114) * [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 * [NEW] Add fastlane to android module and configure CI (#2100) * [IMPROVEMENT] Use react-native-notifier for in-app notifications (#2139) Signed-off-by: Ezequiel De Oliveira Co-authored-by: Diego Mello * [CHORE] Create DimensionsContext (#2098) Signed-off-by: Ezequiel De Oliveira Co-authored-by: Diego Mello * [FIX] Remove duplicated sCU condition (#2194) * [FIX] The auto translate toggle don't save right state (#2142) Signed-off-by: Ezequiel De Oliveira Co-authored-by: Diego Mello * [CHORE] Increase "content_hash_max_items" on Watchman (#2181) Co-authored-by: Diego Mello * [NEW] IFrame authentication (#2184) Co-authored-by: Diego Mello * [NEW] Send multiple attachments (#2162) Co-authored-by: Diego Mello * [NEW] Omnichannel Status Toggle (#2217) Co-authored-by: Diego Mello * [FIX] Typing when UI_Use_Real_Name is enabled (#2216) Co-authored-by: Diego Mello * [REGRESSION] Logout failing after #2217 (#2222) * [CHORE] Add wrapper to make Meteor methods calls over REST (#2104) * [WIP] Use rest instead methodCall * [WIP] Some method calls using wrapper * [WIP] Wrap all necessary methodCalls * fix Co-authored-by: Diego Mello * [IMPROVEMENT] Mark thread as read on open (#2225) * [IMPROVEMENT] Mark a thread as read * Use methodCallWrapper * Check server version Co-authored-by: Diego Mello * [FIX] Read receipt icon on action sheet (#2237) * [FIX] Handle TypeErrors on navigationRef and draftMessage due to null properties (#2232) Co-authored-by: Diego Mello * [FIX] Android crashing when restoring from background (#2238) * [FIX] Send thread attachment (#2242) * [FIX] Iframe auth Login Button (#2241) Co-authored-by: Diego Mello * [REGRESSION] Audio Recording (#2240) Co-authored-by: Diego Mello * [IMPROVEMENT] Expo-av audio recorder (#2195) * [NEW] MessageBox: Expo-av audio recorder * Refactor MessageBox to accommodate recording button even when recording * Rename Recording.js -> RecordAudio.js as we could implement video recording in the future * RecordAudio: Introduce cancel and send buttons * RecordAudio: Introduce recorderBusy state, refactor MessageBox, remove useless SafeAreaView * RecordAudio: Better audio quality 🎉, stop recording on unmount * RecordAudio: Use FileSystem from expo-file-system instead of RNFetchBlob * chore: flush out react-native-audio * fix(MessageBox): bring back some missed styles during refactor * refactor(RecordAudio): use class component * refactor(RecordAudio): recorder busy to class property, styling changes * recorder initialisation changes * fix(RecordAudio): missing await in isRecordingPermissionGranted * fix(RecordAudio): set isRecording = false on cancel/finish, refactor perms Co-authored-by: Diego Mello * [IMPROVEMENT] Unified header UX (#2234) * Change drawer icon * Removed iOS variation * Patch to react-navigation-header-buttons... easier to patch then to overwrite its behaviour :( * Correctly position title * Header subtitle * Layout * Alignment * RoomView header * Renamed RoomHeaderLeft to LeftButtons * RoomView back button * Search icon on RoomView * Refactor * Fix header on tablet * Fix search messages close button on tablet * Search key command * Network status on RoomView header subtitle * Update tests * Scale content * SearchBox cancel color * Bump version to 4.9.0 (#2248) * [FIX] Check for UI_Use_Real_Name when sorting rooms (#2230) Co-authored-by: Diego Mello * [FIX] Emoji keyboard not showing custom and frequently used emojis on Share Extension (#2251) * [FIX] Scroll to top crashing when ref is undefined (#2252) * [FIX] Check if exists scroll ref * Remove scrollTo Co-authored-by: Diego Mello * [FIX] AttachmentView crashing during title decode (#2253) Co-authored-by: Diego Mello * [FIX] Command previews crashing when API returns an error (#2254) Co-authored-by: Diego Mello * [FIX] ThreadMessagesView throwing error when subscription wasn't found (#2255) Co-authored-by: Diego Mello * [FIX] Register crashing when error data is undefined (#2256) Co-authored-by: Diego Mello * [FIX] Get active route returning undefined (#2257) Co-authored-by: Diego Mello * [FIX] ImageViewer not recognising gestures after zoomed (#2261) * [FIX] Zoomed in images must react to gestures * AnimatedFastImage -> AnimatedImage Co-authored-by: Diego Mello * [FIX] Android stack animation throwing illegal node ID (#2260) * [FIX] Navigation object undefined when tapping sidebar's user header on tablet (#2259) * [FIX] Action sheet cutting emojis on the header (#2263) * [FIX] Action sheet cutting emojis on the header * fix tablet case Co-authored-by: Djorkaeff Alexandre * [FIX] Mime type check crashing the app (#2264) * [FIX] Notification preferences update crashing the app (#2262) * [FIX] Create discussion not working from MessageActions (#2265) * [FIX] getSettings not catching errors (#2271) * [REGRESSION] Jitsi Call doesn't send message link (#2277) * [FIX] Messages hidden behind MessageBox (#2281) * fix: package.json & yarn.lock to reduce vulnerabilities (#2275) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-JPEGJS-570039 - https://snyk.io/vuln/SNYK-JS-LODASH-567746 Co-authored-by: Diego Mello * [i18n] Add missing german strings (#2278) * cleaned mixed usage of "du" and "Sie" Co-authored-by: Diego Mello * [CHORE] CircleCI Upgrades (#2269) * Upgrade nvm * Upgrade XCode * Use nvm's default installed version of node (LTS) Co-authored-by: Diego Mello * [NEW] Sign in with Apple (#2282) * Add expo-apple-authentication * Button * Create new provisioning profiles * Login with Apple * Change provisioning profile * Button color based on theme Co-authored-by: Djorkaeff Alexandre * [FIX] MessageBox not being shown on ShareView when Preview is a video (#2283) * Wrap video preview with ScrollView so Messagebox is shown properly * Fix border color * [TESTS] Test in docker (#2290) * Add docker env with orchestration * Update detox, update mocha config format * One simulator at a time - mocha won't run parallel * Docker runner, with test changes to match RC data * Better error trapping in infrastructure control script * Swap user provisioning from Mongo to RC API to work against existing servers * Add docker to e2e readme * Stop using example.com for emails * Default detox to the tests directory * Add working configs for both run scenarios * Add some optional forcing of data.js version for Docker * [CHORE] Consistent Rocket.Chat Branding (#2293) Co-authored-by: Diego Mello * Bump version to 4.10.0 (#2305) Co-authored-by: Daanchaam Co-authored-by: Djorkaeff Alexandre Co-authored-by: Youssef Muhamad Co-authored-by: Iván Álvarez Co-authored-by: Prateek Jain Co-authored-by: Sarthak Pranesh <41206172+sarthakpranesh@users.noreply.github.com> Co-authored-by: phriedrich Co-authored-by: Michele Pellegrini Co-authored-by: Tanmoy Bhowmik Co-authored-by: Hibikine Kage <14365761+hibikine@users.noreply.github.com> Co-authored-by: devyaniChoubey <52153085+devyaniChoubey@users.noreply.github.com> Co-authored-by: Ezequiel de Oliveira Co-authored-by: Neil Agarwal Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Govind Dixit Co-authored-by: Zhaubassarova Aruzhan <49000079+azhaubassar@users.noreply.github.com> Co-authored-by: Aroo Co-authored-by: Sarthak Pranesh Co-authored-by: Siddharth Padhi Co-authored-by: Bruno Dantas Co-authored-by: Calebe Rios Co-authored-by: devyaniChoubey Co-authored-by: Dan Caseley Co-authored-by: Heng Sok Co-authored-by: Snyk bot --- .circleci/config.yml | 12 +- .gitignore | 2 + android/app/build.gradle | 2 +- app/constants/colors.js | 24 +- app/containers/ActionSheet/styles.js | 3 +- app/containers/DisclosureIndicator.js | 2 +- app/containers/Header/index.js | 5 + app/containers/HeaderButton.js | 10 +- app/containers/LoginServices.js | 51 +- app/containers/MessageActions/Header.js | 20 +- app/containers/MessageActions/index.js | 14 +- app/containers/MessageBox/EmojiKeyboard.js | 2 +- app/containers/MessageBox/RecordAudio.js | 226 + app/containers/MessageBox/Recording.js | 172 - .../MessageBox/RightButtons.android.js | 16 +- app/containers/MessageBox/RightButtons.ios.js | 13 +- .../MessageBox/buttons/AudioButton.js | 21 - app/containers/MessageBox/buttons/index.js | 2 - app/containers/MessageBox/index.js | 133 +- app/containers/MessageBox/styles.js | 11 +- app/containers/SearchBox.js | 2 +- app/containers/StatusBar.js | 3 +- app/containers/message/Audio.js | 2 +- app/i18n/locales/de.js | 99 +- app/i18n/locales/en.js | 7 +- app/i18n/locales/es-ES.js | 2 +- app/i18n/locales/fr.js | 2 +- app/i18n/locales/ja.js | 10 +- app/i18n/locales/nl.js | 4 +- app/i18n/locales/pt-BR.js | 7 +- app/i18n/locales/pt-PT.js | 2 +- app/i18n/locales/ru.js | 2 +- app/i18n/locales/zh-CN.js | 2 +- app/lib/database/index.js | 4 +- app/lib/methods/getSettings.js | 72 +- app/lib/rocketchat.js | 8 +- .../ImageViewer/ImageViewer.android.js | 23 +- app/utils/navigation/animations.js | 10 +- app/utils/navigation/index.js | 6 +- app/views/AttachmentView.js | 9 +- .../NotificationPreferencesView/index.js | 41 +- app/views/RegisterView.js | 6 +- app/views/RoomView/Header/Header.js | 18 +- app/views/RoomView/Header/Icon.js | 3 +- .../{RoomHeaderLeft.js => LeftButtons.js} | 13 +- app/views/RoomView/Header/RightButtons.js | 17 + app/views/RoomView/Header/index.js | 25 +- app/views/RoomView/index.js | 58 +- app/views/RoomsListView/Header/Header.ios.js | 95 - .../Header/{Header.android.js => Header.js} | 49 +- app/views/RoomsListView/Header/index.js | 10 +- .../RoomsListView/ListHeader/SearchBar.js | 36 - app/views/RoomsListView/ListHeader/index.js | 20 +- app/views/RoomsListView/index.js | 108 +- app/views/RoomsListView/styles.js | 16 +- app/views/ShareView/Preview.js | 28 +- app/views/ShareView/index.js | 2 +- app/views/SidebarView/index.js | 14 +- app/views/ThreadMessagesView/index.js | 2 +- e2e/.mocharc.json | 6 + e2e/README.md | 36 +- e2e/data.js | 45 +- e2e/data/data.cloud.js | 43 + e2e/data/data.docker.js | 43 + e2e/docker/controlRCDemoEnv.sh | 70 + .../aaa_configureAndWaitForMongo.js | 11 + .../docker-entrypoint-initdb.d/migrations.js | 1 + .../rocketchat_avatars.chunks.js | 1 + .../rocketchat_avatars.files.js | 1 + .../rocketchat_avatars.js | 1 + .../rocketchat_custom_user_status.js | 1 + .../rocketchat_federation_keys.js | 2 + .../rocketchat_livechat_office_hour.js | 7 + .../rocketchat_message.js | 1 + .../rocketchat_oauth_apps.js | 1 + .../rocketchat_permissions.js | 993 + .../rocketchat_roles.js | 11 + .../rocketchat_room.js | 1 + .../rocketchat_settings.js | 894 + .../rocketchat_statistics.js | 1 + .../rocketchat_subscription.js | 1 + .../docker-entrypoint-initdb.d/users.js | 2 + .../rc_test_env/docker-compose.override.yml | 27 + e2e/docker/runTestsInDocker.sh | 31 + e2e/helpers/app.js | 38 +- e2e/helpers/data_setup.js | 77 + e2e/mocha.opts | 1 - e2e/tests/assorted/01-changeserver.spec.js | 13 +- e2e/tests/assorted/02-broadcast.spec.js | 62 +- e2e/tests/assorted/03-profile.spec.js | 16 +- e2e/tests/assorted/04-setting.spec.js | 1 - e2e/tests/assorted/05-joinpublicroom.spec.js | 16 +- e2e/tests/{assorted => }/init.js | 4 +- e2e/tests/onboarding/01-onboarding.spec.js | 1 + .../onboarding/03-forgotpassword.spec.js | 2 +- e2e/tests/onboarding/04-createuser.spec.js | 26 +- e2e/tests/onboarding/05-login.spec.js | 6 +- e2e/tests/onboarding/06-roomslist.spec.js | 8 +- e2e/tests/onboarding/init.js | 11 - e2e/tests/room/01-createroom.spec.js | 5 +- e2e/tests/room/02-room.spec.js | 21 +- e2e/tests/room/03-roomactions.spec.js | 54 +- e2e/tests/room/04-roominfo.spec.js | 8 +- e2e/tests/room/init.js | 11 - ios/Podfile.lock | 16 +- .../EXAppleAuthentication.h | 1 + .../EXAppleAuthenticationButton.h | 1 + .../EXAppleAuthenticationMappings.h | 1 + .../EXAppleAuthenticationRequest.h | 1 + .../Private/RNAudio/AudioRecorderManager.h | 1 - .../EXAppleAuthentication.h | 1 + .../EXAppleAuthenticationButton.h | 1 + .../EXAppleAuthenticationMappings.h | 1 + .../EXAppleAuthenticationRequest.h | 1 + .../Public/RNAudio/AudioRecorderManager.h | 1 - .../EXAppleAuthentication.podspec.json | 23 + ios/Pods/Local Podspecs/RNAudio.podspec.json | 25 - .../Local Podspecs/RNBootSplash.podspec.json | 4 +- ios/Pods/Manifest.lock | 16 +- ios/Pods/Pods.xcodeproj/project.pbxproj | 18612 ++++++++-------- .../EXAppleAuthentication-dummy.m | 5 + .../EXAppleAuthentication-prefix.pch} | 0 .../EXAppleAuthentication.xcconfig | 11 + ...ods-RocketChatRN-acknowledgements.markdown | 25 - .../Pods-RocketChatRN-acknowledgements.plist | 31 - .../Pods-RocketChatRN.debug.xcconfig | 6 +- .../Pods-RocketChatRN.release.xcconfig | 6 +- ...hareRocketChatRN-acknowledgements.markdown | 25 - ...s-ShareRocketChatRN-acknowledgements.plist | 31 - .../Pods-ShareRocketChatRN.debug.xcconfig | 6 +- .../Pods-ShareRocketChatRN.release.xcconfig | 6 +- .../RNAudio/RNAudio-dummy.m | 5 - .../RNAudio/RNAudio.xcconfig | 12 - .../Target Support Files/yoga/yoga-prefix.pch | 12 + ios/RocketChatRN.xcodeproj/project.pbxproj | 2 +- ios/RocketChatRN/Info.plist | 2 +- ios/RocketChatRN/RocketChatRN.entitlements | 4 + .../Base.lproj/MainInterface.storyboard | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 11 +- ...eact-navigation-header-buttons+3.0.5.patch | 12 + yarn.lock | 501 +- 142 files changed, 12917 insertions(+), 10696 deletions(-) create mode 100644 app/containers/MessageBox/RecordAudio.js delete mode 100644 app/containers/MessageBox/Recording.js delete mode 100644 app/containers/MessageBox/buttons/AudioButton.js rename app/views/RoomView/Header/{RoomHeaderLeft.js => LeftButtons.js} (78%) delete mode 100644 app/views/RoomsListView/Header/Header.ios.js rename app/views/RoomsListView/Header/{Header.android.js => Header.js} (54%) delete mode 100644 app/views/RoomsListView/ListHeader/SearchBar.js create mode 100644 e2e/.mocharc.json create mode 100644 e2e/data/data.cloud.js create mode 100644 e2e/data/data.docker.js create mode 100755 e2e/docker/controlRCDemoEnv.sh create mode 100644 e2e/docker/docker-entrypoint-initdb.d/aaa_configureAndWaitForMongo.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/migrations.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_avatars.chunks.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_avatars.files.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_avatars.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_custom_user_status.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_federation_keys.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_livechat_office_hour.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_message.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_oauth_apps.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_permissions.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_roles.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_room.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_settings.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_statistics.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/rocketchat_subscription.js create mode 100644 e2e/docker/docker-entrypoint-initdb.d/users.js create mode 100644 e2e/docker/rc_test_env/docker-compose.override.yml create mode 100755 e2e/docker/runTestsInDocker.sh create mode 100644 e2e/helpers/data_setup.js delete mode 100644 e2e/mocha.opts rename e2e/tests/{assorted => }/init.js (64%) delete mode 100644 e2e/tests/onboarding/init.js delete mode 100644 e2e/tests/room/init.js create mode 120000 ios/Pods/Headers/Private/EXAppleAuthentication/EXAppleAuthentication.h create mode 120000 ios/Pods/Headers/Private/EXAppleAuthentication/EXAppleAuthenticationButton.h create mode 120000 ios/Pods/Headers/Private/EXAppleAuthentication/EXAppleAuthenticationMappings.h create mode 120000 ios/Pods/Headers/Private/EXAppleAuthentication/EXAppleAuthenticationRequest.h delete mode 120000 ios/Pods/Headers/Private/RNAudio/AudioRecorderManager.h create mode 120000 ios/Pods/Headers/Public/EXAppleAuthentication/EXAppleAuthentication.h create mode 120000 ios/Pods/Headers/Public/EXAppleAuthentication/EXAppleAuthenticationButton.h create mode 120000 ios/Pods/Headers/Public/EXAppleAuthentication/EXAppleAuthenticationMappings.h create mode 120000 ios/Pods/Headers/Public/EXAppleAuthentication/EXAppleAuthenticationRequest.h delete mode 120000 ios/Pods/Headers/Public/RNAudio/AudioRecorderManager.h create mode 100644 ios/Pods/Local Podspecs/EXAppleAuthentication.podspec.json delete mode 100644 ios/Pods/Local Podspecs/RNAudio.podspec.json create mode 100644 ios/Pods/Target Support Files/EXAppleAuthentication/EXAppleAuthentication-dummy.m rename ios/Pods/Target Support Files/{RNAudio/RNAudio-prefix.pch => EXAppleAuthentication/EXAppleAuthentication-prefix.pch} (100%) create mode 100644 ios/Pods/Target Support Files/EXAppleAuthentication/EXAppleAuthentication.xcconfig delete mode 100644 ios/Pods/Target Support Files/RNAudio/RNAudio-dummy.m delete mode 100644 ios/Pods/Target Support Files/RNAudio/RNAudio.xcconfig create mode 100644 ios/Pods/Target Support Files/yoga/yoga-prefix.pch create mode 100644 patches/react-navigation-header-buttons+3.0.5.patch diff --git a/.circleci/config.yml b/.circleci/config.yml index 14ba8f40b..bcb01f2a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ defaults: &defaults macos: &macos macos: - xcode: "11.2.1" + xcode: "11.5.0" bash-env: &bash-env BASH_ENV: "~/.nvm/nvm.sh" @@ -33,14 +33,12 @@ save-npm-cache-mac: &save-npm-cache-mac - ./node_modules install-node: &install-node - name: Install Node 10 + name: Install Node command: | - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash source ~/.nvm/nvm.sh - # https://github.com/creationix/nvm/issues/1394 - set +e - nvm install 10 - echo 'export PATH="/home/circleci/.nvm/versions/node/v10.20.1/bin:$PATH"' >> ~/.bash_profile + INSTALLED_NODE=`nvm which current` + echo "export PATH=\"${INSTALLED_NODE%%/node}:\$PATH\"" >> ~/.bash_profile source ~/.bash_profile restore-gems-cache: &restore-gems-cache diff --git a/.gitignore b/.gitignore index 6e797d850..fee7bf865 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ buck-out/ coverage .vscode/ +e2e/docker/rc_test_env/docker-compose.yml +e2e/docker/data/db \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 3182eff24..8bf5d0f93 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -139,7 +139,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer - versionName "4.8.0" + versionName "4.10.0" vectorDrawables.useSupportLibrary = true manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below! diff --git a/app/constants/colors.js b/app/constants/colors.js index 7b9d56763..0b0a8ae7f 100644 --- a/app/constants/colors.js +++ b/app/constants/colors.js @@ -1,5 +1,3 @@ -import { isIOS, isAndroid } from '../utils/deviceInfo'; - export const STATUS_COLORS = { online: '#2de0a5', busy: '#f5455c', @@ -8,7 +6,7 @@ export const STATUS_COLORS = { }; export const SWITCH_TRACK_COLOR = { - false: isAndroid ? '#f5455c' : null, + false: '#f5455c', true: '#2de0a5' }; @@ -34,11 +32,11 @@ export const themes = { separatorColor: '#cbcbcc', navbarBackground: '#ffffff', headerBorder: '#B2B2B2', - headerBackground: isIOS ? '#f8f8f8' : '#2f343d', + headerBackground: '#EEEFF1', headerSecondaryBackground: '#ffffff', - headerTintColor: isAndroid ? '#ffffff' : '#1d74f5', - headerTitleColor: isAndroid ? '#ffffff' : '#0d0e12', - headerSecondaryText: isAndroid ? '#9ca2a8' : '#1d74f5', + headerTintColor: '#6C727A', + headerTitleColor: '#0C0D0F', + headerSecondaryText: '#1d74f5', toastBackground: '#0C0D0F', videoBackground: '#1f2329', favoriteBackground: '#ffbb00', @@ -63,7 +61,7 @@ export const themes = { chatComponentBackground: '#192132', auxiliaryBackground: '#07101e', bannerBackground: '#0e1f38', - titleText: '#FFFFFF', + titleText: '#f9f9f9', bodyText: '#e8ebed', backdropColor: '#000000', dangerColor: '#f5455c', @@ -80,9 +78,9 @@ export const themes = { headerBorder: '#2F3A4B', headerBackground: '#0b182c', headerSecondaryBackground: '#0b182c', - headerTintColor: isAndroid ? '#ffffff' : '#1d74f5', - headerTitleColor: '#FFFFFF', - headerSecondaryText: isAndroid ? '#9297a2' : '#1d74f5', + headerTintColor: '#f9f9f9', + headerTitleColor: '#f9f9f9', + headerSecondaryText: '#9297a2', toastBackground: '#0C0D0F', videoBackground: '#1f2329', favoriteBackground: '#ffbb00', @@ -124,9 +122,9 @@ export const themes = { headerBorder: '#323232', headerBackground: '#0d0d0d', headerSecondaryBackground: '#0d0d0d', - headerTintColor: isAndroid ? '#ffffff' : '#1e9bfe', + headerTintColor: '#f9f9f9', headerTitleColor: '#f9f9f9', - headerSecondaryText: isAndroid ? '#b2b8c6' : '#1e9bfe', + headerSecondaryText: '#b2b8c6', toastBackground: '#0C0D0F', videoBackground: '#1f2329', favoriteBackground: '#ffbb00', diff --git a/app/containers/ActionSheet/styles.js b/app/containers/ActionSheet/styles.js index d87c35f12..76078233b 100644 --- a/app/containers/ActionSheet/styles.js +++ b/app/containers/ActionSheet/styles.js @@ -29,7 +29,8 @@ export default StyleSheet.create({ }, handle: { justifyContent: 'center', - alignItems: 'center' + alignItems: 'center', + paddingBottom: 8 }, handleIndicator: { width: 40, diff --git a/app/containers/DisclosureIndicator.js b/app/containers/DisclosureIndicator.js index 9d574de6c..e33dbe816 100644 --- a/app/containers/DisclosureIndicator.js +++ b/app/containers/DisclosureIndicator.js @@ -17,7 +17,7 @@ const styles = StyleSheet.create({ export const DisclosureImage = React.memo(({ theme }) => ( )); diff --git a/app/containers/Header/index.js b/app/containers/Header/index.js index 249b832e4..2137a71ad 100644 --- a/app/containers/Header/index.js +++ b/app/containers/Header/index.js @@ -20,6 +20,11 @@ export const getHeaderHeight = (isLandscape) => { return 56; }; +export const getHeaderTitlePosition = insets => ({ + left: 60 + insets.left, + right: 80 + insets.right +}); + const styles = StyleSheet.create({ container: { height: headerHeight, diff --git a/app/containers/HeaderButton.js b/app/containers/HeaderButton.js index 3ac44d453..e712a7e1e 100644 --- a/app/containers/HeaderButton.js +++ b/app/containers/HeaderButton.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { HeaderButtons, HeaderButton, Item } from 'react-navigation-header-buttons'; import { CustomIcon } from '../lib/Icons'; -import { isIOS, isAndroid } from '../utils/deviceInfo'; +import { isIOS } from '../utils/deviceInfo'; import { themes } from '../constants/colors'; import I18n from '../i18n'; import { withTheme } from '../theme'; @@ -15,11 +15,7 @@ const CustomHeaderButton = React.memo(withTheme(({ theme, ...props }) => ( {...props} IconComponent={CustomIcon} iconSize={headerIconSize} - color={ - isAndroid - ? themes[theme].headerTitleColor - : themes[theme].headerTintColor - } + color={themes[theme].headerTintColor} /> ))); @@ -32,7 +28,7 @@ export const CustomHeaderButtons = React.memo(props => ( export const DrawerButton = React.memo(({ navigation, testID, ...otherProps }) => ( - + )); diff --git a/app/containers/LoginServices.js b/app/containers/LoginServices.js index b56929033..11ffc6d97 100644 --- a/app/containers/LoginServices.js +++ b/app/containers/LoginServices.js @@ -5,29 +5,32 @@ import { import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { Base64 } from 'js-base64'; +import * as AppleAuthentication from 'expo-apple-authentication'; import { withTheme } from '../theme'; import sharedStyles from '../views/Styles'; import { themes } from '../constants/colors'; -import { loginRequest as loginRequestAction } from '../actions/login'; import Button from './Button'; import OrSeparator from './OrSeparator'; import Touch from '../utils/touch'; import I18n from '../i18n'; import random from '../utils/random'; +import RocketChat from '../lib/rocketchat'; +const BUTTON_HEIGHT = 48; const SERVICE_HEIGHT = 58; +const BORDER_RADIUS = 2; const SERVICES_COLLAPSED_HEIGHT = 174; const styles = StyleSheet.create({ serviceButton: { - borderRadius: 2, + borderRadius: BORDER_RADIUS, marginBottom: 10 }, serviceButtonContainer: { - borderRadius: 2, + borderRadius: BORDER_RADIUS, width: '100%', - height: 48, + height: BUTTON_HEIGHT, flexDirection: 'row', alignItems: 'center', justifyContent: 'center', @@ -187,6 +190,21 @@ class LoginServices extends React.PureComponent { this.openOAuth({ url, ssoToken, authType: 'cas' }); } + onPressAppleLogin = async() => { + try { + const { fullName, email, identityToken } = await AppleAuthentication.signInAsync({ + requestedScopes: [ + AppleAuthentication.AppleAuthenticationScope.FULL_NAME, + AppleAuthentication.AppleAuthenticationScope.EMAIL + ] + }); + + await RocketChat.loginOAuthOrSso({ fullName, email, identityToken }); + } catch { + // Do nothing + } + } + getOAuthState = () => { const credentialToken = random(43); return Base64.encodeURI(JSON.stringify({ loginStyle: 'popup', credentialToken, isCordova: true })); @@ -262,6 +280,7 @@ class LoginServices extends React.PureComponent { } renderItem = (service) => { + const { CAS_enabled, theme } = this.props; let { name } = service; name = name === 'meteor-developer' ? 'meteor' : name; const icon = `icon_${ name }`; @@ -285,11 +304,27 @@ class LoginServices extends React.PureComponent { onPress = () => this.onPressCas(); break; } + case 'apple': { + onPress = () => this.onPressAppleLogin(); + break; + } default: break; } + + if (name === 'apple') { + return ( + + ); + } + name = name.charAt(0).toUpperCase() + name.slice(1); - const { CAS_enabled, theme } = this.props; let buttonText; if (isSaml || (service.service === 'cas' && CAS_enabled)) { buttonText = {name}; @@ -356,8 +391,4 @@ const mapStateToProps = state => ({ services: state.login.services }); -const mapDispatchToProps = dispatch => ({ - loginRequest: params => dispatch(loginRequestAction(params)) -}); - -export default connect(mapStateToProps, mapDispatchToProps)(withTheme(LoginServices)); +export default connect(mapStateToProps)(withTheme(LoginServices)); diff --git a/app/containers/MessageActions/Header.js b/app/containers/MessageActions/Header.js index 5db34acec..7847069e1 100644 --- a/app/containers/MessageActions/Header.js +++ b/app/containers/MessageActions/Header.js @@ -14,17 +14,20 @@ import { Button } from '../ActionSheet'; import { useDimensions } from '../../dimensions'; export const HEADER_HEIGHT = 36; +const ITEM_SIZE = 36; +const CONTAINER_MARGIN = 8; +const ITEM_MARGIN = 8; const styles = StyleSheet.create({ container: { alignItems: 'center', - marginHorizontal: 8 + marginHorizontal: CONTAINER_MARGIN }, headerItem: { - height: 36, - width: 36, - borderRadius: 20, - marginHorizontal: 8, + height: ITEM_SIZE, + width: ITEM_SIZE, + borderRadius: ITEM_SIZE / 2, + marginHorizontal: ITEM_MARGIN, justifyContent: 'center', alignItems: 'center' }, @@ -84,7 +87,7 @@ HeaderFooter.propTypes = { }; const Header = React.memo(({ - handleReaction, server, message, theme + handleReaction, server, message, isMasterDetail, theme }) => { const [items, setItems] = useState([]); const { width, height } = useDimensions(); @@ -96,8 +99,8 @@ const Header = React.memo(({ let freqEmojis = await freqEmojiCollection.query().fetch(); const isLandscape = width > height; - const size = isLandscape ? width / 2 : width; - const quantity = (size / 50) - 1; + const size = (isLandscape || isMasterDetail ? width / 2 : width) - (CONTAINER_MARGIN * 2); + const quantity = (size / (ITEM_SIZE + (ITEM_MARGIN * 2))) - 1; freqEmojis = freqEmojis.concat(DEFAULT_EMOJIS).slice(0, quantity); setItems(freqEmojis); @@ -135,6 +138,7 @@ Header.propTypes = { handleReaction: PropTypes.func, server: PropTypes.string, message: PropTypes.object, + isMasterDetail: PropTypes.bool, theme: PropTypes.string }; export default withTheme(Header); diff --git a/app/containers/MessageActions/index.js b/app/containers/MessageActions/index.js index 4ba286db9..7846e1d70 100644 --- a/app/containers/MessageActions/index.js +++ b/app/containers/MessageActions/index.js @@ -32,7 +32,8 @@ const MessageActions = React.memo(forwardRef(({ Message_AllowEditing_BlockEditInMinutes, Message_AllowPinning, Message_AllowStarring, - Message_Read_Receipt_Store_Users + Message_Read_Receipt_Store_Users, + isMasterDetail }, ref) => { let permissions = {}; const { showActionSheet, hideActionSheet } = useActionSheet(); @@ -116,7 +117,12 @@ const MessageActions = React.memo(forwardRef(({ const handleEdit = message => editInit(message); const handleCreateDiscussion = (message) => { - Navigation.navigate('CreateDiscussionView', { message, channel: room }); + const params = { message, channel: room, showCloseModal: true }; + if (isMasterDetail) { + Navigation.navigate('ModalStackNavigator', { screen: 'CreateDiscussionView', params }); + } else { + Navigation.navigate('NewMessageStackNavigator', { screen: 'CreateDiscussionView', params }); + } }; const handleUnread = async(message) => { @@ -377,6 +383,7 @@ const MessageActions = React.memo(forwardRef(({
) : null) @@ -412,7 +419,8 @@ const mapStateToProps = state => ({ Message_AllowEditing_BlockEditInMinutes: state.settings.Message_AllowEditing_BlockEditInMinutes, Message_AllowPinning: state.settings.Message_AllowPinning, Message_AllowStarring: state.settings.Message_AllowStarring, - Message_Read_Receipt_Store_Users: state.settings.Message_Read_Receipt_Store_Users + Message_Read_Receipt_Store_Users: state.settings.Message_Read_Receipt_Store_Users, + isMasterDetail: state.app.isMasterDetail }); export default connect(mapStateToProps, null, null, { forwardRef: true })(MessageActions); diff --git a/app/containers/MessageBox/EmojiKeyboard.js b/app/containers/MessageBox/EmojiKeyboard.js index f8bc13019..8d552509c 100644 --- a/app/containers/MessageBox/EmojiKeyboard.js +++ b/app/containers/MessageBox/EmojiKeyboard.js @@ -17,7 +17,7 @@ export default class EmojiKeyboard extends React.PureComponent { constructor(props) { super(props); const state = store.getState(); - this.baseUrl = state.server.server; + this.baseUrl = state.share.server || state.server.server; } onEmojiSelected = (emoji) => { diff --git a/app/containers/MessageBox/RecordAudio.js b/app/containers/MessageBox/RecordAudio.js new file mode 100644 index 000000000..b9e94988c --- /dev/null +++ b/app/containers/MessageBox/RecordAudio.js @@ -0,0 +1,226 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { View, Text } from 'react-native'; +import { Audio } from 'expo-av'; +import { BorderlessButton } from 'react-native-gesture-handler'; +import { getInfoAsync } from 'expo-file-system'; +import { deactivateKeepAwake, activateKeepAwake } from 'expo-keep-awake'; + +import styles from './styles'; +import I18n from '../../i18n'; +import { themes } from '../../constants/colors'; +import { CustomIcon } from '../../lib/Icons'; + +const RECORDING_EXTENSION = '.aac'; +const RECORDING_SETTINGS = { + android: { + extension: RECORDING_EXTENSION, + outputFormat: Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS, + audioEncoder: Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC, + sampleRate: Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY.android.sampleRate, + numberOfChannels: Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY.android.numberOfChannels, + bitRate: Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY.android.bitRate + }, + ios: { + extension: RECORDING_EXTENSION, + audioQuality: Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN, + sampleRate: Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY.ios.sampleRate, + numberOfChannels: Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY.ios.numberOfChannels, + bitRate: Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY.ios.bitRate, + outputFormat: Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC + } +}; +const RECORDING_MODE = { + allowsRecordingIOS: true, + playsInSilentModeIOS: true, + staysActiveInBackground: false, + shouldDuckAndroid: true, + playThroughEarpieceAndroid: false, + interruptionModeIOS: Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX, + interruptionModeAndroid: Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX +}; + +const formatTime = function(seconds) { + let minutes = Math.floor(seconds / 60); + seconds %= 60; + if (minutes < 10) { minutes = `0${ minutes }`; } + if (seconds < 10) { seconds = `0${ seconds }`; } + return `${ minutes }:${ seconds }`; +}; + +export default class RecordAudio extends React.PureComponent { + static propTypes = { + theme: PropTypes.string, + recordingCallback: PropTypes.func, + onFinish: PropTypes.func + } + + constructor(props) { + super(props); + this.isRecorderBusy = false; + this.state = { + isRecording: false, + recordingDurationMillis: 0 + }; + } + + componentDidUpdate() { + const { recordingCallback } = this.props; + const { isRecording } = this.state; + + recordingCallback(isRecording); + } + + componentWillUnmount() { + if (this.recording) { + this.cancelRecordingAudio(); + } + } + + get duration() { + const { recordingDurationMillis } = this.state; + return formatTime(Math.floor(recordingDurationMillis / 1000)); + } + + isRecordingPermissionGranted = async() => { + try { + const permission = await Audio.getPermissionsAsync(); + if (permission.status === 'granted') { + return true; + } + await Audio.requestPermissionsAsync(); + } catch { + // Do nothing + } + return false; + } + + onRecordingStatusUpdate = (status) => { + this.setState({ + isRecording: status.isRecording, + recordingDurationMillis: status.durationMillis + }); + } + + startRecordingAudio = async() => { + if (!this.isRecorderBusy) { + this.isRecorderBusy = true; + try { + const canRecord = await this.isRecordingPermissionGranted(); + if (canRecord) { + await Audio.setAudioModeAsync(RECORDING_MODE); + + this.recording = new Audio.Recording(); + await this.recording.prepareToRecordAsync(RECORDING_SETTINGS); + this.recording.setOnRecordingStatusUpdate(this.onRecordingStatusUpdate); + + await this.recording.startAsync(); + activateKeepAwake(); + } else { + await Audio.requestPermissionsAsync(); + } + } catch (error) { + // Do nothing + } + this.isRecorderBusy = false; + } + }; + + finishRecordingAudio = async() => { + if (!this.isRecorderBusy) { + const { onFinish } = this.props; + + this.isRecorderBusy = true; + try { + await this.recording.stopAndUnloadAsync(); + + const fileURI = this.recording.getURI(); + const fileData = await getInfoAsync(fileURI); + const fileInfo = { + name: `${ Date.now() }.aac`, + mime: 'audio/aac', + type: 'audio/aac', + store: 'Uploads', + path: fileURI, + size: fileData.size + }; + + onFinish(fileInfo); + } catch (error) { + // Do nothing + } + this.setState({ isRecording: false, recordingDurationMillis: 0 }); + deactivateKeepAwake(); + this.isRecorderBusy = false; + } + }; + + cancelRecordingAudio = async() => { + if (!this.isRecorderBusy) { + this.isRecorderBusy = true; + try { + await this.recording.stopAndUnloadAsync(); + } catch (error) { + // Do nothing + } + this.setState({ isRecording: false, recordingDurationMillis: 0 }); + deactivateKeepAwake(); + this.isRecorderBusy = false; + } + }; + + render() { + const { theme } = this.props; + const { isRecording } = this.state; + + if (!isRecording) { + return ( + + + + ); + } + + return ( + + + + + + + {this.duration} + + + + + + + ); + } +} diff --git a/app/containers/MessageBox/Recording.js b/app/containers/MessageBox/Recording.js deleted file mode 100644 index d688de3f8..000000000 --- a/app/containers/MessageBox/Recording.js +++ /dev/null @@ -1,172 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { - View, PermissionsAndroid, Text -} from 'react-native'; -import { AudioRecorder, AudioUtils } from 'react-native-audio'; -import { BorderlessButton } from 'react-native-gesture-handler'; -import { activateKeepAwake, deactivateKeepAwake } from 'expo-keep-awake'; -import * as FileSystem from 'expo-file-system'; - -import styles from './styles'; -import I18n from '../../i18n'; -import { isIOS, isAndroid } from '../../utils/deviceInfo'; -import { CustomIcon } from '../../lib/Icons'; -import { themes } from '../../constants/colors'; -import SafeAreaView from '../SafeAreaView'; - -export const _formatTime = function(seconds) { - let minutes = Math.floor(seconds / 60); - seconds %= 60; - if (minutes < 10) { minutes = `0${ minutes }`; } - if (seconds < 10) { seconds = `0${ seconds }`; } - return `${ minutes }:${ seconds }`; -}; - -export default class extends React.PureComponent { - static async permission() { - if (!isAndroid) { - return true; - } - - const rationale = { - title: I18n.t('Microphone_Permission'), - message: I18n.t('Microphone_Permission_Message') - }; - - const result = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.RECORD_AUDIO, rationale); - return result === true || result === PermissionsAndroid.RESULTS.GRANTED; - } - - static propTypes = { - theme: PropTypes.string, - onFinish: PropTypes.func.isRequired - } - - constructor() { - super(); - - this.recordingCanceled = false; - this.recording = true; - this.name = `${ Date.now() }.aac`; - this.state = { - currentTime: '00:00' - }; - } - - componentDidMount() { - const audioPath = `${ AudioUtils.CachesDirectoryPath }/${ this.name }`; - - AudioRecorder.prepareRecordingAtPath(audioPath, { - SampleRate: 22050, - Channels: 1, - AudioQuality: 'Low', - AudioEncoding: 'aac', - OutputFormat: 'aac_adts' - }); - - AudioRecorder.onProgress = (data) => { - this.setState({ - currentTime: _formatTime(Math.floor(data.currentTime)) - }); - }; - // - AudioRecorder.onFinished = (data) => { - if (!this.recordingCanceled && isIOS) { - this.finishRecording(data.status === 'OK', data.audioFileURL, data.audioFileSize); - } - }; - AudioRecorder.startRecording(); - - activateKeepAwake(); - } - - componentWillUnmount() { - if (this.recording) { - this.cancelAudioMessage(); - } - - deactivateKeepAwake(); - } - - finishRecording = (didSucceed, filePath, size) => { - const { onFinish } = this.props; - if (!didSucceed) { - return onFinish && onFinish(didSucceed); - } - const fileInfo = { - name: this.name, - mime: 'audio/aac', - type: 'audio/aac', - store: 'Uploads', - path: filePath, - size - }; - return onFinish && onFinish(fileInfo); - } - - finishAudioMessage = async() => { - try { - this.recording = false; - let filePath = await AudioRecorder.stopRecording(); - if (isAndroid) { - filePath = filePath.startsWith('file://') ? filePath : `file://${ filePath }`; - const data = await FileSystem.getInfoAsync(decodeURIComponent(filePath), { size: true }); - this.finishRecording(true, filePath, data.size); - } - } catch (err) { - this.finishRecording(false); - } - } - - cancelAudioMessage = async() => { - this.recording = false; - this.recordingCanceled = true; - await AudioRecorder.stopRecording(); - return this.finishRecording(false); - } - - render() { - const { currentTime } = this.state; - const { theme } = this.props; - - return ( - - - - - - {currentTime} - - - - - - ); - } -} diff --git a/app/containers/MessageBox/RightButtons.android.js b/app/containers/MessageBox/RightButtons.android.js index 88d6e7288..6da835642 100644 --- a/app/containers/MessageBox/RightButtons.android.js +++ b/app/containers/MessageBox/RightButtons.android.js @@ -2,23 +2,19 @@ import React from 'react'; import PropTypes from 'prop-types'; import { View } from 'react-native'; -import { SendButton, AudioButton, ActionsButton } from './buttons'; +import { SendButton, ActionsButton } from './buttons'; import styles from './styles'; const RightButtons = React.memo(({ - theme, showSend, submit, recordAudioMessage, recordAudioMessageEnabled, showMessageBoxActions, isActionsEnabled + theme, showSend, submit, showMessageBoxActions, isActionsEnabled }) => { if (showSend) { return ; } - if (recordAudioMessageEnabled || isActionsEnabled) { - return ( - <> - {recordAudioMessageEnabled ? : null} - {isActionsEnabled ? : null} - - ); + if (isActionsEnabled) { + return ; } + return ; }); @@ -26,8 +22,6 @@ RightButtons.propTypes = { theme: PropTypes.string, showSend: PropTypes.bool, submit: PropTypes.func.isRequired, - recordAudioMessage: PropTypes.func.isRequired, - recordAudioMessageEnabled: PropTypes.bool, showMessageBoxActions: PropTypes.func.isRequired, isActionsEnabled: PropTypes.bool }; diff --git a/app/containers/MessageBox/RightButtons.ios.js b/app/containers/MessageBox/RightButtons.ios.js index 62fbca5ee..9ea5fc74e 100644 --- a/app/containers/MessageBox/RightButtons.ios.js +++ b/app/containers/MessageBox/RightButtons.ios.js @@ -1,26 +1,19 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { SendButton, AudioButton } from './buttons'; +import { SendButton } from './buttons'; -const RightButtons = React.memo(({ - theme, showSend, submit, recordAudioMessage, recordAudioMessageEnabled -}) => { +const RightButtons = React.memo(({ theme, showSend, submit }) => { if (showSend) { return ; } - if (recordAudioMessageEnabled) { - return ; - } return null; }); RightButtons.propTypes = { theme: PropTypes.string, showSend: PropTypes.bool, - submit: PropTypes.func.isRequired, - recordAudioMessage: PropTypes.func.isRequired, - recordAudioMessageEnabled: PropTypes.bool + submit: PropTypes.func.isRequired }; export default RightButtons; diff --git a/app/containers/MessageBox/buttons/AudioButton.js b/app/containers/MessageBox/buttons/AudioButton.js deleted file mode 100644 index 4c63656dd..000000000 --- a/app/containers/MessageBox/buttons/AudioButton.js +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; - -import BaseButton from './BaseButton'; - -const AudioButton = React.memo(({ theme, onPress }) => ( - -)); - -AudioButton.propTypes = { - theme: PropTypes.string, - onPress: PropTypes.func.isRequired -}; - -export default AudioButton; diff --git a/app/containers/MessageBox/buttons/index.js b/app/containers/MessageBox/buttons/index.js index 15375b905..523764469 100644 --- a/app/containers/MessageBox/buttons/index.js +++ b/app/containers/MessageBox/buttons/index.js @@ -1,13 +1,11 @@ import CancelEditingButton from './CancelEditingButton'; import ToggleEmojiButton from './ToggleEmojiButton'; import SendButton from './SendButton'; -import AudioButton from './AudioButton'; import ActionsButton from './ActionsButton'; export { CancelEditingButton, ToggleEmojiButton, SendButton, - AudioButton, ActionsButton }; diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js index 87270fb0d..813d7d64c 100644 --- a/app/containers/MessageBox/index.js +++ b/app/containers/MessageBox/index.js @@ -17,7 +17,7 @@ import RocketChat from '../../lib/rocketchat'; import styles from './styles'; import database from '../../lib/database'; import { emojis } from '../../emojis'; -import Recording from './Recording'; +import RecordAudio from './RecordAudio'; import log from '../../utils/log'; import I18n from '../../i18n'; import ReplyPreview from './ReplyPreview'; @@ -541,12 +541,14 @@ class MessageBox extends Component { setCommandPreview = async(command, name, params) => { const { rid } = this.props; try { - const { preview } = await RocketChat.getCommandPreview(name, rid, params); - this.setState({ commandPreview: preview.items, showCommandPreview: true, command }); + const { success, preview } = await RocketChat.getCommandPreview(name, rid, params); + if (success) { + return this.setState({ commandPreview: preview?.items, showCommandPreview: true, command }); + } } catch (e) { - this.setState({ commandPreview: [], showCommandPreview: true, command: {} }); log(e); } + this.setState({ commandPreview: [], showCommandPreview: true, command: {} }); } setInput = (text) => { @@ -669,8 +671,7 @@ class MessageBox extends Component { }); } - recordAudioMessage = async() => { - const recording = await Recording.permission(); + recordingCallback = (recording) => { this.setState({ recording }); } @@ -679,9 +680,6 @@ class MessageBox extends Component { rid, tmid, baseUrl: server, user } = this.props; - this.setState({ - recording: false - }); if (fileInfo) { try { if (this.canUploadFile(fileInfo)) { @@ -844,63 +842,84 @@ class MessageBox extends Component { returnKeyType: 'send' } : {}; - if (recording) { - return ; - } - return ( + const recordAudio = showSend || !Message_AudioRecorderEnabled ? null : ( + + ); + + const commandsPreviewAndMentions = !recording ? ( <> - - + + ) : null; + + const replyPreview = !recording ? ( + + ) : null; + + const textInputAndButtons = !recording ? ( + <> + + this.component = component} + style={styles.textBoxInput} + returnKeyType='default' + keyboardType='twitter' + blurOnSubmit={false} + placeholder={I18n.t('New_Message')} + onChangeText={this.onChangeText} + underlineColorAndroid='transparent' + defaultValue='' + multiline + testID='messagebox-input' + theme={theme} + {...isAndroidTablet} + /> + + + ) : null; + + return ( + <> + {commandsPreviewAndMentions} + + {replyPreview} - - this.component = component} - style={styles.textBoxInput} - returnKeyType='default' - keyboardType='twitter' - blurOnSubmit={false} - placeholder={I18n.t('New_Message')} - onChangeText={this.onChangeText} - underlineColorAndroid='transparent' - defaultValue='' - multiline - testID='messagebox-input' - theme={theme} - {...isAndroidTablet} - /> - + {textInputAndButtons} + {recordAudio} {children} diff --git a/app/containers/MessageBox/styles.js b/app/containers/MessageBox/styles.js index f2fb9c554..96001fc15 100644 --- a/app/containers/MessageBox/styles.js +++ b/app/containers/MessageBox/styles.js @@ -15,7 +15,7 @@ export default StyleSheet.create({ }, composer: { flexDirection: 'column', - borderTopWidth: StyleSheet.hairlineWidth + borderTopWidth: 1 }, textArea: { flexDirection: 'row', @@ -104,6 +104,15 @@ export default StyleSheet.create({ scrollViewMention: { maxHeight: SCROLLVIEW_MENTION_HEIGHT }, + recordingContent: { + flexDirection: 'row', + flex: 1, + justifyContent: 'space-between' + }, + recordingCancelText: { + fontSize: 17, + ...sharedStyles.textRegular + }, buttonsWhitespace: { width: 15 } diff --git a/app/containers/SearchBox.js b/app/containers/SearchBox.js index 7c3e337ee..89c51def1 100644 --- a/app/containers/SearchBox.js +++ b/app/containers/SearchBox.js @@ -47,7 +47,7 @@ const styles = StyleSheet.create({ const CancelButton = (onCancelPress, theme) => ( - {I18n.t('Cancel')} + {I18n.t('Cancel')} ); diff --git a/app/containers/StatusBar.js b/app/containers/StatusBar.js index cc9bd73cc..8add422f1 100644 --- a/app/containers/StatusBar.js +++ b/app/containers/StatusBar.js @@ -2,13 +2,12 @@ import React from 'react'; import { StatusBar as StatusBarRN } from 'react-native'; import PropTypes from 'prop-types'; -import { isIOS } from '../utils/deviceInfo'; import { themes } from '../constants/colors'; const StatusBar = React.memo(({ theme, barStyle, backgroundColor }) => { if (!barStyle) { barStyle = 'light-content'; - if (theme === 'light' && isIOS) { + if (theme === 'light') { barStyle = 'dark-content'; } } diff --git a/app/containers/message/Audio.js b/app/containers/message/Audio.js index 27a6d08ee..74410fa3f 100644 --- a/app/containers/message/Audio.js +++ b/app/containers/message/Audio.js @@ -126,7 +126,6 @@ class MessageAudio extends React.Component { this.setState({ loading: true }); try { - await Audio.setAudioModeAsync(mode); await this.sound.loadAsync({ uri: `${ url }?rc_uid=${ user.id }&rc_token=${ user.token }` }); } catch { // Do nothing @@ -225,6 +224,7 @@ class MessageAudio extends React.Component { if (paused) { await this.sound.pauseAsync(); } else { + await Audio.setAudioModeAsync(mode); await this.sound.playAsync(); } } catch { diff --git a/app/i18n/locales/de.js b/app/i18n/locales/de.js index bc74bbdd2..0d0188379 100644 --- a/app/i18n/locales/de.js +++ b/app/i18n/locales/de.js @@ -27,9 +27,9 @@ export default { 'error-invalid-arguments': 'Ungültige Argumente', 'error-invalid-asset': 'Ungültiges Asset', 'error-invalid-channel': 'Ungültiger Kanal', - 'error-invalid-channel-start-with-chars': 'Ungültiger Kanal. Beginnen Sie mit @ oder #', + 'error-invalid-channel-start-with-chars': 'Ungültiger Kanal. Beginne mit @ oder #', 'error-invalid-custom-field': 'Ungültiges benutzerdefiniertes Feld', - 'error-invalid-custom-field-name': 'Ungültiger benutzerdefinierter Feldname. Verwenden Sie nur Buchstaben, Zahlen, Bindestriche und Unterstriche.', + 'error-invalid-custom-field-name': 'Ungültiger benutzerdefinierter Feldname. Verwende nur Buchstaben, Zahlen, Bindestriche und Unterstriche.', 'error-invalid-date': 'Ungültiges Datum angegeben', 'error-invalid-description': 'Ungültige Beschreibung', 'error-invalid-domain': 'Ungültige Domain', @@ -38,7 +38,7 @@ export default { 'error-invalid-file-height': 'Ungültige Dateihöhe', 'error-invalid-file-type': 'Ungültiger Dateityp', 'error-invalid-file-width': 'Ungültige Dateibreite', - 'error-invalid-from-address': 'Sie haben eine ungültige FROM-Adresse mitgeteilt.', + 'error-invalid-from-address': 'Du hast eine ungültige FROM-Adresse mitgeteilt.', 'error-invalid-integration': 'Ungültige Integration', 'error-invalid-message': 'Ungültige Nachricht', 'error-invalid-method': 'Ungültige Methode', @@ -60,24 +60,24 @@ export default { 'error-message-deleting-blocked': 'Das Löschen von Nachrichten ist gesperrt', 'error-message-editing-blocked': 'Die Bearbeitung von Nachrichten ist gesperrt', 'error-message-size-exceeded': 'Die Nachrichtengröße überschreitet Message_MaxAllowedSize', - 'error-missing-unsubscribe-link': 'Sie müssen den Link [abbestellen] angeben.', + 'error-missing-unsubscribe-link': 'Du musst den Link [abbestellen] angeben.', 'error-no-tokens-for-this-user': 'Für diesen Benutzer gibt es keine Token', 'error-not-allowed': 'Nicht erlaubt', 'error-not-authorized': 'Nicht berechtigt', 'error-push-disabled': 'Push ist deaktiviert', - 'error-remove-last-owner': 'Dies ist der letzte Besitzer. Bitte legen Sie einen neuen Besitzer fest, bevor Sie diesen entfernen.', + 'error-remove-last-owner': 'Dies ist der letzte Besitzer. Bitte lege einen neuen Besitzer fest, bevor du diesen entfernst.', 'error-role-in-use': 'Rolle kann nicht gelöscht werden, da sie gerade verwendet wird', 'error-role-name-required': 'Der Rollenname ist erforderlich', 'error-the-field-is-required': 'Das Feld {{field}} ist erforderlich.', - 'error-too-many-requests': 'Fehler, zu viele Anfragen. Sie müssen {{Sekunden}} Sekunden warten, bevor Sie es erneut versuchen.', + 'error-too-many-requests': 'Fehler, zu viele Anfragen. Du musst {{Sekunden}} Sekunden warten, bevor du es erneut versuchst.', 'error-user-is-not-activated': 'Benutzer ist nicht aktiviert', 'error-user-has-no-roles': 'Benutzer hat keine Rollen', - 'error-user-limit-exceeded': 'Die Anzahl der Benutzer, die Sie zu #channel_name einladen möchten, überschreitet die vom Administrator festgelegte Grenze', + 'error-user-limit-exceeded': 'Die Anzahl der Benutzer, die du zu #channel_name einladen möchtest, überschreitet die vom Administrator festgelegte Grenze', 'error-user-not-in-room': 'Benutzer ist nicht in diesem Raum', 'error-user-registration-custom-field': 'error-user-registration-custom-field', 'error-user-registration-disabled': 'Die Benutzerregistrierung ist deaktiviert', 'error-user-registration-secret': 'Die Benutzerregistrierung ist nur über eine geheime URL möglich', - 'error-you-are-last-owner': 'Sie sind der letzte Besitzer. Bitte setzen Sie einen neuen Besitzer, bevor Sie den Raum verlassen.', + 'error-you-are-last-owner': 'Du bist der letzte Besitzer. Bitte setze einen neuen Besitzer, bevor du den Raum verlässt.', Actions: 'Aktionen', activity: 'Aktivität', Activity: 'Aktivität', @@ -99,13 +99,13 @@ export default { and: 'und', announcement: 'Ankündigung', Announcement: 'Ankündigung', - Apply_Your_Certificate: 'Wenden Sie Ihr Zertifikat an', + Apply_Your_Certificate: 'Wende dein Zertifikat an', Applying_a_theme_will_change_how_the_app_looks: 'Das Erscheinungsbild festzulegen wird das Aussehen der Anwendung ändern.', ARCHIVE: 'ARCHIV', archive: 'Archiv', are_typing: 'tippen', Are_you_sure_question_mark: 'Bist du sicher?', - Are_you_sure_you_want_to_leave_the_room: 'Möchten Sie den Raum wirklich verlassen {{room}}?', + Are_you_sure_you_want_to_leave_the_room: 'Möchtest du den Raum wirklich verlassen {{room}}?', Audio: 'Audio', Authenticating: 'Authentifizierung', Automatic: 'Automatisch', @@ -120,7 +120,7 @@ export default { Broadcast_channel_Description: 'Nur autorisierte Benutzer können neue Nachrichten schreiben, die anderen Benutzer können jedoch antworten', Broadcast_Channel: 'Broadcastkanal', Busy: 'Beschäftigt', - By_proceeding_you_are_agreeing: 'Indem Sie fortfahren, stimmen Sie zu unserem', + By_proceeding_you_are_agreeing: 'Indem du fortfährst, stimmst du zu unserem', Cancel_editing: 'Bearbeitung abbrechen', Cancel_recording: 'Aufnahme abbrechen', Cancel: 'Abbrechen', @@ -133,7 +133,7 @@ export default { Call_already_ended: 'Anruf bereits beendet!', Click_to_join: 'Klicken um teilzunehmen!', Close: 'Schließen', - Close_emoji_selector: 'Schließen Sie die Emoji-Auswahl', + Close_emoji_selector: 'Schließe die Emoji-Auswahl', Closing_chat: 'Chat schließen', Change_language_loading: 'Ändere Sprache.', Chat_closed_by_agent: 'Chat durch den Agenten geschlossen', @@ -150,7 +150,7 @@ export default { connecting_server: 'verbinde zum Server', Connecting: 'Verbinden ...', Contact_us: 'Kontaktiere uns', - Contact_your_server_admin: 'Kontaktieren Sie Ihren Server-Administrator.', + Contact_your_server_admin: 'Kontaktiere deinen Server-Administrator.', Continue_with: 'Weitermachen mit', Copied_to_clipboard: 'In die Zwischenablage kopiert!', Copy: 'Kopieren', @@ -159,13 +159,13 @@ export default { Certificate_password: 'Zertifikats-Passwort', Clear_cache: 'Lokalen Server-Cache leeren', Clear_cache_loading: 'Leere Cache.', - Whats_the_password_for_your_certificate: 'Wie lautet das Passwort für Ihr Zertifikat?', + Whats_the_password_for_your_certificate: 'Wie lautet das Passwort für dein Zertifikat?', Create_account: 'Ein Konto erstellen', Create_Channel: 'Kanal erstellen', Create_Direct_Messages: 'Direkt-Nachricht erstellen', Create_Discussion: 'Diskussion erstellen', Created_snippet: 'Erstellt ein Snippet', - Create_a_new_workspace: 'Erstellen Sie einen neuen Arbeitsbereich', + Create_a_new_workspace: 'Erstelle einen neuen Arbeitsbereich', Create: 'Erstellen', Custom_Status: 'eigener Status', Dark: 'Dunkel', @@ -190,8 +190,8 @@ export default { Done: 'Erledigt', Dont_Have_An_Account: 'Du hast noch kein Konto?', Do_you_have_an_account: 'Du hast schon ein Konto?', - Do_you_have_a_certificate: 'Haben Sie ein Zertifikat?', - Do_you_really_want_to_key_this_room_question_mark: 'Möchten Sie diesen Raum wirklich {{key}}?', + Do_you_have_a_certificate: 'Hast du ein Zertifikat?', + Do_you_really_want_to_key_this_room_question_mark: 'Möchtest du diesen Raum wirklich {{key}}?', edit: 'bearbeiten', edited: 'bearbeitet', Edit: 'Bearbeiten', @@ -212,10 +212,10 @@ export default { Files: 'Dateien', File_description: 'Dateibeschreibung', File_name: 'Dateiname', - Finish_recording: 'Beenden Sie die Aufnahme', + Finish_recording: 'Beende die Aufnahme', Following_thread: 'Thread folgen', - For_your_security_you_must_enter_your_current_password_to_continue: 'Zu Ihrer Sicherheit müssen Sie Ihr aktuelles Passwort eingeben, um fortzufahren', - Forgot_password_If_this_email_is_registered: 'Wenn diese E-Mail registriert ist, senden wir Anweisungen zum Zurücksetzen Ihres Passworts. Wenn Sie in Kürze keine E-Mail erhalten, kommen Sie bitte zurück und versuchen Sie es erneut.', + For_your_security_you_must_enter_your_current_password_to_continue: 'Zu deiner Sicherheit musst du dein aktuelles Passwort eingeben, um fortzufahren', + Forgot_password_If_this_email_is_registered: 'Wenn diese E-Mail registriert ist, senden wir Anweisungen zum Zurücksetzen deines Passworts. Wenn du nicht in Kürze keine E-Mail erhältst, versuche es bitte erneut.', Forgot_password: 'Passwort vergessen', Forgot_Password: 'Passwort vergessen', Forward: 'Weiterleiten', @@ -255,7 +255,7 @@ export default { is_not_a_valid_RocketChat_instance: 'ist keine gültige Rocket.Chat-Instanz', is_typing: 'schreibt', Invalid_or_expired_invite_token: 'Ungültiger oder abgelaufener Einladungscode', - Invalid_server_version: 'Der Server, zu dem Sie eine Verbindung herstellen möchten, verwendet eine Version, die von der App nicht mehr unterstützt wird: {{currentVersion}}.\n\nWir benötigen Version {{MinVersion}}.', + Invalid_server_version: 'Der Server, zu dem du dich verbinden möchtest, verwendet eine Version, die von der App nicht mehr unterstützt wird: {{currentVersion}}.\n\nWir benötigen Version {{MinVersion}}.', Invite_Link: 'Einladungs-Link', Invite_users: 'Benutzer einladen', Join: 'Beitreten', @@ -273,7 +273,7 @@ export default { Livechat: 'Live-Chat', Livechat_edit: 'Livechat bearbeiten', Login: 'Anmeldung', - Login_error: 'Ihre Zugangsdaten wurden abgelehnt! Bitte versuchen Sie es erneut.', + Login_error: 'Deine Zugangsdaten wurden abgelehnt! Bitte versuche es erneut.', Login_with: 'Einloggen mit', Logging_out: 'Abmelden.', Logout: 'Abmelden', @@ -295,7 +295,7 @@ export default { Message: 'Nachricht', Messages: 'Mitteilungen', Message_Reported: 'Nachricht gemeldet', - Microphone_Permission_Message: 'Rocket.Chat benötigt Zugriff auf Ihr Mikrofon, damit Sie eine Audionachricht senden können.', + Microphone_Permission_Message: 'Rocket.Chat benötigt Zugriff auf das Mikrofon, damit du eine Audionachricht senden kannst.', Microphone_Permission: 'Mikrofonberechtigung', Mute: 'Stumm', muted: 'stummgeschaltet', @@ -327,13 +327,14 @@ export default { Nothing: 'Nichts', Nothing_to_save: 'Nichts zu speichern!', Notify_active_in_this_room: 'Aktive Benutzer in diesem Raum benachrichtigen', - Notify_all_in_this_room: 'Benachrichtigen Sie alle in diesem Raum', + Notify_all_in_this_room: 'Benachrichtige alle in diesem Raum', Notifications: 'Benachrichtigungen', Notification_Duration: 'Benachrichtigungsdauer', Notification_Preferences: 'Benachrichtigungseinstellungen', No_available_agents_to_transfer: 'Keine Agenten für den Transfer verfügbar', Offline: 'Offline', Oops: 'Hoppla!', + Omnichannel: 'Omnichannel', Onboarding_description: 'Ein Arbeitsbereich ist der Ort für die Zusammenarbeit deines Teams oder Organisation. Bitte den Admin des Arbeitsbereichs um eine Adresse, um ihm beizutreten, oder erstelle einen Arbeitsbereich für dein Team.', Onboarding_join_workspace: 'Tritt einem Arbeitsbereich bei', Onboarding_subtitle: 'Mehr als Team-Zusammenarbeit', @@ -359,7 +360,7 @@ export default { pinned: 'angeheftet', Pinned: 'Angeheftet', Please_add_a_comment: 'Bitte Kommentar hinzufügen', - Please_enter_your_password: 'Bitte geben Sie Ihr Passwort ein', + Please_enter_your_password: 'Gib bitte dein Passwort ein', Please_wait: 'Bitte warten.', Preferences: 'Einstellungen', Preferences_saved: 'Einstellungen gespeichert!', @@ -379,6 +380,8 @@ export default { Reactions_are_enabled: 'Reaktionen sind aktiviert', Reactions: 'Reaktionen', Read: 'Gelesen', + Read_External_Permission_Message: 'Rocket.Chat benötigt Zugriff auf deine Fotos, Medien und Dateien auf deinem Gerät', + Read_External_Permission: 'Lese-Zugriff auf Medien', Read_Only_Channel: 'Nur-Lese-Kanal', Read_Only: 'Schreibgeschützt', Read_Receipt: 'Lesebestätigung', @@ -405,6 +408,7 @@ export default { Review_app_later: 'Vielleicht später', Review_app_unable_store: 'Kann {{store}} nicht öffnen', Review_this_app: 'App bewerten', + Remove: 'Entfernen', Roles: 'Rollen', Room_actions: 'Raumaktionen', Room_changed_announcement: 'Raumansage geändert in: {{announcement}} von {{userBy}}', @@ -428,9 +432,9 @@ export default { Search: 'Suche', Search_by: 'Suche nach', Search_global_users: 'Suche nach globalen Benutzern', - Search_global_users_description: 'Beim Einschalten können Sie nach Benutzern von anderen Unternehmen oder Servern suchen.', + Search_global_users_description: 'Wenn aktiviert, kannst du nach Benutzern von anderen Unternehmen oder Servern suchen.', Seconds: '{{second}} Sekunden', - Select_Avatar: 'Wählen Sie einen Avatar aus', + Select_Avatar: 'Wähle einen Avatar aus', Select_Server: 'Server auswählen', Select_Users: 'Benutzer auswählen', Select_a_Channel: 'Kanal auswählen', @@ -443,11 +447,12 @@ export default { Send_message: 'Nachricht senden', Send_me_the_code_again: 'Den Code neu versenden', Send_to: 'Senden an …', + Sending_to: 'Sende an', Sent_an_attachment: 'Sende einen Anhang', Server: 'Server', Servers: 'Server', Server_version: 'Server version: {{version}}', - Set_username_subtitle: 'Der Benutzername wird verwendet, damit andere Personen Sie in Nachrichten erwähnen können', + Set_username_subtitle: 'Der Benutzername wird verwendet, damit andere Personen dich in Nachrichten erwähnen können', Set_custom_status: 'Individuellen Status setzen', Set_status: 'Status setzen', Status_saved_successfully: 'Status erfolgreich gesetzt!', @@ -470,6 +475,7 @@ export default { starred: 'favorisiert', Starred: 'Favorisiert', Start_of_conversation: 'Beginn des Gesprächs', + Start_a_Discussion: 'Beginne eine Diskussion', Started_discussion: 'Hat eine Diskussion gestartet:', Started_call: 'Anruf gestartet von {{userBy}}', Submit: 'einreichen', @@ -478,10 +484,12 @@ export default { Take_a_photo: 'Foto aufnehmen', Take_a_video: 'Video aufnehmen', tap_to_change_status: 'Tippen um den Status zu ändern', - Tap_to_view_servers_list: 'Tippen Sie hier, um die Serverliste anzuzeigen', + Tap_to_view_servers_list: 'Hier tippen, um die Serverliste anzuzeigen', Terms_of_Service: ' Nutzungsbedingungen', Theme: 'Erscheinungsbild', - The_URL_is_invalid: 'Die eingegebene URL ist ungültig. Überprüfen Sie es und versuchen Sie es bitte erneut!', + The_URL_is_invalid: 'Die eingegebene URL ist ungültig. Überprüfe sie bitte noch einmal und versuche es erneut!', + The_user_wont_be_able_to_type_in_roomName: 'Dem Nutzer wird es nicht möglich sein in {{roomName}} zu schreiben', + The_user_will_be_able_to_type_in_roomName: 'Der Nutzer wird in {{roomName}} schreiben können', There_was_an_error_while_action: 'Während {{action}} ist ein Fehler aufgetreten!', This_room_is_blocked: 'Dieser Raum ist gesperrt', This_room_is_read_only: 'Dieser Raum kann nur gelesen werden', @@ -492,7 +500,7 @@ export default { topic: 'Thema', Topic: 'Thema', Translate: 'Übersetzen', - Try_again: 'Versuchen Sie es nochmal', + Try_again: 'Versuche es nochmal', Two_Factor_Authentication: 'Zwei-Faktor-Authentifizierung', Type_the_channel_name_here: 'Gib hier den Kanalnamen ein', unarchive: 'wiederherstellen', @@ -535,28 +543,29 @@ export default { Video_call: 'Videoanruf', View_Original: 'Original anzeigen', Voice_call: 'Sprachanruf', + Waiting_for_network: 'Warte auf das Netzwerk …', Websocket_disabled: 'Websockets sind auf diesem Server nicht aktiviert.\n{{contact}}', Welcome: 'Herzlich willkommen', What_are_you_doing_right_now: 'Was machst du gerade?', - Whats_your_2fa: 'Wie lautet Ihr 2FA-Code?', + Whats_your_2fa: 'Wie lautet dein 2FA-Code?', Without_Servers: 'Ohne Server', Workspaces: 'Arbeitsbereiche', Would_you_like_to_return_the_inquiry: 'Willst du zur Anfrage zurück?', - Write_External_Permission_Message: 'Rocket.Chat benötigt Zugriff auf Ihre Galerie um Bilder speichern zu können.', + Write_External_Permission_Message: 'Rocket.Chat benötigt Zugriff auf deine Galerie um Bilder speichern zu können.', Write_External_Permission: 'Galerie-Zugriff', Yes: 'Ja', Yes_action_it: 'Ja, {{action}}!', Yesterday: 'Gestern', - You_are_in_preview_mode: 'Sie befinden sich im Vorschaumodus', - You_are_offline: 'Sie sind offline', - You_can_search_using_RegExp_eg: 'Sie können mit RegExp suchen. z.B. `/ ^ text $ / i`', - You_colon: 'Sie: ', - you_were_mentioned: 'Sie wurden erwähnt', - You_were_removed_from_channel: 'Sie wurden aus dem Kanal {{channel}} entfernt', - you: 'Sie', - You: 'Sie', + You_are_in_preview_mode: 'Du befindest dich im Vorschaumodus', + You_are_offline: 'Du bist offline', + You_can_search_using_RegExp_eg: 'Du kannst mit RegExp suchen. z.B. `/ ^ text $ / i`', + You_colon: 'Du: ', + you_were_mentioned: 'Du wurdest erwähnt', + You_were_removed_from_channel: 'Du wurdest aus dem Kanal {{channel}} entfernt', + you: 'du', + You: 'Du', Logged_out_by_server: 'Du bist vom Server abgemeldet worden. Bitte melde dich wieder an.', - You_need_to_access_at_least_one_RocketChat_server_to_share_something: 'Sie benötigen Zugang zu mindestens einem Rocket.Chat-Server um etwas zu teilen.', + You_need_to_access_at_least_one_RocketChat_server_to_share_something: 'Du benötigst Zugang zu mindestens einem Rocket.Chat-Server um etwas zu teilen.', Your_certificate: 'Dein Zertifikat', Your_message: 'Deine Nachricht', Your_invite_link_will_expire_after__usesLeft__uses: 'Dein Einladungs-Link wird nach {{usesLeft}} Benutzungen ablaufen.', @@ -565,9 +574,10 @@ export default { Your_invite_link_will_never_expire: 'Dein Einladungs-Link wird niemals ablaufen.', Your_workspace: 'Dein Arbeitsbereich', Version_no: 'Version: {{version}}', - You_will_not_be_able_to_recover_this_message: 'Sie können diese Nachricht nicht wiederherstellen!', + You_will_not_be_able_to_recover_this_message: 'Du kannst diese Nachricht nicht wiederherstellen!', + You_will_unset_a_certificate_for_this_server: 'Du entfernst ein Zertifikat für diesen Server', Change_Language: 'Sprache ändern', - Crash_report_disclaimer: 'Wir verfolgen niemals den Inhalt Ihrer Chats. Der Crash-Report enthält nur für uns relevante Informationen um das Problem zu erkennen und zu beheben.', + Crash_report_disclaimer: 'Wir verfolgen niemals den Inhalt deiner Chats. Der Crash-Report enthält nur für uns relevante Informationen um das Problem zu erkennen und zu beheben.', Type_message: 'Type message', Room_search: 'Raum-Suche', Room_selection: 'Raum-Auswahl 1...9', @@ -578,6 +588,7 @@ export default { Search_messages: 'Nachrichten durchsuchen', Scroll_messages: 'Nachrichten durchblättern', Reply_latest: 'Auf die letzte Nachricht antworten', + Reply_in_Thread: 'Im Thread antworten', Server_selection: 'Server-Auswahl', Server_selection_numbers: 'Server-Auswahl 1...9', Add_server: 'Server hinufügen', diff --git a/app/i18n/locales/en.js b/app/i18n/locales/en.js index c973245be..e6038732e 100644 --- a/app/i18n/locales/en.js +++ b/app/i18n/locales/en.js @@ -295,7 +295,7 @@ export default { Message: 'Message', Messages: 'Messages', Message_Reported: 'Message reported', - Microphone_Permission_Message: 'Rocket Chat needs access to your microphone so you can send audio message.', + Microphone_Permission_Message: 'Rocket.Chat needs access to your microphone so you can send audio message.', Microphone_Permission: 'Microphone Permission', Mute: 'Mute', muted: 'muted', @@ -380,7 +380,7 @@ export default { Reactions_are_enabled: 'Reactions are enabled', Reactions: 'Reactions', Read: 'Read', - Read_External_Permission_Message: 'Rocket Chat needs to access photos, media, and files on your device', + Read_External_Permission_Message: 'Rocket.Chat needs to access photos, media, and files on your device', Read_External_Permission: 'Read Media Permission', Read_Only_Channel: 'Read Only Channel', Read_Only: 'Read Only', @@ -543,6 +543,7 @@ export default { Video_call: 'Video call', View_Original: 'View Original', Voice_call: 'Voice call', + Waiting_for_network: 'Waiting for network...', Websocket_disabled: 'Websocket is disabled for this server.\n{{contact}}', Welcome: 'Welcome', What_are_you_doing_right_now: 'What are you doing right now?', @@ -550,7 +551,7 @@ export default { Without_Servers: 'Without Servers', Workspaces: 'Workspaces', Would_you_like_to_return_the_inquiry: 'Would you like to return the inquiry?', - Write_External_Permission_Message: 'Rocket Chat needs access to your gallery so you can save images.', + Write_External_Permission_Message: 'Rocket.Chat needs access to your gallery so you can save images.', Write_External_Permission: 'Gallery Permission', Yes: 'Yes', Yes_action_it: 'Yes, {{action}} it!', diff --git a/app/i18n/locales/es-ES.js b/app/i18n/locales/es-ES.js index c57f6800a..74993266d 100644 --- a/app/i18n/locales/es-ES.js +++ b/app/i18n/locales/es-ES.js @@ -233,7 +233,7 @@ export default { messages: 'mensajes', Messages: 'Mensajes', Message_Reported: 'Mensaje notificado', - Microphone_Permission_Message: 'Rocket Chat necesita acceso a su micrófono para que pueda enviar un mensaje de audio.', + Microphone_Permission_Message: 'Rocket.Chat necesita acceso a su micrófono para que pueda enviar un mensaje de audio.', Microphone_Permission: 'Permiso de micrófono', Mute: 'Mutear', muted: 'muteado', diff --git a/app/i18n/locales/fr.js b/app/i18n/locales/fr.js index a2f8fe008..ce638a0db 100644 --- a/app/i18n/locales/fr.js +++ b/app/i18n/locales/fr.js @@ -194,7 +194,7 @@ export default { Message_pinned: 'Message épinglé', Message_removed: 'Message supprimé', Messages: 'Messages', - Microphone_Permission_Message: 'Rocket Chat doit avoir accès à votre microphone pour pouvoir envoyer un message audio.', + Microphone_Permission_Message: 'Rocket.Chat doit avoir accès à votre microphone pour pouvoir envoyer un message audio.', Microphone_Permission: 'Permission de microphone', Mute: 'Rendre muet', muted: 'Rendu muet', diff --git a/app/i18n/locales/ja.js b/app/i18n/locales/ja.js index 30090f635..b3cc25a54 100644 --- a/app/i18n/locales/ja.js +++ b/app/i18n/locales/ja.js @@ -232,8 +232,8 @@ export default { 'アプリを表示中にはバナーを上部に表示し、デスクトップには通知を送ります。', Invisible: '状態を隠す', Invite: '招待', - is_a_valid_RocketChat_instance: 'は正しいRocket Chatのインスタンスです', - is_not_a_valid_RocketChat_instance: 'はRocket Chatのインスタンスではありません', + is_a_valid_RocketChat_instance: 'は正しいRocket.Chatのインスタンスです', + is_not_a_valid_RocketChat_instance: 'はRocket.Chatのインスタンスではありません', is_typing: 'が入力中', Invalid_or_expired_invite_token: '招待トークンが無効か、期限が切れています', Invalid_server_version: @@ -272,7 +272,7 @@ export default { Messages: 'メッセージ', Message_Reported: 'メッセージを報告しました', Microphone_Permission_Message: - 'Rocket Chatは音声メッセージを送信するのにマイクのアクセスの許可が必要です。', + 'Rocket.Chatは音声メッセージを送信するのにマイクのアクセスの許可が必要です。', Microphone_Permission: 'マイクの許可', Mute: 'ミュート', muted: 'ミュートした', @@ -298,7 +298,7 @@ export default { No_Reactions: 'リアクションなし', No_Read_Receipts: '未読通知はありません', Not_logged: 'ログされていません', - Not_RC_Server: 'Rocket Chatサーバーではありません。\n{{contact}}', + Not_RC_Server: 'Rocket.Chatサーバーではありません。\n{{contact}}', Nothing: '何もなし', Nothing_to_save: '保存するものはありません！', Notify_active_in_this_room: 'このルームのアクティブなユーザーに通知する', @@ -488,7 +488,7 @@ export default { Whats_your_2fa: '2段階認証のコードを入力してください', Without_Servers: 'サーバーを除く', Write_External_Permission_Message: - 'Rocket Chatは画像を保存するためにギャラリーへのアクセスを求めています。', + 'Rocket.Chatは画像を保存するためにギャラリーへのアクセスを求めています。', Write_External_Permission: 'ギャラリーへのアクセス許可', Yes_action_it: 'はい、{{action}}します！', Yesterday: '昨日', diff --git a/app/i18n/locales/nl.js b/app/i18n/locales/nl.js index fb41fdfb6..39cecb99c 100644 --- a/app/i18n/locales/nl.js +++ b/app/i18n/locales/nl.js @@ -242,7 +242,7 @@ export default { messages: 'berichten', Messages: 'Berichten', Message_Reported: 'Bericht gerapporteerd', - Microphone_Permission_Message: 'Rocket Chat heeft toegang tot je microfoon nodig voor geluidsberichten.', + Microphone_Permission_Message: 'Rocket.Chat heeft toegang tot je microfoon nodig voor geluidsberichten.', Microphone_Permission: 'Microfoon toestemming', Mute: 'Dempen', muted: 'gedempt', @@ -448,7 +448,7 @@ export default { Welcome: 'Welkom', Whats_your_2fa: 'Wat is je 2FA code?', Without_Servers: 'Zonder Servers', - Write_External_Permission_Message: 'Rocket Chat moet bij je galerij kunnen om afbeeldingen op te slaan.', + Write_External_Permission_Message: 'Rocket.Chat moet bij je galerij kunnen om afbeeldingen op te slaan.', Write_External_Permission: 'Galerij Toestemming', Yes_action_it: 'Ja, {{action}} het!', Yesterday: 'Gisteren', diff --git a/app/i18n/locales/pt-BR.js b/app/i18n/locales/pt-BR.js index 8055e7ea3..5e1d2342b 100644 --- a/app/i18n/locales/pt-BR.js +++ b/app/i18n/locales/pt-BR.js @@ -271,7 +271,7 @@ export default { message: 'mensagem', messages: 'mensagens', Messages: 'Mensagens', - Microphone_Permission_Message: 'Rocket Chat precisa de acesso ao seu microfone para enviar mensagens de áudio.', + Microphone_Permission_Message: 'Rocket.Chat precisa de acesso ao seu microfone para enviar mensagens de áudio.', Microphone_Permission: 'Acesso ao Microfone', Mute: 'Mudo', muted: 'mudo', @@ -344,7 +344,7 @@ export default { Reactions_are_disabled: 'Reagir está desabilitado', Reactions_are_enabled: 'Reagir está habilitado', Reactions: 'Reações', - Read_External_Permission_Message: 'Rocket Chat precisa acessar fotos, mídia e arquivos no seu dispositivo', + Read_External_Permission_Message: 'Rocket.Chat precisa acessar fotos, mídia e arquivos no seu dispositivo', Read_External_Permission: 'Permissão de acesso à arquivos', Read_Only_Channel: 'Canal Somente Leitura', Read_Only: 'Somente Leitura', @@ -479,6 +479,7 @@ export default { Verify_your_email_for_the_code_we_sent: 'Verifique em seu e-mail o código que enviamos', Video_call: 'Chamada de vídeo', Voice_call: 'Chamada de voz', + Waiting_for_network: 'Aguardando rede...', Websocket_disabled: 'Websocket está desativado para esse servidor.\n{{contact}}', Welcome: 'Bem vindo', Whats_your_2fa: 'Qual seu código de autenticação?', @@ -504,7 +505,7 @@ export default { You_will_not_be_able_to_recover_this_message: 'Você não será capaz de recuperar essa mensagem!', You_will_unset_a_certificate_for_this_server: 'Você cancelará a configuração de um certificado para este servidor', Would_you_like_to_return_the_inquiry: 'Deseja retornar a consulta?', - Write_External_Permission_Message: 'Rocket Chat precisa de acesso à sua galeria para salvar imagens', + Write_External_Permission_Message: 'Rocket.Chat precisa de acesso à sua galeria para salvar imagens', Write_External_Permission: 'Acesso à Galeria', Yes: 'Sim', Crash_report_disclaimer: 'Nós não rastreamos o conteúdo das suas conversas. O relatório de erros apenas contém informações relevantes para identificarmos problemas e corrigí-los.', diff --git a/app/i18n/locales/pt-PT.js b/app/i18n/locales/pt-PT.js index 7de141116..a702951bd 100644 --- a/app/i18n/locales/pt-PT.js +++ b/app/i18n/locales/pt-PT.js @@ -195,7 +195,7 @@ export default { Message_pinned: 'Mensagem afixada', Message_removed: 'Mensagem removida', Messages: 'Mensagens', - Microphone_Permission_Message: 'O Rocket Chat necessita de acesso ao seu microfone para que você possa enviar mensagens de áudio.', + Microphone_Permission_Message: 'O Rocket.Chat necessita de acesso ao seu microfone para que você possa enviar mensagens de áudio.', Microphone_Permission: 'Permissão de Microfone', Mute: 'Silenciar', muted: 'silenciado', diff --git a/app/i18n/locales/ru.js b/app/i18n/locales/ru.js index f2d45ef2e..53579a7cd 100644 --- a/app/i18n/locales/ru.js +++ b/app/i18n/locales/ru.js @@ -227,7 +227,7 @@ export default { messages: 'сообщения', Messages: 'Сообщения', Message_Reported: 'Сообщение отправлено', - Microphone_Permission_Message: 'Rocket Chat нужен доступ к вашему микрофону, чтобы вы могли отправлять аудиосообщения.', + Microphone_Permission_Message: 'Rocket.Chat нужен доступ к вашему микрофону, чтобы вы могли отправлять аудиосообщения.', Microphone_Permission: 'Разрешение на использование микрофона', Mute: 'Заглушить', muted: 'Заглушен', diff --git a/app/i18n/locales/zh-CN.js b/app/i18n/locales/zh-CN.js index fa0b9c97b..068125219 100644 --- a/app/i18n/locales/zh-CN.js +++ b/app/i18n/locales/zh-CN.js @@ -190,7 +190,7 @@ export default { Message_pinned: '消息被钉住', Message_removed: '消息被删除', Messages: '消息', - Microphone_Permission_Message: 'Rocket Chat需要访问您的麦克风，以便您可以发送音频消息。', + Microphone_Permission_Message: 'Rocket.Chat需要访问您的麦克风，以便您可以发送音频消息。', Microphone_Permission: '麦克风授权', Mute: '静音', muted: '被静音', diff --git a/app/lib/database/index.js b/app/lib/database/index.js index 31bf5317b..37a17a3cd 100644 --- a/app/lib/database/index.js +++ b/app/lib/database/index.js @@ -110,7 +110,9 @@ class DB { Thread, ThreadMessage, Upload, - Permission + Permission, + CustomEmoji, + FrequentlyUsedEmoji ], actionsEnabled: true }); diff --git a/app/lib/methods/getSettings.js b/app/lib/methods/getSettings.js index 7a6e351cf..e635807e9 100644 --- a/app/lib/methods/getSettings.js +++ b/app/lib/methods/getSettings.js @@ -1,4 +1,3 @@ -import { InteractionManager } from 'react-native'; import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord'; import { Q } from '@nozbe/watermelondb'; @@ -132,48 +131,47 @@ export default async function() { const filteredSettingsIds = filteredSettings.map(s => s._id); reduxStore.dispatch(addSettings(this.parseSettings(filteredSettings))); - InteractionManager.runAfterInteractions(async() => { - // filter server info - const serverInfo = filteredSettings.filter(i1 => serverInfoKeys.includes(i1._id)); - const iconSetting = data.find(item => item._id === 'Assets_favicon_512'); - await serverInfoUpdate(serverInfo, iconSetting); - await db.action(async() => { - const settingsCollection = db.collections.get('settings'); - const allSettingsRecords = await settingsCollection - .query(Q.where('id', Q.oneOf(filteredSettingsIds))) - .fetch(); + // filter server info + const serverInfo = filteredSettings.filter(i1 => serverInfoKeys.includes(i1._id)); + const iconSetting = data.find(item => item._id === 'Assets_favicon_512'); + await serverInfoUpdate(serverInfo, iconSetting); - // filter settings - let settingsToCreate = filteredSettings.filter(i1 => !allSettingsRecords.find(i2 => i1._id === i2.id)); - let settingsToUpdate = allSettingsRecords.filter(i1 => filteredSettings.find(i2 => i1.id === i2._id)); + await db.action(async() => { + const settingsCollection = db.collections.get('settings'); + const allSettingsRecords = await settingsCollection + .query(Q.where('id', Q.oneOf(filteredSettingsIds))) + .fetch(); - // Create - settingsToCreate = settingsToCreate.map(setting => settingsCollection.prepareCreate(protectedFunction((s) => { - s._raw = sanitizedRaw({ id: setting._id }, settingsCollection.schema); - Object.assign(s, setting); - }))); + // filter settings + let settingsToCreate = filteredSettings.filter(i1 => !allSettingsRecords.find(i2 => i1._id === i2.id)); + let settingsToUpdate = allSettingsRecords.filter(i1 => filteredSettings.find(i2 => i1.id === i2._id)); - // Update - settingsToUpdate = settingsToUpdate.map((setting) => { - const newSetting = filteredSettings.find(s => s._id === setting.id); - return setting.prepareUpdate(protectedFunction((s) => { - Object.assign(s, newSetting); - })); - }); + // Create + settingsToCreate = settingsToCreate.map(setting => settingsCollection.prepareCreate(protectedFunction((s) => { + s._raw = sanitizedRaw({ id: setting._id }, settingsCollection.schema); + Object.assign(s, setting); + }))); - const allRecords = [ - ...settingsToCreate, - ...settingsToUpdate - ]; - - try { - await db.batch(...allRecords); - } catch (e) { - log(e); - } - return allRecords.length; + // Update + settingsToUpdate = settingsToUpdate.map((setting) => { + const newSetting = filteredSettings.find(s => s._id === setting.id); + return setting.prepareUpdate(protectedFunction((s) => { + Object.assign(s, newSetting); + })); }); + + const allRecords = [ + ...settingsToCreate, + ...settingsToUpdate + ]; + + try { + await db.batch(...allRecords); + } catch (e) { + log(e); + } + return allRecords.length; }); } catch (e) { log(e); diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js index 06ff12eda..cfa959919 100644 --- a/app/lib/rocketchat.js +++ b/app/lib/rocketchat.js @@ -288,6 +288,8 @@ const RocketChat = { const serversDB = database.servers; reduxStore.dispatch(shareSelectServer(server)); + RocketChat.setCustomEmojis(); + // set User info try { const userId = await RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ server }`); @@ -320,7 +322,7 @@ const RocketChat = { updateJitsiTimeout(roomId) { // RC 0.74.0 - return this.post('jitsi.updateTimeout', { roomId }); + return this.post('video-conference/jitsi.update-timeout', { roomId }); }, register(credentials) { @@ -1075,6 +1077,10 @@ const RocketChat = { return 'cas'; } + if (authName === 'apple' && isIOS) { + return 'apple'; + } + // TODO: remove this after other oauth providers are implemented. e.g. Drupal, github_enterprise const availableOAuth = ['facebook', 'github', 'gitlab', 'google', 'linkedin', 'meteor-developer', 'twitter', 'wordpress']; return availableOAuth.includes(authName) ? 'oauth' : 'not_supported'; diff --git a/app/presentation/ImageViewer/ImageViewer.android.js b/app/presentation/ImageViewer/ImageViewer.android.js index 9c3a29049..2cd8578bb 100644 --- a/app/presentation/ImageViewer/ImageViewer.android.js +++ b/app/presentation/ImageViewer/ImageViewer.android.js @@ -260,6 +260,21 @@ function bouncy( const WIDTH = 300; const HEIGHT = 300; +class Image extends React.PureComponent { + static propTypes = { + imageComponentType: PropTypes.string + } + + render() { + const { imageComponentType } = this.props; + + const Component = ImageComponent(imageComponentType); + + return ; + } +} +const AnimatedImage = Animated.createAnimatedComponent(Image); + // it was picked from https://github.com/software-mansion/react-native-reanimated/tree/master/Example/imageViewer // and changed to use FastImage animated component export class ImageViewer extends React.Component { @@ -386,12 +401,9 @@ export class ImageViewer extends React.Component { render() { const { - uri, width, height, theme, imageComponentType, ...props + uri, width, height, imageComponentType, theme, ...props } = this.props; - const Component = ImageComponent(imageComponentType); - const AnimatedFastImage = Animated.createAnimatedComponent(Component); - // The below two animated values makes it so that scale appears to be done // from the top left corner of the image view instead of its center. This // is required for the "scale focal point" math to work correctly @@ -416,7 +428,7 @@ export class ImageViewer extends React.Component { onGestureEvent={this._onPanEvent} onHandlerStateChange={this._onPanEvent} > - { const translateX = multiply( current.progress.interpolate({ @@ -65,13 +64,12 @@ const forStackAndroid = ({ inverted ); - const opacity = conditional( - closing, - current.progress, + const opacity = multiply( current.progress.interpolate({ inputRange: [0, 1], outputRange: [0, 1] - }) + }), + inverted ); return { diff --git a/app/utils/navigation/index.js b/app/utils/navigation/index.js index e3492df60..6f4faf6c1 100644 --- a/app/utils/navigation/index.js +++ b/app/utils/navigation/index.js @@ -46,9 +46,9 @@ export const navigationTheme = (theme) => { // Gets the current screen from navigation state export const getActiveRoute = (state) => { - const route = state.routes[state.index]; + const route = state?.routes[state?.index]; - if (route.state) { + if (route?.state) { // Dive into nested navigators return getActiveRoute(route.state); } @@ -56,4 +56,4 @@ export const getActiveRoute = (state) => { return route; }; -export const getActiveRouteName = state => getActiveRoute(state).name; +export const getActiveRouteName = state => getActiveRoute(state)?.name; diff --git a/app/views/AttachmentView.js b/app/views/AttachmentView.js index a4b110c72..6f43823da 100644 --- a/app/views/AttachmentView.js +++ b/app/views/AttachmentView.js @@ -70,10 +70,15 @@ class AttachmentView extends React.Component { setHeader = () => { const { route, navigation, theme } = this.props; const attachment = route.params?.attachment; - const { title } = attachment; + let { title } = attachment; + try { + title = decodeURI(title); + } catch { + // Do nothing + } const options = { + title, headerLeft: () => , - title: decodeURI(title), headerRight: () => , headerBackground: () => , headerTintColor: themes[theme].previewTintColor, diff --git a/app/views/NotificationPreferencesView/index.js b/app/views/NotificationPreferencesView/index.js index 1c0f43c8c..31a0fc679 100644 --- a/app/views/NotificationPreferencesView/index.js +++ b/app/views/NotificationPreferencesView/index.js @@ -16,6 +16,7 @@ import RocketChat from '../../lib/rocketchat'; import { withTheme } from '../../theme'; import protectedFunction from '../../lib/methods/helpers/protectedFunction'; import SafeAreaView from '../../containers/SafeAreaView'; +import log from '../../utils/log'; const SectionTitle = React.memo(({ title, theme }) => ( { - await room.update(protectedFunction((r) => { - r[key] = value; - })); - }); - try { - const result = await RocketChat.saveNotificationSettings(this.rid, params); - if (result.success) { - return; - } - } catch { - // do nothing - } + await db.action(async() => { + await room.update(protectedFunction((r) => { + r[key] = value; + })); + }); - await db.action(async() => { - await room.update(protectedFunction((r) => { - r[key] = room[key]; - })); - }); + try { + const result = await RocketChat.saveNotificationSettings(this.rid, params); + if (result.success) { + return; + } + } catch { + // do nothing + } + + await db.action(async() => { + await room.update(protectedFunction((r) => { + r[key] = room[key]; + })); + }); + } catch (e) { + log(e); + } } onValueChangeSwitch = (key, value) => this.saveNotificationSettings(key, value, { [key]: value ? '1' : '0' }); diff --git a/app/views/RegisterView.js b/app/views/RegisterView.js index 1fe127416..1e0ce2654 100644 --- a/app/views/RegisterView.js +++ b/app/views/RegisterView.js @@ -145,10 +145,12 @@ class RegisterView extends React.Component { await loginRequest({ user: email, password }); } } catch (e) { - if (e.data && e.data.errorType === 'username-invalid') { + if (e.data?.errorType === 'username-invalid') { return loginRequest({ user: email, password }); } - showErrorAlert(e.data.error, I18n.t('Oops')); + if (e.data?.error) { + showErrorAlert(e.data.error, I18n.t('Oops')); + } } this.setState({ saving: false }); } diff --git a/app/views/RoomView/Header/Header.js b/app/views/RoomView/Header/Header.js index 58792de2e..9022514ab 100644 --- a/app/views/RoomView/Header/Header.js +++ b/app/views/RoomView/Header/Header.js @@ -6,28 +6,20 @@ import { import I18n from '../../../i18n'; import sharedStyles from '../../Styles'; -import { isAndroid, isTablet } from '../../../utils/deviceInfo'; import Icon from './Icon'; import { themes } from '../../../constants/colors'; import Markdown from '../../../containers/markdown'; -const androidMarginLeft = isTablet ? 0 : 4; - const TITLE_SIZE = 16; const styles = StyleSheet.create({ container: { flex: 1, - marginRight: isAndroid ? 15 : 5, - marginLeft: isAndroid ? androidMarginLeft : -10, justifyContent: 'center' }, titleContainer: { alignItems: 'center', flexDirection: 'row' }, - threadContainer: { - marginRight: isAndroid ? 20 : undefined - }, title: { ...sharedStyles.textSemibold, fontSize: TITLE_SIZE @@ -36,7 +28,6 @@ const styles = StyleSheet.create({ alignItems: 'center' }, subtitle: { - marginRight: -16, ...sharedStyles.textRegular, fontSize: 12 }, @@ -87,12 +78,8 @@ SubTitle.propTypes = { }; const HeaderTitle = React.memo(({ - title, tmid, prid, scale, connecting, theme + title, tmid, prid, scale, theme }) => { - if (connecting) { - title = I18n.t('Connecting'); - } - if (!tmid && !prid) { return ( - + { if (!isMasterDetail || tmid) { const onPress = useCallback(() => navigation.goBack()); + const label = unreadsCount > 99 ? '+99' : unreadsCount || ' '; + const labelLength = label.length ? label.length : 1; + const marginLeft = -2 * labelLength; + const fontSize = labelLength > 1 ? 14 : 17; return ( 999 ? '+999' : unreadsCount || ' '} + label={label} onPress={onPress} tintColor={themes[theme].headerTintColor} + labelStyle={{ fontSize, marginLeft }} /> ); } @@ -44,7 +49,7 @@ const RoomHeaderLeft = React.memo(({ return null; }); -RoomHeaderLeft.propTypes = { +LeftButtons.propTypes = { tmid: PropTypes.string, unreadsCount: PropTypes.number, navigation: PropTypes.object, @@ -58,4 +63,4 @@ RoomHeaderLeft.propTypes = { isMasterDetail: PropTypes.bool }; -export default RoomHeaderLeft; +export default LeftButtons; diff --git a/app/views/RoomView/Header/RightButtons.js b/app/views/RoomView/Header/RightButtons.js index caec40d22..201866fe6 100644 --- a/app/views/RoomView/Header/RightButtons.js +++ b/app/views/RoomView/Header/RightButtons.js @@ -68,6 +68,17 @@ class RightButtonsContainer extends React.PureComponent { } } + goSearchView = () => { + const { + rid, navigation, isMasterDetail + } = this.props; + if (isMasterDetail) { + navigation.navigate('ModalStackNavigator', { screen: 'SearchMessagesView', params: { rid, showCloseModal: true } }); + } else { + navigation.navigate('SearchMessagesView', { rid }); + } + } + toggleFollowThread = () => { const { isFollowingThread } = this.state; const { toggleFollowThread } = this.props; @@ -104,6 +115,12 @@ class RightButtonsContainer extends React.PureComponent { testID='room-view-header-threads' /> ) : null} + ); } diff --git a/app/views/RoomView/Header/index.js b/app/views/RoomView/Header/index.js index e94b58ca2..61b4eb1cd 100644 --- a/app/views/RoomView/Header/index.js +++ b/app/views/RoomView/Header/index.js @@ -4,10 +4,11 @@ import { connect } from 'react-redux'; import equal from 'deep-equal'; import Header from './Header'; +import LeftButtons from './LeftButtons'; import RightButtons from './RightButtons'; import { withTheme } from '../../../theme'; -import RoomHeaderLeft from './RoomHeaderLeft'; import { withDimensions } from '../../../dimensions'; +import I18n from '../../../i18n'; class RoomHeaderView extends Component { static propTypes = { @@ -20,6 +21,7 @@ class RoomHeaderView extends Component { status: PropTypes.string, statusText: PropTypes.string, connecting: PropTypes.bool, + connected: PropTypes.bool, theme: PropTypes.string, roomUserId: PropTypes.string, widthOffset: PropTypes.number, @@ -30,7 +32,7 @@ class RoomHeaderView extends Component { shouldComponentUpdate(nextProps) { const { - type, title, subtitle, status, statusText, connecting, goRoomActionsView, usersTyping, theme, width, height + type, title, subtitle, status, statusText, connecting, connected, goRoomActionsView, usersTyping, theme, width, height } = this.props; if (nextProps.theme !== theme) { return true; @@ -53,6 +55,9 @@ class RoomHeaderView extends Component { if (nextProps.connecting !== connecting) { return true; } + if (nextProps.connected !== connected) { + return true; + } if (nextProps.width !== width) { return true; } @@ -70,9 +75,18 @@ class RoomHeaderView extends Component { render() { const { - title, subtitle, type, prid, tmid, widthOffset, status = 'offline', statusText, connecting, usersTyping, goRoomActionsView, roomUserId, theme, width, height + title, subtitle: subtitleProp, type, prid, tmid, widthOffset, status = 'offline', statusText, connecting, connected, usersTyping, goRoomActionsView, roomUserId, theme, width, height } = this.props; + let subtitle; + if (connecting) { + subtitle = I18n.t('Connecting'); + } else if (!connected) { + subtitle = I18n.t('Waiting_for_network'); + } else { + subtitle = subtitleProp; + } + return (
{ } return { - connecting: state.meteor.connecting, + connecting: state.meteor.connecting || state.server.loading, + connected: state.meteor.connected, usersTyping: state.usersTyping, status, statusText @@ -117,4 +132,4 @@ const mapStateToProps = (state, ownProps) => { export default connect(mapStateToProps)(withDimensions(withTheme(RoomHeaderView))); -export { RightButtons, RoomHeaderLeft }; +export { RightButtons, LeftButtons }; diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js index 62553d368..0b6afd18f 100644 --- a/app/views/RoomView/index.js +++ b/app/views/RoomView/index.js @@ -8,6 +8,7 @@ import moment from 'moment'; import * as Haptics from 'expo-haptics'; import { Q } from '@nozbe/watermelondb'; import isEqual from 'lodash/isEqual'; +import { withSafeAreaInsets } from 'react-native-safe-area-context'; import Touch from '../../utils/touch'; import { @@ -26,7 +27,7 @@ import styles from './styles'; import log from '../../utils/log'; import EventEmitter from '../../utils/events'; import I18n from '../../i18n'; -import RoomHeaderView, { RightButtons, RoomHeaderLeft } from './Header'; +import RoomHeaderView, { RightButtons, LeftButtons } from './Header'; import StatusBar from '../../containers/StatusBar'; import Separator from './Separator'; import { themes } from '../../constants/colors'; @@ -53,6 +54,7 @@ import Banner from './Banner'; import Navigation from '../../lib/Navigation'; import SafeAreaView from '../../containers/SafeAreaView'; import { withDimensions } from '../../dimensions'; +import { getHeaderTitlePosition } from '../../containers/Header'; const stateAttrsUpdate = [ 'joined', @@ -91,7 +93,8 @@ class RoomView extends React.Component { theme: PropTypes.string, replyBroadcast: PropTypes.func, width: PropTypes.number, - height: PropTypes.number + height: PropTypes.number, + insets: PropTypes.object }; constructor(props) { @@ -178,7 +181,7 @@ class RoomView extends React.Component { shouldComponentUpdate(nextProps, nextState) { const { state } = this; const { roomUpdate, member } = state; - const { appState, theme } = this.props; + const { appState, theme, insets } = this.props; if (theme !== nextProps.theme) { return true; } @@ -192,12 +195,15 @@ class RoomView extends React.Component { if (stateUpdated) { return true; } + if (!isEqual(nextProps.insets, insets)) { + return true; + } return roomAttrsUpdate.some(key => !isEqual(nextState.roomUpdate[key], roomUpdate[key])); } componentDidUpdate(prevProps, prevState) { const { roomUpdate } = this.state; - const { appState } = this.props; + const { appState, insets } = this.props; if (appState === 'foreground' && appState !== prevProps.appState && this.rid) { this.onForegroundInteraction = InteractionManager.runAfterInteractions(() => { @@ -222,6 +228,9 @@ class RoomView extends React.Component { if (((roomUpdate.fname !== prevState.roomUpdate.fname) || (roomUpdate.name !== prevState.roomUpdate.name)) && !this.tmid) { this.setHeader(); } + if (insets.left !== prevProps.insets.left || insets.right !== prevProps.insets.right) { + this.setHeader(); + } this.setReadOnly(); } @@ -281,7 +290,7 @@ class RoomView extends React.Component { setHeader = () => { const { room, unreadsCount, roomUserId: stateRoomUserId } = this.state; const { - navigation, route, isMasterDetail, theme, baseUrl, user + navigation, route, isMasterDetail, theme, baseUrl, user, insets } = this.props; const rid = route.params?.rid; const prid = route.params?.prid; @@ -299,9 +308,29 @@ class RoomView extends React.Component { if (!rid) { return; } + const headerTitlePosition = getHeaderTitlePosition(insets); navigation.setOptions({ headerShown: true, headerTitleAlign: 'left', + headerTitleContainerStyle: { + left: headerTitlePosition.left, + right: headerTitlePosition.right + }, + headerLeft: () => ( + + ), headerTitle: () => ( - ), - headerLeft: () => ( - ) }); } @@ -755,7 +769,7 @@ class RoomView extends React.Component { if (handleCommandScroll(event)) { const offset = input === 'UIKeyInputUpArrow' ? 100 : -100; this.offset += offset; - this.flatList.scrollToOffset({ offset: this.offset }); + this.flatList?.scrollToOffset({ offset: this.offset }); } else if (handleCommandRoomActions(event)) { this.goRoomActionsView(); } else if (handleCommandSearchMessages(event)) { @@ -1040,4 +1054,4 @@ const mapDispatchToProps = dispatch => ({ replyBroadcast: message => dispatch(replyBroadcastAction(message)) }); -export default connect(mapStateToProps, mapDispatchToProps)(withDimensions(withTheme(RoomView))); +export default connect(mapStateToProps, mapDispatchToProps)(withDimensions(withTheme(withSafeAreaInsets(RoomView)))); diff --git a/app/views/RoomsListView/Header/Header.ios.js b/app/views/RoomsListView/Header/Header.ios.js deleted file mode 100644 index e45d8baee..000000000 --- a/app/views/RoomsListView/Header/Header.ios.js +++ /dev/null @@ -1,95 +0,0 @@ -import React from 'react'; -import { - Text, View, TouchableOpacity, StyleSheet -} from 'react-native'; -import PropTypes from 'prop-types'; - -import I18n from '../../../i18n'; -import sharedStyles from '../../Styles'; -import { themes } from '../../../constants/colors'; -import { CustomIcon } from '../../../lib/Icons'; - -const styles = StyleSheet.create({ - container: { - flex: 1, - alignItems: 'center', - justifyContent: 'center' - }, - button: { - flexDirection: 'row', - alignItems: 'center' - }, - title: { - fontSize: 14, - ...sharedStyles.textRegular - }, - server: { - fontSize: 12, - ...sharedStyles.textRegular - }, - disclosure: { - marginLeft: 3, - marginTop: 1, - width: 12, - height: 9 - }, - upsideDown: { - transform: [{ scaleY: -1 }] - } -}); - -const HeaderTitle = React.memo(({ connecting, isFetching, theme }) => { - let title = I18n.t('Messages'); - if (connecting) { - title = I18n.t('Connecting'); - } - if (isFetching) { - title = I18n.t('Updating'); - } - return {title}; -}); - -const Header = React.memo(({ - connecting, isFetching, serverName, showServerDropdown, onPress, theme -}) => ( - - - - - {serverName} - - - - -)); - -Header.propTypes = { - connecting: PropTypes.bool, - isFetching: PropTypes.bool, - serverName: PropTypes.string, - theme: PropTypes.string, - showServerDropdown: PropTypes.bool.isRequired, - onPress: PropTypes.func.isRequired -}; - -Header.defaultProps = { - serverName: 'Rocket.Chat' -}; - -HeaderTitle.propTypes = { - connecting: PropTypes.bool, - isFetching: PropTypes.bool, - theme: PropTypes.string -}; - -export default Header; diff --git a/app/views/RoomsListView/Header/Header.android.js b/app/views/RoomsListView/Header/Header.js similarity index 54% rename from app/views/RoomsListView/Header/Header.android.js rename to app/views/RoomsListView/Header/Header.js index d1d4fb745..839048bc0 100644 --- a/app/views/RoomsListView/Header/Header.android.js +++ b/app/views/RoomsListView/Header/Header.js @@ -9,26 +9,23 @@ import I18n from '../../../i18n'; import sharedStyles from '../../Styles'; import { themes } from '../../../constants/colors'; import { CustomIcon } from '../../../lib/Icons'; +import { isTablet, isIOS } from '../../../utils/deviceInfo'; +import { useOrientation } from '../../../dimensions'; const styles = StyleSheet.create({ container: { flex: 1, - justifyContent: 'center' + justifyContent: 'center', + marginLeft: isTablet ? 10 : 0 }, button: { flexDirection: 'row', - alignItems: 'center', - marginRight: 64 + alignItems: 'center' }, - server: { - fontSize: 20, - ...sharedStyles.textRegular + title: { + ...sharedStyles.textSemibold }, - serverSmall: { - fontSize: 16 - }, - updating: { - fontSize: 14, + subtitle: { ...sharedStyles.textRegular }, upsideDown: { @@ -37,41 +34,55 @@ const styles = StyleSheet.create({ }); const Header = React.memo(({ - connecting, isFetching, serverName, showServerDropdown, showSearchHeader, theme, onSearchChangeText, onPress + connecting, connected, isFetching, serverName, server, showServerDropdown, showSearchHeader, theme, onSearchChangeText, onPress }) => { const titleColorStyle = { color: themes[theme].headerTitleColor }; const isLight = theme === 'light'; + const { isLandscape } = useOrientation(); + const scale = isIOS && isLandscape && !isTablet ? 0.8 : 1; + const titleFontSize = 16 * scale; + const subTitleFontSize = 12 * scale; + if (showSearchHeader) { return ( ); } + let subtitle; + if (connecting) { + subtitle = I18n.t('Connecting'); + } else if (isFetching) { + subtitle = I18n.t('Updating'); + } else if (!connected) { + subtitle = I18n.t('Waiting_for_network'); + } else { + subtitle = server?.replace(/(^\w+:|^)\/\//, ''); + } return ( - {connecting ? {I18n.t('Connecting')} : null} - {isFetching ? {I18n.t('Updating')} : null} - {serverName} + {serverName} + {subtitle ? {subtitle} : null} ); @@ -83,8 +94,10 @@ Header.propTypes = { onPress: PropTypes.func.isRequired, onSearchChangeText: PropTypes.func.isRequired, connecting: PropTypes.bool, + connected: PropTypes.bool, isFetching: PropTypes.bool, serverName: PropTypes.string, + server: PropTypes.string, theme: PropTypes.string }; diff --git a/app/views/RoomsListView/Header/index.js b/app/views/RoomsListView/Header/index.js index badcb59ac..12a57dc00 100644 --- a/app/views/RoomsListView/Header/index.js +++ b/app/views/RoomsListView/Header/index.js @@ -18,8 +18,10 @@ class RoomsListHeaderView extends PureComponent { showSearchHeader: PropTypes.bool, serverName: PropTypes.string, connecting: PropTypes.bool, + connected: PropTypes.bool, isFetching: PropTypes.bool, theme: PropTypes.string, + server: PropTypes.string, open: PropTypes.func, close: PropTypes.func, closeSort: PropTypes.func, @@ -68,16 +70,18 @@ class RoomsListHeaderView extends PureComponent { render() { const { - serverName, showServerDropdown, showSearchHeader, connecting, isFetching, theme + serverName, showServerDropdown, showSearchHeader, connecting, connected, isFetching, theme, server } = this.props; return (
({ showSortDropdown: state.rooms.showSortDropdown, showSearchHeader: state.rooms.showSearchHeader, connecting: state.meteor.connecting || state.server.loading, + connected: state.meteor.connected, isFetching: state.rooms.isFetching, - serverName: state.settings.Site_Name + serverName: state.settings.Site_Name, + server: state.server.server }); const mapDispatchtoProps = dispatch => ({ diff --git a/app/views/RoomsListView/ListHeader/SearchBar.js b/app/views/RoomsListView/ListHeader/SearchBar.js deleted file mode 100644 index 6446d4cf4..000000000 --- a/app/views/RoomsListView/ListHeader/SearchBar.js +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; - -import SearchBox from '../../../containers/SearchBox'; -import { isIOS } from '../../../utils/deviceInfo'; -import { withTheme } from '../../../theme'; - -const SearchBar = React.memo(({ - theme, onChangeSearchText, inputRef, searching, onCancelSearchPress, onSearchFocus -}) => { - if (isIOS) { - return ( - - ); - } - return null; -}); - -SearchBar.propTypes = { - theme: PropTypes.string, - searching: PropTypes.bool, - inputRef: PropTypes.func, - onChangeSearchText: PropTypes.func, - onCancelSearchPress: PropTypes.func, - onSearchFocus: PropTypes.func -}; - -export default withTheme(SearchBar); diff --git a/app/views/RoomsListView/ListHeader/index.js b/app/views/RoomsListView/ListHeader/index.js index 63d20ca9e..dec38b506 100644 --- a/app/views/RoomsListView/ListHeader/index.js +++ b/app/views/RoomsListView/ListHeader/index.js @@ -1,28 +1,16 @@ import React from 'react'; import PropTypes from 'prop-types'; -import SearchBar from './SearchBar'; import Directory from './Directory'; import Sort from './Sort'; const ListHeader = React.memo(({ searching, sortBy, - onChangeSearchText, toggleSort, - goDirectory, - inputRef, - onCancelSearchPress, - onSearchFocus + goDirectory }) => ( <> - @@ -31,12 +19,8 @@ const ListHeader = React.memo(({ ListHeader.propTypes = { searching: PropTypes.bool, sortBy: PropTypes.string, - onChangeSearchText: PropTypes.func, toggleSort: PropTypes.func, - goDirectory: PropTypes.func, - inputRef: PropTypes.func, - onCancelSearchPress: PropTypes.func, - onSearchFocus: PropTypes.func + goDirectory: PropTypes.func }; export default ListHeader; diff --git a/app/views/RoomsListView/index.js b/app/views/RoomsListView/index.js index 39b035e6f..7543a46f4 100644 --- a/app/views/RoomsListView/index.js +++ b/app/views/RoomsListView/index.js @@ -12,6 +12,7 @@ import { connect } from 'react-redux'; import { isEqual, orderBy } from 'lodash'; import Orientation from 'react-native-orientation-locker'; import { Q } from '@nozbe/watermelondb'; +import { withSafeAreaInsets } from 'react-native-safe-area-context'; import database from '../../lib/database'; import RocketChat from '../../lib/rocketchat'; @@ -30,7 +31,7 @@ import { } from '../../actions/rooms'; import { appStart as appStartAction, ROOT_BACKGROUND } from '../../actions/app'; import debounce from '../../utils/debounce'; -import { isIOS, isAndroid, isTablet } from '../../utils/deviceInfo'; +import { isIOS, isTablet } from '../../utils/deviceInfo'; import RoomsListHeaderView from './Header'; import { DrawerButton, @@ -59,10 +60,9 @@ import { MAX_SIDEBAR_WIDTH } from '../../constants/tablet'; import { getUserSelector } from '../../selectors/login'; import { goRoom } from '../../utils/goRoom'; import SafeAreaView from '../../containers/SafeAreaView'; -import Header from '../../containers/Header'; +import Header, { getHeaderTitlePosition } from '../../containers/Header'; import { withDimensions } from '../../dimensions'; -const SCROLL_OFFSET = 56; const INITIAL_NUM_TO_RENDER = isTablet ? 20 : 12; const CHATS_HEADER = 'Chats'; const UNREAD_HEADER = 'Unread'; @@ -129,7 +129,8 @@ class RoomsListView extends React.Component { connected: PropTypes.bool, isMasterDetail: PropTypes.bool, rooms: PropTypes.array, - width: PropTypes.number + width: PropTypes.number, + insets: PropTypes.object }; constructor(props) { @@ -242,7 +243,7 @@ class RoomsListView extends React.Component { loading, search } = this.state; - const { rooms, width } = this.props; + const { rooms, width, insets } = this.props; if (nextState.loading !== loading) { return true; } @@ -255,6 +256,9 @@ class RoomsListView extends React.Component { if (!isEqual(nextProps.rooms, rooms)) { return true; } + if (!isEqual(nextProps.insets, insets)) { + return true; + } // If it's focused and there are changes, update if (chatsNotEqual) { this.shouldUpdate = false; @@ -273,7 +277,8 @@ class RoomsListView extends React.Component { connected, roomsRequest, rooms, - isMasterDetail + isMasterDetail, + insets } = this.props; const { item } = this.state; @@ -298,6 +303,9 @@ class RoomsListView extends React.Component { // eslint-disable-next-line react/no-did-update-set-state this.setState({ item: { rid: rooms[0] } }); } + if (insets.left !== prevProps.insets.left || insets.right !== prevProps.insets.right) { + this.setHeader(); + } } componentWillUnmount() { @@ -318,9 +326,11 @@ class RoomsListView extends React.Component { getHeader = () => { const { searching } = this.state; - const { navigation, isMasterDetail } = this.props; + const { navigation, isMasterDetail, insets } = this.props; + const headerTitlePosition = getHeaderTitlePosition(insets); return { - headerLeft: () => (searching && isAndroid ? ( + headerTitleAlign: 'left', + headerLeft: () => (searching ? ( navigation.navigate('ModalStackNavigator', { screen: 'SettingsView' }) : () => navigation.toggleDrawer()} + onPress={isMasterDetail + ? () => navigation.navigate('ModalStackNavigator', { screen: 'SettingsView' }) + : () => navigation.toggleDrawer()} /> )), headerTitle: () => , - headerRight: () => (searching && isAndroid ? null : ( + headerTitleContainerStyle: { + left: headerTitlePosition.left, + right: headerTitlePosition.right + }, + headerRight: () => (searching ? null : ( - {isAndroid ? ( - - ) : null} navigation.navigate('ModalStackNavigator', { screen: 'NewMessageView' }) : () => navigation.navigate('NewMessageStackNavigator')} + onPress={isMasterDetail + ? () => navigation.navigate('ModalStackNavigator', { screen: 'NewMessageView' }) + : () => navigation.navigate('NewMessageStackNavigator')} testID='rooms-list-view-create-channel' /> + )) }; @@ -411,7 +428,7 @@ class RoomsListView extends React.Component { let tempChats = []; let chats = []; if (sortBy === 'alphabetical') { - chats = orderBy(data, ['name'], ['asc']); + chats = orderBy(data, [`${ this.useRealName ? 'fname' : 'name' }`], ['asc']); } else { chats = orderBy(data, ['roomUpdatedAt'], ['desc']); } @@ -476,10 +493,8 @@ class RoomsListView extends React.Component { initSearching = () => { const { openSearchHeader } = this.props; this.internalSetState({ searching: true }, () => { - if (isAndroid) { - openSearchHeader(); - this.setHeader(); - } + openSearchHeader(); + this.setHeader(); }); }; @@ -493,23 +508,11 @@ class RoomsListView extends React.Component { Keyboard.dismiss(); - if (isIOS && this.inputRef) { - this.inputRef.blur(); - this.inputRef.clear(); - } - this.setState({ searching: false, search: [] }, () => { - if (isAndroid) { - this.setHeader(); - closeSearchHeader(); - } + this.setHeader(); + closeSearchHeader(); setTimeout(() => { - const offset = isAndroid ? 0 : SCROLL_OFFSET; - if (this.scroll.scrollTo) { - this.scroll.scrollTo({ x: 0, y: offset, animated: true }); - } else if (this.scroll.scrollToOffset) { - this.scroll.scrollToOffset({ offset }); - } + this.scrollToTop(); }, 200); }); }; @@ -538,9 +541,7 @@ class RoomsListView extends React.Component { search: result, searching: true }); - if (this.scroll && this.scroll.scrollTo) { - this.scroll.scrollTo({ x: 0, y: 0, animated: true }); - } + this.scrollToTop(); }, 300); getRoomTitle = item => RocketChat.getRoomTitle(item) @@ -561,15 +562,16 @@ class RoomsListView extends React.Component { this.goRoom({ item, isMasterDetail }); }; + scrollToTop = () => { + if (this.scroll?.scrollToOffset) { + this.scroll.scrollToOffset({ offset: 0 }); + } + }; + toggleSort = () => { const { toggleSortDropdown } = this.props; - const offset = isAndroid ? 0 : SCROLL_OFFSET; - if (this.scroll.scrollTo) { - this.scroll.scrollTo({ x: 0, y: offset, animated: true }); - } else if (this.scroll.scrollToOffset) { - this.scroll.scrollToOffset({ offset }); - } + this.scrollToTop(); setTimeout(() => { toggleSortDropdown(); }, 100); @@ -714,8 +716,7 @@ class RoomsListView extends React.Component { if (handleCommandShowPreferences(event)) { navigation.navigate('SettingsView'); } else if (handleCommandSearching(event)) { - this.scroll.scrollToOffset({ animated: true, offset: 0 }); - this.inputRef.focus(); + this.initSearching(); } else if (handleCommandSelectRoom(event)) { this.goRoomByIndex(input); } else if (handleCommandPreviousRoom(event)) { @@ -744,19 +745,13 @@ class RoomsListView extends React.Component { getScrollRef = ref => (this.scroll = ref); - getInputRef = ref => (this.inputRef = ref); - renderListHeader = () => { const { searching } = this.state; const { sortBy } = this.props; return ( @@ -869,7 +864,6 @@ class RoomsListView extends React.Component { ref={this.getScrollRef} data={searching ? search : chats} extraData={searching ? search : chats} - contentOffset={isIOS ? { x: 0, y: SCROLL_OFFSET } : {}} keyExtractor={keyExtractor} style={[styles.list, { backgroundColor: themes[theme].backgroundColor }]} renderItem={this.renderItem} @@ -953,4 +947,4 @@ const mapDispatchToProps = dispatch => ({ closeServerDropdown: () => dispatch(closeServerDropdownAction()) }); -export default connect(mapStateToProps, mapDispatchToProps)(withDimensions(withTheme(RoomsListView))); +export default connect(mapStateToProps, mapDispatchToProps)(withDimensions(withTheme(withSafeAreaInsets(RoomsListView)))); diff --git a/app/views/RoomsListView/styles.js b/app/views/RoomsListView/styles.js index 9deb03dc1..70f2bb6dc 100644 --- a/app/views/RoomsListView/styles.js +++ b/app/views/RoomsListView/styles.js @@ -23,7 +23,7 @@ export default StyleSheet.create({ sortToggleText: { fontSize: 16, flex: 1, - marginLeft: 15, + marginLeft: 12, ...sharedStyles.textRegular }, dropdownContainer: { @@ -50,16 +50,16 @@ export default StyleSheet.create({ }, sortSeparator: { height: StyleSheet.hairlineWidth, - marginHorizontal: 15, + marginHorizontal: 12, flex: 1 }, sortIcon: { width: 22, height: 22, - marginHorizontal: 15 + marginHorizontal: 12 }, groupTitleContainer: { - paddingHorizontal: 15, + paddingHorizontal: 12, paddingTop: 17, paddingBottom: 10 }, @@ -75,12 +75,12 @@ export default StyleSheet.create({ }, serverHeaderText: { fontSize: 16, - marginLeft: 15, + marginLeft: 12, ...sharedStyles.textRegular }, serverHeaderAdd: { fontSize: 16, - marginRight: 15, + marginRight: 12, paddingVertical: 10, ...sharedStyles.textRegular }, @@ -95,7 +95,7 @@ export default StyleSheet.create({ serverIcon: { width: 42, height: 42, - marginHorizontal: 15, + marginHorizontal: 12, marginVertical: 13, borderRadius: 4, resizeMode: 'contain' @@ -120,7 +120,7 @@ export default StyleSheet.create({ directoryIcon: { width: 22, height: 22, - marginHorizontal: 15 + marginHorizontal: 12 }, directoryText: { fontSize: 16, diff --git a/app/views/ShareView/Preview.js b/app/views/ShareView/Preview.js index fae679535..2aaff22d8 100644 --- a/app/views/ShareView/Preview.js +++ b/app/views/ShareView/Preview.js @@ -10,12 +10,13 @@ import { ImageViewer, types } from '../../presentation/ImageViewer'; import { themes } from '../../constants/colors'; import { useDimensions, useOrientation } from '../../dimensions'; import { getHeaderHeight } from '../../containers/Header'; -import { isIOS } from '../../utils/deviceInfo'; import { THUMBS_HEIGHT } from './constants'; import sharedStyles from '../Styles'; import { allowPreview } from './utils'; import I18n from '../../i18n'; +const MESSAGEBOX_HEIGHT = 56; + const styles = StyleSheet.create({ fileContainer: { alignItems: 'center', @@ -58,23 +59,24 @@ const Preview = React.memo(({ const { isLandscape } = useOrientation(); const insets = useSafeAreaInsets(); const headerHeight = getHeaderHeight(isLandscape); - const messageboxHeight = isIOS ? 56 : 0; const thumbsHeight = (length > 1) ? THUMBS_HEIGHT : 0; - const calculatedHeight = height - insets.top - insets.bottom - messageboxHeight - thumbsHeight - headerHeight; + const calculatedHeight = height - insets.top - insets.bottom - MESSAGEBOX_HEIGHT - thumbsHeight - headerHeight; if (item?.canUpload) { if (type?.match(/video/)) { return ( -