mr.mojtaba/rasadyar_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor : base page

Browse Source
This commit is contained in:
mr.mojtaba
2025-09-24 21:42:22 +03:30
parent 19802e913c
commit fd9de4f80c
43 changed files with 400 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/chicken/lib/presentation/pages/poultry_science/active_hatching/view.dart
View File

@@ -11,11 +11,13 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
hasSearch: false, hasSearch: false,
hasFilter: false, hasFilter: false,
routesWidget: buildContainerPageRoute(controller.routesName), backId: poultryFirstKey,
onBackPressed: () => Get.back(id: poultryFirstKey),
//routesWidget: buildContainerPageRoute(controller.routesName),
child: Stack( child: Stack(
children: [ children: [
Positioned.fill( Positioned.fill(

33
packages/chicken/lib/presentation/pages/poultry_science/farm/view.dart
View File

@@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.dart'; import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.dart';
import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
import 'package:rasadyar_core/presentation/widget/base_page/widgets/back_ground_widget.dart';
import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
import 'package:rasadyar_chicken/presentation/widget/page_route.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
import 'logic.dart'; import 'logic.dart';
@@ -13,18 +11,13 @@ class FarmPage extends GetView<FarmLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
hasFilter: false, hasFilter: false,
hasSearch: false, hasSearch: false,
isBase: true, isBase: true,
routes: [], routes: [],
onBackPressed: () => Get.back(id: poultryFirstKey), backId: poultryFirstKey,
child: Stack( widgets: [firstTagInformation(), farmListWidget()],
children: [
Positioned.fill(child: chickenBackground()),
Positioned.fill(child: Column(children: [firstTagInformation(), farmListWidget()])),
],
),
); );
} }
@@ -83,7 +76,10 @@ class FarmPage extends GetView<FarmLogic> {
Container itemListExpandedWidget(PoultryFarm item) { Container itemListExpandedWidget(PoultryFarm item) {
return Container( return Container(
padding: EdgeInsets.symmetric(horizontal: 8), padding: EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)), decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
child: Column( child: Column(
spacing: 8, spacing: 8,
children: [ children: [
@@ -132,10 +128,19 @@ class FarmPage extends GetView<FarmLogic> {
), ),
), ),
buildRow(title: 'مالک/ تلفن', value: '${item.user?.fullname} (${item.user?.mobile})'), buildRow(
title: 'مالک/ تلفن',
value: '${item.user?.fullname} (${item.user?.mobile})',
),
buildRow(title: 'شناسه یکتا', value: item.breedingUniqueId ?? 'N/A'), buildRow(title: 'شناسه یکتا', value: item.breedingUniqueId ?? 'N/A'),
buildRow(title: 'کد اپیدمیولوژیک', value: item.epidemiologicalCode ?? 'N/A'), buildRow(
buildRow(title: 'کد بهداشتی', value: item.healthCertificateNumber ?? 'N/A'), title: 'کد اپیدمیولوژیک',
value: item.epidemiologicalCode ?? 'N/A',
),
buildRow(
title: 'کد بهداشتی',
value: item.healthCertificateNumber ?? 'N/A',
),
buildRow( buildRow(
title: 'دامپزشک فارم', title: 'دامپزشک فارم',
value: '${item.vetFarm?.fullName} (${item.vetFarm?.mobile ?? '-'})', value: '${item.vetFarm?.fullName} (${item.vetFarm?.mobile ?? '-'})',

6
packages/chicken/lib/presentation/pages/poultry_science/genocide/view.dart
View File

@@ -14,16 +14,16 @@ class GenocidePage extends GetView<GenocideLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routesWidget: buildContainerPageRoute(controller.routesName), routes:controller.routesName,
hasSearch: true, hasSearch: true,
hasFilter: true, hasFilter: true,
onSearchChanged: (data) { onSearchChanged: (data) {
controller.searchedValue.value = data; controller.searchedValue.value = data;
controller.getPoultryOrderList(); controller.getPoultryOrderList();
}, },
backId: poultryFirstKey,
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),
onBackPressed: () => Get.back(id: poultryFirstKey),
child: Stack( child: Stack(
fit: StackFit.expand, fit: StackFit.expand,
children: [ children: [

2
packages/chicken/lib/presentation/pages/steward/buy/view.dart
View File

@@ -11,7 +11,7 @@ class BuyPage extends GetView<BuyLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routes: controller.routesName, routes: controller.routesName,
isBase: true, isBase: true,
widgets: [ widgets: [

7
packages/chicken/lib/presentation/pages/steward/buy_in_province/view.dart
View File

@@ -13,9 +13,10 @@ class BuyInProvincePage extends GetView<BuyInProvinceLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routesWidget: ObxValue((route) => buildPageRoute(route), controller.routesName), routes: controller.routesName,
onBackPressed: () => Get.back(id: 0), //todo
backId:0,
onSearchChanged: (data) => controller.setSearchValue(data), onSearchChanged: (data) => controller.setSearchValue(data),
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),
widgets: [ widgets: [

5
packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart
View File

@@ -19,9 +19,10 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routes: controller.routesName, routes: controller.routesName,
onBackPressed: () => Get.back(id: 0), backId: 0,
onSearchChanged: (data) => controller.setSearchValue(data), onSearchChanged: (data) => controller.setSearchValue(data),
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),
widgets: [ widgets: [

2
packages/chicken/lib/presentation/pages/steward/sale/view.dart
View File

@@ -12,7 +12,7 @@ class SalePage extends GetView<SaleLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routes: controller.routesName, routes: controller.routesName,
isBase: true, isBase: true,
widgets: [ widgets: [

7
packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart
View File

@@ -18,9 +18,10 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: BasePage( body: ChickenBasePage(
routesWidget: ObxValue((route) => buildPageRoute(route), controller.routesName),
onBackPressed: () => Get.back(id: 1), routes: controller.routesName,
backId:1,
onSearchChanged: (data) => controller.setSearchValue(data), onSearchChanged: (data) => controller.setSearchValue(data),
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),
widgets: [ widgets: [

6
packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart
View File

@@ -19,9 +19,9 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routesWidget: ObxValue((route) => buildPageRoute(route), controller.routesName), routes: controller.routesName,
onBackPressed: () => Get.back(id: 1), backId: 1,
onSearchChanged: (data) => controller.setSearchValue(data), onSearchChanged: (data) => controller.setSearchValue(data),
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),
widgets: [ widgets: [

6
packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart
View File

@@ -15,9 +15,9 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routesWidget: ObxValue((route) => buildPageRoute(route), controller.routesName), routes: controller.routesName,
onBackPressed: () => Get.back(id: 1), backId: 1,
onSearchChanged: (data) => controller.setSearchValue(data), onSearchChanged: (data) => controller.setSearchValue(data),
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),
widgets: [ widgets: [

2
packages/chicken/lib/presentation/pages/steward/segmentation/view.dart
View File

@@ -14,7 +14,7 @@ import 'logic.dart';
class SegmentationPage extends GetView<SegmentationLogic> { class SegmentationPage extends GetView<SegmentationLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BasePage( return ChickenBasePage(
routes: controller.routesName, routes: controller.routesName,
onSearchChanged: (data) => controller.setSearchValue(data), onSearchChanged: (data) => controller.setSearchValue(data),
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),

1
packages/chicken/lib/presentation/widget/app_bar.dart
View File

@@ -23,6 +23,7 @@ RAppBar chickenAppBar({
hasNews: hasNews, hasNews: hasNews,
isBase: isBase, isBase: isBase,
backId: backId, backId: backId,
hasFilter: hasFilter,
onSearchTap: onSearchTap, onSearchTap: onSearchTap,
onBackTap: onBackTap, onBackTap: onBackTap,
onNotificationTap: onNotificationTap, onNotificationTap: onNotificationTap,

17
packages/chicken/lib/presentation/widget/base_page/back_ground.dart Normal file
View File

@@ -0,0 +1,17 @@
import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart';
BackGroundWidget chickenBackground() {
return BackGroundWidget(
gradient: LinearGradient(
begin: Alignment(1.00, 0.01),
end: Alignment(0.04, 0.99),
colors: [
const Color(0xFFD6DCEF).withValues(alpha: .8),
const Color(0xFFD6E6E9).withValues(alpha: .8),
const Color(0xFFD6E4E3).withValues(alpha: .8),
],
),
vecPath: Assets.vec.chickenPatternSvg.path,
);
}

6
packages/chicken/lib/presentation/widget/base_page/view.dart
View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_chicken/presentation/widget/app_bar.dart'; import 'package:rasadyar_chicken/presentation/widget/app_bar.dart';
import 'package:rasadyar_chicken/presentation/widget/base_page/back_ground.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
class ChickenBasePage extends GetView<BaseLogic> { class ChickenBasePage extends GetView<BaseLogic> {
@@ -25,8 +26,8 @@ class ChickenBasePage extends GetView<BaseLogic> {
this.scrollable = false, this.scrollable = false,
this.floatingActionButtonLocation, this.floatingActionButtonLocation,
this.floatingActionButton, this.floatingActionButton,
this.filteringWidget, this.filteringWidget,
this.backGroundWidget,
}) : assert( }) : assert(
(routes != null) || routesWidget != null, (routes != null) || routesWidget != null,
'Either routes or routesWidget must be provided.', 'Either routes or routesWidget must be provided.',
@@ -58,6 +59,8 @@ class ChickenBasePage extends GetView<BaseLogic> {
final Widget? filteringWidget; final Widget? filteringWidget;
final void Function(String?)? onSearchChanged; final void Function(String?)? onSearchChanged;
final BackGroundWidget? backGroundWidget;
void _onFilterTap() { void _onFilterTap() {
if (hasFilter && filteringWidget != null) { if (hasFilter && filteringWidget != null) {
final currentRoute = ModalRoute.of(Get.context!); final currentRoute = ModalRoute.of(Get.context!);
@@ -82,6 +85,7 @@ class ChickenBasePage extends GetView<BaseLogic> {
scrollable: scrollable, scrollable: scrollable,
floatingActionButtonLocation: floatingActionButtonLocation, floatingActionButtonLocation: floatingActionButtonLocation,
floatingActionButton: floatingActionButton, floatingActionButton: floatingActionButton,
backGroundWidget: backGroundWidget ?? chickenBackground(),
appBar: chickenAppBar( appBar: chickenAppBar(
isBase: isBase, isBase: isBase,
hasBack: isBase ? false : hasBack, hasBack: isBase ? false : hasBack,

5
packages/core/lib/presentation/widget/base_page/view.dart
View File

@@ -13,10 +13,7 @@ class BasePage extends GetView<BaseLogic> {
this.floatingActionButton, this.floatingActionButton,
this.appBar, this.appBar,
this.backGroundWidget, this.backGroundWidget,
}) : assert( }) ;
(routes != null) || routesWidget != null,
'Either routes or routesWidget must be provided.',
);
final List<String>? routes; final List<String>? routes;
final Breadcrumb? routesWidget; final Breadcrumb? routesWidget;

25
packages/core/lib/presentation/widget/base_page/widgets/back_ground_widget.dart
View File

@@ -2,7 +2,11 @@ import 'package:flutter/material.dart';
import 'package:rasadyar_core/presentation/common/assets.gen.dart'; import 'package:rasadyar_core/presentation/common/assets.gen.dart';
class BackGroundWidget extends StatelessWidget { class BackGroundWidget extends StatelessWidget {
const BackGroundWidget({super.key, required this.gradient, required this.vecPath}); const BackGroundWidget({
super.key,
required this.gradient,
required this.vecPath,
});
final Gradient gradient; final Gradient gradient;
final String vecPath; final String vecPath;
@@ -16,21 +20,4 @@ class BackGroundWidget extends StatelessWidget {
} }
} }
/*Container chickenBackground() {
return Container(
decoration: BoxDecoration(
gradient:
gradient ??
LinearGradient(
begin: Alignment(1.00, 0.01),
end: Alignment(0.04, 0.99),
colors: [
const Color(0xFFD6DCEF).withValues(alpha: .8),
const Color(0xFFD6E6E9).withValues(alpha: .8),
const Color(0xFFD6E4E3).withValues(alpha: .8),
],
),
),
child: Assets.vec.chickenPatternSvg.svg(fit: BoxFit.cover),
);
}*/

54
packages/core/lib/presentation/widget/base_page/widgets/r_app_bar.dart
View File

@@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
class RAppBar extends StatelessWidget implements PreferredSizeWidget { class RAppBar extends StatelessWidget implements PreferredSizeWidget {
final List<Widget>? children; final List<Widget>? children;
@@ -19,8 +18,10 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
final bool hasSearch; final bool hasSearch;
final VoidCallback? onSearchTap; final VoidCallback? onSearchTap;
final bool hasNotification; final bool hasFilter;
final VoidCallback? onFilterTap;
final bool hasNotification;
final VoidCallback? onNotificationTap; final VoidCallback? onNotificationTap;
final bool hasNews; final bool hasNews;
@@ -36,7 +37,8 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
this.hasBack = true, this.hasBack = true,
this.hasSearch = false, this.hasSearch = false,
this.hasNews = false, this.hasNews = false,
this.hasNotification= false, this.hasNotification = false,
this.hasFilter = false,
this.isBase = false, this.isBase = false,
this.centerTitle = false, this.centerTitle = false,
this.bottom, this.bottom,
@@ -45,6 +47,7 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
this.onSearchTap, this.onSearchTap,
this.onNewsTap, this.onNewsTap,
this.onNotificationTap, this.onNotificationTap,
this.onFilterTap,
}); });
@override @override
@@ -62,10 +65,8 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
children: [ children: [
if (children != null) ...children!, if (children != null) ...children!,
if (hasNews || hasBack || hasSearch || hasNotification) const Spacer(), if (hasNews || hasBack || hasSearch || hasNotification || hasFilter)
const Spacer(),
if (hasSearch) SearchWidget(),
if (hasSearch) SizedBox(width: 8.w),
if (hasNews) if (hasNews)
GestureDetector( GestureDetector(
@@ -78,9 +79,26 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
if (hasNews) SizedBox(width: 8.w), if (hasNews) SizedBox(width: 8.w),
if (hasNotification) if (hasNotification)
Badge.count(count: 2, child: Icon(CupertinoIcons.bell_fill, color: Colors.white)), Badge.count(
count: 2,
child: Icon(CupertinoIcons.bell_fill, color: Colors.white),
),
if (hasNotification) SizedBox(width: 8.w), if (hasNotification) SizedBox(width: 8.w),
if (hasFilter)
GestureDetector(
onTap: onFilterTap,
child: Assets.vec.filterSvg.svg(
width: 24.w,
height: 24.h,
colorFilter: ColorFilter.mode(Colors.white, BlendMode.srcIn),
),
),
if (hasBack) SizedBox(width: 8.w),
if (hasSearch) SearchWidget(),
if (hasSearch) SizedBox(width: 8.w),
if (hasBack) if (hasBack)
GestureDetector( GestureDetector(
onTap: onBackTap ?? () => Get.back(id: backId), onTap: onBackTap ?? () => Get.back(id: backId),
@@ -102,7 +120,8 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
} }
@override @override
Size get preferredSize => Size.fromHeight(kToolbarHeight + (bottom?.preferredSize.height ?? 0)); Size get preferredSize =>
Size.fromHeight(kToolbarHeight + (bottom?.preferredSize.height ?? 0));
MainAxisAlignment _getMainAxisAlignment() { MainAxisAlignment _getMainAxisAlignment() {
if (centerTitle) { if (centerTitle) {
@@ -154,15 +173,21 @@ class RAppBar2 extends StatelessWidget implements PreferredSizeWidget {
excludeHeaderSemantics: true, excludeHeaderSemantics: true,
scrolledUnderElevation: 0, scrolledUnderElevation: 0,
centerTitle: centerTitle, centerTitle: centerTitle,
titleTextStyle: titleTextStyle ?? AppFonts.yekan16.copyWith(color: Colors.white), titleTextStyle:
titleTextStyle ?? AppFonts.yekan16.copyWith(color: Colors.white),
title: Row( title: Row(
children: [ children: [
if (leading != null) ...{ if (leading != null) ...{
Padding(padding: const EdgeInsets.only(right: 6), child: leading), Padding(padding: const EdgeInsets.only(right: 6), child: leading),
}, },
if (title != null) ...[Text(title!), if (iconTitle != null) const SizedBox(width: 8)], if (title != null) ...[
Text(title!),
if (iconTitle != null) const SizedBox(width: 8),
],
if (iconTitle != null) ...{const SizedBox(width: 8)}, if (iconTitle != null) ...{const SizedBox(width: 8)},
if (iconTitle != null) ...{SvgGenImage.vec(iconTitle!).svg(width: 24, height: 24)}, if (iconTitle != null) ...{
SvgGenImage.vec(iconTitle!).svg(width: 24, height: 24),
},
], ],
), ),
titleSpacing: 8, titleSpacing: 8,
@@ -176,7 +201,10 @@ class RAppBar2 extends StatelessWidget implements PreferredSizeWidget {
child: Assets.vec.arrowLeftSvg.svg( child: Assets.vec.arrowLeftSvg.svg(
width: 24.w, width: 24.w,
height: 24.h, height: 24.h,
colorFilter: ColorFilter.mode(iconColor ?? Colors.white, BlendMode.srcIn), colorFilter: ColorFilter.mode(
iconColor ?? Colors.white,
BlendMode.srcIn,
),
), ),
), ),
), ),

68
packages/core/pubspec.lock
View File

@@ -133,10 +133,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: built_value name: built_value
sha256: ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.11.1" version: "8.12.0"
cached_network_image: cached_network_image:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -197,10 +197,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: code_builder name: code_builder
sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.10.1" version: "4.11.0"
collection: collection:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -450,18 +450,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_gen_core name: flutter_gen_core
sha256: eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb sha256: b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.11.0" version: "5.12.0"
flutter_gen_runner: flutter_gen_runner:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_gen_runner name: flutter_gen_runner
sha256: "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521" sha256: c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.11.0" version: "5.12.0"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -599,10 +599,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_svg name: flutter_svg
sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845 sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.0" version: "2.2.1"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -617,10 +617,10 @@ packages:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: freezed name: freezed
sha256: da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c sha256: "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.2.0" version: "3.2.3"
freezed_annotation: freezed_annotation:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -761,10 +761,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: hive_ce name: hive_ce
sha256: "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658" sha256: "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.11.3" version: "2.13.2"
hive_ce_flutter: hive_ce_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -833,10 +833,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_cropper_platform_interface name: image_cropper_platform_interface
sha256: "6ca6b81769abff9a4dcc3bbd3d75f5dfa9de6b870ae9613c8cd237333a4283af" sha256: "2d8db8f4b638e448fa89a1e77cd8f053b4547472bd3ae073169e86626d03afef"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.1.0" version: "7.2.0"
image_picker: image_picker:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -849,10 +849,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_picker_android name: image_picker_android
sha256: "28f3987ca0ec702d346eae1d90eda59603a2101b52f1e234ded62cff1d5cfa6e" sha256: "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.8.13+1" version: "0.8.13+3"
image_picker_for_web: image_picker_for_web:
dependency: transitive dependency: transitive
description: description:
@@ -969,10 +969,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.0.1" version: "11.0.2"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
@@ -1025,10 +1025,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: lottie name: lottie
sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 sha256: "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.3.1" version: "3.3.2"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
@@ -1113,18 +1113,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: objectbox name: objectbox
sha256: "25c2e24b417d938decb5598682dc831bc6a21856eaae65affbc57cfad326808d" sha256: "3cc186749178a3556e1020c9082d0897d0f9ecbdefcc27320e65c5bc650f0e57"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.0" version: "4.3.1"
objectbox_flutter_libs: objectbox_flutter_libs:
dependency: transitive dependency: transitive
description: description:
name: objectbox_flutter_libs name: objectbox_flutter_libs
sha256: "574b0233ba79a7159fca9049c67974f790a2180b6141d4951112b20bd146016a" sha256: cd754766e04229a4f51250f121813d9a3c1a74fc21cd68e48b3c6085cbcd6c85
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.0" version: "4.3.1"
octo_image: octo_image:
dependency: transitive dependency: transitive
description: description:
@@ -1273,10 +1273,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: persian_datetime_picker name: persian_datetime_picker
sha256: "0ec2879d2bee8390dda088b412739e6316e3a54d77640ec54dc1eeca8c5baa59" sha256: "6a5ae6b9f717a6619ae29e65e4c8074285865a88d339dd05c91b9a5b6f8f47d7"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.1" version: "3.2.0"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
@@ -1321,10 +1321,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: pool name: pool
sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.5.1" version: "1.5.2"
posix: posix:
dependency: transitive dependency: transitive
description: description:
@@ -1417,10 +1417,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_android name: shared_preferences_android
sha256: a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74 sha256: bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.4.12" version: "2.4.13"
shared_preferences_foundation: shared_preferences_foundation:
dependency: transitive dependency: transitive
description: description:
@@ -1526,10 +1526,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: source_helper name: source_helper
sha256: a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.7" version: "1.3.8"
source_map_stack_trace: source_map_stack_trace:
dependency: transitive dependency: transitive
description: description:

2
packages/inspection/lib/presentation/pages/action/view.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BasePage;
import 'package:rasadyar_inspection/presentation/pages/records/view.dart'; import 'package:rasadyar_inspection/presentation/pages/records/view.dart';
import 'package:rasadyar_inspection/presentation/pages/statistics/view.dart'; import 'package:rasadyar_inspection/presentation/pages/statistics/view.dart';
import 'package:rasadyar_inspection/presentation/pages/users/view.dart'; import 'package:rasadyar_inspection/presentation/pages/users/view.dart';

4
packages/inspection/lib/presentation/pages/add_mobile_inspector/view.dart
View File

@@ -12,7 +12,7 @@ class AddMobileInspectorPage extends GetView<AddMobileInspectorLogic> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColor.bgLight, backgroundColor: AppColor.bgLight,
appBar: RAppBar( /* appBar: RAppBar(
title: 'افزودن بازرس همراه', title: 'افزودن بازرس همراه',
leading: Assets.vec.messageAddSvg.svg( leading: Assets.vec.messageAddSvg.svg(
width: 16, width: 16,
@@ -25,7 +25,7 @@ class AddMobileInspectorPage extends GetView<AddMobileInspectorLogic> {
additionalActions: [ additionalActions: [
RFab.smallAdd(onPressed: () => controller.countInspector.value++), RFab.smallAdd(onPressed: () => controller.countInspector.value++),
], ],
), ),*/
body: Column( body: Column(
children: [ children: [
Expanded( Expanded(

4
packages/inspection/lib/presentation/pages/add_supervision/view.dart
View File

@@ -11,7 +11,7 @@ class AddSupervisionPage extends GetView<AddSupervisionLogic> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColor.lightGreyLight, backgroundColor: AppColor.lightGreyLight,
appBar: RAppBar( /* appBar: RAppBar(
title: 'ایجاد بازرسی', title: 'ایجاد بازرسی',
leading: Assets.vec.messageAddSvg.svg( leading: Assets.vec.messageAddSvg.svg(
width: 16, width: 16,
@@ -21,7 +21,7 @@ class AddSupervisionPage extends GetView<AddSupervisionLogic> {
BlendMode.srcIn, BlendMode.srcIn,
), ),
), ),
), ),*/
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

4
packages/inspection/lib/presentation/pages/display_information/view.dart
View File

@@ -10,7 +10,7 @@ class DisplayInformationPage extends GetView<DisplayInformationLogic> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColor.bgLight, backgroundColor: AppColor.bgLight,
appBar: RAppBar( /* appBar: RAppBar(
title: 'نمایش اطلاعات', title: 'نمایش اطلاعات',
leading: Assets.vec.messageAddSvg.svg( leading: Assets.vec.messageAddSvg.svg(
width: 16, width: 16,
@@ -20,7 +20,7 @@ class DisplayInformationPage extends GetView<DisplayInformationLogic> {
BlendMode.srcIn, BlendMode.srcIn,
), ),
), ),
), ),*/
body: Column( body: Column(
children: [ children: [

2
packages/inspection/lib/presentation/pages/filter/view.dart
View File

@@ -12,7 +12,7 @@ class SupervisionFilterPage extends GetView<InspectorFilterLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: RAppBar(title: 'نقشه', additionalActions: [_searchButton(), _filterButton()]), /* appBar: RAppBar(title: 'نقشه', additionalActions: [_searchButton(), _filterButton()]),*/
body: PopScope( body: PopScope(
canPop: !controller.bottomSheetManager.isAnyVisible, canPop: !controller.bottomSheetManager.isAnyVisible,
onPopInvokedWithResult: (didPop, result) { onPopInvokedWithResult: (didPop, result) {

2
packages/inspection/lib/presentation/pages/inspection_map/logic.dart
View File

@@ -4,7 +4,7 @@ import 'package:rasadyar_core/core.dart';
import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart'; import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart';
import 'package:rasadyar_inspection/data/repositories/inspection/inspection_repository_imp.dart'; import 'package:rasadyar_inspection/data/repositories/inspection/inspection_repository_imp.dart';
import 'package:rasadyar_inspection/injection/inspection_di.dart'; import 'package:rasadyar_inspection/injection/inspection_di.dart';
import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart'; import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart' hide BaseLogic;
import 'widget/map/logic.dart'; import 'widget/map/logic.dart';

12
packages/inspection/lib/presentation/pages/inspection_map/view.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BasePage;
import 'package:rasadyar_inspection/presentation/routes/app_routes.dart'; import 'package:rasadyar_inspection/presentation/routes/app_routes.dart';
import 'package:rasadyar_inspection/presentation/widget/base_page/view.dart'; import 'package:rasadyar_inspection/presentation/widget/base_page/view.dart';
import 'package:rasadyar_inspection/presentation/widget/custom_chips.dart'; import 'package:rasadyar_inspection/presentation/widget/custom_chips.dart';
@@ -20,7 +20,7 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
filteringWidget: filterWidget(showIndex: 3.obs, filterIndex: 5.obs), filteringWidget: filterWidget(showIndex: 3.obs, filterIndex: 5.obs),
widgets: [ widgets: [
MapPage(), MapPage(),
ObxValue((data) { /* ObxValue((data) {
if (data.value) { if (data.value) {
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
Get.bottomSheet( Get.bottomSheet(
@@ -33,7 +33,7 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
}); });
} }
return const SizedBox.shrink(); return const SizedBox.shrink();
}, controller.baseLogic.isSearchSelected), }, controller.baseLogic.isSearchSelected),*/
], ],
); );
} }
@@ -47,7 +47,7 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
Row( Row(
spacing: 12, spacing: 12,
children: [ children: [
Expanded( /* Expanded(
child: RTextField( child: RTextField(
height: 40, height: 40,
borderColor: AppColor.blackLight, borderColor: AppColor.blackLight,
@@ -62,7 +62,7 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
) )
: IconButton( : IconButton(
onPressed: () { onPressed: () {
controller.baseLogic.searchTextController.clear(); // controller.baseLogic.searchTextController.clear();
controller.baseLogic.searchValue.value = null; controller.baseLogic.searchValue.value = null;
controller.baseLogic.isSearchSelected.value = false; controller.baseLogic.isSearchSelected.value = false;
controller.mapLogic.hasFilterOrSearch.value = false; controller.mapLogic.hasFilterOrSearch.value = false;
@@ -88,7 +88,7 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
controller: controller.baseLogic.searchTextController, controller: controller.baseLogic.searchTextController,
onChanged: (val) => controller.baseLogic.searchValue.value = val, onChanged: (val) => controller.baseLogic.searchValue.value = val,
), ),
), ),*/
GestureDetector( GestureDetector(
onTap: () { onTap: () {
Get.back(); Get.back();

2
packages/inspection/lib/presentation/pages/inspection_map/widget/map/logic.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'dart:math'; import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BaseLogic;
import 'package:rasadyar_inspection/data/model/response/hatching_details/hatching_details.dart'; import 'package:rasadyar_inspection/data/model/response/hatching_details/hatching_details.dart';
import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart'; import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart';
import 'package:rasadyar_inspection/data/repositories/inspection/inspection_repository_imp.dart'; import 'package:rasadyar_inspection/data/repositories/inspection/inspection_repository_imp.dart';

2
packages/inspection/lib/presentation/pages/location_details/view.dart
View File

@@ -12,7 +12,7 @@ class LocationDetailsPage extends GetView<LocationDetailsLogic> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColor.lightGreyLight, backgroundColor: AppColor.lightGreyLight,
appBar: RAppBar(title: 'جزئیات محل'), /* appBar: RAppBar(title: 'جزئیات محل'),*/
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

4
packages/inspection/lib/presentation/pages/registration_of_violation/view.dart
View File

@@ -11,7 +11,7 @@ class RegistrationOfViolationPage extends GetView<RegistrationOfViolationLogic>
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColor.bgLight, backgroundColor: AppColor.bgLight,
appBar: RAppBar( /* appBar: RAppBar(
title: 'ثبت تخلف', title: 'ثبت تخلف',
leading: Assets.vec.messageAddSvg.svg( leading: Assets.vec.messageAddSvg.svg(
width: 16, width: 16,
@@ -19,7 +19,7 @@ class RegistrationOfViolationPage extends GetView<RegistrationOfViolationLogic>
colorFilter: ColorFilter.mode(Colors.white, BlendMode.srcIn), colorFilter: ColorFilter.mode(Colors.white, BlendMode.srcIn),
), ),
additionalActions: [RFab.smallAdd(onPressed: () => controller.countViolation.value++)], additionalActions: [RFab.smallAdd(onPressed: () => controller.countViolation.value++)],
), ),*/
body: Padding( body: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10), padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
child: Column( child: Column(

1
packages/inspection/lib/presentation/routes/app_pages.dart
View File

@@ -6,7 +6,6 @@ import 'package:rasadyar_inspection/presentation/pages/inspection_map/widget/map
import 'package:rasadyar_inspection/presentation/pages/pages.dart'; import 'package:rasadyar_inspection/presentation/pages/pages.dart';
import 'package:rasadyar_inspection/presentation/pages/users/logic.dart'; import 'package:rasadyar_inspection/presentation/pages/users/logic.dart';
import 'package:rasadyar_inspection/presentation/routes/app_routes.dart'; import 'package:rasadyar_inspection/presentation/routes/app_routes.dart';
import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart';
import 'package:rasadyar_inspection/presentation/widget/captcha/logic.dart'; import 'package:rasadyar_inspection/presentation/widget/captcha/logic.dart';
sealed class InspectionPages { sealed class InspectionPages {

7
packages/inspection/lib/presentation/widget/app_bar/i_app_bar.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BaseLogic;
import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart'; import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart';
RAppBar inspectionAppBar({ RAppBar inspectionAppBar({
@@ -11,7 +11,8 @@ RAppBar inspectionAppBar({
GestureTapCallback? onFilterTap, GestureTapCallback? onFilterTap,
GestureTapCallback? onSearchTap, GestureTapCallback? onSearchTap,
}) { }) {
return RAppBar( return RAppBar();
/*return RAppBar(
hasBack: isBase == true ? false : hasBack, hasBack: isBase == true ? false : hasBack,
onBackPressed: onBackPressed, onBackPressed: onBackPressed,
leadingWidth: 155, leadingWidth: 155,
@@ -29,7 +30,7 @@ RAppBar inspectionAppBar({
if (!isBase && hasFilter) filterWidget(onFilterTap), if (!isBase && hasFilter) filterWidget(onFilterTap),
SizedBox(width: 8), SizedBox(width: 8),
], ],
); );*/
} }
GestureDetector filterWidget(GestureTapCallback? onFilterTap) { GestureDetector filterWidget(GestureTapCallback? onFilterTap) {

2
packages/inspection/lib/presentation/widget/base_page/view.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BaseLogic, SearchWidget;
import 'package:rasadyar_inspection/presentation/widget/app_bar/i_app_bar.dart'; import 'package:rasadyar_inspection/presentation/widget/app_bar/i_app_bar.dart';
import 'package:rasadyar_inspection/presentation/widget/search.dart'; import 'package:rasadyar_inspection/presentation/widget/search.dart';

2
packages/inspection/lib/presentation/widget/search.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart'; import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart' hide BaseLogic;
class SearchWidget extends StatefulWidget { class SearchWidget extends StatefulWidget {

228
packages/inspection/pubspec.lock
View File

@@ -77,10 +77,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: build name: build
sha256: "6439a9c71a4e6eca8d9490c1b380a25b02675aa688137dfbe66d2062884a23ac" sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.2" version: "3.1.0"
build_config: build_config:
dependency: transitive dependency: transitive
description: description:
@@ -101,26 +101,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: build_resolvers name: build_resolvers
sha256: "2b21a125d66a86b9511cc3fb6c668c42e9a1185083922bf60e46d483a81a9712" sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.2" version: "3.0.3"
build_runner: build_runner:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: build_runner name: build_runner
sha256: fd3c09f4bbff7fa6e8d8ef688a0b2e8a6384e6483a25af0dac75fef362bcfe6f sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.7.0" version: "2.7.1"
build_runner_core: build_runner_core:
dependency: transitive dependency: transitive
description: description:
name: build_runner_core name: build_runner_core
sha256: ab27e46c8aa233e610cf6084ee6d8a22c6f873a0a9929241d8855b7a72978ae7 sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "9.3.0" version: "9.3.1"
built_collection: built_collection:
dependency: transitive dependency: transitive
description: description:
@@ -133,10 +133,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: built_value name: built_value
sha256: "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62" sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.11.0" version: "8.12.0"
cached_network_image: cached_network_image:
dependency: transitive dependency: transitive
description: description:
@@ -197,10 +197,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: code_builder name: code_builder
sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.10.1" version: "4.11.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
@@ -305,6 +305,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.11" version: "0.7.11"
device_frame_plus:
dependency: transitive
description:
name: device_frame_plus
sha256: ccc94abccd4d9f0a9f19ef239001b3a59896e678ad42601371d7065889f2bf78
url: "https://pub.dev"
source: hosted
version: "1.5.0"
device_info_plus: device_info_plus:
dependency: transitive dependency: transitive
description: description:
@@ -321,6 +329,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.0.3" version: "7.0.3"
device_preview_plus:
dependency: transitive
description:
name: device_preview_plus
sha256: "45f9154c3213e470df1aa54326757ccf3cc6fb1f04396bced6ad1a7bfc9d6400"
url: "https://pub.dev"
source: hosted
version: "2.5.0"
dio: dio:
dependency: transitive dependency: transitive
description: description:
@@ -381,10 +397,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: file_selector_macos name: file_selector_macos
sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711" sha256: "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.9.4+3" version: "0.9.4+4"
file_selector_platform_interface: file_selector_platform_interface:
dependency: transitive dependency: transitive
description: description:
@@ -434,18 +450,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_gen_core name: flutter_gen_core
sha256: eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb sha256: b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.11.0" version: "5.12.0"
flutter_gen_runner: flutter_gen_runner:
dependency: transitive dependency: transitive
description: description:
name: flutter_gen_runner name: flutter_gen_runner
sha256: "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521" sha256: c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.11.0" version: "5.12.0"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -503,10 +519,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_plugin_android_lifecycle name: flutter_plugin_android_lifecycle
sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e sha256: b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.28" version: "2.0.30"
flutter_rating_bar: flutter_rating_bar:
dependency: transitive dependency: transitive
description: description:
@@ -583,10 +599,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_svg name: flutter_svg
sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845 sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.0" version: "2.2.1"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -601,10 +617,10 @@ packages:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: freezed name: freezed
sha256: da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c sha256: "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.2.0" version: "3.2.3"
freezed_annotation: freezed_annotation:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -745,18 +761,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: hive_ce name: hive_ce
sha256: "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658" sha256: "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.11.3" version: "2.13.2"
hive_ce_flutter: hive_ce_flutter:
dependency: transitive dependency: transitive
description: description:
name: hive_ce_flutter name: hive_ce_flutter
sha256: a0989670652eab097b47544f1e5a4456e861b1b01b050098ea0b80a5fabe9909 sha256: f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.1" version: "2.3.2"
hive_ce_generator: hive_ce_generator:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -769,10 +785,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: http name: http
sha256: "85ab0074f9bf2b24625906d8382bbec84d3d6919d285ba9c106b07b65791fb99" sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.5.0-beta.2" version: "1.5.0"
http_multi_server: http_multi_server:
dependency: transitive dependency: transitive
description: description:
@@ -817,10 +833,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_cropper_platform_interface name: image_cropper_platform_interface
sha256: "6ca6b81769abff9a4dcc3bbd3d75f5dfa9de6b870ae9613c8cd237333a4283af" sha256: "2d8db8f4b638e448fa89a1e77cd8f053b4547472bd3ae073169e86626d03afef"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.1.0" version: "7.2.0"
image_picker: image_picker:
dependency: transitive dependency: transitive
description: description:
@@ -833,10 +849,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_picker_android name: image_picker_android
sha256: e83b2b05141469c5e19d77e1dfa11096b6b1567d09065b2265d7c6904560050c sha256: "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.8.13" version: "0.8.13+3"
image_picker_for_web: image_picker_for_web:
dependency: transitive dependency: transitive
description: description:
@@ -889,10 +905,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_size_getter name: image_size_getter
sha256: "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653" sha256: "7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.4.0" version: "2.4.1"
intl: intl:
dependency: transitive dependency: transitive
description: description:
@@ -937,10 +953,10 @@ packages:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: json_serializable name: json_serializable
sha256: "3f2913b7c2430afe8ac5afe6fb15c1de4a60af4f630625e6e238f80ba4b80cbd" sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.11.0" version: "6.11.1"
latlong2: latlong2:
dependency: transitive dependency: transitive
description: description:
@@ -953,10 +969,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.0.1" version: "11.0.2"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
@@ -1009,10 +1025,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: lottie name: lottie
sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 sha256: "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.3.1" version: "3.3.2"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
@@ -1097,18 +1113,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: objectbox name: objectbox
sha256: "25c2e24b417d938decb5598682dc831bc6a21856eaae65affbc57cfad326808d" sha256: "3cc186749178a3556e1020c9082d0897d0f9ecbdefcc27320e65c5bc650f0e57"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.0" version: "4.3.1"
objectbox_flutter_libs: objectbox_flutter_libs:
dependency: transitive dependency: transitive
description: description:
name: objectbox_flutter_libs name: objectbox_flutter_libs
sha256: "574b0233ba79a7159fca9049c67974f790a2180b6141d4951112b20bd146016a" sha256: cd754766e04229a4f51250f121813d9a3c1a74fc21cd68e48b3c6085cbcd6c85
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.0" version: "4.3.1"
octo_image: octo_image:
dependency: transitive dependency: transitive
description: description:
@@ -1169,18 +1185,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path_provider_android name: path_provider_android
sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9 sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.17" version: "2.2.18"
path_provider_foundation: path_provider_foundation:
dependency: transitive dependency: transitive
description: description:
name: path_provider_foundation name: path_provider_foundation
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.4.1" version: "2.4.2"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
@@ -1257,18 +1273,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: persian_datetime_picker name: persian_datetime_picker
sha256: "0ec2879d2bee8390dda088b412739e6316e3a54d77640ec54dc1eeca8c5baa59" sha256: "6a5ae6b9f717a6619ae29e65e4c8074285865a88d339dd05c91b9a5b6f8f47d7"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.1" version: "3.2.0"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
name: petitparser name: petitparser
sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.1.0" version: "7.0.1"
platform: platform:
dependency: transitive dependency: transitive
description: description:
@@ -1305,10 +1321,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: pool name: pool
sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.5.1" version: "1.5.2"
posix: posix:
dependency: transitive dependency: transitive
description: description:
@@ -1337,10 +1353,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: provider name: provider
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84" sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.1.5" version: "6.1.5+1"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:
@@ -1364,6 +1380,22 @@ packages:
relative: true relative: true
source: path source: path
version: "1.2.0+2" version: "1.2.0+2"
rive:
dependency: transitive
description:
name: rive
sha256: "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c"
url: "https://pub.dev"
source: hosted
version: "0.13.20"
rive_common:
dependency: transitive
description:
name: rive_common
sha256: "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a"
url: "https://pub.dev"
source: hosted
version: "0.4.15"
rxdart: rxdart:
dependency: transitive dependency: transitive
description: description:
@@ -1380,6 +1412,62 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.1" version: "1.1.1"
shared_preferences:
dependency: transitive
description:
name: shared_preferences
sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
url: "https://pub.dev"
source: hosted
version: "2.5.3"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
sha256: bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e
url: "https://pub.dev"
source: hosted
version: "2.4.13"
shared_preferences_foundation:
dependency: transitive
description:
name: shared_preferences_foundation
sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
url: "https://pub.dev"
source: hosted
version: "2.5.4"
shared_preferences_linux:
dependency: transitive
description:
name: shared_preferences_linux
sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
shared_preferences_platform_interface:
dependency: transitive
description:
name: shared_preferences_platform_interface
sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
shared_preferences_web:
dependency: transitive
description:
name: shared_preferences_web
sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
url: "https://pub.dev"
source: hosted
version: "2.4.3"
shared_preferences_windows:
dependency: transitive
description:
name: shared_preferences_windows
sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
shelf: shelf:
dependency: transitive dependency: transitive
description: description:
@@ -1445,10 +1533,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: source_helper name: source_helper
sha256: "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1" sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.6" version: "1.3.8"
source_map_stack_trace: source_map_stack_trace:
dependency: transitive dependency: transitive
description: description:
@@ -1653,10 +1741,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vector_graphics_compiler name: vector_graphics_compiler
sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331" sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.17" version: "1.1.19"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
@@ -1669,18 +1757,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "15.0.0" version: "15.0.2"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
name: watcher name: watcher
sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a" sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.2" version: "1.1.3"
web: web:
dependency: transitive dependency: transitive
description: description:
@@ -1749,10 +1837,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: xml name: xml
sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.5.0" version: "6.6.1"
yaml: yaml:
dependency: transitive dependency: transitive
description: description:
@@ -1770,5 +1858,5 @@ packages:
source: hosted source: hosted
version: "2.1.0" version: "2.1.0"
sdks: sdks:
dart: ">=3.9.0 <4.0.0" dart: ">=3.9.2 <4.0.0"
flutter: ">=3.29.0" flutter: ">=3.35.3"

2
packages/livestock/lib/presentation/page/map/logic.dart
View File

@@ -1,5 +1,5 @@
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
import 'package:rasadyar_livestock/presentation/widgets/base_page/logic.dart'; import 'package:rasadyar_livestock/presentation/widgets/base_page/logic.dart' hide BaseLogic;
class MapLogic extends GetxController { class MapLogic extends GetxController {
var ss = Get.find<DraggableBottomSheetController>(); var ss = Get.find<DraggableBottomSheetController>();

8
packages/livestock/lib/presentation/page/map/view.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BasePage;
import 'package:rasadyar_livestock/presentation/page/map/widget/map_widget/view.dart'; import 'package:rasadyar_livestock/presentation/page/map/widget/map_widget/view.dart';
import 'package:rasadyar_livestock/presentation/widgets/base_page/view.dart'; import 'package:rasadyar_livestock/presentation/widgets/base_page/view.dart';
@@ -36,7 +36,7 @@ class MapPage extends GetView<MapLogic> {
Row( Row(
spacing: 12, spacing: 12,
children: [ children: [
Expanded( /* Expanded(
child: RTextField( child: RTextField(
height: 40, height: 40,
borderColor: AppColor.blackLight, borderColor: AppColor.blackLight,
@@ -51,7 +51,7 @@ class MapPage extends GetView<MapLogic> {
) )
: IconButton( : IconButton(
onPressed: () { onPressed: () {
controller.baseLogic.searchTextController.clear(); // controller.baseLogic.searchTextController.clear();
controller.baseLogic.searchValue.value = null; controller.baseLogic.searchValue.value = null;
controller.baseLogic.isSearchSelected.value = false; controller.baseLogic.isSearchSelected.value = false;
//controller.mapLogic.hasFilterOrSearch.value = false; //controller.mapLogic.hasFilterOrSearch.value = false;
@@ -77,7 +77,7 @@ class MapPage extends GetView<MapLogic> {
controller: controller.baseLogic.searchTextController, controller: controller.baseLogic.searchTextController,
onChanged: (val) => controller.baseLogic.searchValue.value = val, onChanged: (val) => controller.baseLogic.searchValue.value = val,
), ),
), ),*/
GestureDetector( GestureDetector(
onTap: () { onTap: () {
Get.back(); Get.back();

2
packages/livestock/lib/presentation/page/request_tagging/view.dart
View File

@@ -2,7 +2,7 @@ import 'dart:io';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BasePage;
import 'package:rasadyar_livestock/presentation/widgets/base_page/view.dart'; import 'package:rasadyar_livestock/presentation/widgets/base_page/view.dart';
import 'logic.dart'; import 'logic.dart';

2
packages/livestock/lib/presentation/page/requests/view.dart
View File

@@ -10,7 +10,7 @@ class RequestsPage extends GetView<RequestsLogic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: RAppBar(title: 'لیست درخواست‌ها', hasBack: false, centerTitle: true), /* appBar: RAppBar(title: 'لیست درخواست‌ها', hasBack: false, centerTitle: true),*/
body: Column( body: Column(
children: [ children: [
SizedBox(height: 8), SizedBox(height: 8),

4
packages/livestock/lib/presentation/page/tagging/view.dart
View File

@@ -12,7 +12,7 @@ class TaggingPage extends GetView<TaggingLogic> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: RAppBar( /* appBar: RAppBar(
title: 'پلاک کوبی', title: 'پلاک کوبی',
leadingWidth: 40, leadingWidth: 40,
leading: Assets.vec.messageAddSvg.svg(width: 12, height: 12), leading: Assets.vec.messageAddSvg.svg(width: 12, height: 12),
@@ -37,7 +37,7 @@ class TaggingPage extends GetView<TaggingLogic> {
child: Assets.icons.search.svg(width: 20, height: 20), child: Assets.icons.search.svg(width: 20, height: 20),
), ),
], ],
), ),*/
body: Stack( body: Stack(
children: [ children: [
Column( Column(

2
packages/livestock/lib/presentation/routes/app_pages.dart
View File

@@ -1,4 +1,4 @@
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BaseLogic;
import 'package:rasadyar_livestock/presentation/page/auth/logic.dart'; import 'package:rasadyar_livestock/presentation/page/auth/logic.dart';
import 'package:rasadyar_livestock/presentation/page/auth/view.dart'; import 'package:rasadyar_livestock/presentation/page/auth/view.dart';
import 'package:rasadyar_livestock/presentation/page/map/logic.dart'; import 'package:rasadyar_livestock/presentation/page/map/logic.dart';

2
packages/livestock/lib/presentation/widgets/app_bar/i_app_bar.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BaseLogic;
import 'package:rasadyar_livestock/presentation/widgets/base_page/logic.dart'; import 'package:rasadyar_livestock/presentation/widgets/base_page/logic.dart';
RAppBar2 liveStockAppBar({ RAppBar2 liveStockAppBar({

2
packages/livestock/lib/presentation/widgets/base_page/view.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BaseLogic, SearchWidget;
import 'package:rasadyar_livestock/presentation/widgets/app_bar/i_app_bar.dart'; import 'package:rasadyar_livestock/presentation/widgets/app_bar/i_app_bar.dart';
import 'package:rasadyar_livestock/presentation/widgets/search.dart'; import 'package:rasadyar_livestock/presentation/widgets/search.dart';

2
packages/livestock/lib/presentation/widgets/search.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart' hide BaseLogic;
import 'base_page/logic.dart'; import 'base_page/logic.dart';

104
pubspec.lock
View File

@@ -117,10 +117,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: built_value name: built_value
sha256: "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62" sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.11.0" version: "8.12.0"
cached_network_image: cached_network_image:
dependency: transitive dependency: transitive
description: description:
@@ -189,10 +189,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: code_builder name: code_builder
sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.10.1" version: "4.11.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
@@ -381,10 +381,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: file_selector_macos name: file_selector_macos
sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711" sha256: "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.9.4+3" version: "0.9.4+4"
file_selector_platform_interface: file_selector_platform_interface:
dependency: transitive dependency: transitive
description: description:
@@ -516,10 +516,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_plugin_android_lifecycle name: flutter_plugin_android_lifecycle
sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e sha256: b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.28" version: "2.0.30"
flutter_rating_bar: flutter_rating_bar:
dependency: transitive dependency: transitive
description: description:
@@ -596,10 +596,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_svg name: flutter_svg
sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845 sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.0" version: "2.2.1"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -763,18 +763,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: hive_ce name: hive_ce
sha256: "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658" sha256: "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.11.3" version: "2.13.2"
hive_ce_flutter: hive_ce_flutter:
dependency: transitive dependency: transitive
description: description:
name: hive_ce_flutter name: hive_ce_flutter
sha256: a0989670652eab097b47544f1e5a4456e861b1b01b050098ea0b80a5fabe9909 sha256: f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.1" version: "2.3.2"
hive_ce_generator: hive_ce_generator:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -787,10 +787,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: http name: http
sha256: "85ab0074f9bf2b24625906d8382bbec84d3d6919d285ba9c106b07b65791fb99" sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.5.0-beta.2" version: "1.5.0"
http_multi_server: http_multi_server:
dependency: transitive dependency: transitive
description: description:
@@ -835,10 +835,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_cropper_platform_interface name: image_cropper_platform_interface
sha256: "6ca6b81769abff9a4dcc3bbd3d75f5dfa9de6b870ae9613c8cd237333a4283af" sha256: "2d8db8f4b638e448fa89a1e77cd8f053b4547472bd3ae073169e86626d03afef"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.1.0" version: "7.2.0"
image_picker: image_picker:
dependency: transitive dependency: transitive
description: description:
@@ -851,10 +851,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_picker_android name: image_picker_android
sha256: e83b2b05141469c5e19d77e1dfa11096b6b1567d09065b2265d7c6904560050c sha256: "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.8.13" version: "0.8.13+3"
image_picker_for_web: image_picker_for_web:
dependency: transitive dependency: transitive
description: description:
@@ -907,10 +907,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: image_size_getter name: image_size_getter
sha256: "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653" sha256: "7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.4.0" version: "2.4.1"
integration_test: integration_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -976,10 +976,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.0.1" version: "11.0.2"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
@@ -1032,10 +1032,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: lottie name: lottie
sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 sha256: "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.3.1" version: "3.3.2"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
@@ -1112,18 +1112,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: objectbox name: objectbox
sha256: "25c2e24b417d938decb5598682dc831bc6a21856eaae65affbc57cfad326808d" sha256: "3cc186749178a3556e1020c9082d0897d0f9ecbdefcc27320e65c5bc650f0e57"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.0" version: "4.3.1"
objectbox_flutter_libs: objectbox_flutter_libs:
dependency: transitive dependency: transitive
description: description:
name: objectbox_flutter_libs name: objectbox_flutter_libs
sha256: "574b0233ba79a7159fca9049c67974f790a2180b6141d4951112b20bd146016a" sha256: cd754766e04229a4f51250f121813d9a3c1a74fc21cd68e48b3c6085cbcd6c85
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.0" version: "4.3.1"
octo_image: octo_image:
dependency: transitive dependency: transitive
description: description:
@@ -1184,18 +1184,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path_provider_android name: path_provider_android
sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9 sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.17" version: "2.2.18"
path_provider_foundation: path_provider_foundation:
dependency: transitive dependency: transitive
description: description:
name: path_provider_foundation name: path_provider_foundation
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.4.1" version: "2.4.2"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
@@ -1272,18 +1272,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: persian_datetime_picker name: persian_datetime_picker
sha256: "0ec2879d2bee8390dda088b412739e6316e3a54d77640ec54dc1eeca8c5baa59" sha256: "6a5ae6b9f717a6619ae29e65e4c8074285865a88d339dd05c91b9a5b6f8f47d7"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.1" version: "3.2.0"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
name: petitparser name: petitparser
sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.1.0" version: "7.0.1"
platform: platform:
dependency: transitive dependency: transitive
description: description:
@@ -1320,10 +1320,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: pool name: pool
sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.5.1" version: "1.5.2"
posix: posix:
dependency: transitive dependency: transitive
description: description:
@@ -1360,10 +1360,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: provider name: provider
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84" sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.1.5" version: "6.1.5+1"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:
@@ -1452,10 +1452,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_android name: shared_preferences_android
sha256: a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74 sha256: bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.4.12" version: "2.4.13"
shared_preferences_foundation: shared_preferences_foundation:
dependency: transitive dependency: transitive
description: description:
@@ -1721,10 +1721,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vector_graphics_compiler name: vector_graphics_compiler
sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331" sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.17" version: "1.1.19"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
@@ -1737,18 +1737,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "15.0.0" version: "15.0.2"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
name: watcher name: watcher
sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a" sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.2" version: "1.1.3"
web: web:
dependency: transitive dependency: transitive
description: description:
@@ -1817,10 +1817,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: xml name: xml
sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.5.0" version: "6.6.1"
yaml: yaml:
dependency: transitive dependency: transitive
description: description: