diff --git a/.fvmrc b/.fvmrc index 19e8577..984aec1 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.41.6" + "flutter": "3.32.4" } \ No newline at end of file diff --git a/assets/release_notes.md b/assets/release_notes.md index aea7e82..e5e9169 100644 --- a/assets/release_notes.md +++ b/assets/release_notes.md @@ -1,9 +1,3 @@ -## 0.23.0 - April 2026 ---- - -- Fixes image artifact issues for iOS devices -- Update underlying Flutter version - ## 0.22.7 - March 2026 --- diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 21365b5..b69d018 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -755,9 +755,6 @@ "level": "Level", "@level": {}, - "lightMode": "Light Mode", - "@lightMode": {}, - "lineItemAdd": "Add Line Item", "@lineItemAdd": {}, @@ -1631,9 +1628,6 @@ "switchCamera": "Switch Camera", "@switchCamera": {}, - "system": "System", - "@system": {}, - "takePicture": "Take Picture", "@takePicture": {}, diff --git a/lib/widget/drawer.dart b/lib/widget/drawer.dart index 0557aec..9f30446 100644 --- a/lib/widget/drawer.dart +++ b/lib/widget/drawer.dart @@ -35,33 +35,50 @@ class ThemeSelectionDialog extends StatelessWidget { content: Column( mainAxisSize: MainAxisSize.min, children: [ - RadioGroup( - groupValue: currentThemeMode, - onChanged: (value) { - if (value != null) { - AdaptiveTheme.of(context).setThemeMode(value); - onThemeSelected(); - } - }, - child: Column( + RadioListTile( + title: Row( children: [ - RadioListTile( - value: AdaptiveThemeMode.system, - title: Text(L10().system), - secondary: Icon(TablerIcons.device_desktop), - ), - RadioListTile( - value: AdaptiveThemeMode.light, - title: Text(L10().lightMode), - secondary: Icon(TablerIcons.sun), - ), - RadioListTile( - value: AdaptiveThemeMode.dark, - title: Text(L10().darkMode), - secondary: Icon(TablerIcons.moon), - ), + Icon(TablerIcons.device_desktop), + SizedBox(width: 10), + Text("System"), ], ), + value: AdaptiveThemeMode.system, + groupValue: currentThemeMode, + onChanged: (value) { + AdaptiveTheme.of(context).setThemeMode(AdaptiveThemeMode.system); + onThemeSelected(); + }, + ), + RadioListTile( + title: Row( + children: [ + Icon(TablerIcons.sun), + SizedBox(width: 10), + Text("Light"), + ], + ), + value: AdaptiveThemeMode.light, + groupValue: currentThemeMode, + onChanged: (value) { + AdaptiveTheme.of(context).setThemeMode(AdaptiveThemeMode.light); + onThemeSelected(); + }, + ), + RadioListTile( + title: Row( + children: [ + Icon(TablerIcons.moon), + SizedBox(width: 10), + Text("Dark"), + ], + ), + value: AdaptiveThemeMode.dark, + groupValue: currentThemeMode, + onChanged: (value) { + AdaptiveTheme.of(context).setThemeMode(AdaptiveThemeMode.dark); + onThemeSelected(); + }, ), ], ), diff --git a/lib/widget/spinner.dart b/lib/widget/spinner.dart index 57abb42..e06e25b 100644 --- a/lib/widget/spinner.dart +++ b/lib/widget/spinner.dart @@ -5,7 +5,7 @@ class Spinner extends StatefulWidget { const Spinner({ this.color = COLOR_GRAY_LIGHT, Key? key, - required this.icon, + @required this.icon, this.duration = const Duration(milliseconds: 1800), }) : super(key: key); diff --git a/pubspec.lock b/pubspec.lock index 5f17bb7..9fd5914 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d" + sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f url: "https://pub.dev" source: hosted - version: "93.0.0" + version: "82.0.0" adaptive_theme: dependency: "direct main" description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: analyzer - sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b + sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0" url: "https://pub.dev" source: hosted - version: "10.0.1" + version: "7.4.5" archive: dependency: transitive description: @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: characters - sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -245,10 +245,10 @@ packages: dependency: transitive description: name: coverage - sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d" + sha256: aa07dbe5f2294c827b7edb9a87bba44a9c15a3cc81bc8da2ca19b37322d30080 url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.14.1" cross_file: dependency: transitive description: @@ -645,6 +645,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.14.2" + js: + dependency: transitive + description: + name: js + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" + url: "https://pub.dev" + source: hosted + version: "0.7.2" json_annotation: dependency: transitive description: @@ -657,26 +665,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "11.0.2" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.10" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.1" lint: dependency: "direct dev" description: @@ -705,26 +713,26 @@ packages: dependency: transitive description: name: matcher - sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.19" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.13.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.16.0" mime: dependency: transitive description: @@ -1158,26 +1166,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7" + sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" url: "https://pub.dev" source: hosted - version: "1.30.0" + version: "1.25.15" test_api: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.4" test_core: dependency: transitive description: name: test_core - sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51" + sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" url: "https://pub.dev" source: hosted - version: "0.6.16" + version: "0.6.8" typed_data: dependency: transitive description: @@ -1262,10 +1270,10 @@ packages: dependency: transitive description: name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.1.4" vm_service: dependency: transitive description: @@ -1371,5 +1379,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.9.0 <4.0.0" + dart: ">=3.8.1 <4.0.0" flutter: ">=3.29.0" diff --git a/pubspec.yaml b/pubspec.yaml index fedd83a..19dfc9c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: inventree description: InvenTree stock management -version: 0.23.0+117 +version: 0.22.7+116 environment: sdk: ^3.8.1