Skip to content

[FIX] User Preferences #2418

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
diegolmello merged 3 commits into from
Aug 21, 2020
Merged

[FIX] User Preferences #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d0ea7e
[FIX] User Preferences
djorkaeffalexandre Aug 21, 2020
e365c0a
Merge branch 'develop' into fix.user-notification
diegolmello Aug 21, 2020
dc79c96
PreferencesView -> UserPreferencesView
diegolmello Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions app/stacks/InsideStack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ import QueueListView from '../views/QueueListView';

// Profile Stack
import ProfileView from '../views/ProfileView';
import UserPreferencesView from '../views/UserPreferencesView';
import UserNotificationPrefView from '../views/UserNotificationPreferencesView';

// Settings Stack
import SettingsView from '../views/SettingsView';
import LanguageView from '../views/LanguageView';
import ThemeView from '../views/ThemeView';
import DefaultBrowserView from '../views/DefaultBrowserView';
import ScreenLockConfigView from '../views/ScreenLockConfigView';
import PreferencesView from '../views/PreferencesView';
import UserNotificationPrefView from '../views/UserNotificationPreferencesView';

// Admin Stack
import AdminPanelView from '../views/AdminPanelView';
Expand Down Expand Up @@ -186,6 +186,21 @@ const ProfileStackNavigator = () => {
component={ProfileView}
options={ProfileView.navigationOptions}
/>
<ProfileStack.Screen
name='UserPreferencesView'
component={UserPreferencesView}
options={UserPreferencesView.navigationOptions}
/>
<ProfileStack.Screen
name='UserNotificationPrefView'
component={UserNotificationPrefView}
options={UserNotificationPrefView.navigationOptions}
/>
<ProfileStack.Screen
name='PickerView'
component={PickerView}
options={PickerView.navigationOptions}
/>
</ProfileStack.Navigator>
);
};
Expand Down Expand Up @@ -222,21 +237,6 @@ const SettingsStackNavigator = () => {
component={ScreenLockConfigView}
options={ScreenLockConfigView.navigationOptions}
/>
<SettingsStack.Screen
name='PreferencesView'
component={PreferencesView}
options={PreferencesView.navigationOptions}
/>
<SettingsStack.Screen
name='UserNotificationPrefView'
component={UserNotificationPrefView}
options={UserNotificationPrefView.navigationOptions}
/>
<SettingsStack.Screen
name='PickerView'
component={PickerView}
options={PickerView.navigationOptions}
/>
</SettingsStack.Navigator>
);
};
Expand Down
8 changes: 4 additions & 4 deletions app/stacks/MasterDetailStack/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import AdminPanelView from '../../views/AdminPanelView';
import NewMessageView from '../../views/NewMessageView';
import CreateChannelView from '../../views/CreateChannelView';
import QueueListView from '../../views/QueueListView';
import PreferencesView from '../../views/PreferencesView';
import UserPreferencesView from '../../views/UserPreferencesView';
import UserNotificationPrefView from '../../views/UserNotificationPreferencesView';

// InsideStackNavigator
Expand Down Expand Up @@ -256,9 +256,9 @@ const ModalStackNavigator = React.memo(({ navigation }) => {
component={CreateDiscussionView}
/>
<ModalStack.Screen
name='PreferencesView'
component={PreferencesView}
options={PreferencesView.navigationOptions}
name='UserPreferencesView'
component={UserPreferencesView}
options={UserPreferencesView.navigationOptions}
/>
<ModalStack.Screen
name='UserNotificationPrefView'
Expand Down
2 changes: 1 addition & 1 deletion app/views/ProfileView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class ProfileView extends React.Component {
options.headerLeft = () => <DrawerButton navigation={navigation} />;
}
options.headerRight = () => (
<PreferencesButton onPress={() => navigation.navigate('PreferencesView')} testID='preferences-view-open' />
<PreferencesButton onPress={() => navigation.navigate('UserPreferencesView')} testID='preferences-view-open' />
);
return options;
}
Expand Down
4 changes: 2 additions & 2 deletions app/views/PreferencesView/index.js → app/views/UserPreferencesView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import ListItem from '../../containers/ListItem';
import { DisclosureImage } from '../../containers/DisclosureIndicator';
import { withTheme } from '../../theme';

class PreferencesView extends React.Component {
class UserPreferencesView extends React.Component {
static navigationOptions = () => ({
title: I18n.t('Preferences')
});
Expand Down Expand Up @@ -62,4 +62,4 @@ class PreferencesView extends React.Component {
}
}

export default withTheme(PreferencesView);
export default withTheme(UserPreferencesView);