fix(collection): правки по коллекциям #4
File diff suppressed because one or more lines are too long
Binary file not shown.
@@ -1 +0,0 @@
|
|||||||
/Users/vitalijnecitajlo/work/my/new\ remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/dart_build_result.json:
|
|
||||||
@@ -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"]}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"dependencies":[],"code_assets":[]}
|
|
||||||
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
-1
@@ -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"]}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"inputs":[],"outputs":[]}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/Users/vitalijnecitajlo/work/my/new\ remover/.dart_tool/flutter_build/f8aeafefd67128b8dbf5f95a00355084/native_assets.json:
|
|
||||||
@@ -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
-1
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
{"format-version":[1,0,0],"native-assets":{}}
|
|
||||||
File diff suppressed because one or more lines are too long
+1139
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,4 +1,4 @@
|
|||||||
PROJECT_NAME=JY
|
PROJECT_NAME=remever
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "ru.remever.mobile.remever"
|
namespace = "ru.remever.mobile"
|
||||||
compileSdk = flutter.compileSdkVersion
|
compileSdk = 36
|
||||||
ndkVersion = "27.0.12077973"
|
ndkVersion = "27.0.12077973"
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
@@ -21,11 +21,11 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
// 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.
|
// You can update the following values to match your application needs.
|
||||||
// For more information, see: https://flutter.dev/to/review-gradle-config.
|
// For more information, see: https://flutter.dev/to/review-gradle-config.
|
||||||
minSdk = flutter.minSdkVersion
|
minSdk = 21
|
||||||
targetSdk = flutter.targetSdkVersion
|
targetSdk = 36
|
||||||
versionCode = flutter.versionCode
|
versionCode = flutter.versionCode
|
||||||
versionName = flutter.versionName
|
versionName = flutter.versionName
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:label="remever"
|
android:label="remever"
|
||||||
android:name="${applicationName}"
|
android:name="${applicationName}"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package ru.remever.mobile.remever
|
package ru.remever.mobile
|
||||||
|
|
||||||
import io.flutter.embedding.android.FlutterActivity
|
import io.flutter.embedding.android.FlutterActivity
|
||||||
|
|
||||||
|
|||||||
@@ -369,7 +369,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever;
|
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
@@ -385,7 +385,7 @@
|
|||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 1.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever.RunnerTests;
|
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.RunnerTests;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
@@ -402,7 +402,7 @@
|
|||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 1.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever.RunnerTests;
|
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.RunnerTests;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
|
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
|
||||||
@@ -417,7 +417,7 @@
|
|||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 1.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever.RunnerTests;
|
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.RunnerTests;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
|
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
|
||||||
@@ -549,7 +549,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever;
|
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
@@ -572,7 +572,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile.remever;
|
PRODUCT_BUNDLE_IDENTIFIER = ru.remever.mobile;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
/// Locales: 2
|
/// Locales: 2
|
||||||
/// Strings: 20 (10 per locale)
|
/// 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
|
// coverage:ignore-file
|
||||||
// ignore_for_file: type=lint, unused_import
|
// ignore_for_file: type=lint, unused_import
|
||||||
|
|||||||
+27
-4
@@ -147,20 +147,43 @@ class CollectionSearchRouteArgs {
|
|||||||
|
|
||||||
/// generated route for
|
/// generated route for
|
||||||
/// [_i5.CreateScreen]
|
/// [_i5.CreateScreen]
|
||||||
class CreateRoute extends _i13.PageRouteInfo<void> {
|
class CreateRoute extends _i13.PageRouteInfo<CreateRouteArgs> {
|
||||||
const CreateRoute({List<_i13.PageRouteInfo>? children})
|
CreateRoute({
|
||||||
: super(CreateRoute.name, initialChildren: children);
|
_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 const String name = 'CreateRoute';
|
||||||
|
|
||||||
static _i13.PageInfo page = _i13.PageInfo(
|
static _i13.PageInfo page = _i13.PageInfo(
|
||||||
name,
|
name,
|
||||||
builder: (data) {
|
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
|
/// generated route for
|
||||||
/// [_i6.CrudCollectionFullscreenField]
|
/// [_i6.CrudCollectionFullscreenField]
|
||||||
class CrudCollectionFullscreenField
|
class CrudCollectionFullscreenField
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import 'package:remever/components/extensions/context.dart';
|
|||||||
import 'package:remever/database/database.dart';
|
import 'package:remever/database/database.dart';
|
||||||
import 'package:remever/gen/assets.gen.dart';
|
import 'package:remever/gen/assets.gen.dart';
|
||||||
import 'package:remever/inject.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/collections_screen.dart';
|
||||||
import 'package:remever/screens/collections/widgets/ticket_card.dart';
|
import 'package:remever/screens/collections/widgets/ticket_card.dart';
|
||||||
import 'package:remever/screens/dialogs/info_dialog.dart';
|
import 'package:remever/screens/dialogs/info_dialog.dart';
|
||||||
@@ -221,11 +222,14 @@ class CollectionDetailScreen extends StatelessWidget {
|
|||||||
return PrimaryButton(
|
return PrimaryButton(
|
||||||
height: 52,
|
height: 52,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// context.read<HomeCubit>().toCollection();
|
context.replaceRoute(CreateRoute(collection: collection));
|
||||||
context.back();
|
|
||||||
},
|
},
|
||||||
color: AppColors.primary,
|
color: AppColors.primary,
|
||||||
child: AppTypography('Создать карточку', type: Regular14px()),
|
child: AppTypography(
|
||||||
|
'Создать карточку',
|
||||||
|
type: Regular14px(),
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,6 +67,8 @@ class _TicketCardState extends State<TicketCard> {
|
|||||||
safeSetState(() => _isRolled = !_isRolled);
|
safeSetState(() => _isRolled = !_isRolled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onEditTap() {}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Padding(
|
return Padding(
|
||||||
@@ -134,7 +136,7 @@ class _TicketCardState extends State<TicketCard> {
|
|||||||
|
|
||||||
Widget _buildEditButton() {
|
Widget _buildEditButton() {
|
||||||
return GestureDetector(
|
return GestureDetector(
|
||||||
onTap: () {},
|
onTap: _onEditTap,
|
||||||
child: Assets.icons.typeEdit.image(height: 24.h, width: 24.w),
|
child: Assets.icons.typeEdit.image(height: 24.h, width: 24.w),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import 'package:remever/common/widgets/w_if.dart';
|
|||||||
import 'package:remever/common/widgets/wspace.dart';
|
import 'package:remever/common/widgets/wspace.dart';
|
||||||
import 'package:remever/components/extensions/context.dart';
|
import 'package:remever/components/extensions/context.dart';
|
||||||
import 'package:remever/components/extensions/state.dart';
|
import 'package:remever/components/extensions/state.dart';
|
||||||
|
import 'package:remever/database/database.dart';
|
||||||
import 'package:remever/gen/assets.gen.dart';
|
import 'package:remever/gen/assets.gen.dart';
|
||||||
import 'package:remever/inject.dart';
|
import 'package:remever/inject.dart';
|
||||||
import 'package:remever/models/create_ticket_dto.dart';
|
import 'package:remever/models/create_ticket_dto.dart';
|
||||||
@@ -23,7 +24,9 @@ import 'package:remever/widgets/primary_button.dart';
|
|||||||
|
|
||||||
@RoutePage()
|
@RoutePage()
|
||||||
class CreateScreen extends StatefulWidget {
|
class CreateScreen extends StatefulWidget {
|
||||||
const CreateScreen({super.key});
|
const CreateScreen({super.key, this.collection});
|
||||||
|
|
||||||
|
final Collection? collection;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<CreateScreen> createState() => _CreateScreenState();
|
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() {
|
PreferredSizeWidget _buildAppBar() {
|
||||||
return AppBar(
|
return AppBar(
|
||||||
toolbarHeight: 66.h,
|
toolbarHeight: 66.h,
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ class _SplashScreenState extends State<SplashScreen> {
|
|||||||
safeSetState(() => _launchLogo = !_launchLogo);
|
safeSetState(() => _launchLogo = !_launchLogo);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Future<void>.delayed(const Duration(seconds: 4), _navigate);
|
Future<void>.delayed(const Duration(seconds: 4), _navigate);
|
||||||
Future<void>.delayed(const Duration(seconds: 1), _navigate);
|
// Future<void>.delayed(const Duration(seconds: 1), _navigate);
|
||||||
});
|
});
|
||||||
|
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|||||||
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
name: remever
|
name: remever
|
||||||
description: "A new Flutter project."
|
description: ""
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
|
|
||||||
version: 1.0.0+1
|
version: 1.0.0+7
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.7.0
|
sdk: ^3.7.0
|
||||||
|
|||||||
Reference in New Issue
Block a user