diff --git a/RELEASE/app-release_version_1_0.apk b/RELEASE/Old - before play store/app-release_version_1_0.apk similarity index 100% rename from RELEASE/app-release_version_1_0.apk rename to RELEASE/Old - before play store/app-release_version_1_0.apk diff --git a/RELEASE/app-release_version_1_1.apk b/RELEASE/Old - before play store/app-release_version_1_1.apk similarity index 100% rename from RELEASE/app-release_version_1_1.apk rename to RELEASE/Old - before play store/app-release_version_1_1.apk diff --git a/RELEASE/app-release_version_1_2.apk b/RELEASE/Old - before play store/app-release_version_1_2.apk similarity index 100% rename from RELEASE/app-release_version_1_2.apk rename to RELEASE/Old - before play store/app-release_version_1_2.apk diff --git a/RELEASE/app-release_version_1_3.aab b/RELEASE/Old - before play store/app-release_version_1_3.aab similarity index 100% rename from RELEASE/app-release_version_1_3.aab rename to RELEASE/Old - before play store/app-release_version_1_3.aab diff --git a/RELEASE/app-release_version_1_4.aab b/RELEASE/Old - before play store/app-release_version_1_4.aab similarity index 100% rename from RELEASE/app-release_version_1_4.aab rename to RELEASE/Old - before play store/app-release_version_1_4.aab diff --git a/RELEASE/app-release_version_2_0_2.aab b/RELEASE/Old - before play store/app-release_version_2_0_2.aab similarity index 100% rename from RELEASE/app-release_version_2_0_2.aab rename to RELEASE/Old - before play store/app-release_version_2_0_2.aab diff --git a/RELEASE/app-release_version_2_0_3.aab b/RELEASE/Old - before play store/app-release_version_2_0_3.aab similarity index 100% rename from RELEASE/app-release_version_2_0_3.aab rename to RELEASE/Old - before play store/app-release_version_2_0_3.aab diff --git a/RELEASE/app-release_version_2_0_4.aab b/RELEASE/Old - before play store/app-release_version_2_0_4.aab similarity index 100% rename from RELEASE/app-release_version_2_0_4.aab rename to RELEASE/Old - before play store/app-release_version_2_0_4.aab diff --git a/RELEASE/app-release_version_2_0_5.aab b/RELEASE/Old - before play store/app-release_version_2_0_5.aab similarity index 100% rename from RELEASE/app-release_version_2_0_5.aab rename to RELEASE/Old - before play store/app-release_version_2_0_5.aab diff --git a/RELEASE/app-release_version_2_0_6.aab b/RELEASE/Old - before play store/app-release_version_2_0_6.aab similarity index 100% rename from RELEASE/app-release_version_2_0_6.aab rename to RELEASE/Old - before play store/app-release_version_2_0_6.aab diff --git a/RELEASE/app-release_version_2_0_6_14.aab b/RELEASE/Old - before play store/app-release_version_2_0_6_14.aab similarity index 100% rename from RELEASE/app-release_version_2_0_6_14.aab rename to RELEASE/Old - before play store/app-release_version_2_0_6_14.aab diff --git a/RELEASE/app-release_version_2_0_9.aab b/RELEASE/app-release_version_2_0_9.aab new file mode 100644 index 0000000..62feedd Binary files /dev/null and b/RELEASE/app-release_version_2_0_9.aab differ diff --git a/Screenshot_20240708_164912.png b/Screenshot_20240708_164912.png new file mode 100644 index 0000000..0f527dd Binary files /dev/null and b/Screenshot_20240708_164912.png differ diff --git a/Screenshot_20240708_164954.png b/Screenshot_20240708_164954.png new file mode 100644 index 0000000..03448b0 Binary files /dev/null and b/Screenshot_20240708_164954.png differ diff --git a/Screenshot_20240708_165019.png b/Screenshot_20240708_165019.png new file mode 100644 index 0000000..a8f0945 Binary files /dev/null and b/Screenshot_20240708_165019.png differ diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 5d53055..c03a81c 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="be.unov.myinfomate.tablet"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c4b7159..e0decaa 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,11 +1,11 @@ + package="be.unov.myinfomate.tablet"> - + diff --git a/android/app/src/main/kotlin/be/musee/de/la/fraise/tablet_app/MainActivity.kt b/android/app/src/main/kotlin/be/unov/myinfomate/tablet/MainActivity.kt similarity index 69% rename from android/app/src/main/kotlin/be/musee/de/la/fraise/tablet_app/MainActivity.kt rename to android/app/src/main/kotlin/be/unov/myinfomate/tablet/MainActivity.kt index f90fce8..254e53b 100644 --- a/android/app/src/main/kotlin/be/musee/de/la/fraise/tablet_app/MainActivity.kt +++ b/android/app/src/main/kotlin/be/unov/myinfomate/tablet/MainActivity.kt @@ -1,4 +1,4 @@ -package be.musee.de.la.fraise.tablet_app +package be.unov.myinfomate.tablet import io.flutter.embedding.android.FlutterActivity diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 5d53055..c03a81c 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="be.unov.myinfomate.tablet"> diff --git a/android/build.gradle b/android/build.gradle index 526e555..5886511 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -24,7 +24,14 @@ subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + //project.evaluationDependsOn(':app') + project.configurations.all { + resolutionStrategy.eachDependency { details -> + if (details.requested.group == 'androidx.lifecycle') { + details.useVersion '2.4.0' // To fix mapbox issue.. + } + } + } } tasks.register("clean", Delete) { diff --git a/android/key.properties b/android/key.properties index f7f7d73..5c54dc1 100644 --- a/android/key.properties +++ b/android/key.properties @@ -1,4 +1,5 @@ storePassword=Unov5100! keyPassword=Unov5100! keyAlias=key -storeFile=C:/Users/thoma/OneDrive/Documents/Unov/App Play store/Tablet App/android_key.jks \ No newline at end of file +storeFile=C:/Users/ThomasFransolet/Documents/Documents/Perso/UNOV/android_key.jks +//storeFile=C:/Users/thoma/OneDrive/Documents/Unov/App Play store/Tablet App/android_key.jks \ No newline at end of file diff --git a/lib/app_context.dart b/lib/app_context.dart index 3017f1f..3fd4ae5 100644 --- a/lib/app_context.dart +++ b/lib/app_context.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:tablet_app/Models/tabletContext.dart'; -import 'package:tablet_app/client.dart'; class AppContext with ChangeNotifier { TabletAppContext? _tabletContext; diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig index 4227576..9ca6338 100644 --- a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -1,10 +1,10 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/Users/thomasfransolet/Documents/flutter -FLUTTER_APPLICATION_PATH=/Users/thomasfransolet/Documents/Proj/MyMuseum/tablet_app +FLUTTER_ROOT=C:\PROJ\flutter +FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\MuseeDeLaFraise\tablet-app COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_BUILD_DIR=build -FLUTTER_BUILD_NAME=2.0.7 -FLUTTER_BUILD_NUMBER=15 +FLUTTER_BUILD_NAME=2.0.9 +FLUTTER_BUILD_NUMBER=17 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=true TREE_SHAKE_ICONS=false diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh index 77da297..de3bcca 100755 --- a/macos/Flutter/ephemeral/flutter_export_environment.sh +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -1,11 +1,11 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/thomasfransolet/Documents/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/thomasfransolet/Documents/Proj/MyMuseum/tablet_app" +export "FLUTTER_ROOT=C:\PROJ\flutter" +export "FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\MuseeDeLaFraise\tablet-app" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_BUILD_DIR=build" -export "FLUTTER_BUILD_NAME=2.0.7" -export "FLUTTER_BUILD_NUMBER=15" +export "FLUTTER_BUILD_NAME=2.0.9" +export "FLUTTER_BUILD_NUMBER=17" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false" diff --git a/playStore.png b/playStore.png new file mode 100644 index 0000000..5c3b0e3 Binary files /dev/null and b/playStore.png differ diff --git a/pubspec.yaml b/pubspec.yaml index 91662e1..5e67691 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.0.9+17 +version: 2.0.9+18 environment: sdk: ">=3.1.0 <4.0.0"