diff --git a/android/app/build.gradle b/android/app/build.gradle index f9bd3b7..fc7e5e7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,10 @@ +plugins { + id "com.android.application" + 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()) { @@ -12,10 +19,10 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } -def flutterRoot = localProperties.getProperty('flutter.sdk') +/*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) { @@ -27,9 +34,9 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' +/*apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"*/ android { compileSdkVersion 34 @@ -49,7 +56,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "be.unov.myinfomate.mdlf" // Update for mdlf and other clients -- "be.unov.mymuseum.fortsaintheribert" + applicationId "be.unov.mymuseum.fortsaintheribert" // Update for mdlf and other clients -- "be.unov.mymuseum.fortsaintheribert" // be.unov.myinfomate.mdlf minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() @@ -81,6 +88,6 @@ flutter { source '../..' } -dependencies { +/*dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +}*/ diff --git a/android/build.gradle b/android/build.gradle index 674e96f..c8ad5a4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,4 @@ -buildscript { +/*buildscript { ext.kotlin_version = '1.9.0' repositories { google() @@ -9,7 +9,7 @@ buildscript { classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } -} +}*/ allprojects { repositories { diff --git a/android/settings.gradle b/android/settings.gradle index 44e62bc..5ea421c 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -include ':app' +/*include ':app' def localPropertiesFile = new File(rootProject.projectDir, "local.properties") def properties = new Properties() @@ -9,3 +9,30 @@ localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } def flutterSdkPath = properties.getProperty("flutter.sdk") assert flutterSdkPath != null, "flutter.sdk not set in local.properties" apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +*/ + +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.2.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.0" apply false +} + +include ":app" \ No newline at end of file diff --git a/lib/Components/CustomAppBar.dart b/lib/Components/CustomAppBar.dart index e72125c..e5fe015 100644 --- a/lib/Components/CustomAppBar.dart +++ b/lib/Components/CustomAppBar.dart @@ -32,9 +32,9 @@ class _CustomAppBarState extends State { String cleanedTitle = widget.title.replaceAll('\n', ' ').replaceAll('
', ' '); - String formattedTitle = cleanedTitle.length > 45 + /*String formattedTitle = cleanedTitle.length > 45 ? cleanedTitle.substring(0, 45) + '...' - : cleanedTitle; + : cleanedTitle;*/ //final notchInset = MediaQuery.of(context).padding; return AppBar( @@ -54,10 +54,10 @@ class _CustomAppBarState extends State { }, child: SizedBox( width: widget.isHomeButton ? size.width * 0.8 : null, - height: 60, + height: 58, child: Center( child: HtmlWidget( - formattedTitle, + cleanedTitle, textStyle: const TextStyle(color: Colors.white, fontFamily: 'Roboto', fontSize: 20), customStylesBuilder: (element) { diff --git a/lib/Components/ScannerDialog.dart b/lib/Components/ScannerDialog.dart index 78ae5f4..4e4fc21 100644 --- a/lib/Components/ScannerDialog.dart +++ b/lib/Components/ScannerDialog.dart @@ -124,7 +124,8 @@ class _ScannerDialogState extends State { borderRadius: 10, borderLength: 25, borderWidth: 5, - cutOutSize: 225.0), + overlayColor: Colors.black.withValues(alpha: 0.55), + cutOutSize: 225.0), onPermissionSet: (ctrl, p) => _onPermissionSet(context, ctrl, p), ); } diff --git a/lib/Screens/Article/audio_player_floating.dart b/lib/Screens/Article/audio_player_floating.dart index 714d60b..6e21848 100644 --- a/lib/Screens/Article/audio_player_floating.dart +++ b/lib/Screens/Article/audio_player_floating.dart @@ -66,6 +66,8 @@ class _AudioPlayerFloatingContainerState extends State player.duration!.inMilliseconds) { @@ -80,8 +82,6 @@ class _AudioPlayerFloatingContainerState extends State { borderRadius: BorderRadius.all(Radius.circular(20.0)) ), content: SizedBox( - width: 400, - height: 200, - child: DownloadConfigurationWidget(configuration: configuration), + width: 350, + height: 125, + child: Center( + child: DownloadConfigurationWidget(configuration: configuration) + ), ), - actions: const [], ), context: context ); isDialogOpen = false; diff --git a/lib/Services/downloadConfiguration.dart b/lib/Services/downloadConfiguration.dart index 26c921e..bd0c189 100644 --- a/lib/Services/downloadConfiguration.dart +++ b/lib/Services/downloadConfiguration.dart @@ -262,24 +262,23 @@ class _DownloadConfigurationWidgetState extends State( + valueListenable: currentResourceNbr, + builder: (context, valueNbr, _) { return ValueListenableBuilder( - valueListenable: currentResourceNbr, - builder: (context, valueNbr, _) { - return ValueListenableBuilder( - valueListenable: currentResourceIndex, - builder: (context, valueIndex, _) { - return Center( + valueListenable: currentResourceIndex, + builder: (context, valueIndex, _) { + var valueInPercentage = valueNbr > 0 ? (valueIndex / valueNbr) * 100 : 100; + String formattedPercentage = valueInPercentage.toStringAsFixed(0); + return Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Center( + child: Padding( + padding: const EdgeInsets.all(8.0), child: Text( textAlign: TextAlign.center, valueIndex == valueNbr && valueNbr != -1 ? valueNbr == 0 ? @@ -292,38 +291,39 @@ class _DownloadConfigurationWidgetState extends State( - valueListenable: currentResourceNbr, - builder: (context, valueNbr, _) { - return ValueListenableBuilder( - valueListenable: currentResourceIndex, - builder: (context, valueIndex, _) { - var valueInPercentage = valueNbr > 0 ? (valueIndex / valueNbr) * 100 : 100; - String formattedPercentage = valueInPercentage.toStringAsFixed(0); // Limite à 2 décimales - - return valueNbr != -1 && valueNbr != 0 ? Center( - child: Padding( - padding: const EdgeInsets.only(bottom: 8.0), - child: Text( - '$formattedPercentage%', - style: const TextStyle(fontSize: 45, fontWeight: FontWeight.w500), - ), - ), - ) : const SizedBox(height: 0,width: 0); - } - ); - } - ), - Spacer() - ], + ); + }), ); } } diff --git a/release/fortSaintHeribert_2_0_2.aab b/release/fortSaintHeribert_2_0_2.aab new file mode 100644 index 0000000..e6b51e6 Binary files /dev/null and b/release/fortSaintHeribert_2_0_2.aab differ