diff --git a/lib/main.dart b/lib/main.dart index 3092f27..e8166f2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -27,3 +27,11 @@ Future main() async { runApp(Phoenix(child: const MyApp())); } + + +// 1 create bloc +// 2 create use_case under domain folder +// 3 create repository +// 4 create repository implementation +// 5 create data source +// 6 add di register \ No newline at end of file diff --git a/lib/presentation/widgets/order_card.dart b/lib/presentation/widgets/order_card.dart index c051b33..4e4d267 100644 --- a/lib/presentation/widgets/order_card.dart +++ b/lib/presentation/widgets/order_card.dart @@ -1,3 +1,4 @@ +import 'package:easy_stepper/easy_stepper.dart'; import 'package:flutter/material.dart'; import '../../configs/configs.dart'; @@ -58,58 +59,119 @@ class OrderCard extends StatelessWidget { ), /// gap - Space.yf(0.75), + Space.y!, + const Divider(), + Space.y!, /// info bar Row( children: [ Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + flex: 2, + child: Row( children: [ - Text( - 'Nireden:', - style: AppText.b2b!.copyWith( - color: const Color(0xFF96969C), + SizedBox( + width: AppDimensions.normalize(15), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + const Icon( + Icons.check_circle, + size: 16, + color: Colors.green, + ), + SizedBox( + height: AppDimensions.normalize(7), + child: const VerticalDivider( + color: Colors.green, + width: 1, + indent: 0, + endIndent: 0, + thickness: 2, + ), + ), + const SizedBox( + width: 16, + child: Divider( + thickness: 2, + color: Colors.green, + ), + ), + SizedBox( + height: AppDimensions.normalize(7), + child: const VerticalDivider( + color: Color(0xFF96969C), + thickness: 2, + ), + ), + const Icon( + Icons.check_circle, + size: 16, + color: Color(0xFF96969C), + ), + ], ), ), - Text( - 'Urumçy', - style: AppText.b2b!.copyWith( - color: const Color(0xFF57575C), - ), - ), - const SizedBox(height: 8), - Text( - 'Nirede:', - style: AppText.b2b!.copyWith( - color: const Color(0xFF96969C), - ), - ), - Text( - 'Aşgabat', - style: AppText.b2b!.copyWith( - color: const Color(0xFF57575C), - ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Nireden:', + style: AppText.b2b!.copyWith( + color: const Color(0xFF96969C), + ), + ), + Text( + 'Urumçy', + style: AppText.b2b!.copyWith( + color: const Color(0xFF57575C), + ), + ), + const SizedBox(height: 8), + Text( + 'Nirede:', + style: AppText.b2b!.copyWith( + color: const Color(0xFF96969C), + ), + ), + Text( + 'Aşgabat', + style: AppText.b2b!.copyWith( + color: const Color(0xFF57575C), + ), + ), + ], ), ], ), + + /* */ ), - const Spacer(flex: 1), + // const Spacer(flex: 1), Expanded( - flex: 1, + flex: 2, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const Text('Ýer sany:'), Text( - '10', + 'Ýer sany:', style: AppText.b2b!.copyWith( color: const Color(0xFF96969C), ), ), + Text( + '10', + style: AppText.b2b!.copyWith( + color: const Color(0xFF57575C), + ), + ), const SizedBox(height: 8), - const Text('Göwrümi:'), + Text( + 'Göwrümi:', + style: AppText.b2b!.copyWith( + color: const Color(0xFF96969C), + ), + ), Text( '1472,31', style: AppText.b2b!.copyWith( @@ -119,7 +181,7 @@ class OrderCard extends StatelessWidget { ], ), ), - const Spacer(flex: 1), + // const Spacer(flex: 1), Expanded( child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/presentation/widgets/successful_auth_dialog.dart b/lib/presentation/widgets/successful_auth_dialog.dart index 4fbc40b..9cc72b4 100644 --- a/lib/presentation/widgets/successful_auth_dialog.dart +++ b/lib/presentation/widgets/successful_auth_dialog.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; import '../../configs/configs.dart'; -import '../../core/core.dart'; Future showSuccessfulAuthDialog(BuildContext context, String text) async { return showDialog( diff --git a/pubspec.lock b/pubspec.lock index 91dd2f1..b0ef175 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" args: dependency: transitive description: @@ -57,6 +65,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + crypto: + dependency: transitive + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" cupertino_icons: dependency: "direct main" description: @@ -73,6 +89,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.10.1" + easy_stepper: + dependency: "direct main" + description: + name: easy_stepper + sha256: d09e974ec9148480072f8a7d3b0779dfdbc1a3ec1ff7daa7fbda95b0c1fe7453 + url: "https://pub.dev" + source: hosted + version: "0.8.5" equatable: dependency: "direct main" description: @@ -272,6 +296,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + lottie: + dependency: transitive + description: + name: lottie + sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" + url: "https://pub.dev" + source: hosted + version: "3.1.2" matcher: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c9d0641..40362f2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,6 +23,7 @@ dependencies: flutter_phoenix: ^1.1.1 flutter_svg: ^2.0.10+1 flutter_secure_storage: ^9.2.2 + easy_stepper: ^0.8.5 dev_dependencies: flutter_test: