Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow

design_3.0_dark_mode
WaseemAbbasi22 12 months ago
commit b767f9123e

@ -172,20 +172,13 @@ class _SplashPageState extends State<SplashPage> {
Future<bool> checkDeviceSafety() async { Future<bool> checkDeviceSafety() async {
if (!kReleaseMode) return true; if (!kReleaseMode) return true;
bool isOnExternalStorage = false;
bool isDevelopmentModeEnable = false;
bool isJailBroken = false; bool isJailBroken = false;
bool isRealDevice = false; bool isRealDevice = false;
try { try {
isJailBroken = await SafeDevice.isJailBroken; isJailBroken = await SafeDevice.isJailBroken;
isRealDevice = await SafeDevice.isRealDevice; isRealDevice = await SafeDevice.isRealDevice;
if (Platform.isAndroid) { if (isJailBroken || !isRealDevice) {
isOnExternalStorage = await SafeDevice.isOnExternalStorage;
isDevelopmentModeEnable = await SafeDevice.isDevelopmentModeEnable;
}
//TODO correct isDevelopmentModeEnable when publish to prod...
if (isJailBroken || !isRealDevice || isOnExternalStorage || isDevelopmentModeEnable) {
return false; return false;
} else { } else {
return true; return true;

@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:nfc_manager/nfc_manager.dart'; import 'package:nfc_manager/nfc_manager.dart';
import 'package:nfc_manager/platform_tags.dart'; import 'package:nfc_manager/platform_tags.dart';
void showNfcReader(BuildContext context, { Function(String nfcId) ?onNcfScan}) { void showNfcReader(BuildContext context, {Function(String nfcId)? onNcfScan}) {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
enableDrag: false, enableDrag: false,
@ -23,7 +23,7 @@ void showNfcReader(BuildContext context, { Function(String nfcId) ?onNcfScan}) {
} }
class NfcLayout extends StatefulWidget { class NfcLayout extends StatefulWidget {
Function(String nfcId) ?onNcfScan; Function(String nfcId)? onNcfScan;
NfcLayout({this.onNcfScan}); NfcLayout({this.onNcfScan});
@ -96,7 +96,6 @@ class _NfcLayoutState extends State<NfcLayout> {
SizedBox( SizedBox(
height: 30, height: 30,
), ),
Image.asset( Image.asset(
"assets/images/ic_nfc.png", "assets/images/ic_nfc.png",
height: MediaQuery.of(context).size.width / 3, height: MediaQuery.of(context).size.width / 3,

@ -50,7 +50,6 @@ class _VerifyAssetDetailsState extends State<VerifyAssetDetails> with TickerProv
@override @override
void initState() { void initState() {
super.initState(); super.initState();
} }
Future<void> getFaultDescription({required int? assetId}) async { Future<void> getFaultDescription({required int? assetId}) async {
@ -116,7 +115,8 @@ class _VerifyAssetDetailsState extends State<VerifyAssetDetails> with TickerProv
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
if (widget.isEdit) ...[ if (widget.isEdit) ...[
Column( SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -223,6 +223,7 @@ class _VerifyAssetDetailsState extends State<VerifyAssetDetails> with TickerProv
: const SizedBox(), : const SizedBox(),
], ],
).toShadowContainer(context).paddingAll(16), ).toShadowContainer(context).paddingAll(16),
).expanded,
] else ...[ ] else ...[
assetStatusWidget(context: context, workOrderData: requestDetailProvider.engineerUpdateWorkOrderHelperModel!).toShadowContainer(context).paddingAll(16), assetStatusWidget(context: context, workOrderData: requestDetailProvider.engineerUpdateWorkOrderHelperModel!).toShadowContainer(context).paddingAll(16),
], ],

Loading…
Cancel
Save