diff --git a/android/app/build.gradle b/android/app/build.gradle index da6b75a0..b77f17da 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 { @@ -50,29 +50,29 @@ android { minSdkVersion 21 targetSdkVersion 33 versionCode 5 - versionName '1.0.5' + versionName '1.1.0' } -// 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/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8cd1055f..29c8ac40 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -370,7 +370,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = 99Z3UD3LJM; ENABLE_BITCODE = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -380,7 +380,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -593,7 +593,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = 99Z3UD3LJM; ENABLE_BITCODE = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -603,7 +603,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -702,7 +702,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = 99Z3UD3LJM; ENABLE_BITCODE = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -712,7 +712,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index afe9aa7e..b577042f 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -1,12 +1,10 @@ class URLs { URLs._(); - static const host2 = "http://194.163.164.213/atoms/api"; // todo @sikander will remove after confirmation - //static const host1 = "https://atomsuat.hmg.com"; // old uat url - //static const host1 = "https://atomsm.hmg.com"; // production url + static const host1 = "https://atomsm.hmg.com"; // production url - static const host1 = "https://atomsmdev.hmg.com"; // local UAT url + // static const host1 = "https://atomsmdev.hmg.com"; // local UAT url // static const host1 = "http://109.123.243.118:9000"; diff --git a/lib/views/pages/user/ppm/ppm_details_page.dart b/lib/views/pages/user/ppm/ppm_details_page.dart index 380c3399..aeeb2aef 100644 --- a/lib/views/pages/user/ppm/ppm_details_page.dart +++ b/lib/views/pages/user/ppm/ppm_details_page.dart @@ -92,8 +92,8 @@ class _PpmDetailsPageState extends State { '${context.translation.assetSN}: ${ppm.assetSerialNo}'.bodyText(context), '${context.translation.requestNo}: ${ppm.visitCode}'.bodyText(context), const Divider().defaultStyle(context), - '${context.translation.expectDate}: ${ppm.expectedDate?.toServiceRequestDetailsFormat ?? ""}'.bodyText(context), - '${context.translation.actualDate}: ${ppm.actualDate?.toServiceRequestDetailsFormat ?? ""}'.bodyText(context), + '${context.translation.expectDate}: ${ppm.expectedDate?.toAssetDetailsFormat ?? ""}'.bodyText(context), + '${context.translation.actualDate}: ${ppm.actualDate?.toAssetDetailsFormat ?? ""}'.bodyText(context), const Divider().defaultStyle(context), '${context.translation.assignedTo}: ${ppm.assignedToName ?? ""}'.bodyText(context), '${context.translation.engineerName}: ${ppm.assignedEmployeeName ?? ""}'.bodyText(context), diff --git a/pubspec.yaml b/pubspec.yaml index c8bf3c04..432a9d5b 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.0.7+6 +version: 1.1.0+5 environment: sdk: ">=2.7.0 <3.0.0"