diff --git a/android/app/build.gradle b/android/app/build.gradle index b77f17da..74abb2b6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -49,8 +49,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. minSdkVersion 21 targetSdkVersion 33 - versionCode 5 - versionName '1.1.0' + versionCode 7 + versionName '1.2.0' } signingConfigs { diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 9ef05cd5..b8b494a0 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -1,9 +1,8 @@ class URLs { URLs._(); - // static const host1 = "https://atomsm.hmg.com"; // production url - static const host1 = "https://atomsmdev.hmg.com"; // local UAT url - + static const host1 = "https://atomsm.hmg.com"; // production url + // static const host1 = "https://atomsmdev.hmg.com"; // local UAT url static String _baseUrl = "$_host/mobile"; @@ -43,6 +42,7 @@ class URLs { static get getRepairLocation => "$_baseUrl/Lookups/GetLookup?lookupEnum=504"; static get equipmentStatus => "$_baseUrl/Lookups/GetLookup?lookupEnum=601"; + static get commissioningStatus => "$_baseUrl/Lookups/GetLookup?lookupEnum=601"; static get getDateOperators => "$_baseUrl/Lookups/GetLookup?lookupEnum=200"; @@ -75,7 +75,7 @@ class URLs { static get getSubWorkerInfoAccordingToPreviousStep => "$_baseUrl/WorkOrder/GetDataPreviousStep"; static get getPpmReasons => "$_baseUrl/Lookups/GetLookup?lookupEnum=522"; // get for ppm po reason, in mobile there is no use of it. - static get getPpmAssetAvailability => "$_baseUrl/Lookups/GetLookup?lookupEnum=1205"; // get for ppm po reason, in mobile there is no use of it. + static get getPpmAssetAvailability => "$_baseUrl/Lookups/GetLookup?lookupEnum=1205"; // get for ppm po reason, in mobile there is no use of it. static get getPpmElectricalSafety => "$_baseUrl/Lookups/GetLookup?lookupEnum=480"; // get for ppm po reason, in mobile there is no use of it. static get getPpmTaskStatus => "$_baseUrl/Lookups/GetLookup?lookupEnum=403"; // get for ppm po reason, in mobile there is no use of it. static get getPpmService => "$_baseUrl/Lookups/GetLookup?lookupEnum=34"; // get for ppm po reason, in mobile there is no use of it. diff --git a/lib/new_views/common_widgets/app_bottom_nav_bar.dart b/lib/new_views/common_widgets/app_bottom_nav_bar.dart index 6336b1ac..53d78b9f 100644 --- a/lib/new_views/common_widgets/app_bottom_nav_bar.dart +++ b/lib/new_views/common_widgets/app_bottom_nav_bar.dart @@ -20,7 +20,7 @@ class AppBottomNavigationBar extends StatelessWidget { return ClipRRect( borderRadius: const BorderRadius.only(topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)), child: Container( - height: 100.toScreenHeight, + height: 120.toScreenHeight, decoration: BoxDecoration( color: AppColor.background(context), boxShadow: [boxShadowR14], diff --git a/pubspec.yaml b/pubspec.yaml index 77b0c789..c20a5a37 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.1+6 +version: 1.2.0+7 environment: sdk: ">=2.7.0 <3.0.0"