Name folders consistently

react/features/base/media/reducer.js

@@ -9,21 +9,6 @@ import {
 } from './actionTypes';
 import { CAMERA_FACING_MODE } from './constants';
 
-/**
- * Listen for various actions related to media devices.
- *
- * @param {Object} state - State of media devices.
- * @param {Object} action - Action object.
- * @param {string} action.type - Type of action.
- * @param {Object} action.media - Information about media devices to be
- * modified.
- * @returns {Object}
- */
-ReducerRegistry.register('features/base/media', combineReducers({
-    audio,
-    video
-}));
-
 /**
  * Media state object for local audio.
  *
@@ -105,3 +90,18 @@ function video(state = VIDEO_INITIAL_MEDIA_STATE, action) {
         return state;
     }
 }
+
+/**
+ * Listen for various actions related to media devices.
+ *
+ * @param {Object} state - State of media devices.
+ * @param {Object} action - Action object.
+ * @param {string} action.type - Type of action.
+ * @param {Object} action.media - Information about media devices to be
+ * modified.
+ * @returns {Object}
+ */
+ReducerRegistry.register('features/base/media', combineReducers({
+    audio,
+    video
+}));

react/features/conference/components/Conference.native.js

@@ -3,8 +3,8 @@ import { connect as reactReduxConnect } from 'react-redux';
 
 import { connect, disconnect } from '../../base/connection';
 import { Container } from '../../base/react';
-import { FilmStrip } from '../../filmStrip';
-import { LargeVideo } from '../../largeVideo';
+import { FilmStrip } from '../../film-strip';
+import { LargeVideo } from '../../large-video';
 import { RoomLockPrompt } from '../../room-lock';
 import { Toolbar } from '../../toolbar';
 

react/features/film-strip/components/Thumbnail.js

@@ -1,14 +1,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import {
-    Audio,
-    MEDIA_TYPE
-} from '../../base/media';
-import {
-    PARTICIPANT_ROLE,
-    pinParticipant
-} from '../../base/participants';
+import { Audio, MEDIA_TYPE } from '../../base/media';
+import { PARTICIPANT_ROLE, pinParticipant } from '../../base/participants';
 import { Container } from '../../base/react';
 import { getTrackByMediaTypeAndParticipant } from '../../base/tracks';
 import { ParticipantView } from '../../conference';
@@ -148,10 +142,10 @@ class Thumbnail extends Component {
  *  }}
  */
 function mapStateToProps(state, ownProps) {
-    // We need read-only access to the state of features/largeVideo so that the
+    // We need read-only access to the state of features/large-video so that the
     // film strip doesn't render the video of the participant who is rendered on
     // the stage i.e. as a large video.
-    const largeVideo = state['features/largeVideo'];
+    const largeVideo = state['features/large-video'];
     const tracks = state['features/base/tracks'];
     const id = ownProps.participant.id;
     const audioTrack

react/features/large-video/actions.js

@@ -20,7 +20,7 @@ export function selectParticipant() {
         const conference = state['features/base/conference'].conference;
 
         if (conference) {
-            const largeVideo = state['features/largeVideo'];
+            const largeVideo = state['features/large-video'];
             const tracks = state['features/base/tracks'];
 
             const id = largeVideo.participantId;
@@ -53,7 +53,7 @@ export function selectParticipantInLargeVideo() {
     return (dispatch, getState) => {
         const state = getState();
         const participantId = _electParticipantInLargeVideo(state);
-        const largeVideo = state['features/largeVideo'];
+        const largeVideo = state['features/large-video'];
 
         if (participantId !== largeVideo.participantId) {
             dispatch({

react/features/large-video/components/LargeVideo.js

@@ -52,7 +52,7 @@ class LargeVideo extends Component {
  */
 function mapStateToProps(state) {
     return {
-        _participantId: state['features/largeVideo'].participantId
+        _participantId: state['features/large-video'].participantId
     };
 }
 

react/features/large-video/middleware.js

@@ -47,7 +47,7 @@ MiddlewareRegistry.register(store => next => action => {
                 = getTrackByJitsiTrack(
                     state['features/base/tracks'],
                     action.track.jitsiTrack);
-            const participantId = state['features/largeVideo'].participantId;
+            const participantId = state['features/large-video'].participantId;
 
             (track.participantId === participantId)
                 && store.dispatch(selectParticipant());

react/features/large-video/reducer.js

@@ -3,7 +3,7 @@ import { ReducerRegistry } from '../base/redux';
 
 import { SELECT_LARGE_VIDEO_PARTICIPANT } from './actionTypes';
 
-ReducerRegistry.register('features/largeVideo', (state = {}, action) => {
+ReducerRegistry.register('features/large-video', (state = {}, action) => {
     switch (action.type) {
 
     // When conference is joined, we update ID of local participant from default

react/features/toolbar/components/ToolbarButton.native.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { TouchableHighlight } from 'react-native';
 
-import { Icon } from '../../base/fontIcons';
+import { Icon } from '../../base/font-icons';
 
 import AbstractToolbarButton from './AbstractToolbarButton';