Merge branch 'main' into dependabot/gradle/app/android/com.android.to…

…ols.build-gradle-8.2.2

CHANGELOG.md

@@ -12,10 +12,24 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [//]: # (### Bugfix 🐛:)
 [//]: # (### Other changes:)
 
+
 ## [Unreleased]
+
+
+## [0.6.1] - 2024-03-21
 ### Added Features and Improvements 🙌:
+- All new and improved interpolation API, the predictions are now more reliable
 - Using the latest flutter 3.19 with upgraded deps
 - Compile against Android 14 (SDK34)
+- Hello World! Thx to the community, the app is now available in Lithuanian, Chinese and Spanish 🎉
+
+### Bugfix 🐛:
+- Fix bug, when reloading theme
+- Fix bug that the interpolation was not shown for disabled smoothing, #25
+
+### Other changes:
+- Disabling interpolation, will now use sigma=2days for extrapolation prediction
+- Removed v0.6.0 due to critical bug when user targe weight was set.
 
 
 ## [0.5.0] - 2024-01-25
@@ -41,6 +55,15 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Fix f-droid metadata
 
 
+## [0.4.6] - 2024-01-08
+### Bugfix 🐛:
+- Fix bug, when using lb and st units
+
+### Other changes:
+- Fix version error in 0.4.5
+- Fix f-droid metadata
+
+
 ## [0.4.4] - 2023-12-20
 ### Bugfix 🐛:
 - Fix bug, which prevented loading the app without measurements
@@ -146,7 +169,8 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - initial release
 
 
-[Unreleased]: https://github.com/quantumphysique/trale/compare/v0.5.0...main
+[Unreleased]: https://github.com/quantumphysique/trale/compare/v0.6.1...main
+[0.6.1]: https://github.com/quantumphysique/trale/compare/v0.5.0...v0.6.1
 [0.5.0]: https://github.com/quantumphysique/trale/compare/v0.4.7...v0.5.0
 [0.4.7]: https://github.com/quantumphysique/trale/compare/v0.4.6...v0.4.7
 [0.4.6]: https://github.com/quantumphysique/trale/compare/v0.4.4...v0.4.6

app/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-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) {
     flutterVersionCode = '1'
@@ -21,10 +22,6 @@ 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()) {
@@ -90,7 +87,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23"
 }
 
 // Map for the version code that gives each ABI a value.

app/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.9.22'
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

app/android/settings.gradle

@@ -1,3 +1,28 @@
+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 "8.2.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
+}
+
+
 include ':app'
 
 def localPropertiesFile = new File(rootProject.projectDir, "local.properties")