Merge pull request #248 from AlexTelon/dev

Dev

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "docwriter.style": "Auto-detect"
-}
+  "docwriter.style": "Auto-detect",
+  "java.configuration.updateBuildConfiguration": "interactive"
+}

README.md

@@ -18,6 +18,8 @@ Make sure that the extension Flutter is installed and enabled.
 
 If you get prompted that some packages are missing, press download. Else, go to pubspec.yaml and and download the packages from there, or download from the terminal by entering `flutter pub get`
 
+Follow the instructions in the documentation file on how to start the app in iOS and android simulators.
+
 The app can now be started with either the command `flutter run` or by going to main.dart. If you have a connected supported Android or IOS device, or an emulator up and running, the app should launch fine. :)
 
 ### Versions

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         jcenter()
@@ -11,7 +11,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
     }
 }
 
@@ -32,6 +32,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

documentation/internal-team-documentation/Notes - Sprint Planning & Retrospective.md

@@ -0,0 +1,42 @@
+# Notes - Sprint Planning & Retrospective
+**Sprint 1**
+- The Sprint backlog is set for Sprint 1.
+- We agreed upon prioritizing to get all of the legacy system up and running (both devices) for all team members and test lead before starting any of the other sprint backlog items
+- Since some of the team members have had trouble getting it to work on both devices, time estimation of the items will be done during a daily meeting instead.
+- Once that is done the backlog item regarding changing the splashscreen package to a newer version has to be handled.
+- Google maps API key is currently being handled by Alex and Robin.
+- Test lead have an important item this Sprint regarding updating the workflow yaml file so pushes to the repo goes through properly without complaining.
+
+  **Retrospective Summery Sprint 1**
+  - The application is now fully functional on both devices, with two new UIs implemented. Deprecated dependencies and packages have been updated, and crucial documentation was received. The Scrum method is streamlining development, and cross-platform and native squads are aligning efforts. However, backlog grooming for Sprint 2 needs improvement, and communication with late arrivals must be enhanced. The team had a positive feeling during the retrospective, and a new Git workflow was introduced, but the Google Maps API key is still pending. Reflecting on the product, there were successes in UI development and documentation, but delays in documentation delivery and missing API keys were noted. Technology updates and Git workflow implementation were positive, though repository updates took time. The Scrum process has been fully adapted, with open dialogue and constructive feedback. Overall, the team is making progress, but there's room for improvement in certain areas, particularly in communication and documentation management.
+
+ **Sprint 2**
+ - The Sprint backlog is set for Sprint 2.
+ - We agreed on putting our focus on UI related items and once they are done switch the focus to the backend functionality for these UI related items.
+ - 3 backlog items regarding bug fixing is also on the agenda for this sprint but they will be focused later in the sprint.
+ - A lot of backlog items regarding testing is also on the table for this sprint.
+ - The native squad also has their focus on UI related backlog items this sprint so that our squads work towards the same direction.
+
+   **Retrospective Summery Sprint 2**
+   - In summary, the team has made effective progress through cooperation with other squads and gained valuable insights from a Scrum Master workshop with Bruce. However, time dedicated to an AI assignment affected overall productivity. The team demonstrated agility in handling setbacks and communicates well. We successfully implemented new UI screens and maintained project documentation. Despite these accomplishments, we faced challenges with missing backend functionality due to absent API endpoints and the ongoing quest for a Google Maps API key. Our communication and collaboration efforts with other squads have improved, but we reflected on the need for better-defined sprint goal and enhanced communication practices. Additionally, there is some uncertainty caused by conflicting opinions on Scrum practices from different sources. 
+
+**Sprint 3**
+- The sprint backlog is set for Sprint 3.
+- Sprint Goal: Get the charging functionality to properly work
+- The main focus this sprint will be getting the charging process to work and therefore is most of sprint backlog items related to that.
+- There are also some items related to some UI fixes.
+- Our test lead focus will be on preparing tests for the disred charging functionality.
+
+   **Retrospective Summery Sprint 3**
+  - In sum, the sprint exhibited a commendable level of team focus, demonstrating significant progress toward the ultimate goal of delivering a comprehensive product. Noteworthy achievements include the successful implementation of the charging process, encompassing payment integration with Klarna, albeit solely with mock data and not yet with live data sourced from the backend. It has become apparent, however, that our team's reliance on the backend squad has presented certain limitations, hindering the sprint's overall efficiency.
+A prominent positive aspect of this sprint was the lucidity and specificity of our sprint goal, which facilitated alignment among team members, fostering a cohesive work environment. Nevertheless, it became evident that more time than initially anticipated was requisite for the complete realization of this goal. Furthermore, the sprint was characterized by effective intra-team and inter-team communication, particularly with the native squad.
+On the other hand, it has become increasingly apparent that communication with the backend squad must undergo improvement in preparation for the forthcoming sprint.
+
+
+**Sprint 4**
+- Sprint Goal: Get the charging process to work with live metrics from the backend including payment method and QR scan a charger.
+- The main focus will be to get the charging process to work with live metrics from the backend.
+- There are also som bug fixing that is related to the charging process that is being focused this week (QR scan a charger)
+- The payment bug with klarna will also have a high priority.
+- Other than that, some UI features will be implemented in line with the native sqaud.
+- The test lead will be focused on testing the bug fixes and the charging process. 

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -36,8 +36,14 @@ end
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
+     flutter_additional_ios_build_settings(target)
+      target.build_configurations.each do |config|
+        xcconfig_path = config.base_configuration_reference.real_path
+        xcconfig = File.read(xcconfig_path)
+        xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+        File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
+      end
   end
 end
 
-pod "KlarnaMobileSDK", "2.2.3"
+pod "KlarnaMobileSDK"

ios/Podfile.lock

@@ -1,55 +1,148 @@
 PODS:
   - Flutter (1.0.0)
+  - flutter_secure_storage (6.0.0):
+    - Flutter
   - geolocator_apple (1.2.0):
     - Flutter
   - google_maps_flutter_ios (0.0.1):
     - Flutter
-    - GoogleMaps
-  - GoogleMaps (7.1.0):
-    - GoogleMaps/Maps (= 7.1.0)
-  - GoogleMaps/Base (7.1.0)
-  - GoogleMaps/Maps (7.1.0):
+    - GoogleMaps (< 8.0)
+  - GoogleDataTransport (9.2.5):
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleMaps (7.4.0):
+    - GoogleMaps/Maps (= 7.4.0)
+  - GoogleMaps/Base (7.4.0)
+  - GoogleMaps/Maps (7.4.0):
     - GoogleMaps/Base
-  - KlarnaMobileSDK (2.2.3):
-    - KlarnaMobileSDK/full (= 2.2.3)
-  - KlarnaMobileSDK/full (2.2.3)
-  - MTBBarcodeScanner (5.0.11)
-  - qr_code_scanner (0.2.0):
+  - GoogleMLKit/BarcodeScanning (3.2.0):
+    - GoogleMLKit/MLKitCore
+    - MLKitBarcodeScanning (~> 2.2.0)
+  - GoogleMLKit/MLKitCore (3.2.0):
+    - MLKitCommon (~> 8.0.0)
+  - GoogleToolboxForMac/DebugUtils (2.3.2):
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+  - GoogleToolboxForMac/Defines (2.3.2)
+  - GoogleToolboxForMac/Logger (2.3.2):
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+  - "GoogleToolboxForMac/NSData+zlib (2.3.2)":
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+  - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)":
+    - GoogleToolboxForMac/DebugUtils (= 2.3.2)
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+    - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
+  - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
+  - GoogleUtilities/Environment (7.11.5):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.11.5):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/UserDefaults (7.11.5):
+    - GoogleUtilities/Logger
+  - GoogleUtilitiesComponents (1.1.0):
+    - GoogleUtilities/Logger
+  - GTMSessionFetcher/Core (1.7.2)
+  - KlarnaMobileSDK (2.6.10):
+    - KlarnaMobileSDK/full (= 2.6.10)
+  - KlarnaMobileSDK/full (2.6.10)
+  - MLImage (1.0.0-beta3)
+  - MLKitBarcodeScanning (2.2.0):
+    - MLKitCommon (~> 8.0)
+    - MLKitVision (~> 4.2)
+  - MLKitCommon (8.0.0):
+    - GoogleDataTransport (~> 9.0)
+    - GoogleToolboxForMac/Logger (~> 2.1)
+    - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
+    - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
+    - GoogleUtilities/UserDefaults (~> 7.0)
+    - GoogleUtilitiesComponents (~> 1.0)
+    - GTMSessionFetcher/Core (~> 1.1)
+    - Protobuf (~> 3.12)
+  - MLKitVision (4.2.0):
+    - GoogleToolboxForMac/Logger (~> 2.1)
+    - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
+    - GTMSessionFetcher/Core (~> 1.1)
+    - MLImage (= 1.0.0-beta3)
+    - MLKitCommon (~> 8.0)
+    - Protobuf (~> 3.12)
+  - mobile_scanner (0.0.1):
+    - Flutter
+    - GoogleMLKit/BarcodeScanning (~> 3.2.0)
+  - nanopb (2.30909.0):
+    - nanopb/decode (= 2.30909.0)
+    - nanopb/encode (= 2.30909.0)
+  - nanopb/decode (2.30909.0)
+  - nanopb/encode (2.30909.0)
+  - PromisesObjC (2.3.1)
+  - Protobuf (3.24.4)
+  - shared_preferences_foundation (0.0.1):
     - Flutter
-    - MTBBarcodeScanner
+    - FlutterMacOS
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
+  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
-  - KlarnaMobileSDK (= 2.2.3)
-  - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
+  - KlarnaMobileSDK
+  - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
 
 SPEC REPOS:
   trunk:
+    - GoogleDataTransport
     - GoogleMaps
+    - GoogleMLKit
+    - GoogleToolboxForMac
+    - GoogleUtilities
+    - GoogleUtilitiesComponents
+    - GTMSessionFetcher
     - KlarnaMobileSDK
-    - MTBBarcodeScanner
+    - MLImage
+    - MLKitBarcodeScanning
+    - MLKitCommon
+    - MLKitVision
+    - nanopb
+    - PromisesObjC
+    - Protobuf
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
+  flutter_secure_storage:
+    :path: ".symlinks/plugins/flutter_secure_storage/ios"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/ios"
   google_maps_flutter_ios:
     :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
-  qr_code_scanner:
-    :path: ".symlinks/plugins/qr_code_scanner/ios"
+  mobile_scanner:
+    :path: ".symlinks/plugins/mobile_scanner/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   geolocator_apple: b741765c55dc21950e3e106e8b3584e55cf81ce5
-  google_maps_flutter_ios: 66201f392bf62d500f07670a30488a247b9bb5b9
-  GoogleMaps: bc56ffb0324e345a2d91bac1a64a920f9c8f1b20
-  KlarnaMobileSDK: fd45c3323345347a866d44b5bc00178ddb11c87b
-  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
+  google_maps_flutter_ios: abdac20d6ce8931f6ebc5f46616df241bfaa2cfd
+  GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
+  GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
+  GoogleMLKit: 0017a6a8372e1a182139b9def4d89be5d87ca5a7
+  GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
+  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
+  GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
+  GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba
+  KlarnaMobileSDK: 7cbd171e0bec5128bbd732b87967941045817d84
+  MLImage: 489dfec109f21da8621b28d476401aaf7a0d4ff4
+  MLKitBarcodeScanning: d92fe1911001ec36870162c5a0eb206f612b7169
+  MLKitCommon: f6da6c5659618c070b50a80db01248ebe2964175
+  MLKitVision: 96c96571190b7f63eddf4a12068ce8a8689e0d2c
+  mobile_scanner: 0cf06f3d5224576aa24ade02a6f73d8b2551c7bf
+  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
+  PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  Protobuf: 351e9022fe13a6e2af00e9aefc22077cb88520f8
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
 
-PODFILE CHECKSUM: 4f0f4cc041961986b1e84e15e58b9cdd68e52964
+PODFILE CHECKSUM: c85171f42754331f5f1cbc3c374e7daddf469cdc
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.13.0

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -165,7 +165,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -369,7 +369,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -448,7 +448,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -497,7 +497,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -581,4 +581,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Info.plist

@@ -62,5 +62,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>