diff --git a/src/screens/Amicale/Clubs/ClubListScreen.tsx b/src/screens/Amicale/Clubs/ClubListScreen.tsx
index 260ad1b..5d4debb 100644
--- a/src/screens/Amicale/Clubs/ClubListScreen.tsx
+++ b/src/screens/Amicale/Clubs/ClubListScreen.tsx
@@ -93,7 +93,7 @@ function ClubListScreen() {
headerTitleContainerStyle:
Platform.OS === 'ios'
? { marginHorizontal: 0, width: '70%' }
- : { marginHorizontal: 0, right: 50, left: 50 },
+ : { width: '100%' },
});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [navigation]);
diff --git a/src/screens/Planex/GroupSelectionScreen.tsx b/src/screens/Planex/GroupSelectionScreen.tsx
index e09b00a..aafc9d3 100644
--- a/src/screens/Planex/GroupSelectionScreen.tsx
+++ b/src/screens/Planex/GroupSelectionScreen.tsx
@@ -81,6 +81,15 @@ function GroupSelectionScreen() {
const favoriteGroups = getFavoriteGroups();
useLayoutEffect(() => {
+ const getSearchBar = () => {
+ return (
+ // @ts-ignore
+
+ );
+ };
navigation.setOptions({
headerTitle: getSearchBar,
headerBackTitleVisible: false,
@@ -91,16 +100,6 @@ function GroupSelectionScreen() {
});
}, [navigation]);
- const getSearchBar = () => {
- return (
- // @ts-ignore
-
- );
- };
-
/**
* Gets a render item for the given article
*
diff --git a/src/screens/Services/Proximo/ProximoListScreen.tsx b/src/screens/Services/Proximo/ProximoListScreen.tsx
index 2f67cc6..8bf2009 100644
--- a/src/screens/Services/Proximo/ProximoListScreen.tsx
+++ b/src/screens/Services/Proximo/ProximoListScreen.tsx
@@ -120,6 +120,7 @@ function ProximoListScreen(props: Props) {
const theme = useTheme();
const { articles, setArticles } = useCachedProximoArticles();
const modalRef = useRef(null);
+ const navParams = props.route.params;
const [currentSearchString, setCurrentSearchString] = useState('');
const [currentSortMode, setCurrentSortMode] = useState(2);
@@ -130,6 +131,70 @@ function ProximoListScreen(props: Props) {
const sortModes = [sortPrice, sortPriceReverse, sortName, sortNameReverse];
useLayoutEffect(() => {
+ const getSearchBar = () => {
+ return (
+ // @ts-ignore
+
+ );
+ };
+ const getModalSortMenu = () => {
+ return (
+
+
+ {i18n.t('screens.proximo.sortOrder')}
+
+
+
+
+
+
+
+
+ );
+ };
+ const setSortMode = (mode: string) => {
+ const currentMode = parseInt(mode, 10);
+ setCurrentSortMode(currentMode);
+ if (modalRef.current && currentMode !== currentSortMode) {
+ modalRef.current.close();
+ }
+ };
+ const getSortMenuButton = () => {
+ return (
+
+ - {
+ setModalCurrentDisplayItem(getModalSortMenu());
+ if (modalRef.current) {
+ modalRef.current.open();
+ }
+ }}
+ />
+
+ );
+ };
+
navigation.setOptions({
headerRight: getSortMenuButton,
headerTitle: getSearchBar,
@@ -137,21 +202,9 @@ function ProximoListScreen(props: Props) {
headerTitleContainerStyle:
Platform.OS === 'ios'
? { marginHorizontal: 0, width: '70%' }
- : { marginHorizontal: 0, right: 50, left: 50 },
+ : { width: '100%' },
});
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [navigation, currentSortMode]);
-
- /**
- * Callback used when clicking on the sort menu button.
- * It will open the modal to show a sort selection
- */
- const onSortMenuPress = () => {
- setModalCurrentDisplayItem(getModalSortMenu());
- if (modalRef.current) {
- modalRef.current.open();
- }
- };
+ }, [navigation, currentSortMode, navParams.shouldFocusSearchBar]);
/**
* Callback used when clicking an article in the list.
@@ -166,19 +219,6 @@ function ProximoListScreen(props: Props) {
}
};
- /**
- * Sets the current sort mode.
- *
- * @param mode The number representing the mode
- */
- const setSortMode = (mode: string) => {
- const currentMode = parseInt(mode, 10);
- setCurrentSortMode(currentMode);
- if (modalRef.current && currentMode !== currentSortMode) {
- modalRef.current.close();
- }
- };
-
/**
* Gets a color depending on the quantity available
*
@@ -197,35 +237,6 @@ function ProximoListScreen(props: Props) {
return color;
};
- /**
- * Gets the sort menu header button
- *
- * @return {*}
- */
- const getSortMenuButton = () => {
- return (
-
-