diff --git a/android/settings.gradle b/android/settings.gradle index 00f50689d..edf41e8a1 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'jitsi-meet-react' +rootProject.name = 'jitsi-meet' include ':app' include ':react-native-background-timer' diff --git a/doc/coding-style.md b/doc/coding-style.md index 03d75b322..b4c53f7a7 100644 --- a/doc/coding-style.md +++ b/doc/coding-style.md @@ -76,7 +76,7 @@ projects. For example: * The instance of lib-jitsi-meet's `JitsiConnection` type should be named - `connection` or `jitsiConnection` in jitsi-meet-react, not `client`. + `connection` or `jitsiConnection` in jitsi-meet, not `client`. * The class `ReducerRegistry` should be defined in ReducerRegistry.js and its imports in other files should use the same name. Don't define the class diff --git a/doc/mobile.md b/doc/mobile.md index 9885579fe..32eca0637 100644 --- a/doc/mobile.md +++ b/doc/mobile.md @@ -43,8 +43,8 @@ work properly with the native plugins we require. Using Xcode - - Open **ios/jitsi-meet-react.xcworkspace** in Xcode. Make sure it's the - workspace file! + - Open **ios/jitsi-meet.xcworkspace** in Xcode. Make sure it's the workspace + file! - Select your device from the top bar and hit the "play" button. diff --git a/ios/jitsi-meet-react.entitlements b/ios/jitsi-meet.entitlements similarity index 100% rename from ios/jitsi-meet-react.entitlements rename to ios/jitsi-meet.entitlements diff --git a/ios/jitsi-meet-react.xcodeproj/project.pbxproj b/ios/jitsi-meet.xcodeproj/project.pbxproj similarity index 97% rename from ios/jitsi-meet-react.xcodeproj/project.pbxproj rename to ios/jitsi-meet.xcodeproj/project.pbxproj index ec1f52909..d478da05d 100644 --- a/ios/jitsi-meet-react.xcodeproj/project.pbxproj +++ b/ios/jitsi-meet.xcodeproj/project.pbxproj @@ -285,7 +285,7 @@ 0EA8C046B2BF46279796F07D /* libKCKeepAwake.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libKCKeepAwake.a; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* jitsi-meet-react.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "jitsi-meet-react.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07F961A680F5B00A75B9A /* jitsi-meet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "jitsi-meet.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = app/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = app/AppDelegate.m; sourceTree = ""; }; 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; @@ -303,7 +303,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; B30EF2301DC0ED7C00690F45 /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = "../node_modules/react-native-webrtc/ios/WebRTC.framework"; sourceTree = ""; }; B3A9D0241E0481E10009343D /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = POSIX.m; path = app/POSIX.m; sourceTree = ""; }; - B3B083EB1D4955FF0069CEE7 /* jitsi-meet-react.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "jitsi-meet-react.entitlements"; sourceTree = ""; }; + B3B083EB1D4955FF0069CEE7 /* jitsi-meet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "jitsi-meet.entitlements"; sourceTree = ""; }; B96AF9B6FBC0453798399985 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; BF9643811C34FBB300B0BBDF /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; BF9643831C34FBBB00B0BBDF /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; @@ -530,7 +530,7 @@ children = ( 13B07FAE1A68108700A75B9A /* app */, B3BA19B71DC6B02F00BCD481 /* Frameworks */, - B3B083EB1D4955FF0069CEE7 /* jitsi-meet-react.entitlements */, + B3B083EB1D4955FF0069CEE7 /* jitsi-meet.entitlements */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 83CBBA001A601CBA00E9B192 /* Products */, 6956B374CC3C453DB7B8E82D /* Resources */, @@ -542,7 +542,7 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* jitsi-meet-react.app */, + 13B07F961A680F5B00A75B9A /* jitsi-meet.app */, ); name = Products; sourceTree = ""; @@ -581,9 +581,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 13B07F861A680F5B00A75B9A /* jitsi-meet-react */ = { + 13B07F861A680F5B00A75B9A /* jitsi-meet */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet-react" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */; buildPhases = ( 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -596,9 +596,9 @@ ); dependencies = ( ); - name = "jitsi-meet-react"; + name = "jitsi-meet"; productName = "Hello World"; - productReference = 13B07F961A680F5B00A75B9A /* jitsi-meet-react.app */; + productReference = 13B07F961A680F5B00A75B9A /* jitsi-meet.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -620,7 +620,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "jitsi-meet-react" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "jitsi-meet" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -695,7 +695,7 @@ ); projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* jitsi-meet-react */, + 13B07F861A680F5B00A75B9A /* jitsi-meet */, ); }; /* End PBXProject section */ @@ -989,7 +989,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = "jitsi-meet-react.entitlements"; + CODE_SIGN_ENTITLEMENTS = "jitsi-meet.entitlements"; CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; ENABLE_BITCODE = NO; @@ -1019,7 +1019,7 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeet.ios; - PRODUCT_NAME = "jitsi-meet-react"; + PRODUCT_NAME = "jitsi-meet"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1028,7 +1028,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = "jitsi-meet-react.entitlements"; + CODE_SIGN_ENTITLEMENTS = "jitsi-meet.entitlements"; CURRENT_PROJECT_VERSION = 1; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1057,7 +1057,7 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeet.ios; - PRODUCT_NAME = "jitsi-meet-react"; + PRODUCT_NAME = "jitsi-meet"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -1164,7 +1164,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet-react" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -1173,7 +1173,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "jitsi-meet-react" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "jitsi-meet" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/ios/jitsi-meet-react.xcodeproj/xcshareddata/xcschemes/jitsi-meet-react.xcscheme b/ios/jitsi-meet.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme similarity index 82% rename from ios/jitsi-meet-react.xcodeproj/xcshareddata/xcschemes/jitsi-meet-react.xcscheme rename to ios/jitsi-meet.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme index a0f0676da..930da39e6 100644 --- a/ios/jitsi-meet-react.xcodeproj/xcshareddata/xcschemes/jitsi-meet-react.xcscheme +++ b/ios/jitsi-meet.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme @@ -29,9 +29,9 @@ + BuildableName = "jitsi-meet.app" + BlueprintName = "jitsi-meet" + ReferencedContainer = "container:jitsi-meet.xcodeproj"> @@ -47,9 +47,9 @@ + BuildableName = "jitsi-meet.app" + BlueprintName = "jitsi-meet" + ReferencedContainer = "container:jitsi-meet.xcodeproj"> @@ -70,9 +70,9 @@ + BuildableName = "jitsi-meet.app" + BlueprintName = "jitsi-meet" + ReferencedContainer = "container:jitsi-meet.xcodeproj"> @@ -89,9 +89,9 @@ + BuildableName = "jitsi-meet.app" + BlueprintName = "jitsi-meet" + ReferencedContainer = "container:jitsi-meet.xcodeproj"> diff --git a/ios/jitsi-meet-react.xcworkspace/contents.xcworkspacedata b/ios/jitsi-meet.xcworkspace/contents.xcworkspacedata similarity index 67% rename from ios/jitsi-meet-react.xcworkspace/contents.xcworkspacedata rename to ios/jitsi-meet.xcworkspace/contents.xcworkspacedata index 870e30f28..f0e3abb22 100644 --- a/ios/jitsi-meet-react.xcworkspace/contents.xcworkspacedata +++ b/ios/jitsi-meet.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "group:jitsi-meet.xcodeproj"> diff --git a/react/features/base/lib-jitsi-meet/_.native.js b/react/features/base/lib-jitsi-meet/_.native.js index c9d3c3124..0d3c2d3f8 100644 --- a/react/features/base/lib-jitsi-meet/_.native.js +++ b/react/features/base/lib-jitsi-meet/_.native.js @@ -20,14 +20,14 @@ import './native'; })(global || window || this); // eslint-disable-line no-invalid-this // Re-export JitsiMeetJS from the library lib-jitsi-meet to (the other features -// of) the project jitsi-meet-react. +// of) the project jitsi-meet. // // TODO The Web support implemented by the jitsi-meet project explicitly uses // the library lib-jitsi-meet as a binary and keeps it out of the application -// bundle. The mobile support implemented by the jitsi-meet-react project did -// not get to keeping the lib-jitsi-meet library out of the application bundle -// and even used it from source. As an intermediate step, start using the -// library lib-jitsi-meet as a binary on mobile at the time of this writing. In -// the future, implement not packaging it in the application bundle. +// bundle. The mobile support implemented by the jitsi-meet project did not get +// to keeping the lib-jitsi-meet library out of the application bundle and even +// used it from source. As an intermediate step, start using the library +// lib-jitsi-meet as a binary on mobile at the time of this writing. In the +// future, implement not packaging it in the application bundle. import JitsiMeetJS from 'lib-jitsi-meet/lib-jitsi-meet.min'; export { JitsiMeetJS as default }; diff --git a/react/features/base/lib-jitsi-meet/index.js b/react/features/base/lib-jitsi-meet/index.js index 76e5c217d..323cff76b 100644 --- a/react/features/base/lib-jitsi-meet/index.js +++ b/react/features/base/lib-jitsi-meet/index.js @@ -1,5 +1,5 @@ // Re-export JitsiMeetJS from the library lib-jitsi-meet to (the other features -// of) the project jitsi-meet-react. +// of) the project jitsi-meet. import JitsiMeetJS from './_'; export { JitsiMeetJS as default }; diff --git a/react/features/base/tracks/actions.js b/react/features/base/tracks/actions.js index 1b415c3c5..80f773b33 100644 --- a/react/features/base/tracks/actions.js +++ b/react/features/base/tracks/actions.js @@ -215,8 +215,7 @@ function _getLocalTrack(tracks, mediaType) { track.isLocal() // XXX JitsiTrack#getType() returns a MEDIA_TYPE value in the terms - // of lib-jitsi-meet while mediaType is in the terms of - // jitsi-meet-react. + // of lib-jitsi-meet while mediaType is in the terms of jitsi-meet. && track.getType() === mediaType); } @@ -275,13 +274,12 @@ function _shouldMirror(track) { && track.isLocal() && track.isVideoTrack() - // XXX The type of the return value of - // JitsiLocalTrack's getCameraFacingMode happens to be named - // CAMERA_FACING_MODE as well, it's defined by lib-jitsi-meet. Note - // though that the type of the value on the right side of the - // equality check is defined by jitsi-meet-react. The type - // definitions are surely compatible today but that may not be the - // case tomorrow. + // XXX The type of the return value of JitsiLocalTrack's + // getCameraFacingMode happens to be named CAMERA_FACING_MODE as + // well, it's defined by lib-jitsi-meet. Note though that the type + // of the value on the right side of the equality check is defined + // by jitsi-meet. The type definitions are surely compatible today + // but that may not be the case tomorrow. && track.getCameraFacingMode() === CAMERA_FACING_MODE.USER ); } diff --git a/react/features/base/tracks/middleware.js b/react/features/base/tracks/middleware.js index 0dc7ce52f..7c0cbfa96 100644 --- a/react/features/base/tracks/middleware.js +++ b/react/features/base/tracks/middleware.js @@ -156,7 +156,7 @@ function _trackUpdated(store, next, action) { if ('muted' in track) { // XXX The return value of JitsiTrack.getType() is of type MEDIA_TYPE // that happens to be compatible with the type MEDIA_TYPE defined by - // jitsi-meet-react. + // jitsi-meet. mediaType = track.jitsiTrack.getType(); const localTrack = _getLocalTrack(store, mediaType);