diff --git a/android/.gitignore b/android/.gitignore
index 65b7315a..55afd919 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,10 +1,13 @@
-*.iml
-*.class
-.gradle
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d2083062..6a726445 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -5,23 +5,6 @@ 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 flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
- flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
- flutterVersionName = '1.0'
-}
//SIGNING APK-----------------------------------------------------------
def keystoreProperties = new Properties()
@@ -31,45 +14,52 @@ if (keystorePropertiesFile.exists()) {
}
//----------------------------------------------------------------------
android {
- namespace "com.ferrarid.converterpro"
- compileSdkVersion flutter.compileSdkVersion
- ndkVersion flutter.ndkVersion
+ namespace = "com.ferrarid.converterpro"
+ compileSdk = flutter.compileSdkVersion
+ ndkVersion = flutter.ndkVersion
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_1_8
}
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.ferrarid.converterpro"
- minSdkVersion flutter.minSdkVersion
- targetSdkVersion flutter.targetSdkVersion
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
+ applicationId = "com.ferrarid.converterpro"
+ // You can update the following values to match your application needs.
+ // For more information, see: https://flutter.dev/to/review-gradle-config.
+ minSdk = flutter.minSdkVersion
+ targetSdk = flutter.targetSdkVersion
+ versionCode = flutter.versionCode
+ versionName = flutter.versionName
}
//SIGNING APK-----------------------------------------------------------------------------------
signingConfigs {
release {
- keyAlias keystoreProperties['keyAlias']
- keyPassword keystoreProperties['keyPassword']
- storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
- storePassword keystoreProperties['storePassword']
+ keyAlias = keystoreProperties['keyAlias']
+ keyPassword = keystoreProperties['keyPassword']
+ storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+ storePassword = keystoreProperties['storePassword']
}
}
//-----------------------------------------------------------------------------------------------
+
buildTypes {
release {
- minifyEnabled true
+ minifyEnabled = true
//SIGNING APK---------------------------------------------------------------------------
- //signingConfig signingConfigs.debug //not signed
- signingConfig signingConfigs.release //signed (release)
+ // signingConfig = signingConfigs.debug // not signed
+ signingConfig = signingConfigs.release // signed
//--------------------------------------------------------------------------------------
}
}
}
flutter {
- source '../..'
+ source = "../.."
}
diff --git a/android/app/src/main/res/drawable-night-v21/background.png b/android/app/src/main/res/drawable-night-v21/background.png
deleted file mode 100644
index 50d5a2c0..00000000
Binary files a/android/app/src/main/res/drawable-night-v21/background.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml
deleted file mode 100644
index 3cc4948a..00000000
--- a/android/app/src/main/res/drawable-night-v21/launch_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
- -
-
-
-
diff --git a/android/app/src/main/res/drawable-night/background.png b/android/app/src/main/res/drawable-night/background.png
deleted file mode 100644
index 50d5a2c0..00000000
Binary files a/android/app/src/main/res/drawable-night/background.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml
deleted file mode 100644
index 3cc4948a..00000000
--- a/android/app/src/main/res/drawable-night/launch_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
- -
-
-
-
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
deleted file mode 100644
index edbe194f..00000000
Binary files a/android/app/src/main/res/drawable-v21/background.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index 3cc4948a..49bb8a5c 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,9 +1,11 @@
+
+ -
-
-
- -
-
+
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
deleted file mode 100644
index edbe194f..00000000
Binary files a/android/app/src/main/res/drawable/background.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 3cc4948a..c4359c10 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,9 +1,11 @@
+
+ -
-
-
- -
-
+
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index e202e4be..00000000
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index e202e4be..00000000
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/mipmap-hdpi/launch_image.png
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/splash.png
rename to android/app/src/main/res/mipmap-hdpi/launch_image.png
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/mipmap-mdpi/launch_image.png
similarity index 100%
rename from android/app/src/main/res/drawable-mdpi/splash.png
rename to android/app/src/main/res/mipmap-mdpi/launch_image.png
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/mipmap-xhdpi/launch_image.png
similarity index 100%
rename from android/app/src/main/res/drawable-xhdpi/splash.png
rename to android/app/src/main/res/mipmap-xhdpi/launch_image.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/mipmap-xxhdpi/launch_image.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxhdpi/splash.png
rename to android/app/src/main/res/mipmap-xxhdpi/launch_image.png
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxxhdpi/splash.png
rename to android/app/src/main/res/mipmap-xxxhdpi/launch_image.png
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index b9921e9a..06952be7 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -3,17 +3,14 @@
-
diff --git a/android/gradle.properties b/android/gradle.properties
index d2032bce..e6249b90 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
-android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
-android.enableR8=true
+android.enableJetifier=true
+android.enableR8=true
\ No newline at end of file
diff --git a/android/gradlew.bat b/android/gradlew.bat
index 8a0b282a..aec99730 100644
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android/settings.gradle b/android/settings.gradle
index 7d064493..536165d3 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -22,4 +22,4 @@ plugins {
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
}
-include ":app"
\ No newline at end of file
+include ":app"
diff --git a/pubspec.lock b/pubspec.lock
index b463feb7..4652c213 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -25,14 +25,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.3.2+1"
- ansicolor:
- dependency: transitive
- description:
- name: ansicolor
- sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880"
- url: "https://pub.dev"
- source: hosted
- version: "2.0.2"
archive:
dependency: transitive
description:
@@ -160,22 +152,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.3"
- csslib:
- dependency: transitive
- description:
- name: csslib
- sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.0"
decimal:
dependency: transitive
description:
name: decimal
- sha256: "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21"
+ sha256: "4140a688f9e443e2f4de3a1162387bf25e1ac6d51e24c9da263f245210f41440"
url: "https://pub.dev"
source: hosted
- version: "2.3.3"
+ version: "3.0.2"
dynamic_color:
dependency: "direct main"
description:
@@ -231,14 +215,6 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
- flutter_native_splash:
- dependency: "direct main"
- description:
- name: flutter_native_splash
- sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0
- url: "https://pub.dev"
- source: hosted
- version: "2.4.0"
flutter_riverpod:
dependency: "direct main"
description:
@@ -318,14 +294,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.3.1"
- html:
- dependency: transitive
- description:
- name: html
- sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
- url: "https://pub.dev"
- source: hosted
- version: "0.15.4"
http:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6a321d0f..32684f77 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,8 +15,6 @@ dependencies:
sdk: flutter
# App dynamic color theme
dynamic_color: ^1.7.0
- # Native splash screen on Android
- flutter_native_splash: ^2.4.0
# State management
flutter_riverpod: ^2.5.1
# For svg icons
@@ -65,13 +63,6 @@ dev_dependencies:
msix: ^3.16.7
test: ^1.25.2
-flutter_native_splash:
- # Run code generation: `flutter pub run flutter_native_splash:create`
- web: false
- color: "#eeeeee"
- color_dark: "#333333"
- image: assets/app_icons/logo.png
-
msix_config:
display_name: Converter NOW
publisher_display_name: Damiano Ferrari