fix(collection): правки по коллекциям

This commit is contained in:
2025-06-16 20:22:56 +03:00
parent 9981f1ef0f
commit 3d31cd7737
29 changed files with 1218 additions and 43 deletions

View File

@@ -6,7 +6,7 @@
/// Locales: 2
/// Strings: 20 (10 per locale)
///
/// Built on 2025-04-02 at 18:04 UTC
/// Built on 2025-06-16 at 17:17 UTC
// coverage:ignore-file
// ignore_for_file: type=lint, unused_import

View File

@@ -147,20 +147,43 @@ class CollectionSearchRouteArgs {
/// generated route for
/// [_i5.CreateScreen]
class CreateRoute extends _i13.PageRouteInfo<void> {
const CreateRoute({List<_i13.PageRouteInfo>? children})
: super(CreateRoute.name, initialChildren: children);
class CreateRoute extends _i13.PageRouteInfo<CreateRouteArgs> {
CreateRoute({
_i14.Key? key,
_i15.Collection? collection,
List<_i13.PageRouteInfo>? children,
}) : super(
CreateRoute.name,
args: CreateRouteArgs(key: key, collection: collection),
initialChildren: children,
);
static const String name = 'CreateRoute';
static _i13.PageInfo page = _i13.PageInfo(
name,
builder: (data) {
return const _i5.CreateScreen();
final args = data.argsAs<CreateRouteArgs>(
orElse: () => const CreateRouteArgs(),
);
return _i5.CreateScreen(key: args.key, collection: args.collection);
},
);
}
class CreateRouteArgs {
const CreateRouteArgs({this.key, this.collection});
final _i14.Key? key;
final _i15.Collection? collection;
@override
String toString() {
return 'CreateRouteArgs{key: $key, collection: $collection}';
}
}
/// generated route for
/// [_i6.CrudCollectionFullscreenField]
class CrudCollectionFullscreenField

View File

@@ -13,6 +13,7 @@ import 'package:remever/components/extensions/context.dart';
import 'package:remever/database/database.dart';
import 'package:remever/gen/assets.gen.dart';
import 'package:remever/inject.dart';
import 'package:remever/router.gr.dart';
import 'package:remever/screens/collections/collections_screen.dart';
import 'package:remever/screens/collections/widgets/ticket_card.dart';
import 'package:remever/screens/dialogs/info_dialog.dart';
@@ -221,11 +222,14 @@ class CollectionDetailScreen extends StatelessWidget {
return PrimaryButton(
height: 52,
onTap: () {
// context.read<HomeCubit>().toCollection();
context.back();
context.replaceRoute(CreateRoute(collection: collection));
},
color: AppColors.primary,
child: AppTypography('Создать карточку', type: Regular14px()),
child: AppTypography(
'Создать карточку',
type: Regular14px(),
color: Colors.white,
),
);
}
}

View File

@@ -67,6 +67,8 @@ class _TicketCardState extends State<TicketCard> {
safeSetState(() => _isRolled = !_isRolled);
}
void _onEditTap() {}
@override
Widget build(BuildContext context) {
return Padding(
@@ -134,7 +136,7 @@ class _TicketCardState extends State<TicketCard> {
Widget _buildEditButton() {
return GestureDetector(
onTap: () {},
onTap: _onEditTap,
child: Assets.icons.typeEdit.image(height: 24.h, width: 24.w),
);
}

View File

@@ -11,6 +11,7 @@ import 'package:remever/common/widgets/w_if.dart';
import 'package:remever/common/widgets/wspace.dart';
import 'package:remever/components/extensions/context.dart';
import 'package:remever/components/extensions/state.dart';
import 'package:remever/database/database.dart';
import 'package:remever/gen/assets.gen.dart';
import 'package:remever/inject.dart';
import 'package:remever/models/create_ticket_dto.dart';
@@ -23,7 +24,9 @@ import 'package:remever/widgets/primary_button.dart';
@RoutePage()
class CreateScreen extends StatefulWidget {
const CreateScreen({super.key});
const CreateScreen({super.key, this.collection});
final Collection? collection;
@override
State<CreateScreen> createState() => _CreateScreenState();
@@ -107,6 +110,22 @@ class _CreateScreenState extends State<CreateScreen> {
});
}
@override
void initState() {
super.initState();
_setInitialData();
}
///
/// Простановка данных для редиректа из коллекции
///
void _setInitialData() {
if (widget.collection != null) {
safeSetState(() => _dto = _dto.copyWith(collection: widget.collection));
}
}
PreferredSizeWidget _buildAppBar() {
return AppBar(
toolbarHeight: 66.h,

View File

@@ -51,8 +51,8 @@ class _SplashScreenState extends State<SplashScreen> {
safeSetState(() => _launchLogo = !_launchLogo);
});
// Future<void>.delayed(const Duration(seconds: 4), _navigate);
Future<void>.delayed(const Duration(seconds: 1), _navigate);
Future<void>.delayed(const Duration(seconds: 4), _navigate);
// Future<void>.delayed(const Duration(seconds: 1), _navigate);
});
super.initState();