Skip to content

Commit

Permalink
Tablet layout
Browse files Browse the repository at this point in the history
  • Loading branch information
diegolmello committed Nov 29, 2024
1 parent 4bc7f7e commit f3ddc7d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
2 changes: 2 additions & 0 deletions app/stacks/MasterDetailStack/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import MessagesView from '../../views/MessagesView';
import AutoTranslateView from '../../views/AutoTranslateView';
import DirectoryView from '../../views/DirectoryView';
import NotificationPrefView from '../../views/NotificationPreferencesView';
import E2EEToggleRoomView from '../../views/E2EEToggleRoomView';
import PushTroubleshootView from '../../views/PushTroubleshootView';
import ForwardLivechatView from '../../views/ForwardLivechatView';
import ForwardMessageView from '../../views/ForwardMessageView';
Expand Down Expand Up @@ -141,6 +142,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
/>
<ModalStack.Screen name='QueueListView' component={QueueListView} />
<ModalStack.Screen name='NotificationPrefView' component={NotificationPrefView} />
<ModalStack.Screen name='E2EEToggleRoomView' component={E2EEToggleRoomView} />
<ModalStack.Screen name='ForwardMessageView' component={ForwardMessageView} />
{/* @ts-ignore */}
<ModalStack.Screen name='ForwardLivechatView' component={ForwardLivechatView} />
Expand Down
3 changes: 3 additions & 0 deletions app/stacks/MasterDetailStack/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ export type ModalStackParamList = {
rid: string;
room: ISubscription;
};
E2EEToggleRoomView: {
rid: string;
};
ForwardMessageView: {
message: TAnyMessageModel;
};
Expand Down
20 changes: 10 additions & 10 deletions app/views/RoomView/RightButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -396,16 +396,16 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
if (!rid) {
return;
}
// if (isMasterDetail) {
// // @ts-ignore TODO: find a way to make this work
// navigation.navigate('ModalStackNavigator', {
// screen: 'SearchMessagesView',
// params: { rid, showCloseModal: true, encrypted }
// });
// } else {
// @ts-ignore
navigation.navigate('E2EEToggleRoomView', { rid });
// }
if (isMasterDetail) {
// @ts-ignore TODO: find a way to make this work
navigation.navigate('ModalStackNavigator', {
screen: 'E2EEToggleRoomView',
params: { rid }
});
} else {
// @ts-ignore
navigation.navigate('E2EEToggleRoomView', { rid });
}
};

toggleFollowThread = () => {
Expand Down

0 comments on commit f3ddc7d

Please sign in to comment.