diff --git a/backend/requirements.txt b/backend/requirements.txt index 370fb6da..7fca8f3f 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -21,7 +21,7 @@ click==8.1.7 click-didyoumean==0.3.1 click-plugins==1.1.1 click-repl==0.3.0 -contourpy==1.2.0 +contourpy==1.2.1 cryptography==42.0.5 cycler==0.12.1 dbscan1d==0.2.2 @@ -69,7 +69,7 @@ oic==1.6.1 packaging==24.0 pandas==2.2.1 pathspec==0.12.1 -Pillow==10.2.0 +Pillow==10.3.0 platformdirs==4.2.0 pluggy==1.4.0 prometheus-client==0.20.0 @@ -78,7 +78,7 @@ prompt-toolkit==3.0.43 psycopg2-binary==2.9.9 py==1.11.0 pycodestyle==2.11.1 -pycparser==2.21 +pycparser==2.22 pycryptodomex==3.20.0 pydantic==2.6.4 pydantic-settings==2.2.1 @@ -102,7 +102,7 @@ recipe-scrapers==14.55.0 regex==2023.12.25 requests==2.31.0 scikit-learn==1.4.0 -scipy==1.12.0 +scipy==1.13.0 setuptools-scm==8.0.4 simple-websocket==1.0.0 six==1.16.0 @@ -116,7 +116,7 @@ tqdm==4.66.2 typed-ast==1.5.5 types-beautifulsoup4==4.12.0.20240229 types-html5lib==1.1.11.20240228 -types-requests==2.31.0.20240311 +types-requests==2.31.0.20240403 types-urllib3==1.26.25.14 typing_extensions==4.10.0 tzdata==2024.1 @@ -128,7 +128,7 @@ vine==5.1.0 w3lib==2.1.2 wcwidth==0.2.13 webencodings==0.5.1 -Werkzeug==3.0.1 +Werkzeug==3.0.2 wsproto==1.2.0 zope.event==5.0 zope.interface==6.2 diff --git a/kitchenowl/android/build.gradle b/kitchenowl/android/build.gradle index 92546c15..bc157bd1 100644 --- a/kitchenowl/android/build.gradle +++ b/kitchenowl/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/kitchenowl/android/settings.gradle b/kitchenowl/android/settings.gradle index 9b1d7a1e..8bdd0105 100644 --- a/kitchenowl/android/settings.gradle +++ b/kitchenowl/android/settings.gradle @@ -5,16 +5,21 @@ pluginManagement { def flutterSdkPath = properties.getProperty("flutter.sdk") assert flutterSdkPath != null, "flutter.sdk not set in local.properties" return flutterSdkPath - } - settings.ext.flutterSdkPath = flutterSdkPath() + }() - includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - plugins { - id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + repositories { + google() + mavenCentral() + gradlePluginPortal() } } -include ":app" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.4.0" apply false + id "org.jetbrains.kotlin.android" version "1.7.10" apply false +} -apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" \ No newline at end of file +include ":app" diff --git a/kitchenowl/lib/widgets/chart_line_current_month.dart b/kitchenowl/lib/widgets/chart_line_current_month.dart index 56f9161b..02228f99 100644 --- a/kitchenowl/lib/widgets/chart_line_current_month.dart +++ b/kitchenowl/lib/widgets/chart_line_current_month.dart @@ -85,7 +85,8 @@ class _ChartLineCurrentMonthState extends State { ), lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Theme.of(context).cardTheme.color ?? + getTooltipColor: (group) => + Theme.of(context).cardTheme.color ?? Theme.of(context).colorScheme.surface, tooltipRoundedRadius: 14, getTooltipItems: (touchedSpots) => diff --git a/kitchenowl/pubspec.lock b/kitchenowl/pubspec.lock index 42a5f806..3561b95b 100755 --- a/kitchenowl/pubspec.lock +++ b/kitchenowl/pubspec.lock @@ -293,10 +293,10 @@ packages: dependency: "direct main" description: name: fl_chart - sha256: "00b74ae680df6b1135bdbea00a7d1fc072a9180b7c3f3702e4b19a9943f5ed7d" + sha256: "2b7c1f5d867da9a054661641c8f499c55c47c39acccb97b3bc673f5fa9a39e74" url: "https://pub.dev" source: hosted - version: "0.66.2" + version: "0.67.0" flutter: dependency: "direct main" description: flutter diff --git a/kitchenowl/pubspec.yaml b/kitchenowl/pubspec.yaml index 1d1578d4..bb23a4bb 100644 --- a/kitchenowl/pubspec.yaml +++ b/kitchenowl/pubspec.yaml @@ -53,7 +53,7 @@ dependencies: markdown: ^7.1.1 tuple: ^2.0.1 community_charts_flutter: ^1.0.2 - fl_chart: ^0.66.0 + fl_chart: ^0.67.0 cached_network_image: ^3.3.0 image_picker: ^1.0.4 file_picker: ^8.0.0+1