From 03748d4fb46d46865d5078dbf60122963b2b7af1 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Fri, 17 Nov 2023 20:24:01 +0300 Subject: [PATCH] Fixing asset picker and asset details issue --- android/app/build.gradle | 38 +++++++++---------- .../equipment/single_device_picker.dart | 4 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5529b7b7..da6b75a0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,11 +26,11 @@ apply plugin: 'kotlin-android' apply plugin: 'com.google.gms.google-services' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file('key.properties') -if (keystorePropertiesFile.exists()) { - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) -} +//def keystoreProperties = new Properties() +//def keystorePropertiesFile = rootProject.file('key.properties') +//if (keystorePropertiesFile.exists()) { +// keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +//} android { @@ -53,26 +53,26 @@ android { versionName '1.0.5' } - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null - storePassword keystoreProperties['storePassword'] - } - } +// signingConfigs { +// release { +// keyAlias keystoreProperties['keyAlias'] +// keyPassword keystoreProperties['keyPassword'] +// storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null +// storePassword keystoreProperties['storePassword'] +// } +// } buildTypes { debug { signingConfig signingConfigs.debug } -// release { -// signingConfig signingConfigs.debug -// } release { - minifyEnabled true - shrinkResources true - signingConfig signingConfigs.release + signingConfig signingConfigs.debug } +// release { +// minifyEnabled true +// shrinkResources true +// signingConfig signingConfigs.release +// } } } diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index 3b03c2dc..13774f96 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.dart @@ -171,7 +171,7 @@ class _MyAssetsPageState extends State { return AssetItemListView( device: _searchableList[itemIndex], onPressed: (device) { - Navigator.of(context).pop(device); + widget.fromBottomBar ? Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id) : Navigator.of(context).pop(device); // Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); }, ); @@ -185,7 +185,7 @@ class _MyAssetsPageState extends State { return AssetItemGridView( device: _searchableList[index], onPressed: (device) { - Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); + widget.fromBottomBar ? Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id) : Navigator.of(context).pop(device); }, ); },