diff --git a/.gitignore b/.gitignore
index 0b6c8f04..f7287c3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ android/key.properties
# Flutter/Dart/Pub related
ios/Flutter/flutter_export_environment.sh
+ios/Flutter/Flutter.podspec
**/doc/api/
.dart_tool/
.flutter-plugins
diff --git a/.gitmodules b/.gitmodules
index 6f815f87..4de5b519 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "lib/l10n"]
path = lib/l10n
- url = git@github.com:SchrodingersGat/inventreeapp.git
+ url = git@github.com:inventree/inventree-app-i18n.git
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1ace8c7a..98276147 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -5,6 +5,40 @@ PODS:
- Flutter
- device_info_plus (0.0.1):
- Flutter
+ - DKImagePickerController/Core (4.3.2):
+ - DKImagePickerController/ImageDataManager
+ - DKImagePickerController/Resource
+ - DKImagePickerController/ImageDataManager (4.3.2)
+ - DKImagePickerController/PhotoGallery (4.3.2):
+ - DKImagePickerController/Core
+ - DKPhotoGallery
+ - DKImagePickerController/Resource (4.3.2)
+ - DKPhotoGallery (0.0.17):
+ - DKPhotoGallery/Core (= 0.0.17)
+ - DKPhotoGallery/Model (= 0.0.17)
+ - DKPhotoGallery/Preview (= 0.0.17)
+ - DKPhotoGallery/Resource (= 0.0.17)
+ - SDWebImage
+ - SwiftyGif
+ - DKPhotoGallery/Core (0.0.17):
+ - DKPhotoGallery/Model
+ - DKPhotoGallery/Preview
+ - SDWebImage
+ - SwiftyGif
+ - DKPhotoGallery/Model (0.0.17):
+ - SDWebImage
+ - SwiftyGif
+ - DKPhotoGallery/Preview (0.0.17):
+ - DKPhotoGallery/Model
+ - DKPhotoGallery/Resource
+ - SDWebImage
+ - SwiftyGif
+ - DKPhotoGallery/Resource (0.0.17):
+ - SDWebImage
+ - SwiftyGif
+ - file_picker (0.0.1):
+ - DKImagePickerController/PhotoGallery
+ - Flutter
- Flutter (1.0.0)
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
@@ -12,6 +46,8 @@ PODS:
- image_picker (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
+ - open_file (0.0.1):
+ - Flutter
- package_info_plus (0.4.5):
- Flutter
- path_provider (0.0.1):
@@ -19,6 +55,9 @@ PODS:
- qr_code_scanner (0.2.0):
- Flutter
- MTBBarcodeScanner
+ - SDWebImage (5.11.1):
+ - SDWebImage/Core (= 5.11.1)
+ - SDWebImage/Core (5.11.1)
- Sentry (6.2.1):
- Sentry/Core (= 6.2.1)
- Sentry/Core (6.2.1)
@@ -30,6 +69,7 @@ PODS:
- sqflite (0.0.2):
- Flutter
- FMDB (>= 2.7.5)
+ - SwiftyGif (5.4.0)
- url_launcher (0.0.1):
- Flutter
@@ -37,8 +77,10 @@ DEPENDENCIES:
- audioplayers (from `.symlinks/plugins/audioplayers/ios`)
- camera (from `.symlinks/plugins/camera/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+ - file_picker (from `.symlinks/plugins/file_picker/ios`)
- Flutter (from `Flutter`)
- image_picker (from `.symlinks/plugins/image_picker/ios`)
+ - open_file (from `.symlinks/plugins/open_file/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
@@ -49,9 +91,13 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
+ - DKImagePickerController
+ - DKPhotoGallery
- FMDB
- MTBBarcodeScanner
+ - SDWebImage
- Sentry
+ - SwiftyGif
EXTERNAL SOURCES:
audioplayers:
@@ -60,10 +106,14 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/camera/ios"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
+ file_picker:
+ :path: ".symlinks/plugins/file_picker/ios"
Flutter:
:path: Flutter
image_picker:
:path: ".symlinks/plugins/image_picker/ios"
+ open_file:
+ :path: ".symlinks/plugins/open_file/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider:
@@ -83,17 +133,23 @@ SPEC CHECKSUMS:
audioplayers: 455322b54050b30ea4b1af7cd9e9d105f74efa8c
camera: 3164201dc344383e62282964016528c4f5a9ad50
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
+ DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d
+ DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
+ file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
image_picker: e06f7a68f000bd36f552c1847e33cda96ed31f1f
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
+ open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
+ SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
Sentry: 9b922b396b0e0bca8516a10e36b0ea3ebea5faf7
sentry_flutter: 5b3c6d717db5b7482504a313c831b318297d4d37
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+ SwiftyGif: 5d4af95df24caf1c570dbbcb32a3b8a0763bc6d7
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
PODFILE CHECKSUM: a0aa7ddb96bc3e003aa8b0367963d0cf20ba3eed
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 7c9c9b67..077fa39c 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -267,13 +267,19 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+ "${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
+ "${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
"${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
+ "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
+ "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
"${BUILT_PRODUCTS_DIR}/audioplayers/audioplayers.framework",
"${BUILT_PRODUCTS_DIR}/camera/camera.framework",
"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
+ "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
"${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
+ "${BUILT_PRODUCTS_DIR}/open_file/open_file.framework",
"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
"${BUILT_PRODUCTS_DIR}/qr_code_scanner/qr_code_scanner.framework",
@@ -284,13 +290,19 @@
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audioplayers.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/camera.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_file.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/qr_code_scanner.framework",
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 1e3e35de..8cb2defc 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -18,7 +18,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>inventree_app</string>
+ <string>InvenTree</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
diff --git a/lib/settings/settings.dart b/lib/settings/settings.dart
index 75cfb0fc..b8bb4c37 100644
--- a/lib/settings/settings.dart
+++ b/lib/settings/settings.dart
@@ -1,10 +1,7 @@
import 'package:inventree/app_colors.dart';
-import 'package:inventree/inventree/sentry.dart';
import 'package:inventree/settings/about.dart';
import 'package:inventree/settings/app_settings.dart';
import 'package:inventree/settings/login.dart';
-import 'package:inventree/widget/snacks.dart';
-import 'package:inventree/widget/dialogs.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -29,7 +26,6 @@ class InvenTreeSettingsWidget extends StatefulWidget {
class _InvenTreeSettingsState extends State<InvenTreeSettingsWidget> {
final _scaffoldKey = GlobalKey<ScaffoldState>();
- final _feedbackKey = GlobalKey<FormState>();
final String docsUrl = "https://inventree.readthedocs.io/en/latest/app/app/";
diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart
index 8e518c3b..26e8f3b6 100644
--- a/lib/widget/location_display.dart
+++ b/lib/widget/location_display.dart
@@ -318,7 +318,10 @@ List<Widget> detailTiles() {
} else {
tiles.add(ListTile(
title: Text(L10().sublocationNone),
- subtitle: Text(L10().sublocationNoneDetail)
+ subtitle: Text(
+ L10().sublocationNoneDetail,
+ style: TextStyle(fontStyle: FontStyle.italic)
+ )
));
}