Page MenuHomePhorge
Files F32331645

D7496.1765306141.diff
No OneTemporary
Actions

Size
10 KB
Referenced Files
None
Subscribers
None

D7496.1765306141.diff
View Options

diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js
--- a/native/account/logged-out-modal.react.js
+++ b/native/account/logged-out-modal.react.js
@@ -39,7 +39,12 @@
} from '../keyboard/keyboard.js';
import { createIsForegroundSelector } from '../navigation/nav-selectors.js';
import { NavContext } from '../navigation/navigation-context.js';
-import { LoggedOutModalRouteName } from '../navigation/route-names.js';
+import type { RootNavigationProp } from '../navigation/root-navigator.react.js';
+import {
+ type NavigationRoute,
+ LoggedOutModalRouteName,
+ RegistrationRouteName,
+} from '../navigation/route-names.js';
import { resetUserStateActionType } from '../redux/action-types.js';
import { useSelector } from '../redux/redux-utils.js';
import { usePersistedStateLoaded } from '../selectors/app-state-selectors.js';
@@ -111,7 +116,13 @@
);
}
+type BaseProps = {
+ +navigation: RootNavigationProp<'LoggedOutModal'>,
+ +route: NavigationRoute<'LoggedOutModal'>,
+};
+
type Props = {
+ ...BaseProps,
// Navigation state
+isForeground: boolean,
// Redux state
@@ -125,7 +136,6 @@
+styles: typeof unboundStyles,
// Redux dispatch functions
+dispatch: Dispatch,
- ...
};
type State = {
+mode: LoggedOutMode,
@@ -525,13 +535,13 @@
if (__DEV__) {
registerButtons.push(
<TouchableOpacity
- onPress={this.onPressRegister}
+ onPress={this.onPressNewRegister}
style={[styles.button, styles.classicAuthButton]}
activeOpacity={0.6}
key="new"
>
<Text style={[styles.buttonText, styles.classicAuthButtonText]}>
- Register
+ Register (new)
</Text>
</TouchableOpacity>,
);
@@ -637,6 +647,10 @@
this.keyboardHeightValue.setValue(-1);
this.setMode('register');
};
+
+ onPressNewRegister = () => {
+ this.props.navigation.navigate(RegistrationRouteName);
+ };
}
const unboundStyles = {
@@ -747,39 +761,38 @@
LoggedOutModalRouteName,
);
-const ConnectedLoggedOutModal: React.ComponentType<{ ... }> = React.memo<{
- ...
-}>(function ConnectedLoggedOutModal(props: { ... }) {
- const navContext = React.useContext(NavContext);
- const isForeground = isForegroundSelector(navContext);
+const ConnectedLoggedOutModal: React.ComponentType<BaseProps> =
+ React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
+ const navContext = React.useContext(NavContext);
+ const isForeground = isForegroundSelector(navContext);
- const rehydrateConcluded = useSelector(
- state => !!(state._persist && state._persist.rehydrated && navContext),
- );
- const persistedStateLoaded = usePersistedStateLoaded();
- const cookie = useSelector(state => state.cookie);
- const urlPrefix = useSelector(state => state.urlPrefix);
- const loggedIn = useSelector(isLoggedIn);
- const dimensions = useSelector(derivedDimensionsInfoSelector);
- const splashStyle = useSelector(splashStyleSelector);
- const styles = useStyles(unboundStyles);
-
- const dispatch = useDispatch();
- return (
- <LoggedOutModal
- {...props}
- isForeground={isForeground}
- persistedStateLoaded={persistedStateLoaded}
- rehydrateConcluded={rehydrateConcluded}
- cookie={cookie}
- urlPrefix={urlPrefix}
- loggedIn={loggedIn}
- dimensions={dimensions}
- splashStyle={splashStyle}
- styles={styles}
- dispatch={dispatch}
- />
- );
-});
+ const rehydrateConcluded = useSelector(
+ state => !!(state._persist && state._persist.rehydrated && navContext),
+ );
+ const persistedStateLoaded = usePersistedStateLoaded();
+ const cookie = useSelector(state => state.cookie);
+ const urlPrefix = useSelector(state => state.urlPrefix);
+ const loggedIn = useSelector(isLoggedIn);
+ const dimensions = useSelector(derivedDimensionsInfoSelector);
+ const splashStyle = useSelector(splashStyleSelector);
+ const styles = useStyles(unboundStyles);
+
+ const dispatch = useDispatch();
+ return (
+ <LoggedOutModal
+ {...props}
+ isForeground={isForeground}
+ persistedStateLoaded={persistedStateLoaded}
+ rehydrateConcluded={rehydrateConcluded}
+ cookie={cookie}
+ urlPrefix={urlPrefix}
+ loggedIn={loggedIn}
+ dimensions={dimensions}
+ splashStyle={splashStyle}
+ styles={styles}
+ dispatch={dispatch}
+ />
+ );
+ });
export default ConnectedLoggedOutModal;
diff --git a/native/account/registration/keyserver-selection.react.js b/native/account/registration/keyserver-selection.react.js
new file mode 100644
--- /dev/null
+++ b/native/account/registration/keyserver-selection.react.js
@@ -0,0 +1,36 @@
+// @flow
+
+import * as React from 'react';
+import { View, Text } from 'react-native';
+
+import type { RegistrationNavigationProp } from './registration-navigator.react.js';
+import type { NavigationRoute } from '../../navigation/route-names.js';
+import { useStyles } from '../../themes/colors.js';
+
+type Props = {
+ +navigation: RegistrationNavigationProp<'KeyserverSelection'>,
+ +route: NavigationRoute<'KeyserverSelection'>,
+};
+// eslint-disable-next-line no-unused-vars
+function KeyserverSelection(props: Props): React.Node {
+ const styles = useStyles(unboundStyles);
+ return (
+ <View style={styles.background}>
+ <Text>Test Hello Test</Text>
+ </View>
+ );
+}
+
+const unboundStyles = {
+ background: {
+ backgroundColor: 'panelBackground',
+ flex: 1,
+ },
+ testText: {
+ alignText: 'center',
+ fontSize: 24,
+ color: 'white',
+ },
+};
+
+export default KeyserverSelection;
diff --git a/native/account/registration/registration-navigator.react.js b/native/account/registration/registration-navigator.react.js
new file mode 100644
--- /dev/null
+++ b/native/account/registration/registration-navigator.react.js
@@ -0,0 +1,64 @@
+// @flow
+
+import {
+ createStackNavigator,
+ type StackNavigationProp,
+ type StackNavigationHelpers,
+} from '@react-navigation/stack';
+import * as React from 'react';
+import { View } from 'react-native';
+
+import KeyserverSelection from './keyserver-selection.react.js';
+import KeyboardAvoidingView from '../../components/keyboard-avoiding-view.react.js';
+import type { RootNavigationProp } from '../../navigation/root-navigator.react.js';
+import {
+ KeyserverSelectionRouteName,
+ type ScreenParamList,
+ type RegistrationParamList,
+} from '../../navigation/route-names.js';
+import { useStyles } from '../../themes/colors.js';
+
+export type RegistrationNavigationProp<
+ RouteName: $Keys<RegistrationParamList> = $Keys<RegistrationParamList>,
+> = StackNavigationProp<ScreenParamList, RouteName>;
+
+const Registration = createStackNavigator<
+ ScreenParamList,
+ RegistrationParamList,
+ StackNavigationHelpers<ScreenParamList>,
+>();
+type Props = {
+ +navigation: RootNavigationProp<'Registration'>,
+ ...
+};
+// eslint-disable-next-line no-unused-vars
+function RegistrationNavigator(props: Props): React.Node {
+ const styles = useStyles(unboundStyles);
+ return (
+ <View style={styles.view}>
+ <KeyboardAvoidingView
+ behavior="padding"
+ style={styles.keyboardAvoidingView}
+ >
+ <Registration.Navigator>
+ <Registration.Screen
+ name={KeyserverSelectionRouteName}
+ component={KeyserverSelection}
+ />
+ </Registration.Navigator>
+ </KeyboardAvoidingView>
+ </View>
+ );
+}
+
+const unboundStyles = {
+ keyboardAvoidingView: {
+ flex: 1,
+ },
+ view: {
+ flex: 1,
+ backgroundColor: 'panelBackground',
+ },
+};
+
+export default RegistrationNavigator;
diff --git a/native/navigation/root-navigator.react.js b/native/navigation/root-navigator.react.js
--- a/native/navigation/root-navigator.react.js
+++ b/native/navigation/root-navigator.react.js
@@ -38,8 +38,10 @@
type ScreenParamList,
type RootParamList,
TermsAndPrivacyRouteName,
+ RegistrationRouteName,
} from './route-names.js';
import LoggedOutModal from '../account/logged-out-modal.react.js';
+import RegistrationNavigator from '../account/registration/registration-navigator.react.js';
import TermsAndPrivacyModal from '../account/terms-and-privacy-modal.react.js';
import ThreadPickerModal from '../calendar/thread-picker-modal.react.js';
import ImagePasteModal from '../chat/image-paste-modal.react.js';
@@ -190,6 +192,11 @@
component={LoggedOutModal}
options={disableGesturesScreenOptions}
/>
+ <Root.Screen
+ name={RegistrationRouteName}
+ component={RegistrationNavigator}
+ options={disableGesturesScreenOptions}
+ />
<Root.Screen name={AppRouteName} component={AppNavigator} />
<Root.Screen
name={TermsAndPrivacyRouteName}
diff --git a/native/navigation/route-names.js b/native/navigation/route-names.js
--- a/native/navigation/route-names.js
+++ b/native/navigation/route-names.js
@@ -79,6 +79,8 @@
export const ThreadSettingsRouteName = 'ThreadSettings';
export const VideoPlaybackModalRouteName = 'VideoPlaybackModal';
export const TermsAndPrivacyRouteName = 'TermsAndPrivacyModal';
+export const RegistrationRouteName = 'Registration';
+export const KeyserverSelectionRouteName = 'KeyserverSelection';
export type RootParamList = {
+LoggedOutModal: void,
@@ -93,6 +95,7 @@
+TermsAndPrivacyModal: TermsAndPrivacyModalParams,
+SubchannelsListModal: SubchannelListModalParams,
+MessageReactionsModal: MessageReactionsModalParams,
+ +Registration: void,
};
export type MessageTooltipRouteNames =
@@ -155,6 +158,8 @@
export type CommunityDrawerParamList = { +TabNavigator: void };
+export type RegistrationParamList = { +KeyserverSelection: void };
+
export type ScreenParamList = {
...RootParamList,
...OverlayParamList,
@@ -163,12 +168,13 @@
...ChatTopTabsParamList,
...ProfileParamList,
...CommunityDrawerParamList,
+ ...RegistrationParamList,
};
export type NavigationRoute<RouteName: string = $Keys<ScreenParamList>> =
RouteProp<ScreenParamList, RouteName>;
-export const accountModals = [LoggedOutModalRouteName];
+export const accountModals = [LoggedOutModalRouteName, RegistrationRouteName];
export const scrollBlockingModals = [
ImageModalRouteName,

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 9, 6:49 PM (10 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5856791
Default Alt Text
D7496.1765306141.diff (10 KB)

Event Timeline