Skip to content

Commit

Permalink
chore: update header
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikSin committed May 1, 2024
1 parent 253ad89 commit ef3fd6d
Show file tree
Hide file tree
Showing 7 changed files with 271 additions and 231 deletions.
2 changes: 1 addition & 1 deletion src/frontend/screens/MapScreen/track/SaveTrackScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
StyleSheet,
View,
} from 'react-native';
import {DiscardModal} from '../../../sharedComponents/DiscardModal.tsx';
import {DiscardModal} from '../../../sharedComponents/CustomHeaderLeftClose/DiscardModal.tsx';
import {BottomSheet} from '../../../sharedComponents/BottomSheet/BottomSheet';
import PhotoIcon from '../../../images/camera.svg';
import DetailsIcon from '../../../images/details.svg';
Expand Down
6 changes: 3 additions & 3 deletions src/frontend/screens/ObservationEdit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {PresetView} from './PresetView';
import {useBottomSheetModal} from '../../sharedComponents/BottomSheetModal';
import {ErrorModal} from '../../sharedComponents/ErrorModal';
import {SaveButton} from './SaveButton';
import {DiscardModal} from '../../sharedComponents/DiscardModal';
import {DiscardModal} from '../../sharedComponents/CustomHeaderLeftClose/DiscardModal';
import {CustomHeaderLeftClose} from '../../sharedComponents/CustomHeaderLeftClose';

const m = defineMessages({
Expand Down Expand Up @@ -118,15 +118,15 @@ export const ObservationEdit: NativeNavigationComponent<'ObservationEdit'> & {
</ScrollView>
<BottomSheet items={bottomSheetItems} />
<ErrorModal sheetRef={sheetRef} closeSheet={closeSheet} isOpen={isOpen} />
<DiscardModal
{/* <DiscardModal
bottomSheetRef={sheetRef}
isOpen={isOpen}
closeSheet={closeSheet}
title={deleteObservationMessages.discardObservation}
description={deleteObservationMessages.discardObservationDescription}
discardButtonText={deleteObservationMessages.discardObservationButton}
handleDiscard={handleDiscard}
/>
/> */}
</View>
);
};
Expand Down
18 changes: 9 additions & 9 deletions src/frontend/screens/PresetChooser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {CustomHeaderLeftClose} from '../sharedComponents/CustomHeaderLeftClose';
import {CustomHeaderLeft} from '../sharedComponents/CustomHeaderLeft';
import {Preset} from '@mapeo/schema';
import {usePresetsQuery} from '../hooks/server/presets';
import {DiscardModal} from '../sharedComponents/DiscardModal';
import {deleteObservationMessages} from './ObservationEdit';
// import {DiscardModal} from '../sharedComponents/DiscardModal';
// import {deleteObservationMessages} from './ObservationEdit';
import {useBottomSheetModal} from '../sharedComponents/BottomSheetModal';

const m = defineMessages({
Expand All @@ -44,7 +44,7 @@ export const PresetChooser: NativeNavigationComponent<'PresetChooser'> = ({
const currentIndex = state.index;
const routes = state.routes;
const prevRouteNameInStack = routes[currentIndex - 1]?.name;
const {openSheet, sheetRef, isOpen, closeSheet} = useBottomSheetModal({
const {openSheet} = useBottomSheetModal({
openOnMount: false,
});
React.useLayoutEffect(() => {
Expand Down Expand Up @@ -81,10 +81,10 @@ export const PresetChooser: NativeNavigationComponent<'PresetChooser'> = ({
);
const numColumns = Math.floor(Dimensions.get('window').width / MIN_COL_WIDTH);

const handleDiscard = React.useCallback(() => {
closeSheet();
navigation.reset({index: 0, routes: [{name: 'Home'}]});
}, [navigation, closeSheet]);
// const handleDiscard = React.useCallback(() => {
// closeSheet();
// navigation.reset({index: 0, routes: [{name: 'Home'}]});
// }, [navigation, closeSheet]);

return (
<>
Expand All @@ -108,15 +108,15 @@ export const PresetChooser: NativeNavigationComponent<'PresetChooser'> = ({
numColumns={numColumns}
/>
</View>
<DiscardModal
{/* <DiscardModal
bottomSheetRef={sheetRef}
isOpen={isOpen}
closeSheet={closeSheet}
title={deleteObservationMessages.discardObservation}
description={deleteObservationMessages.discardObservationDescription}
discardButtonText={deleteObservationMessages.discardObservationButton}
handleDiscard={handleDiscard}
/>
/> */}
</>
);
};
Expand Down
166 changes: 0 additions & 166 deletions src/frontend/sharedComponents/CustomHeaderLeftClose.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import React, {FC, RefObject} from 'react';
import {BottomSheetModalMethods} from '@gorhom/bottom-sheet/lib/typescript/types';
import {BottomSheetContent, BottomSheetModal} from '../BottomSheetModal';
import DiscardIcon from '../images/delete.svg';
import ErrorIcon from '../images/Error.svg';
import {MessageDescriptor, defineMessages, useIntl} from 'react-intl';

const m = defineMessages({
defaultButton: {
id: 'sharedComponents.DiscardModal.defaultButton',
defaultMessage: 'Continue Editing',
},
});

export interface DiscardModal {
closeSheet: () => void;
title: MessageDescriptor;
description: MessageDescriptor;
handleDiscard: () => void;
discardButtonText: MessageDescriptor;
}

export const DiscardModal: FC<DiscardModal> = props => {
const {formatMessage} = useIntl();

return (
<BottomSheetContent
title={formatMessage(props.title)}
description={formatMessage(props.description)}
buttonConfigs={[
{
variation: 'filled',
dangerous: true,
onPress: props.handleDiscard,
text: formatMessage(props.discardButtonText),
icon: <DiscardIcon />,
},
{
onPress: closeSheet,
text: formatMessage(m.defaultButton),
variation: 'outlined',
},
]}
icon={<ErrorIcon width={60} height={60} style={{marginBottom: 15}} />}
/>
);
};
Loading

0 comments on commit ef3fd6d

Please sign in to comment.