Merge branch 'develop'

woin2ee · Feb 12, 2025 · b61ec89 · b61ec89
2 parents e5c0d37 + df5abb3
commit b61ec89
Show file tree

Hide file tree

Showing 71 changed files with 1,557 additions and 1,256 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,7 +49,7 @@ lib/**/*.freezed.dart
 lib/**/*.g.dart
 
 # Personal
-lib/example
+example/**
 design/
 
 # l10n

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -28,7 +28,7 @@
             "name": "Flutter(example) for MacOS",
             "request": "launch",
             "type": "dart",
-            "program": "lib/example/main.dart",
+            "program": "example/main.dart",
             "args": [
                 "-d",
                 "macos",

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -25,8 +25,11 @@ linter:
   # producing the lint.
   rules:
     prefer_const_constructors: true
+    prefer_relative_imports: true
+    prefer_final_locals: true
+    # prefer_final_parameters: true
+    prefer_final_in_for_each: true
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -1,8 +1,9 @@
-import 'package:dst_helper/app/home_page.dart';
-import 'package:dst_helper/l10n/l10ns.dart';
 import 'package:flutter/material.dart';
 import 'package:universal_io/io.dart';
 
+import '../l10n/l10ns.dart';
+import 'home_page.dart';
+
 class App extends StatefulWidget {
   const App({super.key});
 

diff --git a/lib/app/home_page.dart b/lib/app/home_page.dart
@@ -1,12 +1,13 @@
-import 'package:dst_helper/app/models/menu.dart';
-import 'package:dst_helper/cook_page/cook_page.dart';
-import 'package:dst_helper/farm_page/farm_page.dart';
-import 'package:dst_helper/utils/custom_icon/custom_icon_icons.dart';
-import 'package:dst_helper/utils/font_family.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.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 'models/menu.dart';
+
 enum AvailableLanguage {
   en,
   ko,

diff --git a/lib/app/models/menu.dart b/lib/app/models/menu.dart
@@ -1,7 +1,8 @@
-import 'package:dst_helper/l10n/l10ns.dart';
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
+import '../../l10n/l10ns.dart';
+
 enum Menu {
   farm,
   cook;

diff --git a/lib/app/side_bar.dart b/lib/app/side_bar.dart
@@ -1,6 +1,7 @@
-import 'package:dst_helper/app/models/menu.dart';
 import 'package:flutter/material.dart';
 
+import 'models/menu.dart';
+
 class SideBar extends StatelessWidget {
   const SideBar({
     super.key,

diff --git a/lib/cook_page/cook_page.dart b/lib/cook_page/cook_page.dart
@@ -1,8 +1,9 @@
-import 'package:dst_helper/cook_page/recipe_card_table.dart';
-import 'package:dst_helper/cook_page/recipe_list/recipe_list.dart';
-import 'package:dst_helper/models/v2/item/item.dart';
 import 'package:flutter/material.dart';
 
+import '../models/v2/item/item.dart';
+import 'recipe_card_table.dart';
+import 'recipe_list/recipe_list.dart';
+
 class CookPage extends StatefulWidget {
   const CookPage({super.key});
 

diff --git a/lib/cook_page/recipe_card/default_recipe_card.dart b/lib/cook_page/recipe_card/default_recipe_card.dart
@@ -1,11 +1,12 @@
-import 'package:dst_helper/cook_page/recipe_card/dragging_recipe_image.dart';
-import 'package:dst_helper/cook_page/recipe_card/status_pair.dart';
-import 'package:dst_helper/l10n/l10ns.dart';
-import 'package:dst_helper/models/v2/item/categories.dart';
-import 'package:dst_helper/utils/etc.dart';
-import 'package:dst_helper/utils/font_family.dart';
 import 'package:flutter/material.dart';
 
+import '../../l10n/l10ns.dart';
+import '../../models/v2/item/categories.dart';
+import '../../utils/etc.dart';
+import '../../utils/font_family.dart';
+import 'dragging_recipe_image.dart';
+import 'status_pair.dart';
+
 class DefaultRecipeCard extends StatelessWidget {
   const DefaultRecipeCard({
     super.key,

diff --git a/lib/cook_page/recipe_card/detail_recipe_card.dart b/lib/cook_page/recipe_card/detail_recipe_card.dart
@@ -1,12 +1,13 @@
-import 'package:dst_helper/cook_page/recipe_card/dragging_recipe_image.dart';
-import 'package:dst_helper/cook_page/recipe_card/status_pair.dart';
-import 'package:dst_helper/l10n/l10ns.dart';
-import 'package:dst_helper/models/v2/item/categories.dart';
-import 'package:dst_helper/models/v2/status_value.dart';
-import 'package:dst_helper/utils/etc.dart';
-import 'package:dst_helper/utils/font_family.dart';
 import 'package:flutter/material.dart';
 
+import '../../l10n/l10ns.dart';
+import '../../models/v2/item/categories.dart';
+import '../../models/v2/status_value.dart';
+import '../../utils/etc.dart';
+import '../../utils/font_family.dart';
+import 'dragging_recipe_image.dart';
+import 'status_pair.dart';
+
 class DetailRecipeCard extends StatelessWidget {
   const DetailRecipeCard({
     super.key,

diff --git a/lib/cook_page/recipe_card/only_image_recipe_card.dart b/lib/cook_page/recipe_card/only_image_recipe_card.dart
@@ -1,7 +1,8 @@
-import 'package:dst_helper/cook_page/recipe_card/dragging_recipe_image.dart';
-import 'package:dst_helper/models/v2/item/categories.dart';
 import 'package:flutter/material.dart';
 
+import '../../models/v2/item/categories.dart';
+import 'dragging_recipe_image.dart';
+
 class OnlyImageRecipeCard extends StatelessWidget {
   const OnlyImageRecipeCard({
     super.key,

diff --git a/lib/cook_page/recipe_card/simple_recipe_card.dart b/lib/cook_page/recipe_card/simple_recipe_card.dart
@@ -1,10 +1,11 @@
-import 'package:dst_helper/cook_page/recipe_card/dragging_recipe_image.dart';
-import 'package:dst_helper/l10n/l10ns.dart';
-import 'package:dst_helper/models/v2/item/categories.dart';
-import 'package:dst_helper/utils/etc.dart';
-import 'package:dst_helper/utils/font_family.dart';
 import 'package:flutter/material.dart';
 
+import '../../l10n/l10ns.dart';
+import '../../models/v2/item/categories.dart';
+import '../../utils/etc.dart';
+import '../../utils/font_family.dart';
+import 'dragging_recipe_image.dart';
+
 class SimpleRecipeCard extends StatelessWidget {
   const SimpleRecipeCard({
     super.key,

diff --git a/lib/cook_page/recipe_card/status_pair.dart b/lib/cook_page/recipe_card/status_pair.dart
@@ -1,7 +1,8 @@
-import 'package:dst_helper/models/v2/status_value.dart';
-import 'package:dst_helper/utils/font_family.dart';
 import 'package:flutter/material.dart';
 
+import '../../models/v2/status_value.dart';
+import '../../utils/font_family.dart';
+
 enum StatusKey {
   hunger,
   health,

diff --git a/lib/cook_page/recipe_card_table.dart b/lib/cook_page/recipe_card_table.dart
@@ -1,7 +1,8 @@
-import 'package:dst_helper/cook_page/recipe_card/recipe_card.dart';
-import 'package:dst_helper/cook_page/recipe_card_table_model.dart';
 import 'package:flutter/material.dart';
 
+import 'recipe_card/recipe_card.dart';
+import 'recipe_card_table_model.dart';
+
 class RecipeCardTable extends StatefulWidget {
   const RecipeCardTable({super.key});
 
@@ -138,7 +139,7 @@ class _ModeChangeSwitchState extends State<_ModeChangeSwitch> {
   @override
   void initState() {
     super.initState();
-    var index = _order.indexOf(widget.model.recipeCardMode);
+    final index = _order.indexOf(widget.model.recipeCardMode);
     _selectedModes[index] = true;
   }
 

diff --git a/lib/cook_page/recipe_card_table_model.dart b/lib/cook_page/recipe_card_table_model.dart
@@ -1,8 +1,9 @@
-import 'package:dst_helper/cook_page/recipe_card/recipe_card.dart';
-import 'package:dst_helper/l10n/l10ns.dart';
-import 'package:dst_helper/models/v2/item/item.dart';
 import 'package:flutter/material.dart';
 
+import '../l10n/l10ns.dart';
+import '../models/v2/item/item.dart';
+import 'recipe_card/recipe_card.dart';
+
 class RecipeCardTableModel extends ChangeNotifier {
   RecipeCardMode _recipeCardMode = RecipeCardMode.basic;
   RecipeCardMode get recipeCardMode => _recipeCardMode;
@@ -18,16 +19,16 @@ class RecipeCardTableModel extends ChangeNotifier {
   }
 
   List<Recipe> getRecipes(BuildContext context) {
-    var entireRecipes = Items.recipes;
+    final entireRecipes = Items.recipes;
 
     if (_searchKeyword.isEmpty) {
       return entireRecipes;
     }
 
-    var searchedRecipes = entireRecipes.where((recipe) {
-      var recipeName = L10ns.of(context).localized('${recipe.code}_name');
-      var adjustedName = recipeName.replaceAll(' ', '').toLowerCase();
-      var searchKeyword = _searchKeyword.toLowerCase();
+    final searchedRecipes = entireRecipes.where((recipe) {
+      final recipeName = L10ns.of(context).localized('${recipe.code}_name');
+      final adjustedName = recipeName.replaceAll(' ', '').toLowerCase();
+      final searchKeyword = _searchKeyword.toLowerCase();
       return adjustedName.contains(searchKeyword);
     });
 

diff --git a/lib/cook_page/recipe_list/recipe_list.dart b/lib/cook_page/recipe_list/recipe_list.dart
@@ -1,11 +1,12 @@
-import 'package:dst_helper/cook_page/recipe_list/recipe_list_item.dart';
-import 'package:dst_helper/cook_page/recipe_list/recipe_list_notifier.dart';
-import 'package:dst_helper/l10n/l10ns.dart';
-import 'package:dst_helper/models/v2/item/item.dart';
-import 'package:dst_helper/utils/font_family.dart';
 import 'package:flutter/material.dart';
 import 'package:toastification/toastification.dart';
 
+import '../../l10n/l10ns.dart';
+import '../../models/v2/item/item.dart';
+import '../../utils/font_family.dart';
+import 'recipe_list_item.dart';
+import 'recipe_list_notifier.dart';
+
 class RecipeList extends StatefulWidget {
   RecipeList() : super(key: GlobalKey());
 
@@ -22,7 +23,7 @@ class _RecipeListState extends State<RecipeList> {
   Widget build(BuildContext context) {
     return DragTarget<Recipe>(
       onAcceptWithDetails: (details) {
-        var recipe = details.data;
+        final recipe = details.data;
         if (_recipeListNotifier.value.contains(recipe)) {
           _showToast(context);
           return;

diff --git a/lib/cook_page/recipe_list/recipe_list_item.dart b/lib/cook_page/recipe_list/recipe_list_item.dart
@@ -1,8 +1,9 @@
-import 'package:dst_helper/cook_page/recipe_list/recipe_list_notifier.dart';
-import 'package:dst_helper/models/v2/item/categories.dart';
-import 'package:dst_helper/models/v2/item/categories_extension.dart';
 import 'package:flutter/material.dart';
 
+import '../../models/v2/item/categories.dart';
+import '../../models/v2/item/categories_extension.dart';
+import 'recipe_list_notifier.dart';
+
 class DraggableRecipeListItem extends StatelessWidget {
   const DraggableRecipeListItem({
     super.key,

diff --git a/lib/cook_page/recipe_list/recipe_list_notifier.dart b/lib/cook_page/recipe_list/recipe_list_notifier.dart
@@ -1,6 +1,7 @@
-import 'package:dst_helper/models/v2/item/item.dart';
 import 'package:flutter/foundation.dart';
 
+import '../../models/v2/item/item.dart';
+
 class RecipeListNotifier extends ChangeNotifier {
   List<Recipe> _value = [];
   List<Recipe> get value => _value.toList();

diff --git a/lib/farm_page/edit_farm_set/components/analysis_view/analysis_view.dart b/lib/farm_page/edit_farm_set/components/analysis_view/analysis_view.dart
@@ -1,12 +1,14 @@
 import 'dart:ui';
 
-import 'package:dst_helper/farm_page/edit_farm_set/components/analysis_view/family_condition_box.dart';
-import 'package:dst_helper/farm_page/edit_farm_set/components/analysis_view/nutrient_condition_box.dart';
-import 'package:dst_helper/farm_page/edit_farm_set/components/analysis_view/season_condition_box.dart';
-import 'package:dst_helper/l10n/l10ns.dart';
-import 'package:dst_helper/utils/font_family.dart';
 import 'package:flutter/material.dart';
 
+import '../../../../l10n/l10ns.dart';
+import '../../../../utils/font_family.dart';
+import 'analysis_view_controller.dart';
+import 'family_condition_box.dart';
+import 'nutrient_condition_box.dart';
+import 'season_condition_box.dart';
+
 class AnalysisView extends StatelessWidget {
   const AnalysisView({
     super.key,
@@ -106,55 +108,6 @@ class AnalysisView extends StatelessWidget {
   }
 }
 
-class AnalysisViewController {
-  AnalysisViewController._({
-    required this.isSatisfying,
-    required this.isPlacedAnyPlant,
-    required this.seasonConditionBoxController,
-    required this.nutrientConditionBoxController,
-    required this.familyConditionBoxController,
-  });
-
-  factory AnalysisViewController.create({
-    required SeasonConditionBoxController seasonConditionBoxController,
-    required NutrientConditionBoxController nutrientConditionBoxController,
-    required FamilyConditionBoxController familyConditionBoxController,
-    required bool isPlacedAnyPlant,
-  }) {
-    bool isSatisfying() {
-      return seasonConditionBoxController.suitableSeasons.isNotEmpty &&
-          nutrientConditionBoxController.value.isSatisfying &&
-          familyConditionBoxController.value.isSatisfying;
-    }
-
-    final analysisViewController = AnalysisViewController._(
-      seasonConditionBoxController: seasonConditionBoxController,
-      nutrientConditionBoxController: nutrientConditionBoxController,
-      familyConditionBoxController: familyConditionBoxController,
-      isSatisfying: ValueNotifier(isSatisfying()),
-      isPlacedAnyPlant: ValueNotifier(isPlacedAnyPlant),
-    );
-
-    seasonConditionBoxController.addListener(() {
-      analysisViewController.isSatisfying.value = isSatisfying();
-    });
-    nutrientConditionBoxController.addListener(() {
-      analysisViewController.isSatisfying.value = isSatisfying();
-    });
-    familyConditionBoxController.addListener(() {
-      analysisViewController.isSatisfying.value = isSatisfying();
-    });
-    return analysisViewController;
-  }
-
-  final SeasonConditionBoxController seasonConditionBoxController;
-  final NutrientConditionBoxController nutrientConditionBoxController;
-  final FamilyConditionBoxController familyConditionBoxController;
-
-  ValueNotifier<bool> isSatisfying;
-  ValueNotifier<bool> isPlacedAnyPlant;
-}
-
 class _Title extends StatelessWidget {
   const _Title();
 
@@ -223,7 +176,7 @@ class _ConditionGroup extends StatelessWidget {
   });
 
   final SeasonConditionBoxController seasonConditionBoxController;
-  final NutrientConditionBoxController nutrientConditionBoxController;
+  final NutrientConditionBoxNotifier nutrientConditionBoxController;
   final FamilyConditionBoxController familyConditionBoxController;
 
   final BorderRadius borderRadius;