From 77d92f53076814d422a62a018bcae95cdf7ec2fc Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sun, 24 May 2020 20:29:50 +1000
Subject: [PATCH] I don't even know. Some magic that I found on the internet...

---
 android/app/build.gradle                  |  2 +-
 android/app/src/debug/AndroidManifest.xml |  2 ++
 android/build.gradle                      | 10 +++++--
 ios/Runner/Info.plist                     |  8 ++++++
 pubspec.lock                              | 32 +++++++++++++++++++++--
 pubspec.yaml                              |  6 +++++
 6 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index bb3ab384..bc44d6eb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -38,7 +38,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "inventree.inventree_app"
-        minSdkVersion 20
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 4c9a6baa..ca5f4fc9 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -4,4 +4,6 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.MICROPHONE"/>
 </manifest>
diff --git a/android/build.gradle b/android/build.gradle
index bb8a3038..9cf5c0ef 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -19,9 +19,15 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
+    project.configurations.all {
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'androidx.core' &&
+                    !details.requested.name.contains('androidx')) {
+                details.useVersion "1.0.2"
+            }
+        }
+    }
 }
 
 task clean(type: Delete) {
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index b2bacc3e..0337b954 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -41,5 +41,13 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSCameraUsageDescription</key>
+    <string>Camera required to upload stock images / test report images / etc</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>Select photos from library to upload to InvenTree</string>
+    <key>NSCameraUsageDescription</key>
+    <string>Take photos using the camera to upload to InvenTree</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Record videos using the camera to upload to InvenTree</string>
 </dict>
 </plist>
diff --git a/pubspec.lock b/pubspec.lock
index 4cd9e59c..6db61833 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -29,6 +29,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.5"
+  camera:
+    dependency: "direct main"
+    description:
+      name: camera
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.8+2"
   charcode:
     dependency: transitive
     description:
@@ -90,6 +97,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.7.5"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.8"
   flutter_speed_dial:
     dependency: "direct main"
     description:
@@ -149,6 +163,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.4"
+  image_picker:
+    dependency: "direct main"
+    description:
+      name: image_picker
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.6+4"
+  image_picker_platform_interface:
+    dependency: transitive
+    description:
+      name: image_picker_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   matcher:
     dependency: transitive
     description:
@@ -171,7 +199,7 @@ packages:
     source: hosted
     version: "0.4.0+18"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"
@@ -192,7 +220,7 @@ packages:
     source: hosted
     version: "0.1.4"
   path_provider:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path_provider
       url: "https://pub.dartlang.org"
diff --git a/pubspec.yaml b/pubspec.yaml
index c2050b56..853a1ad3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,6 +34,12 @@ dependencies:
   flutter_speed_dial: ^1.2.5              # FAB menu elements
   sentry: ^3.0.1                          # Error reporting
   flutter_typeahead: ^1.8.1               # Auto-complete input field
+  image_picker: ^0.6.6                    # Select or take photos
+  #flutter_form_builder:
+
+  camera:
+  path_provider:
+  path:
 
 dev_dependencies:
   flutter_test: