chore: updated sidebar options

RocketChat · Jan 28, 2025 · 9c6df22 · 9c6df22
1 parent ffb4cd8
commit 9c6df22
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 32 deletions.
diff --git a/android/app/src/main/assets/fonts/custom.ttf b/android/app/src/main/assets/fonts/custom.ttf
diff --git a/app/containers/CustomIcon/mappedIcons.js b/app/containers/CustomIcon/mappedIcons.js
@@ -1,4 +1,5 @@
 export const mappedIcons = {
+	'accessibility': 59855,
 	'add': 59872,
 	'administration': 59662,
 	'adobe-reader-monochromatic': 59663,

diff --git a/app/containers/CustomIcon/selection.json b/app/containers/CustomIcon/selection.json
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
@@ -85,7 +85,8 @@ import {
 	InsideStackParamList,
 	NewMessageStackParamList,
 	ProfileStackParamList,
-	SettingsStackParamList
+	SettingsStackParamList,
+	AccessibilityStackParamList
 } from './types';
 import { isIOS } from '../lib/methods/helpers';
 import { TNavigation } from './stackType';
@@ -185,7 +186,6 @@ const SettingsStackNavigator = () => {
 			<SettingsStack.Screen name='PushTroubleshootView' component={PushTroubleshootView} />
 			<SettingsStack.Screen name='E2EEncryptionSecurityView' component={E2EEncryptionSecurityView} />
 			<SettingsStack.Screen name='LanguageView' component={LanguageView} />
-			<SettingsStack.Screen name='ThemeView' component={ThemeView} />
 			<SettingsStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />
 			<SettingsStack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
 			<SettingsStack.Screen name='GetHelpView' component={GetHelpView} />
@@ -213,15 +213,15 @@ const AdminPanelStackNavigator = () => {
 	);
 };
 
-// DisplayPreferenceNavigator
-const DisplayPrefStack = createNativeStackNavigator<DisplayPrefStackParamList>();
-const DisplayPrefStackNavigator = () => {
+// AccessibilityStackNavigator
+const AccessibilityStack = createNativeStackNavigator<AccessibilityStackParamList>();
+const AccessibilityStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
-
 	return (
-		<DisplayPrefStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
-			<DisplayPrefStack.Screen name='DisplayPrefsView' component={DisplayPrefsView} />
-		</DisplayPrefStack.Navigator>
+		<AccessibilityStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
+			<AccessibilityStack.Screen name='DisplayPrefsView' component={DisplayPrefsView} />
+			<AccessibilityStack.Screen name='ThemeView' component={ThemeView} />
+		</AccessibilityStack.Navigator>
 	);
 };
 
@@ -246,7 +246,7 @@ const DrawerNavigator = () => {
 			<Drawer.Screen name='ProfileStackNavigator' component={ProfileStackNavigator} />
 			<Drawer.Screen name='SettingsStackNavigator' component={SettingsStackNavigator} />
 			<Drawer.Screen name='AdminPanelStackNavigator' component={AdminPanelStackNavigator} />
-			<Drawer.Screen name='DisplayPrefStackNavigator' component={DisplayPrefStackNavigator} />
+			<Drawer.Screen name='AccessibilityStackNavigator' component={AccessibilityStackNavigator} />
 		</Drawer.Navigator>
 	);
 };

diff --git a/app/stacks/types.ts b/app/stacks/types.ts
@@ -28,22 +28,22 @@ export type ChatsStackParamList = {
 	NewMessageStack: undefined;
 	RoomsListView: undefined;
 	RoomView:
-	| {
-		rid: string;
-		t: SubscriptionType;
-		tmid?: string;
-		messageId?: string;
-		name?: string;
-		fname?: string;
-		prid?: string;
-		room?: TSubscriptionModel | { rid: string; t: string; name?: string; fname?: string; prid?: string };
-		jumpToMessageId?: string;
-		jumpToThreadId?: string;
-		roomUserId?: string | null;
-		usedCannedResponse?: string;
-		status?: string;
+		| {
+				rid: string;
+				t: SubscriptionType;
+				tmid?: string;
+				messageId?: string;
+				name?: string;
+				fname?: string;
+				prid?: string;
+				room?: TSubscriptionModel | { rid: string; t: string; name?: string; fname?: string; prid?: string };
+				jumpToMessageId?: string;
+				jumpToThreadId?: string;
+				roomUserId?: string | null;
+				usedCannedResponse?: string;
+				status?: string;
 		  }
-	| undefined; // Navigates back to RoomView already on stack
+		| undefined; // Navigates back to RoomView already on stack
 	RoomActionsView: {
 		room: TSubscriptionModel;
 		member?: any;
@@ -210,7 +210,6 @@ export type SettingsStackParamList = {
 	SecurityPrivacyView: undefined;
 	E2EEncryptionSecurityView: undefined;
 	LanguageView: undefined;
-	ThemeView: undefined;
 	DefaultBrowserView: undefined;
 	ScreenLockConfigView: undefined;
 	ProfileView: undefined;
@@ -224,6 +223,12 @@ export type AdminPanelStackParamList = {
 	AdminPanelView: undefined;
 };
 
+export type AccessibilityStackParamList = {
+	AccessibilityAndAppearanceView: undefined;
+	DisplayPrefsView: undefined;
+	ThemeView: undefined;
+};
+
 export type DisplayPrefStackParamList = {
 	DisplayPrefsView: undefined;
 };
@@ -233,7 +238,7 @@ export type DrawerParamList = {
 	ProfileStackNavigator: NavigatorScreenParams<ProfileStackParamList>;
 	SettingsStackNavigator: NavigatorScreenParams<SettingsStackParamList>;
 	AdminPanelStackNavigator: NavigatorScreenParams<AdminPanelStackParamList>;
-	DisplayPrefStackNavigator: NavigatorScreenParams<DisplayPrefStackParamList>;
+	AccessibilityStackNavigator: NavigatorScreenParams<AccessibilityStackParamList>;
 };
 
 export type NewMessageStackParamList = {

diff --git a/app/views/SidebarView/index.tsx b/app/views/SidebarView/index.tsx
@@ -253,10 +253,10 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
 				/>
 				<List.Separator />
 				<List.Item
-					title={'Display'}
-					left={() => <List.Icon name='sort' />}
-					onPress={() => this.sidebarNavigate('DisplayPrefStackNavigator')}
-					backgroundColor={this.currentItemKey === 'DisplayPrefStackNavigator' ? themes[theme!].strokeLight : undefined}
+					title={'Accessibility'}
+					left={() => <List.Icon name='accessibility' />}
+					onPress={() => this.sidebarNavigate('AccessibilityStackNavigator')}
+					backgroundColor={this.currentItemKey === 'AccessibilityStackNavigator' ? themes[theme!].strokeLight : undefined}
 					testID='sidebar-display'
 				/>
 				<List.Separator />

diff --git a/ios/custom.ttf b/ios/custom.ttf