Merge branch 'main' into hotfix/461-offering-lecture-hours

polito · Apr 15, 2024 · 51bf07d · 51bf07d
2 parents 62d1696 + 88b70ba
commit 51bf07d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/ios/students/Info.plist b/ios/students/Info.plist
@@ -33,7 +33,7 @@
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Access to current position to check-in bookings</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-    <string>Check in bookings</string>
+    <string>Access to current position to check-in bookings</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Scan documents and pick images for assignments and ticket attachments</string>
 	<key>UIAppFonts</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polito/students-app",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "private": true,
   "scripts": {
     "android": "react-native run-android --active-arch-only --appIdSuffix=dev",

diff --git a/src/features/places/components/MarkersLayer.tsx b/src/features/places/components/MarkersLayer.tsx
@@ -167,7 +167,7 @@ export const MarkersLayer = ({
             symbolSortKey: ['get', 'priority'],
             textField: ['get', 'name'],
             textSize: fontSizes['2xs'],
-            textFont: ['Open Sans Semibold', 'Arial Unicode MS Regular'],
+            textFont: ['Open Sans Semibold'],
             textColor: ['get', 'color'],
             textOffset: [0, 1.2],
             textAnchor: 'top',

diff --git a/src/features/places/components/PlacesNavigator.tsx b/src/features/places/components/PlacesNavigator.tsx
@@ -95,8 +95,13 @@ export const PlacesNavigator = () => {
           attributionEnabled: false,
           compassEnabled: true,
           compassFadeWhenNorth: true,
-          styleJSON:
-            '{"version":8,"sources":{},"layers":[],"glyphs":"mapbox://fonts/mapbox/{fontstack}/{range}.pbf"}',
+          styleJSON: JSON.stringify({
+            version: 8,
+            glyphs:
+              'https://app.didattica.polito.it/maps_fonts/{fontstack}/{range}.pbf',
+            sources: {},
+            layers: [],
+          }),
         },
         mapDefaultContent: (
           <>

diff --git a/src/features/places/screens/PlacesScreen.tsx b/src/features/places/screens/PlacesScreen.tsx
@@ -397,7 +397,7 @@ export const PlacesScreen = ({ navigation, route }: Props) => {
       )}
 
       <Animated.View style={[styles.controls, controlsAnimatedStyle]}>
-        <Row gap={3} align="center" justify="space-between">
+        <Row gap={3} align="stretch" justify="space-between">
           <TranslucentCard>
             <IconButton
               icon={faCrosshairs}
@@ -527,7 +527,7 @@ const createStyles = ({ spacing }: Theme) =>
       marginBottom: spacing[2],
     },
     icon: {
+      alignItems: 'center',
       paddingHorizontal: spacing[3],
-      paddingVertical: spacing[2.5],
     },
   });