Merge pull request #22 from reedu-reengineering-education/feat/create…

…-new-box Feat/create new box
reedu-reengineering-education · Nov 3, 2023 · a4efb88 · a4efb88
2 parents 672837b + ce92ef2
commit a4efb88
Show file tree

Hide file tree

Showing 14 changed files with 405 additions and 167 deletions.
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-bluetooth-le')
     implementation project(':capacitor-app')
+    implementation project(':capacitor-geolocation')
     implementation project(':capacitor-preferences')
     implementation project(':felixerdy-background-geolocation')
 

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -8,6 +8,9 @@ project(':capacitor-community-bluetooth-le').projectDir = new File('../node_modu
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
 
+include ':capacitor-geolocation'
+project(':capacitor-geolocation').projectDir = new File('../node_modules/@capacitor/geolocation/android')
+
 include ':capacitor-preferences'
 project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
 

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -13,6 +13,7 @@ def capacitor_pods
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCommunityBluetoothLe', :path => '../../node_modules/@capacitor-community/bluetooth-le'
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
+  pod 'CapacitorGeolocation', :path => '../../node_modules/@capacitor/geolocation'
   pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
   pod 'FelixerdyBackgroundGeolocation', :path => '../../node_modules/@felixerdy/background-geolocation'
 end

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -6,6 +6,8 @@ PODS:
   - CapacitorCommunityBluetoothLe (3.0.2):
     - Capacitor
   - CapacitorCordova (5.5.0)
+  - CapacitorGeolocation (5.0.6):
+    - Capacitor
   - CapacitorPreferences (5.0.6):
     - Capacitor
   - FelixerdyBackgroundGeolocation (0.0.1):
@@ -16,6 +18,7 @@ DEPENDENCIES:
   - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
   - "CapacitorCommunityBluetoothLe (from `../../node_modules/@capacitor-community/bluetooth-le`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
+  - "CapacitorGeolocation (from `../../node_modules/@capacitor/geolocation`)"
   - "CapacitorPreferences (from `../../node_modules/@capacitor/preferences`)"
   - "FelixerdyBackgroundGeolocation (from `../../node_modules/@felixerdy/background-geolocation`)"
 
@@ -28,6 +31,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor-community/bluetooth-le"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
+  CapacitorGeolocation:
+    :path: "../../node_modules/@capacitor/geolocation"
   CapacitorPreferences:
     :path: "../../node_modules/@capacitor/preferences"
   FelixerdyBackgroundGeolocation:
@@ -38,9 +43,10 @@ SPEC CHECKSUMS:
   CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
   CapacitorCommunityBluetoothLe: 83b0de348b2ec461e0f9fa0e48c9e79c8378ddb0
   CapacitorCordova: 3d3908a3d208a11a75f9df3b18c4405c4de76e1d
+  CapacitorGeolocation: 7be5f77abc205c0efe319fff8587a7183e7b0240
   CapacitorPreferences: f03954bcb0ff09c792909e46bff88e3183c16b10
   FelixerdyBackgroundGeolocation: 1e6a92a836b58a62b20e0eb6b78bff201265deb8
 
-PODFILE CHECKSUM: f2e3708e22e094f8a9b03f2e5f0e3688df829e58
+PODFILE CHECKSUM: cd5890a32fa9a1bf24ccec4e54b55f6d47a564c8
 
 COCOAPODS: 1.14.0
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "@capacitor/android": "^5.3.0",
     "@capacitor/app": "^5.0.6",
     "@capacitor/core": "^5.3.0",
+    "@capacitor/geolocation": "^5.0.6",
     "@capacitor/ios": "^5.3.0",
     "@capacitor/preferences": "^5.0.6",
     "@felixerdy/background-geolocation": "1.2.15",

diff --git a/src/components/Device/DeviceMapWrapper.tsx b/src/components/Device/DeviceMapWrapper.tsx
@@ -25,7 +25,7 @@ export default function DeviceMapWrapper() {
 
   return (
     <div className="flex h-full w-full portrait:flex-col">
-      <div className="portrait:border-b-2 landscape:border-r-2">
+      <div className="portrait:border-b landscape:border-r-2">
         <MeasurementsGrid />
       </div>
       <div className="relative h-full w-full">

diff --git a/src/components/Device/SettingsDrawer.tsx b/src/components/Device/SettingsDrawer.tsx
@@ -87,8 +87,8 @@ export default function SettingsDrawer() {
         <Cog className="w-6" />
       </Drawer.Trigger>
       <Drawer.Portal>
-        <Drawer.Overlay className="fixed inset-0 bg-black/40" />
-        <Drawer.Content className="fixed bottom-0 left-0 right-0 z-10 mt-24 flex max-h-[75%] flex-col rounded-t-lg bg-background pb-safe focus:outline-none">
+        <Drawer.Overlay className="fixed inset-0 z-20 bg-black/60" />
+        <Drawer.Content className="fixed bottom-0 left-0 right-0 z-30 mt-24 flex max-h-[75%] flex-col rounded-t-lg border-t bg-background focus:outline-none">
           <div className="flex-1 overflow-auto rounded-t-[10px] p-4">
             <div className="mx-auto mb-8 h-1.5 w-12 flex-shrink-0 rounded-full bg-muted" />
             <div className="mx-auto max-w-md">
@@ -168,7 +168,7 @@ export default function SettingsDrawer() {
 
 function SettingsDrawerFooter() {
   return (
-    <div className="mt-auto border-t bg-muted p-4">
+    <div className="mt-auto border-t bg-muted p-4 pb-safe">
       <div className="mx-auto flex max-w-md justify-end gap-6">
         <a
           className="gap-0.25 flex items-center text-xs text-muted-foreground"