Merge branch 'master' into mirza_dev
# Conflicts: # android/build.gradle # android/gradle/wrapper/gradle-wrapper.properties # lib/config/provider_routes.dart # lib/main.dart # lib/repositories/branch_repo.dart # lib/repositories/items_repo.dart # lib/repositories/subscription_repo.dart # lib/view_models/service_view_model.dart # lib/views/dashboard/dashboard_page.dart # lib/views/dashboard/fragments/home_fragment.dart # lib/views/dashboard/fragments/request_list_fragment.dart # lib/views/settings/branch/branch_detail_page.dart # lib/views/settings/branch/define_branch_page.dart # lib/views/settings/services/create_item_page.dart # pubspec.lockmirza_dev
commit
501cd60814
@ -0,0 +1,69 @@
|
|||||||
|
import 'dart:developer';
|
||||||
|
|
||||||
|
import 'package:car_provider_app/generated/locale_keys.g.dart';
|
||||||
|
import 'package:mc_common_app/view_models/requests_view_model.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:mc_common_app/extensions/int_extensions.dart';
|
||||||
|
import 'package:mc_common_app/extensions/string_extensions.dart';
|
||||||
|
import 'package:mc_common_app/theme/colors.dart';
|
||||||
|
import 'package:mc_common_app/utils/enums.dart';
|
||||||
|
import 'package:mc_common_app/views/requests/widget/request_item.dart';
|
||||||
|
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
|
||||||
|
import 'package:mc_common_app/widgets/common_widgets/categories_list.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
|
|
||||||
|
class MyRequestsFragment extends StatelessWidget {
|
||||||
|
final bool isNeedAppBar;
|
||||||
|
|
||||||
|
const MyRequestsFragment({super.key, this.isNeedAppBar = true});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Scaffold(
|
||||||
|
appBar: !isNeedAppBar ? null : CustomAppBar(title: LocaleKeys.myServiceBranches.tr()),
|
||||||
|
body: Container(
|
||||||
|
color: MyColors.backgroundColor,
|
||||||
|
width: double.infinity,
|
||||||
|
height: double.infinity,
|
||||||
|
child: Consumer(builder: (BuildContext context, RequestsVM requestsVM, Widget? child) {
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
16.height,
|
||||||
|
FiltersList(
|
||||||
|
filterList: requestsVM.requestsTypeFilterOptions,
|
||||||
|
onFilterTapped: (index, selectedFilterId) {
|
||||||
|
requestsVM.applyFilterOnRequestsVM(requestsTypeEnum: selectedFilterId.toRequestTypeStatusEnum());
|
||||||
|
},
|
||||||
|
),
|
||||||
|
8.height,
|
||||||
|
Expanded(
|
||||||
|
child: RefreshIndicator(
|
||||||
|
onRefresh: () async => await requestsVM.getRequests(isNeedToRebuild: true, appType: AppType.provider),
|
||||||
|
child: requestsVM.state == ViewState.busy
|
||||||
|
? const Center(child: CircularProgressIndicator())
|
||||||
|
: requestsVM.myFilteredRequests.isEmpty
|
||||||
|
? Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
"No Requests to show.".toText(fontSize: 16, color: MyColors.lightTextColor),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
: ListView.separated(
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
return RequestItem(request: requestsVM.myFilteredRequests[index], appType: AppType.provider, requestIndex: index);
|
||||||
|
},
|
||||||
|
separatorBuilder: (context, index) {
|
||||||
|
return 16.height;
|
||||||
|
},
|
||||||
|
itemCount: requestsVM.myFilteredRequests.length,
|
||||||
|
padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16, top: 8),
|
||||||
|
),
|
||||||
|
))
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,110 +0,0 @@
|
|||||||
import 'package:car_provider_app/config/provider_routes.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:mc_common_app/classes/consts.dart';
|
|
||||||
import 'package:mc_common_app/extensions/int_extensions.dart';
|
|
||||||
import 'package:mc_common_app/extensions/string_extensions.dart';
|
|
||||||
import 'package:mc_common_app/theme/colors.dart';
|
|
||||||
import 'package:mc_common_app/view_models/requests_view_model.dart';
|
|
||||||
import 'package:mc_common_app/views/requests/widget/request_item.dart';
|
|
||||||
|
|
||||||
import 'package:mc_common_app/widgets/button/show_fill_button.dart';
|
|
||||||
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
|
|
||||||
import 'package:mc_common_app/widgets/common_widgets/categories_list.dart';
|
|
||||||
import 'package:mc_common_app/widgets/dropdown/dropdow_field.dart';
|
|
||||||
|
|
||||||
import 'package:mc_common_app/widgets/tab/menu_tabs.dart';
|
|
||||||
|
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
|
|
||||||
class RequestListFragment extends StatelessWidget {
|
|
||||||
VoidCallback onBackButtonTapped;
|
|
||||||
|
|
||||||
RequestListFragment({required this.onBackButtonTapped, Key? key}) : super(key: key);
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return Scaffold(
|
|
||||||
appBar: CustomAppBar(
|
|
||||||
profileImageUrl: MyAssets.carBanner,
|
|
||||||
title: "Requests",
|
|
||||||
onBackButtonTapped: onBackButtonTapped,
|
|
||||||
actions: [
|
|
||||||
IconButton(
|
|
||||||
onPressed: () {},
|
|
||||||
icon: const Icon(Icons.search),
|
|
||||||
),
|
|
||||||
10.width,
|
|
||||||
],
|
|
||||||
),
|
|
||||||
body: SizedBox(
|
|
||||||
width: double.infinity,
|
|
||||||
height: double.infinity,
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
21.height,
|
|
||||||
MenuTabs(
|
|
||||||
0,
|
|
||||||
[
|
|
||||||
DropValue(0, "Special Request", ""),
|
|
||||||
DropValue(1, "My Offers", ""),
|
|
||||||
],
|
|
||||||
onSelect: (DropValue dropValue) {},
|
|
||||||
selectedColor: MyColors.darkPrimaryColor,
|
|
||||||
),
|
|
||||||
12.height,
|
|
||||||
// Expanded(
|
|
||||||
// child: Consumer(builder: (BuildContext context, RequestsVM requestsVM, Widget? child) {
|
|
||||||
// return Column(
|
|
||||||
// children: [
|
|
||||||
// ShowFillButton(
|
|
||||||
// title: "title",
|
|
||||||
// onPressed: () {
|
|
||||||
// context.read<RequestsVM>().getRequests();
|
|
||||||
// }),
|
|
||||||
// 16.height,
|
|
||||||
// FiltersList(
|
|
||||||
// filterList: requestsVM.requestsFilterOptions,
|
|
||||||
// onFilterTapped: (index, selectedFilterId) => requestsVM.applyFilterOnRequestsVM(index: index),
|
|
||||||
// ),
|
|
||||||
// 8.height,
|
|
||||||
// Expanded(
|
|
||||||
// child: requestsVM.isRequestLoading
|
|
||||||
// ? const Center(child: CircularProgressIndicator())
|
|
||||||
// : requestsVM.requests.isEmpty
|
|
||||||
// ? Center(
|
|
||||||
// child: "No Request Available".toText(
|
|
||||||
// isBold: true,
|
|
||||||
// ),
|
|
||||||
// )
|
|
||||||
// : ListView.separated(
|
|
||||||
// itemBuilder: (context, index) {
|
|
||||||
// return RequestItem(requestsVM.requests[index]);
|
|
||||||
// },
|
|
||||||
// separatorBuilder: (context, index) {
|
|
||||||
// return 16.height;
|
|
||||||
// },
|
|
||||||
// itemCount: requestsVM.requests.length,
|
|
||||||
// padding: const EdgeInsets.only(
|
|
||||||
// left: 16,
|
|
||||||
// right: 16,
|
|
||||||
// bottom: 16,
|
|
||||||
// top: 8,
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
// )
|
|
||||||
// ],
|
|
||||||
// );
|
|
||||||
// }),
|
|
||||||
// ),
|
|
||||||
// const Padding(
|
|
||||||
// padding: EdgeInsets.symmetric(horizontal: 21),
|
|
||||||
// child: RequestListCardWidget(
|
|
||||||
// count: 12,
|
|
||||||
// ),
|
|
||||||
// )
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
import 'package:car_provider_app/config/provider_routes.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:mc_common_app/classes/consts.dart';
|
|
||||||
import 'package:mc_common_app/extensions/int_extensions.dart';
|
|
||||||
import 'package:mc_common_app/extensions/string_extensions.dart';
|
|
||||||
import 'package:mc_common_app/theme/colors.dart';
|
|
||||||
import 'package:mc_common_app/utils/navigator.dart';
|
|
||||||
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
|
|
||||||
|
|
||||||
class RequestListCardWidget extends StatelessWidget {
|
|
||||||
final int count;
|
|
||||||
|
|
||||||
const RequestListCardWidget({Key? key, required this.count}) : super(key: key);
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return ListView.builder(
|
|
||||||
itemCount: count,
|
|
||||||
shrinkWrap: true,
|
|
||||||
physics: const NeverScrollableScrollPhysics(),
|
|
||||||
itemBuilder: (BuildContext context, int index) {
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.only(bottom: 15),
|
|
||||||
child: buildRequestContainer(context),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget buildRequestContainer(BuildContext context) {
|
|
||||||
return Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
"Toyota Crolla".toText(fontSize: 16, isBold: true),
|
|
||||||
showItem("Model:", "2019"),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.end,
|
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
"Riyadh".toText(
|
|
||||||
color: MyColors.lightTextColor,
|
|
||||||
),
|
|
||||||
"9 Hours Ago".toText(color: MyColors.lightTextColor),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
showItem("Customer Name", "Abdullah"),
|
|
||||||
showItem("Description", "Looking for the car as soon as possible"),
|
|
||||||
showItem("Price Range:", ""),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.end,
|
|
||||||
children: [
|
|
||||||
"30,000".toText(fontSize: 16, isBold: true),
|
|
||||||
2.width,
|
|
||||||
"SAR:".toText(
|
|
||||||
color: MyColors.lightTextColor,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const Icon(Icons.arrow_forward)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
).toWhiteContainer(
|
|
||||||
width: double.infinity,
|
|
||||||
allPading: 12,
|
|
||||||
onTap: () {
|
|
||||||
navigateWithName(context, ProviderAppRoutes.requestsDetailPage);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget showItem(String title, String value) {
|
|
||||||
return Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
if (title.isNotEmpty)
|
|
||||||
title.toText(
|
|
||||||
color: MyColors.lightTextColor,
|
|
||||||
),
|
|
||||||
if (title.isNotEmpty) 2.width,
|
|
||||||
if (value.isNotEmpty) Expanded(child: value.toText(isBold: true)),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue