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

Merge branch with resolved conflicts - restructured features and added new modules

Browse Source
This commit is contained in:
mr.mojtaba
2025-12-17 10:26:39 +03:30
parent 02686115cb a8e500551d
commit 3486bc73e9
484 changed files with 55236 additions and 4255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/chicken/lib/features/poultry_science/root/logic.dart
View File

@@ -1,11 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:rasadyar_chicken/data/di/chicken_di.dart';
import 'package:rasadyar_chicken/data/repositories/poultry_science/poultry_science_repository.dart';
import 'package:rasadyar_chicken/features/common/profile/view.dart';
import 'package:rasadyar_chicken/features/poultry_science/home/view.dart';
=
import 'package:rasadyar_chicken/features/poultry_science/data/repositories/poultry_science_repository.dart';
import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/home/view.dart';
import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart';
import 'package:rasadyar_chicken/presentation/routes/pages.dart';
import 'package:rasadyar_chicken/presentation/routes/routes.dart';
import 'package:rasadyar_chicken/features/poultry_science/presentation/routes/routes.dart';
import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
import 'package:rasadyar_chicken/presentation/utils/utils.dart';
import 'package:rasadyar_core/core.dart';
@@ -24,13 +25,13 @@ class PoultryScienceRootLogic extends GetxController {
RxInt currentPage = 1.obs;
final pages = [
Navigator(
key: Get.nestedKey(poultryFirstKey),
Navigator(
key: Get.nestedKey(poultryScienceActionKey),
onGenerateRoute: (settings) {
final page = ChickenPages.pages.firstWhere(
(e) => e.name == settings.name,
orElse: () => ChickenPages.pages.firstWhere(
(e) => e.name == ChickenRoutes.actionPoultryScience,
(e) => e.name == PoultryScienceRoutes.actionPoultryScience,
),
);
@@ -39,8 +40,6 @@ class PoultryScienceRootLogic extends GetxController {
),
PoultryScienceHomePage(),
ProfilePage(),
];
@override
@@ -49,7 +48,6 @@ class PoultryScienceRootLogic extends GetxController {
poultryRepository = diChicken.get<PoultryScienceRepository>();
}
void toggleExpanded(int index) {
if (homeExpandedList.keys.contains(index)) {
homeExpandedList.remove(index);
@@ -81,7 +79,7 @@ class PoultryScienceRootLogic extends GetxController {
}
}
void popBackTaped() async{
void popBackTaped() async {
final nestedKeyId = getNestedKey();
GlobalKey<NavigatorState>? currentNestedKey = Get.nestedKey(nestedKeyId);

18
packages/chicken/lib/features/poultry_science/root/view.dart
View File

@@ -30,11 +30,9 @@ class PoultryScienceRootPage extends GetView<PoultryScienceRootLogic> {
isSelected: controller.currentPage.value == 0,
onTap: () {
Get.nestedKey(
poultrySecondKey,
)?.currentState?.popUntil((route) => route.isFirst);
Get.nestedKey(
poultryFirstKey,
poultryScienceActionKey,
)?.currentState?.popUntil((route) => route.isFirst);
controller.changePage(0);
},
),
@@ -44,11 +42,9 @@ class PoultryScienceRootPage extends GetView<PoultryScienceRootLogic> {
isSelected: controller.currentPage.value == 1,
onTap: () {
Get.nestedKey(
poultryFirstKey,
)?.currentState?.popUntil((route) => route.isFirst);
Get.nestedKey(
poultryThirdKey,
poultryScienceActionKey,
)?.currentState?.popUntil((route) => route.isFirst);
controller.changePage(1);
},
),
@@ -58,11 +54,9 @@ class PoultryScienceRootPage extends GetView<PoultryScienceRootLogic> {
isSelected: controller.currentPage.value == 2,
onTap: () {
Get.nestedKey(
poultryFirstKey,
)?.currentState?.popUntil((route) => route.isFirst);
Get.nestedKey(
poultrySecondKey,
poultryScienceActionKey,
)?.currentState?.popUntil((route) => route.isFirst);
controller.changePage(2);
},
),