diff --git a/android/.gitignore b/android/.gitignore
index 6f568019d3c69d4966bb5a0f759980a1472afc1e..0a741cb43d66c6790a2a913fa24c8878fb1ab7b5 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -9,5 +9,3 @@ 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 662c3bec1e4dc873e224c19276a951e98c4ea4f9..d5f7926b5cb142116e664f85f36fd44b2242d136 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -21,40 +21,32 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+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))
}
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
android {
- compileSdkVersion flutter.compileSdkVersion
- ndkVersion flutter.ndkVersion
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = '1.8'
- }
+ compileSdkVersion 33
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
+ lintOptions {
+ disable 'InvalidPackage'
+ }
+
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "gecko.axiomteam.fr"
- // 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 19
- targetSdkVersion flutter.targetSdkVersion
+ targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
@@ -90,4 +82,5 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation 'androidx.work:work-runtime-ktx:2.7.0'
}
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
new file mode 100644
index 0000000000000000000000000000000000000000..3df0b1b00986b5a04ec91edc3995fec53506ce1a
--- /dev/null
+++ b/android/app/proguard-rules.pro
@@ -0,0 +1,7 @@
+-ignorewarnings
+-keep class * {
+ public private *;
+}
+-dontwarn org.xmlpull.v1.XmlPullParser
+-dontwarn org.xmlpull.v1.XmlSerializer
+-keep class org.xmlpull.v1.* {*;}
\ No newline at end of file
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index a38ff12828784c9e73a2e550c3eee5593f8e2132..2f0961bcef8dae3412685e7e9d291a76c6d68203 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,7 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="gecko.axiomteam.gecko">
- <!-- The INTERNET permission is required for development. Specifically,
- the Flutter tool needs it to communicate with the running application
+ package="gecko.axiomteam.fr">
+ <!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 87c59ae5ba1b273501b3d68a45b91f99cafa0e5f..f2ad46536f97c8450fde639aaa34c73ec3294c86 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,30 +1,50 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="gecko.axiomteam.gecko">
- <application
- android:label="gecko"
+ package="gecko.axiomteam.fr">
+ <!-- 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. -->
+
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <application
+ android:requestLegacyExternalStorage="true"
android:name="${applicationName}"
- android:icon="@mipmap/ic_launcher">
+ android:label="Äžecko"
+ android:usesCleartextTraffic="true">
+ <!-- TODO: Remove usesCleartextTraffic for production mode ! kopa -->
+ <!-- android:icon="@mipmap/ic_launcher"> -->
<activity
+ android:requestLegacyExternalStorage="true"
android:name=".MainActivity"
- android:exported="true"
+ android:icon="@mipmap/ic_launcher"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
- android:windowSoftInputMode="adjustResize">
+ android:windowSoftInputMode="adjustResize"
+ android:exported="true">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
- <meta-data
+ <!-- <meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
- />
+ android:icon="@mipmap/ic_launcher"
+ /> -->
+
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
+ <activity
+ android:name="com.yalantis.ucrop.UCropActivity"
+ android:screenOrientation="portrait"
+ android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
diff --git a/android/app/src/main/kotlin/com/example/gecko/MainActivity.kt b/android/app/src/main/kotlin/com/example/gecko/MainActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..de5d149bf6124d6488db0ffaee2f1bf5b14d61c8
--- /dev/null
+++ b/android/app/src/main/kotlin/com/example/gecko/MainActivity.kt
@@ -0,0 +1,6 @@
+package gecko.axiomteam.fr
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}
diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dae5e06ea768c2ee38981aafc97779fd089f1b3
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5966d5e8a68b91799fa40135c3fb7c69a18e591b
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3fc36908c583e7c702bdf574864e169ec6c28be
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..51afdd65b51bdec69d5400f21c6967f68b64a88a
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4868adcb3b656b5bfa62bcf3139409355de26223
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cb1ef88056edd1caf99a935e434e7ff6943a0ef6..1f83a33fd4f2c45c5ffa5b6c1b729c431fd445fc 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
- <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+ <!-- Theme applied to the Android Window while the process is starting -->
+ <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
- the Flutter engine draws its first frame -->
+ Flutter draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
-
+
This Theme is only used starting with V2 of Flutter's Android embedding. -->
- <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
- <item name="android:windowBackground">?android:colorBackground</item>
+ <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+ <item name="android:windowBackground">@android:color/white</item>
</style>
</resources>
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index a38ff12828784c9e73a2e550c3eee5593f8e2132..2f0961bcef8dae3412685e7e9d291a76c6d68203 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,7 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="gecko.axiomteam.gecko">
- <!-- The INTERNET permission is required for development. Specifically,
- the Flutter tool needs it to communicate with the running application
+ package="gecko.axiomteam.fr">
+ <!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/build.gradle b/android/build.gradle
index 20411f5f31a99755c8b9b215e6150266225c6955..bef5f7b277cef0c0bfdb0edbdd52eeabfd5f3a97 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,7 +2,7 @@ buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
- mavenCentral()
+ jcenter()
}
dependencies {
@@ -14,7 +14,7 @@ buildscript {
allprojects {
repositories {
google()
- mavenCentral()
+ jcenter()
}
}
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a3f97aa8ae37ba567d080f94f95ee8f9b7..4d3226abc21bb47320bb73c654e77d565977204d 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b99c6f3501ff93513bcdf39dabe4f236a55..c4623b06ba65d731350639b7df7a50ee9b6e1bc0 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#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-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
\ No newline at end of file
diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e7b4def49cb53d9aa04228dd3edb14c9e635e003
--- /dev/null
+++ b/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'