Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Update dependencies and migrate to phosphoricons_flutter
EinTonic8d3e71e3d88
diff --git a/analysis_options.yaml b/analysis_options.yamlindex a15d6cb..317ff8e 100644--- a/analysis_options.yaml+++ b/analysis_options.yaml@@ -3,6 +3,8 @@ include: package:flutter_lints/flutter.yamlanalyzer:exclude:- lib/l10n/app_localizations*.dart+ - build/**+ - android/**formatter:page_width: 110diff --git a/android/gradle.properties b/android/gradle.propertiesindex fbee1d8..d5da727 100644--- a/android/gradle.properties+++ b/android/gradle.properties@@ -1,2 +1,6 @@org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryErrorandroid.useAndroidX=true+# This builtInKotlin flag was added automatically by Flutter migrator+android.builtInKotlin=false+# This newDsl flag was added automatically by Flutter migrator+android.newDsl=falsediff --git a/android/settings.gradle.kts b/android/settings.gradle.ktsindex fb605bc..ca7fe06 100644--- a/android/settings.gradle.kts+++ b/android/settings.gradle.kts@@ -19,8 +19,8 @@ pluginManagement {plugins {id("dev.flutter.flutter-plugin-loader") version "1.0.0"- id("com.android.application") version "8.9.1" apply false- id("org.jetbrains.kotlin.android") version "2.1.0" apply false+ id("com.android.application") version "8.11.1" apply false+ id("org.jetbrains.kotlin.android") version "2.2.20" apply false}include(":app")diff --git a/lib/app/app_shell.dart b/lib/app/app_shell.dartindex 25e859a..1d60bd4 100644--- a/lib/app/app_shell.dart+++ b/lib/app/app_shell.dart@@ -1,6 +1,6 @@import 'package:flutter/material.dart';import 'package:flutter/services.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../screens/about_screen.dart';diff --git a/lib/screens/about_screen.dart b/lib/screens/about_screen.dartindex 02752ce..947986f 100644--- a/lib/screens/about_screen.dart+++ b/lib/screens/about_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import 'package:url_launcher/url_launcher.dart';import '../catalog/exercise_catalog.dart';diff --git a/lib/screens/compare_screen.dart b/lib/screens/compare_screen.dartindex 2d96fad..eb9e142 100644--- a/lib/screens/compare_screen.dart+++ b/lib/screens/compare_screen.dart@@ -1,7 +1,7 @@import 'dart:io';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/progress_shot.dart';diff --git a/lib/screens/exercise_detail_screen.dart b/lib/screens/exercise_detail_screen.dartindex be36978..150cf2a 100644--- a/lib/screens/exercise_detail_screen.dart+++ b/lib/screens/exercise_detail_screen.dart@@ -1,6 +1,6 @@import 'package:file_picker/file_picker.dart';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/exercise.dart';diff --git a/lib/screens/exercises_screen.dart b/lib/screens/exercises_screen.dartindex 4d11cd9..0a56232 100644--- a/lib/screens/exercises_screen.dart+++ b/lib/screens/exercises_screen.dart@@ -2,7 +2,7 @@ import 'dart:io';import 'package:file_picker/file_picker.dart';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../catalog/exercise_catalog.dart';import '../l10n/l10n.dart';diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dartindex 587680f..33e5cc2 100644--- a/lib/screens/home_screen.dart+++ b/lib/screens/home_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/exercise.dart';diff --git a/lib/screens/measures_screen.dart b/lib/screens/measures_screen.dartindex 8fd61b6..f918b2e 100644--- a/lib/screens/measures_screen.dart+++ b/lib/screens/measures_screen.dart@@ -1,6 +1,6 @@import 'package:flutter/material.dart';import 'package:flutter/services.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/measure.dart';diff --git a/lib/screens/note_edit_screen.dart b/lib/screens/note_edit_screen.dartindex 547eb53..b088d61 100644--- a/lib/screens/note_edit_screen.dart+++ b/lib/screens/note_edit_screen.dart@@ -1,6 +1,6 @@import 'package:file_picker/file_picker.dart';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/exercise.dart';diff --git a/lib/screens/notes_screen.dart b/lib/screens/notes_screen.dartindex 01833e1..307b46a 100644--- a/lib/screens/notes_screen.dart+++ b/lib/screens/notes_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/exercise.dart';diff --git a/lib/screens/onboarding_screen.dart b/lib/screens/onboarding_screen.dartindex e7f56d4..1a01701 100644--- a/lib/screens/onboarding_screen.dart+++ b/lib/screens/onboarding_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../state/fit_state.dart';diff --git a/lib/screens/places_screen.dart b/lib/screens/places_screen.dartindex b526aa2..d4dabee 100644--- a/lib/screens/places_screen.dart+++ b/lib/screens/places_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../catalog/exercise_catalog.dart';import '../l10n/l10n.dart';diff --git a/lib/screens/progress_screen.dart b/lib/screens/progress_screen.dartindex c88c50a..43c790d 100644--- a/lib/screens/progress_screen.dart+++ b/lib/screens/progress_screen.dart@@ -1,7 +1,7 @@import 'dart:io';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/progress_shot.dart';diff --git a/lib/screens/routine_edit_screen.dart b/lib/screens/routine_edit_screen.dartindex a4b025a..00f4ee8 100644--- a/lib/screens/routine_edit_screen.dart+++ b/lib/screens/routine_edit_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../catalog/exercise_catalog.dart';import '../l10n/l10n.dart';diff --git a/lib/screens/routines_screen.dart b/lib/screens/routines_screen.dartindex e48f49c..27649ad 100644--- a/lib/screens/routines_screen.dart+++ b/lib/screens/routines_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/workout.dart';diff --git a/lib/screens/session_screen.dart b/lib/screens/session_screen.dartindex 6fdcbfb..de6e786 100644--- a/lib/screens/session_screen.dart+++ b/lib/screens/session_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../catalog/exercise_catalog.dart';import '../l10n/l10n.dart';diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 4313723..ab29441 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';import 'package:home_widget/home_widget.dart';import 'package:image_picker/image_picker.dart';import 'package:path_provider/path_provider.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import 'package:share_plus/share_plus.dart';import 'package:url_launcher/url_launcher.dart';diff --git a/lib/screens/timeline_screen.dart b/lib/screens/timeline_screen.dartindex 06ff406..50b1981 100644--- a/lib/screens/timeline_screen.dart+++ b/lib/screens/timeline_screen.dart@@ -3,7 +3,7 @@ import 'dart:math' as math;import 'package:flutter/material.dart';import 'package:image_picker/image_picker.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/progress_shot.dart';diff --git a/lib/screens/tools_screen.dart b/lib/screens/tools_screen.dartindex 02b2cd1..8ba2ac2 100644--- a/lib/screens/tools_screen.dart+++ b/lib/screens/tools_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../catalog/exercise_catalog.dart';import '../l10n/l10n.dart';diff --git a/lib/screens/train_screen.dart b/lib/screens/train_screen.dartindex ebd8654..67db346 100644--- a/lib/screens/train_screen.dart+++ b/lib/screens/train_screen.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../models/exercise.dart';diff --git a/lib/widgets/exercise_art.dart b/lib/widgets/exercise_art.dartindex 8abcde8..942b51a 100644--- a/lib/widgets/exercise_art.dart+++ b/lib/widgets/exercise_art.dart@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart' show SynchronousFuture;import 'package:flutter/material.dart';import 'package:flutter/services.dart' show rootBundle;import 'package:path_drawing/path_drawing.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../theme/app_colors.dart';diff --git a/lib/widgets/exercise_media.dart b/lib/widgets/exercise_media.dartindex ea33150..ba4f77f 100644--- a/lib/widgets/exercise_media.dart+++ b/lib/widgets/exercise_media.dart@@ -1,7 +1,7 @@import 'dart:io';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import 'package:video_player/video_player.dart';import '../models/exercise.dart';diff --git a/lib/widgets/note_kit.dart b/lib/widgets/note_kit.dartindex 25f9ab0..5a70dc1 100644--- a/lib/widgets/note_kit.dart+++ b/lib/widgets/note_kit.dart@@ -1,7 +1,7 @@import 'dart:io';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import 'package:video_player/video_player.dart';import '../l10n/l10n.dart';diff --git a/lib/widgets/photo_source_sheet.dart b/lib/widgets/photo_source_sheet.dartindex b4eaaaa..9212dcb 100644--- a/lib/widgets/photo_source_sheet.dart+++ b/lib/widgets/photo_source_sheet.dart@@ -1,6 +1,6 @@import 'package:flutter/material.dart';import 'package:image_picker/image_picker.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../theme/app_colors.dart';diff --git a/lib/widgets/stopwatch_card.dart b/lib/widgets/stopwatch_card.dartindex 62e63ef..f7b8541 100644--- a/lib/widgets/stopwatch_card.dart+++ b/lib/widgets/stopwatch_card.dart@@ -1,7 +1,7 @@import 'dart:async';import 'package:flutter/material.dart';-import 'package:phosphor_flutter/phosphor_flutter.dart';+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../l10n/l10n.dart';import '../theme/app_colors.dart';diff --git a/pubspec.lock b/pubspec.lockindex fd7e55b..d25ac46 100644--- a/pubspec.lock+++ b/pubspec.lock@@ -457,10 +457,10 @@ packages:dependency: "direct main"description:name: intl- sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"+ sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867"url: "https://pub.dev"source: hosted- version: "0.20.2"+ version: "0.20.3"jni:dependency: transitivedescription:@@ -529,10 +529,10 @@ packages:dependency: transitivedescription:name: matcher- sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861+ sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"url: "https://pub.dev"source: hosted- version: "0.12.19"+ version: "0.12.20"material_color_utilities:dependency: transitivedescription:@@ -545,10 +545,10 @@ packages:dependency: transitivedescription:name: meta- sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"+ sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"url: "https://pub.dev"source: hosted- version: "1.17.0"+ version: "1.19.0"mime:dependency: transitivedescription:@@ -653,14 +653,14 @@ packages:url: "https://pub.dev"source: hostedversion: "7.0.2"- phosphor_flutter:+ phosphoricons_flutter:dependency: "direct main"description:- name: phosphor_flutter- sha256: "8a14f238f28a0b54842c5a4dc20676598dd4811fcba284ed828bd5a262c11fde"+ name: phosphoricons_flutter+ sha256: "34e4a00cc1a4be87c60edfcfcd5de23c005dc69945a5d77e08d33e6d23c0e793"url: "https://pub.dev"source: hosted- version: "2.1.0"+ version: "1.0.0"platform:dependency: transitivedescription:@@ -830,10 +830,10 @@ packages:dependency: transitivedescription:name: test_api- sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"+ sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"url: "https://pub.dev"source: hosted- version: "0.7.10"+ version: "0.7.12"timezone:dependency: "direct main"description:@@ -926,10 +926,10 @@ packages:dependency: transitivedescription:name: vector_math- sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b+ sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47url: "https://pub.dev"source: hosted- version: "2.2.0"+ version: "2.4.2"video_player:dependency: "direct main"description:diff --git a/pubspec.yaml b/pubspec.yamlindex 44e3b8d..d158799 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -21,7 +21,7 @@ dependencies:intl: ^0.20.2path_drawing: ^1.0.1path_provider: ^2.1.6- phosphor_flutter: ^2.1.0+ phosphoricons_flutter: ^1.0.0share_plus: ^12.0.2shared_preferences: ^2.3.2timezone: ^0.11.1