Merge pull request #40 from simonyiszk/map-improvements

Map improvements
simonyiszk · Mar 2, 2024 · c6cf6f5 · c6cf6f5
2 parents 7a54fe4 + 49a93be
commit c6cf6f5
Show file tree

Hide file tree

Showing 8 changed files with 398 additions and 484 deletions.
diff --git a/app/(tabs)/map.tsx b/app/(tabs)/map.tsx
@@ -7,17 +7,15 @@ import { Header } from '../../components/common/header';
 import { Title } from '../../components/common/title';
 import { Map } from '../../components/map/map';
 import { ResourceSheet } from '../../components/map/resource-sheet';
-import { MapResources_en } from '../../content/map-resources-en.content';
-import { MapResources_hu } from '../../content/map-resources-hu.content';
+import { MapResources_hu } from '../../content/map-resources.content';
 import { MapResource } from '../../types/map.type';
 
 export default function MapPage() {
   const { t } = useTranslation();
   const [selectedResource, setSelectedResource] = useState<MapResource>();
 
   const onSelectedResource = (id: string) => {
-    const localizedResource = t('map.key') === 'hu' ? MapResources_hu : MapResources_en;
-    const res = localizedResource.find((r) => r.id === id);
+    const res = MapResources_hu.find((r) => r.id === id);
     setSelectedResource(res);
   };
 
@@ -26,7 +24,13 @@ export default function MapPage() {
       <Header>
         <Title>{t('tabbar.map')}</Title>
       </Header>
-      <ReactNativeZoomableViewWithGestures initialZoom={0.5} maxZoom={2} contentHeight={1332} contentWidth={846}>
+      <ReactNativeZoomableViewWithGestures
+        panBoundaryPadding={200}
+        initialZoom={0.5}
+        maxZoom={2}
+        contentHeight={1332}
+        contentWidth={846}
+      >
         <Map selectedResource={selectedResource?.id} onSelectedResource={onSelectedResource} />
       </ReactNativeZoomableViewWithGestures>
       <ResourceSheet resource={selectedResource} />

diff --git a/components/map/map.tsx b/components/map/map.tsx
diff --git a/components/map/resource-sheet.tsx b/components/map/resource-sheet.tsx
@@ -30,11 +30,11 @@ export function ResourceSheet({ resource, className, ...props }: ResourceSheetPr
           outputRange: [0, 400],
         }),
       }}
-      className={cn('bg-white -mt-10 dark:bg-slate-800 pb-40 rounded-t-2xl px-5 pt-5 space-y-2', className)}
+      className={cn('bg-white -mt-10 dark:bg-slate-800 pb-32 rounded-t-2xl px-5 pt-5 space-y-2', className)}
       {...props}
     >
       <StyledText className='text-2xl'>{savedResource?.title}</StyledText>
-      <StyledText className='text-slate-500'>{savedResource?.description}</StyledText>
+      <StyledText className='text-slate-500 text-lg'>{savedResource?.description.hu}</StyledText>
     </Animated.View>
   );
 }
diff --git a/content/map-resources-en.content.ts b/content/map-resources-en.content.ts
diff --git a/content/map-resources-hu.content.ts b/content/map-resources-hu.content.ts