refactor: Split up PopUpCard component, update i18n configuration, an…

…d improve login form error handling
neuland-ingolstadt · Aug 9, 2024 · 941e74c · 941e74c
1 parent 7e7beda
commit 941e74c
Show file tree

Hide file tree

Showing 68 changed files with 925 additions and 1,088 deletions.
diff --git a/app.config.json b/app.config.json
@@ -25,7 +25,8 @@
                 "CFBundleAllowMixedLocalizations": true,
                 "CFBundleLocalizations": ["en", "de"],
                 "CFBundleDevelopmentRegion": "en",
-                "UIViewControllerBasedStatusBarAppearance": true
+                "UIViewControllerBasedStatusBarAppearance": true,
+                "NSLocationWhenInUseUsageDescription": "Allow Neuland Next to access your location to show your location on the map."
             },
             "splash": {
                 "image": "./src/assets/splash/splashLight.png",
@@ -38,6 +39,10 @@
             },
             "icon": "./src/assets/appIcons/default.png"
         },
+        "locales": {
+            "en-US": "./src/localization/en/ios.json",
+            "de-DE": "./src/localization/de/ios.json"
+        },
         "androidStatusBar": {
             "translucent": true
         },

diff --git a/bun.lockb b/bun.lockb
diff --git a/ios/NeulandNext.xcodeproj/project.pbxproj b/ios/NeulandNext.xcodeproj/project.pbxproj
diff --git a/ios/NeulandNext.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/NeulandNext.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "e70d3525c8e2819a8b34f22909815dab5c700c25a06c32388f3930f7b3627768",
+  "originHash" : "b440cbd994821d1c59ef3fae39cdd359458004248a336c94f8a8b08f5fed3877",
   "pins" : [
     {
       "identity" : "maplibre-gl-native-distribution",

diff --git a/ios/NeulandNext/Info.plist b/ios/NeulandNext/Info.plist
@@ -1,174 +1,162 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Neuland Next</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundleAlternateIcons</key>
-		<dict>
-			<key>Default</key>
-			<dict>
-				<key>CFBundleIconFiles</key>
-				<array>
-					<string>Default</string>
-				</array>
-				<key>UIPrerenderedIcon</key>
-				<false/>
-			</dict>
-			<key>ModernDark</key>
-			<dict>
-				<key>CFBundleIconFiles</key>
-				<array>
-					<string>ModernDark</string>
-				</array>
-				<key>UIPrerenderedIcon</key>
-				<false/>
-			</dict>
-			<key>ModernGreen</key>
-			<dict>
-				<key>CFBundleIconFiles</key>
-				<array>
-					<string>ModernGreen</string>
-				</array>
-				<key>UIPrerenderedIcon</key>
-				<false/>
-			</dict>
-			<key>RainbowDark</key>
-			<dict>
-				<key>CFBundleIconFiles</key>
-				<array>
-					<string>RainbowDark</string>
-				</array>
-				<key>UIPrerenderedIcon</key>
-				<false/>
-			</dict>
-			<key>RainbowMoonLight</key>
-			<dict>
-				<key>CFBundleIconFiles</key>
-				<array>
-					<string>RainbowMoonLight</string>
-				</array>
-				<key>UIPrerenderedIcon</key>
-				<false/>
-			</dict>
-			<key>Retro</key>
-			<dict>
-				<key>CFBundleIconFiles</key>
-				<array>
-					<string>Retro</string>
-				</array>
-				<key>UIPrerenderedIcon</key>
-				<false/>
-			</dict>
-		</dict>
-	</dict>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>en</string>
-		<string>de</string>
-	</array>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.8.3</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>neuland</string>
-				<string>de.neuland-ingolstadt.neuland-app</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>exp+neuland-app-native</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>71</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<false/>
-		<key>NSAllowsLocalNetworking</key>
-		<true/>
-	</dict>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Allow $(PRODUCT_NAME) to use Face ID.</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Allow $(PRODUCT_NAME) to access your location</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Allow $(PRODUCT_NAME) to access your location</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Allow $(PRODUCT_NAME) to access your location.</string>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-	</array>
-	<key>RCTAsyncStorageExcludeFromBackup</key>
-	<false/>
-	<key>UILaunchStoryboardName</key>
-	<string>SplashScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-	</array>
-	<key>UIRequiresFullScreen</key>
-	<false/>
-	<key>UIStatusBarStyle</key>
-	<string>UIStatusBarStyleDefault</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIUserInterfaceStyle</key>
-	<string>Automatic</string>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
-</dict>
-</plist>
+  <dict>
+    <key>CADisableMinimumFrameDurationOnPhone</key>
+    <true/>
+    <key>CFBundleAllowMixedLocalizations</key>
+    <true/>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleDisplayName</key>
+    <string>Neuland Next</string>
+    <key>CFBundleExecutable</key>
+    <string>$(EXECUTABLE_NAME)</string>
+    <key>CFBundleIcons</key>
+    <dict>
+      <key>CFBundleAlternateIcons</key>
+      <dict>
+        <key>Default</key>
+        <dict>
+          <key>CFBundleIconFiles</key>
+          <array>
+            <string>Default</string>
+          </array>
+          <key>UIPrerenderedIcon</key>
+          <false/>
+        </dict>
+        <key>ModernDark</key>
+        <dict>
+          <key>CFBundleIconFiles</key>
+          <array>
+            <string>ModernDark</string>
+          </array>
+          <key>UIPrerenderedIcon</key>
+          <false/>
+        </dict>
+        <key>ModernGreen</key>
+        <dict>
+          <key>CFBundleIconFiles</key>
+          <array>
+            <string>ModernGreen</string>
+          </array>
+          <key>UIPrerenderedIcon</key>
+          <false/>
+        </dict>
+        <key>RainbowDark</key>
+        <dict>
+          <key>CFBundleIconFiles</key>
+          <array>
+            <string>RainbowDark</string>
+          </array>
+          <key>UIPrerenderedIcon</key>
+          <false/>
+        </dict>
+        <key>RainbowMoonLight</key>
+        <dict>
+          <key>CFBundleIconFiles</key>
+          <array>
+            <string>RainbowMoonLight</string>
+          </array>
+          <key>UIPrerenderedIcon</key>
+          <false/>
+        </dict>
+        <key>Retro</key>
+        <dict>
+          <key>CFBundleIconFiles</key>
+          <array>
+            <string>Retro</string>
+          </array>
+          <key>UIPrerenderedIcon</key>
+          <false/>
+        </dict>
+      </dict>
+    </dict>
+    <key>CFBundleIdentifier</key>
+    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleLocalizations</key>
+    <array>
+      <string>en</string>
+      <string>de</string>
+    </array>
+    <key>CFBundleName</key>
+    <string>$(PRODUCT_NAME)</string>
+    <key>CFBundlePackageType</key>
+    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+    <key>CFBundleShortVersionString</key>
+    <string>0.9.0</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleURLTypes</key>
+    <array>
+      <dict>
+        <key>CFBundleURLSchemes</key>
+        <array>
+          <string>neuland</string>
+          <string>de.neuland-ingolstadt.neuland-app</string>
+        </array>
+      </dict>
+      <dict>
+        <key>CFBundleURLSchemes</key>
+        <array>
+          <string>exp+neuland-app-native</string>
+        </array>
+      </dict>
+    </array>
+    <key>CFBundleVersion</key>
+    <string>71</string>
+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false/>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+      <key>NSAllowsArbitraryLoads</key>
+      <false/>
+      <key>NSAllowsLocalNetworking</key>
+      <true/>
+    </dict>
+    <key>NSFaceIDUsageDescription</key>
+    <string>Allow $(PRODUCT_NAME) to use Face ID.</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>Allow Neuland Next to access your location to show your location on the map.</string>
+    <key>NSUserActivityTypes</key>
+    <array>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+    </array>
+    <key>RCTAsyncStorageExcludeFromBackup</key>
+    <false/>
+    <key>UILaunchStoryboardName</key>
+    <string>SplashScreen</string>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+      <string>arm64</string>
+    </array>
+    <key>UIRequiresFullScreen</key>
+    <false/>
+    <key>UIStatusBarStyle</key>
+    <string>UIStatusBarStyleDefault</string>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationPortraitUpsideDown</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationPortraitUpsideDown</string>
+      <string>UIInterfaceOrientationLandscapeLeft</string>
+      <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UIUserInterfaceStyle</key>
+    <string>Automatic</string>
+    <key>UIViewControllerBasedStatusBarAppearance</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/ios/NeulandNext/NeulandNextRelease.entitlements b/ios/NeulandNext/NeulandNextRelease.entitlements
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>webcredentials:neuland.app</string>
-		<string>activitycontinuation:neuland.app</string>
-	</array>
-</dict>
-</plist>
+  <dict>
+    <key>com.apple.developer.associated-domains</key>
+    <array>
+      <string>webcredentials:neuland.app</string>
+      <string>activitycontinuation:neuland.app</string>
+    </array>
+  </dict>
+</plist>
diff --git a/ios/NeulandNext/Supporting/de-DE.lproj/InfoPlist.strings b/ios/NeulandNext/Supporting/de-DE.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+CFBundleDisplayName = "Neuland Next";
+NSFaceIDUsageDescription = "Erlaube Neuland Next die Verwendung von Face ID.";
+NSLocationWhenInUseUsageDescription = "Erlaube Neuland Next den Zugriff auf deinen Standort, um deine Position auf der Karte anzuzeigen.";
diff --git a/ios/NeulandNext/Supporting/en-US.lproj/InfoPlist.strings b/ios/NeulandNext/Supporting/en-US.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+CFBundleDisplayName = "Neuland Next";
+NSFaceIDUsageDescription = "Allow Neuland Next to use Face ID.";
+NSLocationWhenInUseUsageDescription = "Allow Neuland Next to access your location to show your location on the map.";