onboaring & qr scanning improvements

diepoe · Jan 31, 2023 · fa02252 · fa02252
1 parent 5c96792
commit fa02252
Show file tree

Hide file tree

Showing 12 changed files with 235 additions and 45 deletions.
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -10,6 +10,8 @@ android {
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-barcode-scanner')
+    implementation project(':capacitor-community-sqlite')
+    implementation project(':capacitor-geolocation')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-toast')
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="diepoe.heggame">
+<?xml version="1.0" encoding="utf-8" ?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="diepoe.heggame">
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -27,16 +29,20 @@
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
         </provider>
     </application>
 
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
-    
+
     <!-- camera permission for qr-code scanning-->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
-</manifest>
+
+    <!-- geolocation permission for compass helping feature -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-feature android:name="android.hardware.location.gps" />
+</manifest>
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -5,6 +5,12 @@ project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capa
 include ':capacitor-community-barcode-scanner'
 project(':capacitor-community-barcode-scanner').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor-community/barcode-scanner/android')
 
+include ':capacitor-community-sqlite'
+project(':capacitor-community-sqlite').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor-community/sqlite/android')
+
+include ':capacitor-geolocation'
+project(':capacitor-geolocation').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/geolocation/android')
+
 include ':capacitor-haptics'
 project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/haptics/android')
 

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -45,5 +45,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Der Standort wird zur Assistenz in der Gebäudeführung benötigt</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Der Standort wird zur Assistenz in der Gebäudeführung benötigt</string>
 </dict>
 </plist>
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -12,6 +12,8 @@ def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/ios'
   pod 'CapacitorCommunityBarcodeScanner', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor-community/barcode-scanner'
+  pod 'CapacitorCommunitySqlite', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor-community/sqlite'
+  pod 'CapacitorGeolocation', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/geolocation'
   pod 'CapacitorHaptics', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/haptics'
   pod 'CapacitorToast', :path => '../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/toast'
 end

diff --git a/package.json b/package.json
@@ -34,12 +34,16 @@
 	"type": "module",
 	"dependencies": {
 		"@capacitor-community/barcode-scanner": "^3.0.1",
+		"@capacitor-community/sqlite": "4.6.1-2",
 		"@capacitor/android": "^4.6.2",
 		"@capacitor/assets": "^2.0.4",
 		"@capacitor/cli": "^4.6.2",
 		"@capacitor/core": "^4.6.2",
+		"@capacitor/geolocation": "^4.1.0",
 		"@capacitor/haptics": "^4.1.0",
 		"@capacitor/ios": "^4.6.2",
-		"@capacitor/toast": "^4.1.0"
+		"@capacitor/toast": "^4.1.0",
+		"@types/node": "^18.11.18",
+		"sql.js": "^1.8.0"
 	}
 }