149 remove multipageformfield

ios/Podfile.lock

@@ -112,21 +112,21 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_appauth: aff60f61e4a80b8b5c051615f00bf8f3b54fc5e8
-  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
-  flutter_web_auth: acc15a8fd7bba796a933c724a6dffc3d00f07c27
-  google_sign_in_ios: 07375bfbf2620bc93a602c0e27160d6afc6ead38
+  flutter_appauth: 914057fda669db5073d3ca9d94ea932e7df3c964
+  flutter_secure_storage: 50035aef357c5a8bdd67fd6bc81370d46efc4d16
+  flutter_web_auth: e5618c2e8a6822d86a0dc49f08d00a7ba25cfafd
+  google_sign_in_ios: 0ab078e60da6dfe23cbc55c83502b52bba1aad63
   GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
   GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
-  kakao_flutter_sdk_common: 4f10f98226da5d0f7cbdeeaed5cc21f144515209
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  kakao_flutter_sdk_common: 7747df5fa2bf4cfcdc7aaa9ec260eb5e89e05f75
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
   sqlite3: 3da10a59910c809fb584a93aa46a3f05b785e12e
-  sqlite3_flutter_libs: 5f386339eccc9516a12ab10e4aa925cbef5f2dcf
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  webview_flutter_wkwebview: a4af96a051138e28e29f60101d094683b9f82188
+  sqlite3_flutter_libs: c26d86af4ad88f1465dc4e07e6dc6931eef228e4
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -495,13 +495,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = SA9884Z46P;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.onTimeFront;
+				PRODUCT_BUNDLE_IDENTIFIER = club.devkor.ontime;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -677,13 +678,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = SA9884Z46P;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.onTimeFront;
+				PRODUCT_BUNDLE_IDENTIFIER = club.devkor.ontime;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -699,13 +701,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = SA9884Z46P;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.onTimeFront;
+				PRODUCT_BUNDLE_IDENTIFIER = club.devkor.ontime;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

lib/data/repositories/authentication_repository_impl.dart

@@ -54,10 +54,10 @@ class AuthenticationRepositoryImpl implements AuthenticationRepository {
 
   @override
   Future<void> signInWithGoogle() async {
-    final GoogleSignIn _googleSignIn =
+    final GoogleSignIn googleSignIn =
         GoogleSignIn(scopes: ['email', 'profile']);
     try {
-      final GoogleSignInAccount? googleUser = await _googleSignIn.signIn();
+      final GoogleSignInAccount? googleUser = await googleSignIn.signIn();
       if (googleUser != null) {
         final GoogleSignInAuthentication googleAuth =
             await googleUser.authentication;

lib/presentation/login/screens/sign_in_main_screen.dart

@@ -63,14 +63,14 @@ class _SocialSignInButtonRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final AuthenticationRepository _authenticationRepository =
+    final AuthenticationRepository authenticationRepository =
         getIt.get<AuthenticationRepository>();
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         GoogleSignInButton(
           onPressed: () async {
-            await _authenticationRepository.signInWithGoogle();
+            await authenticationRepository.signInWithGoogle();
           },
         ),
       ],

lib/presentation/onboarding/components/onboarding_page_view_layout.dart

@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 
 class OnboardingPageViewLayout extends StatefulWidget {
   const OnboardingPageViewLayout(
-      {super.key, required this.title, required this.form});
+      {super.key, required this.title, required this.child});
 
   final Widget title;
-  final Form form;
+  final Widget child;
 
   @override
   State<OnboardingPageViewLayout> createState() =>
@@ -28,7 +28,7 @@ class _OnboardingPageViewLayoutState extends State<OnboardingPageViewLayout> {
           ),
         ),
         Expanded(
-          child: widget.form,
+          child: widget.child,
         ),
       ],
     );

lib/presentation/onboarding/cubit/onboarding/onboarding_cubit.dart → lib/presentation/onboarding/cubit/onboarding_cubit.dart

@@ -15,17 +15,20 @@ class OnboardingCubit extends Cubit<OnboardingState> {
 
   final OnboardUseCase _createDefaultPreparationUseCase;
 
-  Future<void> onboardingFormSubmitted(OnboardingState state) async {
+  Future<void> onboardingFormSubmitted() async {
     return await _createDefaultPreparationUseCase(
       preparationEntity: state.toEntity(),
-      spareTime: state.spareTime ?? Duration.zero,
+      spareTime: state.spareTime!,
       note: state.note ?? '',
     );
   }
 
-  void onboardingFormChanged(
-      List<OnboardingPreparationStepState> preparationStepList) {
-    emit(state.copyWith(preparationStepList: preparationStepList));
+  void onboardingFormChanged({
+    List<OnboardingPreparationStepState>? preparationStepList,
+    Duration? spareTime,
+  }) {
+    emit(state.copyWith(
+        preparationStepList: preparationStepList, spareTime: spareTime));
   }
 
   void onboardingFormValidated({

lib/presentation/onboarding/preparation_name_select/components/preparation_name_select_field.dart

@@ -0,0 +1,90 @@
+import 'package:flutter/material.dart';
+import 'package:on_time_front/presentation/onboarding/preparation_name_select/cubit/preparation_step_name/preparation_step_name_cubit.dart';
+import 'package:on_time_front/presentation/shared/components/check_button.dart';
+import 'package:on_time_front/presentation/shared/components/tile.dart';
+import 'package:on_time_front/presentation/shared/theme/tile_style.dart';
+
+class PreparationNameSelectField extends StatefulWidget {
+  const PreparationNameSelectField({
+    super.key,
+    required this.preparationStep,
+    this.onNameChanged,
+    this.onNameSaved,
+    required this.onSelectionChanged,
+    this.isAdding = false,
+  });
+
+  final PreparationStepNameState preparationStep;
+  final ValueChanged<String>? onNameChanged;
+  final VoidCallback? onNameSaved;
+  final VoidCallback onSelectionChanged;
+  final bool isAdding;
+
+  @override
+  State<PreparationNameSelectField> createState() =>
+      _PreparationNameSelectFieldState();
+}
+
+class _PreparationNameSelectFieldState
+    extends State<PreparationNameSelectField> {
+  final FocusNode focusNode = FocusNode();
+
+  @override
+  void dispose() {
+    focusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    focusNode.addListener(() {
+      if (!focusNode.hasFocus) {
+        widget.onNameSaved?.call();
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.isAdding) {
+      focusNode.requestFocus();
+    }
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8.0),
+      child: Tile(
+        key: ValueKey<String>(widget.preparationStep.preparationId),
+        style: TileStyle(padding: EdgeInsets.all(16.0)),
+        leading: SizedBox(
+            width: 30,
+            height: 30,
+            child: CheckButton(
+              isChecked: widget.preparationStep.isSelected,
+              onPressed: widget.onSelectionChanged,
+            )),
+        child: Expanded(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 19.0),
+            child: Container(
+              constraints: BoxConstraints(minHeight: 30),
+              child: TextFormField(
+                initialValue: widget.preparationStep.preparationName.value,
+                onChanged: widget.onNameChanged,
+                onFieldSubmitted: (value) => widget.onNameSaved?.call(),
+                onTapOutside: (event) {
+                  FocusManager.instance.primaryFocus?.unfocus();
+                },
+                decoration: InputDecoration(
+                  isDense: true,
+                  border: InputBorder.none,
+                  contentPadding: EdgeInsets.all(3.0),
+                ),
+                focusNode: focusNode,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}