diff --git a/.gitignore b/.gitignore
index 224512bb1f0862747229852612caf017a065986e..feabf13db09e71209d747a928563aca69c1a756c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,4 +56,5 @@ android/app/build.gradle
integration_test/duniter/data/chains/
# Ignore PC deps
-scripts/pushGecko
\ No newline at end of file
+scripts/pushGecko
+android-old
\ No newline at end of file
diff --git a/.metadata b/.metadata
index 245a8e8c21fdfe2322dcaa09a6c7cdcfd33420a6..caa269cf4c72fd3dea88ba0fad48991fc9f2735f 100644
--- a/.metadata
+++ b/.metadata
@@ -4,7 +4,7 @@
# This file should be version controlled.
version:
- revision: 85684f9300908116a78138ea4c6036c35c9a1236
+ revision: c07f7888888435fd9df505aa2efc38d3cf65681b
channel: stable
project_type: app
@@ -13,11 +13,26 @@ project_type: app
migration:
platforms:
- platform: root
- create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
- base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+ create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
- platform: android
- create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
- base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+ create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ - platform: ios
+ create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ - platform: linux
+ create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ - platform: macos
+ create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ - platform: web
+ create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ - platform: windows
+ create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+ base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
# User provided section
diff --git a/README.md b/README.md
index af9cd6a86d6830b39e2da3e3543822a4d19dd6ef..430cf83b374fd0b8d9d571f2aedce2080a038e5d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
# Ğecko
-Ğecko is a transaction client owned by [Axiom-Team association] and written in Dart. It is fast and secure thanks to native code compilation. It is not intended to manage member accounts, but rather simple wallets.
+Ğecko is a transaction client owned by [Axiom-Team association] and written in Dart. It is fast and
+secure thanks to native code compilation. It is not intended to manage member accounts, but rather
+simple wallets.
-The development is quite early, you can participate in the discussion [on the Duniter forum](https://forum.duniter.org/t/gecko-nouveau-client-de-paiements-1-sur-mobile-en-cours-de-developpement-dart-flutter/7857) (mostly FR)
+The development is quite early, you can participate in the
+discussion [on the Duniter forum](https://forum.duniter.org/t/gecko-nouveau-client-de-paiements-1-sur-mobile-en-cours-de-developpement-dart-flutter/7857) (
+mostly FR)
[Axiom-Team association]: https://axiom-team.fr/
@@ -20,18 +24,22 @@ The development is quite early, you can participate in the discussion [on the Du
To contribute to the code, we advise you to install the following development environment.
1. Android Studio
- - Android VM
- - Android NDK
+
+- Android VM
+- Android NDK
+
1. Flutter SDK
1. VSCode/Codium Flutter extension
-This will take about 12GB on your drive and 30 min of your time (with a good connection). Don't hesitate to ask on the forum for a peer-coding session if you are stuck.
+This will take about 12GB on your drive and 30 min of your time (with a good connection). Don't
+hesitate to ask on the forum for a peer-coding session if you are stuck.
### Android Studio
Android Studio will let you set up an Android VM and install tools you need.
-- Install [Android Studio](https://developer.android.com/studio/) using your favorite installation method.
+- Install [Android Studio](https://developer.android.com/studio/) using your favorite installation
+ method.
- At startup, do not open a project but click "configure" at the bottom of the "Welcome" menu
- In "SDK Manager"
- SDK Platforms Ttab
@@ -47,16 +55,21 @@ If you reach this point without trouble, you're good to go for the next step.
### Flutter SDK
-Flutter is a powerfull SDK to develop Android apps. [Install it](https://flutter.dev/docs/get-started/install/linux) with your favorite installation method.
+Flutter is a powerfull SDK to develop Android
+apps. [Install it](https://flutter.dev/docs/get-started/install/linux) with your favorite
+installation method.
### VSCode
-We are using VSCode and therefore document the process for this IDE. Of course you're free to use whatever you want.
-Clone the ğecko repo and open a dart file (e.g. `lib/main.dart`). VSCode will suggest you to insall relevant extensions.
+We are using VSCode and therefore document the process for this IDE. Of course you're free to use
+whatever you want.
+Clone the ğecko repo and open a dart file (e.g. `lib/main.dart`). VSCode will suggest you to insall
+relevant extensions.
### Build the app
-In a dart file (e.g. `lib/main.dart`), type the `F5` key to build the code. The app should open automatically in your VM which is running.
+In a dart file (e.g. `lib/main.dart`), type the `F5` key to build the code. The app should open
+automatically in your VM which is running.
### Build your app for Desktop
diff --git a/android/.gitignore b/android/.gitignore
index 0a741cb43d66c6790a2a913fa24c8878fb1ab7b5..6f568019d3c69d4966bb5a0f759980a1472afc1e 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 d5f7926b5cb142116e664f85f36fd44b2242d136..662c3bec1e4dc873e224c19276a951e98c4ea4f9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -21,32 +21,40 @@ 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 33
+ compileSdkVersion flutter.compileSdkVersion
+ ndkVersion flutter.ndkVersion
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
}
- lintOptions {
- disable 'InvalidPackage'
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
+
+ sourceSets {
+ main.java.srcDirs += 'src/main/kotlin'
}
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 33
+ targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
@@ -82,5 +90,4 @@ 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
deleted file mode 100644
index 3df0b1b00986b5a04ec91edc3995fec53506ce1a..0000000000000000000000000000000000000000
--- a/android/app/proguard-rules.pro
+++ /dev/null
@@ -1,7 +0,0 @@
--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 2f0961bcef8dae3412685e7e9d291a76c6d68203..a38ff12828784c9e73a2e550c3eee5593f8e2132 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="gecko.axiomteam.fr">
- <!-- Flutter needs it to communicate with the running application
+ package="gecko.axiomteam.gecko">
+ <!-- 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"/>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f2ad46536f97c8450fde639aaa34c73ec3294c86..87c59ae5ba1b273501b3d68a45b91f99cafa0e5f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,50 +1,30 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- 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"
+ package="gecko.axiomteam.gecko">
+ <application
+ android:label="gecko"
android:name="${applicationName}"
- android:label="Ğecko"
- android:usesCleartextTraffic="true">
- <!-- TODO: Remove usesCleartextTraffic for production mode ! kopa -->
- <!-- android:icon="@mipmap/ic_launcher"> -->
+ android:icon="@mipmap/ic_launcher">
<activity
- android:requestLegacyExternalStorage="true"
android:name=".MainActivity"
- android:icon="@mipmap/ic_launcher"
+ android:exported="true"
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: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
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
deleted file mode 100644
index de5d149bf6124d6488db0ffaee2f1bf5b14d61c8..0000000000000000000000000000000000000000
--- a/android/app/src/main/kotlin/com/example/gecko/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 8dae5e06ea768c2ee38981aafc97779fd089f1b3..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and /dev/null 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
deleted file mode 100644
index 5966d5e8a68b91799fa40135c3fb7c69a18e591b..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and /dev/null 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
deleted file mode 100644
index a3fc36908c583e7c702bdf574864e169ec6c28be..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and /dev/null 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
deleted file mode 100644
index 51afdd65b51bdec69d5400f21c6967f68b64a88a..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and /dev/null 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
deleted file mode 100644
index 4868adcb3b656b5bfa62bcf3139409355de26223..0000000000000000000000000000000000000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 1f83a33fd4f2c45c5ffa5b6c1b729c431fd445fc..cb1ef88056edd1caf99a935e434e7ff6943a0ef6 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 -->
- <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+ <!-- 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">
<!-- Show a splash screen on the activity. Automatically removed when
- Flutter draws its first frame -->
+ the Flutter engine 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.Black.NoTitleBar">
- <item name="android:windowBackground">@android:color/white</item>
+ <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+ <item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 2f0961bcef8dae3412685e7e9d291a76c6d68203..a38ff12828784c9e73a2e550c3eee5593f8e2132 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="gecko.axiomteam.fr">
- <!-- Flutter needs it to communicate with the running application
+ package="gecko.axiomteam.gecko">
+ <!-- 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"/>
diff --git a/android/build.gradle b/android/build.gradle
index bef5f7b277cef0c0bfdb0edbdd52eeabfd5f3a97..20411f5f31a99755c8b9b215e6150266225c6955 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,7 +2,7 @@ buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
@@ -14,7 +14,7 @@ buildscript {
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
}
}
diff --git a/android/gradle.properties b/android/gradle.properties
index 4d3226abc21bb47320bb73c654e77d565977204d..94adc3a3f97aa8ae37ba567d080f94f95ee8f9b7 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 97691bdaf2871f5d79230139faf926188b8b0b93..3c472b99c6f3501ff93513bcdf39dabe4f236a55 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +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-7.3.3-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle
deleted file mode 100644
index e7b4def49cb53d9aa04228dd3edb14c9e635e003..0000000000000000000000000000000000000000
--- a/android/settings_aar.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index 491a7e88f0ccda0d00908a16b025a6734e8ea953..d08d914cb197c18a95b08a4fcc4b72bf0654b3e6 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 3431e535148fd3fdfb8f4ce48d701238ca2ede4f..6cb6241930badf9acc80f7ce52acb6eeb7f4c978 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 37ff62bf6121621371b67c9928c935028c94f092..3e54e80e816ecaee013b6eb8d9fc24cdb055ffe9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index f390c8aaad1a63dd3ab3a17e3a657c9b3e170a07..a544812c10915a5bafbb14b4fa2961411b3c2e8c 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index b859bae2c8c1dc86e8f41b8f9d1f8585afc496f7..db4c93212315fca1bb93972241d0b5d4ae43ae7f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 993c790b3a12242a033ee2a8042ea23079b109e9..4005a0d105b9714c7857a7e71926af24bdbed048 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index d9b8ac2fc6a72f2ad3ec6e8e3d326c29e60c2825..852aa3158849d8b8727ed7aeb6d4c24db1801c6c 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 37ff62bf6121621371b67c9928c935028c94f092..3e54e80e816ecaee013b6eb8d9fc24cdb055ffe9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 93b01663837dd0d7e8f3a165f637dcfbc357441f..b6fb5054080b504859943b8a1d91ea242cc2da26 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 5ef70304b165dde793c02daaad8d7e4ab1f373bd..aad11e21030478b30e30420320e93c33c271fc6f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 5ef70304b165dde793c02daaad8d7e4ab1f373bd..aad11e21030478b30e30420320e93c33c271fc6f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 40f80a2bb9c8615c64f871da07203cd836044c99..afc4220df553a1e6a8d41e5065b0645a4067d3db 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index a66b260d8625e678d492ba30627baf0096d75bae..3c6974e098d9fb889c93ed8abad1c3c5afba93c9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 16a48d43b58d815a4bbbed206cb8b49a97bc9d99..7740bbd3d827783a50fa01754c8788bedad53c7c 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index d32030bd5a51ca97f642544bc0fe95bc5bd2d27b..2b683d06110417f93faa3677a433e491763b4c64 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/pubspec.lock b/pubspec.lock
index 98edc3d59cce0f013e0a5962651d135819ddecd1..52f540edd039670992fd30877b6dcb574f055c9d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1153,10 +1153,10 @@ packages:
description:
path: "."
ref: gecko-fixes
- resolved-ref: c97a9223c70b00261f6144543a9f5edf88d6b837
+ resolved-ref: "2e42824adf778c118248ba559be32208e9d9a650"
url: "https://github.com/poka-IT/sdk.git"
source: git
- version: "0.5.0"
+ version: "0.5.2"
pool:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b5278afb9aa675cfe1817ad3a0957e16cf56098d..9f0296df7616af346aa29adcda40903e58ee12b5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -42,12 +42,11 @@ dependencies:
dio: ^5.0.1
durt: ^0.1.6
package_info_plus: ^3.0.2
- polkawallet_sdk: #^0.4.9
+ polkawallet_sdk: #^0.5.2
git:
# url: https://github.com/polkawallet-io/sdk.git
# ref: develop
url: https://github.com/poka-IT/sdk.git
- # ref: gecko-old
ref: gecko-fixes
dots_indicator: ^2.1.0
connectivity_plus: ^3.0.2
diff --git a/scripts/build-apk.sh b/scripts/build-apk.sh
index be0a178eea5bd8da91c97f17e42fd800cbbc3375..f5ac9b277eb9c4ecdca716855c0306579039670b 100755
--- a/scripts/build-apk.sh
+++ b/scripts/build-apk.sh
@@ -17,7 +17,7 @@ echo "Nom du build final: ${APPNAME}-${VERSION}+${BUILD}.apk"
## To build Rust dependancies
# cargo br
-#flutter clean
+flutter clean
if [[ $1 == "bundle" ]]; then
flutter build appbundle --release --target-platform android-arm,android-arm64 --build-name $VERSION --build-number $BUILD
else
diff --git a/web/favicon.png b/web/favicon.png
deleted file mode 100644
index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000
Binary files a/web/favicon.png and /dev/null differ
diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png
deleted file mode 100644
index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000
Binary files a/web/icons/Icon-192.png and /dev/null differ
diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png
deleted file mode 100644
index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000
Binary files a/web/icons/Icon-512.png and /dev/null differ
diff --git a/web/index.html b/web/index.html
deleted file mode 100644
index 803aca72bbb905e519abd99ba5bd924849a36e60..0000000000000000000000000000000000000000
--- a/web/index.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <!--
- If you are serving your web app in a path other than the root, change the
- href value below to reflect the base path you are serving from.
-
- The path provided below has to start and end with a slash "/" in order for
- it to work correctly.
-
- For more details:
- * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
- -->
- <base href="/">
-
- <meta charset="UTF-8">
- <meta content="IE=Edge" http-equiv="X-UA-Compatible">
- <meta name="description" content="A new Flutter project.">
-
- <!-- iOS meta tags & icons -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="gecko">
- <link rel="apple-touch-icon" href="icons/Icon-192.png">
-
- <title>gecko</title>
- <link rel="manifest" href="manifest.json">
-</head>
-<body>
- <!-- This script installs service_worker.js to provide PWA functionality to
- application. For more information, see:
- https://developers.google.com/web/fundamentals/primers/service-workers -->
- <script>
- var serviceWorkerVersion = null;
- var scriptLoaded = false;
- function loadMainDartJs() {
- if (scriptLoaded) {
- return;
- }
- scriptLoaded = true;
- var scriptTag = document.createElement('script');
- scriptTag.src = 'main.dart.js';
- scriptTag.type = 'application/javascript';
- document.body.append(scriptTag);
- }
-
- if ('serviceWorker' in navigator) {
- // Service workers are supported. Use them.
- window.addEventListener('load', function () {
- // Wait for registration to finish before dropping the <script> tag.
- // Otherwise, the browser will load the script multiple times,
- // potentially different versions.
- var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
- navigator.serviceWorker.register(serviceWorkerUrl)
- .then((reg) => {
- function waitForActivation(serviceWorker) {
- serviceWorker.addEventListener('statechange', () => {
- if (serviceWorker.state == 'activated') {
- console.log('Installed new service worker.');
- loadMainDartJs();
- }
- });
- }
- if (!reg.active && (reg.installing || reg.waiting)) {
- // No active web worker and we have installed or are installing
- // one for the first time. Simply wait for it to activate.
- waitForActivation(reg.installing ?? reg.waiting);
- } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
- // When the app updates the serviceWorkerVersion changes, so we
- // need to ask the service worker to update.
- console.log('New service worker available.');
- reg.update();
- waitForActivation(reg.installing);
- } else {
- // Existing service worker is still good.
- console.log('Loading app from service worker.');
- loadMainDartJs();
- }
- });
-
- // If service worker doesn't succeed in a reasonable amount of time,
- // fallback to plaint <script> tag.
- setTimeout(() => {
- if (!scriptLoaded) {
- console.warn(
- 'Failed to load app from service worker. Falling back to plain <script> tag.',
- );
- loadMainDartJs();
- }
- }, 4000);
- });
- } else {
- // Service workers not supported. Just drop the <script> tag.
- loadMainDartJs();
- }
- </script>
-</body>
-</html>
diff --git a/web/manifest.json b/web/manifest.json
deleted file mode 100644
index b57dd44198ec7a3a06410d52e40e4da290c56301..0000000000000000000000000000000000000000
--- a/web/manifest.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "gecko",
- "short_name": "gecko",
- "start_url": ".",
- "display": "standalone",
- "background_color": "#0175C2",
- "theme_color": "#0175C2",
- "description": "A new Flutter project.",
- "orientation": "portrait-primary",
- "prefer_related_applications": false,
- "icons": [
- {
- "src": "icons/Icon-192.png",
- "sizes": "192x192",
- "type": "image/png"
- },
- {
- "src": "icons/Icon-512.png",
- "sizes": "512x512",
- "type": "image/png"
- }
- ]
-}