fix(settings): restrict iOS app icon navigation to non-desktop devices

neuland-ingolstadt · Oct 21, 2024 · 8c0dc56 · 8c0dc56
1 parent 8a9bad8
commit 8c0dc56
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/app.config.json b/app.config.json
@@ -44,7 +44,7 @@
         "android": {
             "package": "app.neuland",
             "userInterfaceStyle": "automatic",
-            "versionCode": 178,
+            "versionCode": 179,
             "splash": {
                 "image": "./src/assets/splash/splashLight.png",
                 "resizeMode": "contain",

diff --git a/src/app/(screens)/clEvent.tsx b/src/app/(screens)/clEvent.tsx
@@ -133,12 +133,7 @@ export default function ClEventDetail(): JSX.Element {
             ? [
                   {
                       header: t('pages.event.description'),
-                      items: [
-                          {
-                              value: clEvent?.description,
-                              layout: 'column' as any,
-                          },
-                      ],
+                      item: clEvent?.description,
                   },
               ]
             : []),
@@ -175,10 +170,10 @@ export default function ClEventDetail(): JSX.Element {
                     await Share.share({
                         message: t('pages.event.shareMessage', {
                             title: clEvent?.title,
-
                             organizer: clEvent?.organizer,
-                            date: formatFriendlyDateTime(
-                                clEvent?.begin as unknown as string
+                            date: formatFriendlyDateTimeRange(
+                                new Date(clEvent?.begin as unknown as string),
+                                new Date(clEvent?.end as unknown as string)
                             ),
                         }),
                     })

diff --git a/src/app/(screens)/settings.tsx b/src/app/(screens)/settings.tsx
@@ -42,6 +42,7 @@ import {
     Text,
     View,
 } from 'react-native'
+import DeviceInfo from 'react-native-device-info'
 import Animated, {
     cancelAnimation,
     useAnimatedStyle,
@@ -276,7 +277,8 @@ export default function Settings(): JSX.Element {
                         router.navigate('theme')
                     },
                 },
-                ...(Platform.OS === 'ios'
+                ...(Platform.OS === 'ios' &&
+                DeviceInfo.getDeviceType() !== 'Desktop'
                     ? [
                           {
                               title: 'App Icon',

diff --git a/src/localization/de/common.json b/src/localization/de/common.json
@@ -178,7 +178,7 @@
             "optional": "Optional",
             "invitationLink": "Einladungslink",
             "eMail": "E-Mail",
-            "shareMessage": "Schau dir dieses Event an: {{title}} von {{organizer}} um {{date}}\nhttps://neuland.app/events"
+            "shareMessage": "Schau dir dieses Event an:\n{{title}} von {{organizer}} um {{date}}\nhttps://neuland.app/events"
         },
         "map": {
             "search": {

diff --git a/src/localization/en/common.json b/src/localization/en/common.json
@@ -178,7 +178,7 @@
             "optional": "Optional",
             "invitationLink": "Invitation link",
             "eMail": "E-Mail",
-            "shareMessage": "Check out this event: {{title}} by {{organizer}} on {{date}}\nhttps://neuland.app/events"
+            "shareMessage": "Check out this event:\n{{title}} by {{organizer}} on {{date}}\nhttps://neuland.app/events"
         },
         "map": {
             "search": {