Merge branch 'develop'

Author: woin2ee

lib/app/app.dart

@@ -1,39 +1,32 @@
 import 'package:flutter/material.dart';
-import 'package:universal_io/io.dart';
+import 'package:provider/provider.dart';
 
 import '../l10n/l10ns.dart';
+import 'app_state.dart';
 import 'home_page.dart';
 
-class App extends StatefulWidget {
+class App extends StatelessWidget {
   const App({super.key});
 
-  @override
-  State<App> createState() => _AppState();
-}
-
-class _AppState extends State<App> {
-  Locale _selectedLocale = Locale(Platform.localeName.split('_')[0]);
-
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'DST Helper',
-      restorationScopeId: 'restoration_scope_id_dst_helper_0.0.1_0_debug',
-      locale: _selectedLocale,
-      localizationsDelegates: L10ns.localizationsDelegates,
-      supportedLocales: L10ns.supportedLocales,
-      theme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(seedColor: Colors.brown.shade800),
-        useMaterial3: true,
-      ),
-      home: HomePage(
-        onSelectedLocale: (locale) {
-          setState(() {
-            _selectedLocale = locale;
-          });
-        },
-        selectedLocale: _selectedLocale,
-      ),
+    return ChangeNotifierProvider(
+      create: (context) => AppState(),
+      builder: (context, child) {
+        final appState = context.watch<AppState>();
+        return MaterialApp(
+          title: 'DST Helper',
+          restorationScopeId: 'restoration_scope_id_dst_helper_0.0.1_0_debug',
+          locale: appState.currentLocale,
+          localizationsDelegates: L10ns.localizationsDelegates,
+          supportedLocales: L10ns.supportedLocales,
+          theme: ThemeData(
+            colorScheme: ColorScheme.fromSeed(seedColor: Colors.brown.shade800),
+            useMaterial3: true,
+          ),
+          home: const HomePage(),
+        );
+      },
     );
   }
 }

lib/app/app_state.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:universal_io/io.dart';
+
+class AppState extends ChangeNotifier {
+  Locale _currentLocale = Locale(Platform.localeName.split('_')[0]);
+  Locale get currentLocale => _currentLocale;
+  set currentLocale(Locale value) {
+    _currentLocale = value;
+    notifyListeners();
+  }
+}

lib/app/home_page.dart

@@ -1,11 +1,13 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../cook_page/cook_page.dart';
 import '../farm_page/farm_page.dart';
 import '../utils/custom_icon/custom_icon_icons.dart';
 import '../utils/font_family.dart';
+import 'app_state.dart';
 import 'models/menu.dart';
 
 enum AvailableLanguage {
@@ -16,13 +18,8 @@ enum AvailableLanguage {
 class HomePage extends StatefulWidget {
   const HomePage({
     super.key,
-    required this.onSelectedLocale,
-    required this.selectedLocale,
   });
 
-  final void Function(Locale) onSelectedLocale;
-  final Locale selectedLocale;
-
   @override
   State<HomePage> createState() => _HomePageState();
 }
@@ -39,8 +36,8 @@ class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-
     final selectedMenu = _selectedMenuState.firstWhere((element) => element.$2 == true).$1;
+    final appState = context.watch<AppState>();
 
     return Scaffold(
       backgroundColor: colorScheme.surfaceContainerLowest,
@@ -59,9 +56,9 @@ class _HomePageState extends State<HomePage> {
           ),
           const SizedBox(width: 20),
           LanguagePopupMenuButton(
-            selectedLocaleName: widget.selectedLocale.localizedName,
+            selectedLocaleName: appState.currentLocale.localizedName,
             onSelected: (AvailableLanguage item) {
-              widget.onSelectedLocale(Locale(item.name));
+              appState.currentLocale = Locale(item.name);
             },
           ),
           const SizedBox(width: 30),

lib/farm_page/edit_farm_set/components/analysis_view/analysis_view.dart

@@ -1,33 +1,28 @@
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 import '../../../../l10n/l10ns.dart';
 import '../../../../utils/font_family.dart';
-import 'analysis_view_controller.dart';
-import 'family_condition_box.dart';
+import '../../farm_group_edit_controller.dart';
+import 'family_condition/family_condition_box.dart';
 import 'nutrient_condition_box.dart';
 import 'season_condition_box.dart';
 
 class AnalysisView extends StatelessWidget {
   const AnalysisView({
     super.key,
-    required this.width,
-    required this.height,
-    required this.controller,
   });
 
-  final AnalysisViewController controller;
-
-  final double width;
-  final double height;
-
   @override
   Widget build(BuildContext context) {
     const BorderRadius conditionGroupBorderRadius = BorderRadius.all(Radius.circular(12));
+    final controller = context.read<FarmGroupEditController>().analysisViewController;
+
     return SizedBox(
-      width: width,
-      height: height,
+      width: 400,
+      height: 356,
       child: ValueListenableBuilder(
         valueListenable: controller.isSatisfying,
         builder: (context, isSatisfying, child) {

lib/farm_page/edit_farm_set/components/analysis_view/analysis_view_controller.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'family_condition_box.dart';
+import 'family_condition/family_condition_box.dart';
 import 'nutrient_condition_box.dart';
 import 'season_condition_box.dart';