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

Merged
Dimkov966 merged 1 commits from feature/collection into develop 2025-06-16 17:24:13 +00:00
29 changed files with 1218 additions and 43 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
/Users/vitalijnecitajlo/work/my/new\ remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/dart_build_result.json:

View File

@@ -1 +0,0 @@
{"inputs":["/Users/vitalijnecitajlo/fvm/versions/3.29.0/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart","/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/package_config_subset"],"outputs":["/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/dart_build_result.json","/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/dart_build_result.json"]}

View File

@@ -1 +0,0 @@
{"dependencies":[],"code_assets":[]}

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
{"inputs":["/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/package_config_subset"],"outputs":["/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/flutter_build/dart_plugin_registrant.dart"]}

View File

@@ -1 +0,0 @@
{"inputs":[],"outputs":[]}

View File

@@ -1 +0,0 @@
/Users/vitalijnecitajlo/work/my/new\ remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/native_assets.json:

View File

@@ -1 +0,0 @@
{"inputs":["/Users/vitalijnecitajlo/fvm/versions/3.29.0/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart","/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/package_config_subset"],"outputs":["/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/native_assets.json","/Users/vitalijnecitajlo/work/my/new remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/native_assets.json"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
{"format-version":[1,0,0],"native-assets":{}}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
PROJECT_NAME=JY
PROJECT_NAME=remever
.PHONY: clean

View File

@@ -6,8 +6,8 @@ plugins {
}
android {
namespace = "ru.remever.mobile.remever"
compileSdk = flutter.compileSdkVersion
namespace = "ru.remever.mobile"
compileSdk = 36
ndkVersion = "27.0.12077973"
compileOptions {
@@ -21,11 +21,11 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "ru.remever.mobile.remever"
applicationId = "ru.remever.mobile"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
minSdk = 21
targetSdk = 36
versionCode = flutter.versionCode
versionName = flutter.versionName
}

View File

@@ -1,4 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<application
android:label="remever"
android:name="${applicationName}"

View File

@@ -1,4 +1,4 @@
package ru.remever.mobile.remever
package ru.remever.mobile
import io.flutter.embedding.android.FlutterActivity

View File

@@ -369,7 +369,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@@ -385,7 +385,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever.RunnerTests;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -402,7 +402,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever.RunnerTests;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -417,7 +417,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever.RunnerTests;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -549,7 +549,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -572,7 +572,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever;
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;

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();

View File

@@ -1,8 +1,8 @@
name: remever
description: "A new Flutter project."
description: ""
publish_to: 'none'
version: 1.0.0+1
version: 1.0.0+7
environment:
sdk: ^3.7.0