diff --git a/.vscode/settings.json b/.vscode/settings.json index c5f3f6b..e0f15db 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "automatic" } \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 366c737..96cf1b8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,4 @@ + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -13,17 +14,21 @@ if (flutterRoot == null) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = '2' } def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = '2.1.1' } apply plugin: 'com.android.application' 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') + android { namespace "com.mobileapp.store.ride" @@ -48,19 +53,27 @@ android { applicationId "com.mobileapp.store.ride" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + versionCode 4 + versionName '1.0.4' } - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { + release { + signingConfig signingConfigs.release + } + } + + } flutter { @@ -69,4 +82,6 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + // implementation platform('com.google.firebase:firebase-bom:32.1.1') + } diff --git a/lib/views/auth/login_page.dart b/lib/views/auth/login_page.dart index c5b4519..5804951 100644 --- a/lib/views/auth/login_page.dart +++ b/lib/views/auth/login_page.dart @@ -184,13 +184,13 @@ class LoginPage extends StatelessWidget { displayFullTextOnTap: true, stopPauseOnTap: true, ), - GestureDetector( - onTap: () => Get.to(LoginCaptin()), - child: Text( - 'If You Want be Captin Click Here.'.tr, - style: AppStyle.headtitle2, - ), - ) + // GestureDetector( + // onTap: () => Get.to(LoginCaptin()), + // child: Text( + // 'If You Want be Captin Click Here.'.tr, + // style: AppStyle.headtitle2, + // ), + // ) ], ), )