diff --git a/ios/Podfile.lock b/ios/Podfile.lock index cbf76fea..71e55807 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -213,4 +213,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 -COCOAPODS: 1.11.3 +COCOAPODS: 1.10.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a5559bc2..5116f0d6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -227,6 +227,7 @@ }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -258,6 +259,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 347cd5f4..86b0405c 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -60,5 +60,7 @@ UIViewControllerBasedStatusBarAppearance + UIApplicationSupportsIndirectInputEvents + diff --git a/old_lib/views/app_style/colors.dart b/old_lib/views/app_style/colors.dart index b6200b0e..f358210b 100644 --- a/old_lib/views/app_style/colors.dart +++ b/old_lib/views/app_style/colors.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/models/lookup.dart'; +//import 'package:test_sa/models/lookup.dart'; + class AColors { AColors._(); static const Color white = Color(0xffffffff); diff --git a/old_lib/views/pages/device_transfer/device_transfer_details.dart b/old_lib/views/pages/device_transfer/device_transfer_details.dart index 7b36058c..20e80a0e 100644 --- a/old_lib/views/pages/device_transfer/device_transfer_details.dart +++ b/old_lib/views/pages/device_transfer/device_transfer_details.dart @@ -1,24 +1,25 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; -import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart'; -import 'package:test_sa/controllers/providers/api/user_provider.dart'; -import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; -import 'package:test_sa/models/device/device_transfer.dart'; -import 'package:test_sa/models/device/device_transfer_info.dart'; -import 'package:test_sa/models/subtitle.dart'; -import 'package:test_sa/views/app_style/colors.dart'; -import 'package:test_sa/views/app_style/sizing.dart'; -import 'package:test_sa/views/pages/device_transfer/update_device_transfer.dart'; -import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; -import 'package:test_sa/views/widgets/buttons/app_small_button.dart'; -import 'package:test_sa/views/widgets/device_trancfer/device_transfer_info_section.dart'; -import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; -import 'package:test_sa/views/widgets/requests/info_row.dart'; +import '../../../controllers/localization/localization.dart'; +import '../../../controllers/providers/api/device_transfer_provider.dart'; +import '../../../controllers/providers/api/user_provider.dart'; +import '../../../controllers/providers/settings/setting_provider.dart'; +import '../../../extensions/int_extensions.dart'; +import '../../../models/device/device_transfer.dart'; +import '../../../models/device/device_transfer_info.dart'; +import '../../../models/subtitle.dart'; +import '../../app_style/colors.dart'; +import '../../app_style/sizing.dart'; +import '../../widgets/buttons/app_back_button.dart'; +import '../../widgets/buttons/app_small_button.dart'; +import '../../widgets/device_trancfer/device_transfer_info_section.dart'; +import '../../widgets/loaders/loading_manager.dart'; +import '../../widgets/requests/info_row.dart'; +import 'update_device_transfer.dart'; class DeviceTransferDetails extends StatefulWidget { final DeviceTransfer model; - const DeviceTransferDetails({Key key, this.model}) : super(key: key); + const DeviceTransferDetails({Key? key, required this.model}) : super(key: key); @override State createState() => _DeviceTransferDetailsState(); @@ -29,18 +30,16 @@ class _DeviceTransferDetailsState extends State { final DeviceTransferInfo _model = DeviceTransferInfo(); bool _isSender = false; bool _isReceiver = false; - UserProvider _userProvider; - SettingProvider _settingProvider; - DeviceTransferProvider _deviceTransferProvider; + UserProvider? _userProvider; + SettingProvider? _settingProvider; + DeviceTransferProvider? _deviceTransferProvider; bool _isLoading = false; - Subtitle _subtitle; + Subtitle? _subtitle; final GlobalKey _formKey = GlobalKey(); final GlobalKey _scaffoldKey = GlobalKey(); @override void initState() { - - super.initState(); } @@ -50,8 +49,8 @@ class _DeviceTransferDetailsState extends State { _userProvider = Provider.of(context); _settingProvider = Provider.of(context); _deviceTransferProvider = Provider.of(context); - _isSender = _userProvider.user.id == widget.model.sender?.userId; - _isReceiver = _userProvider.user.id == widget.model.receiver?.userId; + _isSender = _userProvider?.user.id == widget.model.sender?.userId; + _isReceiver = _userProvider?.user.id == widget.model.receiver?.userId; return Scaffold( key: _scaffoldKey, body: SafeArea( @@ -69,12 +68,12 @@ class _DeviceTransferDetailsState extends State { padding: const EdgeInsets.symmetric(horizontal: 0,vertical: 4), child: Row( children: [ - const ABackButton(), + ABackButton(), Expanded( child: Center( child: Text( - _subtitle.details, - style: Theme.of(context).textTheme.headline6.copyWith( + _subtitle?.details??"", + style: Theme.of(context).textTheme.headline6?.copyWith( color: AColors.white, fontStyle: FontStyle.italic ), @@ -92,11 +91,11 @@ class _DeviceTransferDetailsState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ RequestInfoRow( - title: _subtitle.title, + title: _subtitle?.title??"", info: widget.model.title, ), RequestInfoRow( - title: _subtitle.device, + title: _subtitle?.device??"", info: widget.model.device.serialNumber, ), const SizedBox(height:8), @@ -110,7 +109,7 @@ class _DeviceTransferDetailsState extends State { ), if(_isSender) ASmallButton( - text: _subtitle.edit, + text: _subtitle?.edit??"", onPressed: (){ Navigator.of(context).push( MaterialPageRoute( @@ -136,7 +135,7 @@ class _DeviceTransferDetailsState extends State { ), if(_isReceiver) ASmallButton( - text: _subtitle.edit, + text: _subtitle?.edit??"", onPressed: (){ Navigator.of(context).push( MaterialPageRoute( diff --git a/old_lib/views/pages/device_transfer/request_device_transfer.dart b/old_lib/views/pages/device_transfer/request_device_transfer.dart index eaaed184..6f3b2c91 100644 --- a/old_lib/views/pages/device_transfer/request_device_transfer.dart +++ b/old_lib/views/pages/device_transfer/request_device_transfer.dart @@ -1,27 +1,17 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart'; -import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart'; -import 'package:test_sa/controllers/providers/api/user_provider.dart'; -import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; -import 'package:test_sa/extensions/int_extensions.dart'; -import 'package:test_sa/models/device/device_transfer.dart'; -import 'package:test_sa/models/device/device_transfer_info.dart'; -import 'package:test_sa/models/subtitle.dart'; -import 'package:test_sa/views/app_style/sizing.dart'; -import 'package:test_sa/views/widgets/buttons/app_button.dart'; -import 'package:test_sa/views/widgets/departments/department_button.dart'; -import 'package:test_sa/views/widgets/equipment/device_button.dart'; -import 'package:test_sa/views/widgets/hospitals/hospital_button.dart'; -import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; -import 'package:test_sa/views/widgets/titles/app_sub_title.dart'; -import '../../../../controllers/localization/localization.dart'; +import '../../../controllers/providers/api/device_transfer_provider.dart'; +import '../../../controllers/providers/api/user_provider.dart'; +import '../../../controllers/providers/settings/setting_provider.dart'; +import '../../../models/device/device_transfer.dart'; +import '../../../models/device/device_transfer_info.dart'; +import '../../../models/subtitle.dart'; class RequestDeviceTransfer extends StatefulWidget { static const String id = "/request-device-transfer"; - const RequestDeviceTransfer({Key key}) : super(key: key); + const RequestDeviceTransfer({Key? key}) : super(key: key); @override State createState() => _RequestDeviceTransferState(); @@ -30,10 +20,10 @@ class RequestDeviceTransfer extends StatefulWidget { class _RequestDeviceTransferState extends State { bool _isLoading = false; bool _validate = false; - Subtitle _subtitle; - UserProvider _userProvider; - SettingProvider _settingProvider; - DeviceTransferProvider _deviceTransferProvider; + Subtitle? _subtitle; + UserProvider? _userProvider; + SettingProvider? _settingProvider; + DeviceTransferProvider? _deviceTransferProvider; final TextEditingController _requestedQuantityController = TextEditingController(); final DeviceTransfer _formModel = DeviceTransfer(receiver: DeviceTransferInfo()); final GlobalKey _formKey = GlobalKey();