diff --git a/.gitignore b/.gitignore index 0fa6b67..efa4139 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,9 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/.metadata b/.metadata index ec98142..2544bab 100644 --- a/.metadata +++ b/.metadata @@ -1,10 +1,30 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: d79295af24c3ed621c33713ecda14ad196fd9c31 + revision: f1875d570e39de09040c8f79aa13cc56baab8db1 channel: stable project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + - platform: android + create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..61b6c4d --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore index 0a741cb..6f56801 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle index ff1732c..7a05d80 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,7 +27,17 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply plugin: 'com.google.gms.google-services' android { - compileSdkVersion 30 + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -35,8 +45,10 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.payflow" - minSdkVersion 23 + applicationId "com.cprimbee.payflow" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. + minSdkVersion 21 targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -57,6 +69,6 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation platform('com.google.firebase:firebase-bom:28.1.0') - implementation 'com.google.firebase:firebase-analytics' + implementation platform('com.google.firebase:firebase-bom:30.3.1') + implementation 'com.google.firebase:firebase-analytics-ktx' } diff --git a/android/app/google-services.json b/android/app/google-services.json index 2b2205f..7c09c37 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -7,18 +7,18 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:1009449369695:android:064de23e2f1583d30a5bea", + "mobilesdk_app_id": "1:1009449369695:android:98636241c6e1888f0a5bea", "android_client_info": { - "package_name": "com.example.payflow" + "package_name": "com.cprimbee.payflow" } }, "oauth_client": [ { - "client_id": "1009449369695-ku76t6grik7ssp1trecit680qsq21qf4.apps.googleusercontent.com", + "client_id": "1009449369695-k2kmf2t8tp1qgndn5frgsungst95l82j.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.example.payflow", - "certificate_hash": "e0068306068a731bceaf5bdcf1a275dc6d6f8f7e" + "package_name": "com.cprimbee.payflow", + "certificate_hash": "16a6312fd82fb3647a0efe21b84883f14db8c8a4" } }, { diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 21234cc..75d8637 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,7 @@ - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e030b80..f72416d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,10 +1,12 @@ + package="com.cprimbee.payflow"> - - diff --git a/android/app/src/main/kotlin/com/example/payflow/MainActivity.kt b/android/app/src/main/kotlin/com/cprimbee/payflow/MainActivity.kt similarity index 76% rename from android/app/src/main/kotlin/com/example/payflow/MainActivity.kt rename to android/app/src/main/kotlin/com/cprimbee/payflow/MainActivity.kt index 98c3c71..11198bf 100644 --- a/android/app/src/main/kotlin/com/example/payflow/MainActivity.kt +++ b/android/app/src/main/kotlin/com/cprimbee/payflow/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.payflow +package com.cprimbee.payflow import io.flutter.embedding.android.FlutterActivity diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml index 449a9f9..06952be 100644 --- a/android/app/src/main/res/values-night/styles.xml +++ b/android/app/src/main/res/values-night/styles.xml @@ -3,14 +3,14 @@