sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade flutter

Browse Source
This commit is contained in:
sainw
2025-02-11 22:11:45 +06:30
parent 4607c34879
commit 69361f8445
29 changed files with 498 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/.gitignore vendored
View File

@@ -7,5 +7,7 @@ gradle-wrapper.jar
GeneratedPluginRegistrant.java
# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
# See https://flutter.dev/to/reference-keystore
key.properties
**/*.keystore
**/*.jks

75
android/app/build.gradle
View File

@@ -1,85 +1,49 @@
plugins {
id "com.android.application"
// START: FlutterFire Configuration
id 'com.google.gms.google-services'
// END: FlutterFire Configuration
id "kotlin-android"
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
localPropertiesFile.withReader('UTF-8') { reader ->
localProperties.load(reader)
}
}
def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
}
def flutterVersionName = localProperties.getProperty('flutter.versionName')
if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
def keystorePropertiesFile = rootProject.file('dev-key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}
android {
namespace = "com.mokkon.fcs.fcs"
compileSdkVersion 34
ndkVersion = "27.0.12077973"
namespace = "com.example.fcs"
compileSdk = 35
ndkVersion = flutter.ndkVersion
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
coreLibraryDesugaringEnabled true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = 17
}
lintOptions {
checkReleaseBuilds false
jvmTarget = JavaVersion.VERSION_1_8
}
defaultConfig {
applicationId = "com.example.fcs"
minSdkVersion 23
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
targetSdkVersion 35
}
flavorDimensions "fcs"
productFlavors {
prod {
dimension "fcs"
applicationId "com.mokkon.fcs"
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
versionCode = flutter.versionCode
versionName = flutter.versionName
}
dev {
dimension "fcs"
applicationId "com.mokkon.fcs.dev"
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
versionCode = flutter.versionCode
versionName = flutter.versionName
}
}
@@ -95,7 +59,6 @@ android {
buildTypes {
release {
signingConfig signingConfigs.release
minifyEnabled true
// useProguard false
@@ -103,11 +66,7 @@ android {
applicationVariants.all { variant ->
variant.outputs.all {
def newName
// if (buildType == 'debug'){
// newName = "app-${variant.getFlavorName()}-debug.apk"
// } else {
newName = "${variant.productFlavors[0].dimension}_${variant.productFlavors[0].name}_v${defaultConfig.versionName}+${defaultConfig.versionCode}.apk"
// }
newName = "${variant.productFlavors[0].dimension}_${variant.productFlavors[0].name}_v${variant.productFlavors[0].versionName}+${variant.productFlavors[0].versionCode}.apk"
outputFileName = newName
}
}
@@ -119,10 +78,6 @@ android {
}
flutter {
source '../..'
source = "../.."
}
dependencies {
implementation "androidx.multidex:multidex:2.0.1"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
}

3
android/app/src/debug/AndroidManifest.xml
View File

@@ -1,5 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>

38
android/app/src/dev/AndroidManifest.xml
View File

@@ -1,38 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name=".Application"
android:exported="true"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:hardwareAccelerated="true"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<!-- This keeps the window background of the activity showing
until Flutter renders its first frame. It can be removed if
there is no splash screen (such as the default splash screen
defined in @style/LaunchTheme). -->
<meta-data
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
android:value="true" />
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="FLUTTER_NOTIFICATION_CLICK" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
android:label="FCS Dev">
</application>
</manifest>
</manifest>

31
android/app/src/dev/google-services.json
View File

@@ -14,6 +14,30 @@
}
},
"oauth_client": [
{
"client_id": "944560757353-1e5a1qdip1hu3p6531hvf89uf4up5ohk.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.mokkon.fcs.dev",
"certificate_hash": "1f3978310f4c9d4978cd876bcb042c8de833af2d"
}
},
{
"client_id": "944560757353-em1esjsi8o4vdmaqpo2te3f3oruvp7mu.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.mokkon.fcs.dev",
"certificate_hash": "f8b4455e24bbef71ded264dd2a39e76823569ee4"
}
},
{
"client_id": "944560757353-l57he8ni7fck8rkbdqn0f7icn46vmnf3.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.mokkon.fcs.dev",
"certificate_hash": "651c29f96db66a3c6e8889e7db766e96b0d92503"
}
},
{
"client_id": "944560757353-n44kricufdgign6ki6eu1fqvh7ppa29m.apps.googleusercontent.com",
"client_type": 3
@@ -30,6 +54,13 @@
{
"client_id": "944560757353-n44kricufdgign6ki6eu1fqvh7ppa29m.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "944560757353-o6emrja7ad8g8ulbcvvpah9a1tul3s21.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.mokkon.fcs.dev"
}
}
]
}

4
android/app/src/dev/res/values/strings.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">FCS - Dev</string>
</resources>

31
android/app/src/main/AndroidManifest.xml
View File

@@ -1,14 +1,19 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:exported="true"
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:taskAffinity=""
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
@@ -18,15 +23,6 @@
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
<!-- Displays an Android View that continues showing the launch screen
Drawable until Flutter paints its first frame, then this splash
screen fades out. A splash screen is useful to avoid any visual
gap between the end of Android's launch screen and the painting of
Flutter's first frame. -->
<meta-data
android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background"
/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@@ -38,4 +34,15 @@
android:name="flutterEmbedding"
android:value="2" />
</application>
<!-- Required to query activities that can process text, see:
https://developer.android.com/training/package-visibility and
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
<queries>
<intent>
<action android:name="android.intent.action.PROCESS_TEXT"/>
<data android:mimeType="text/plain"/>
</intent>
</queries>
</manifest>

13
android/app/src/main/java/com/mokkon/fcs/fcs/Application.java
View File

@@ -1,13 +0,0 @@
package com.mokkon.fcs.fcs;
import io.flutter.app.FlutterApplication;
import io.flutter.plugin.common.PluginRegistry;
import io.flutter.plugins.GeneratedPluginRegistrant;
public class Application extends FlutterApplication {
@Override
public void onCreate() {
super.onCreate();
}
}

6
android/app/src/main/java/com/mokkon/fcs/fcs/MainActivity.java
View File

@@ -1,6 +0,0 @@
package com.mokkon.fcs.fcs;
import io.flutter.embedding.android.FlutterActivity;
public class MainActivity extends FlutterActivity {
}

5
android/app/src/main/kotlin/com/example/fcs/MainActivity.kt Normal file
View File

@@ -0,0 +1,5 @@
package com.example.fcs
import io.flutter.embedding.android.FlutterActivity
class MainActivity: FlutterActivity()

38
android/app/src/prod/AndroidManifest.xml
View File

@@ -1,38 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name=".Application"
android:exported="true"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:hardwareAccelerated="true"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<!-- This keeps the window background of the activity showing
until Flutter renders its first frame. It can be removed if
there is no splash screen (such as the default splash screen
defined in @style/LaunchTheme). -->
<meta-data
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
android:value="true" />
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="FLUTTER_NOTIFICATION_CLICK" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
android:label="FCS Logistics">
</application>
</manifest>
</manifest>

4
android/app/src/prod/res/values/strings.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">FCS Logistics</string>
</resources>

6
android/app/src/profile/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mokkon.fcs.fcs">
<!-- Flutter needs it to communicate with the running application
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>

4
android/gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx2536M
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=true

3
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,5 @@
#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

4
android/settings.gradle
View File

@@ -18,11 +18,11 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.3.2" apply false
id "com.android.application" version "8.1.0" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
}
include ":app"

1
android/settings_aar.gradle
View File

@@ -1 +0,0 @@
include ':app'