Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

gas refill

Browse Source
main_design2.0
nextwo 2 years ago
parent ec4d4a9193
commit 64b249a0cd
12 changed files with 276 additions and 132 deletions
Show Stats Download Patch File Download Diff File

2
assets/translations/ar.json
Unescape Escape View File

@ -18,6 +18,8 @@
"transferRequest" : "طلب نقل", "transferRequest" : "طلب نقل",
"serviceRequest" : "طلب خدمة", "serviceRequest" : "طلب خدمة",
"newServiceRequest" : "طلب خدمة جديدة", "newServiceRequest" : "طلب خدمة جديدة",
"search": "بحث",
"filter" : "تصنيف",
"newGasRefillRequest" : "طلب إعادة تعبئة غاز جديد", "newGasRefillRequest" : "طلب إعادة تعبئة غاز جديد",
"newTransferRequest" : "طلب نقل جديد", "newTransferRequest" : "طلب نقل جديد",
"submitRequest" : "تأكيد الطلب", "submitRequest" : "تأكيد الطلب",

2
assets/translations/en.json
Unescape Escape View File

@ -18,6 +18,8 @@
"transferRequest" : "Transfer Request", "transferRequest" : "Transfer Request",
"serviceRequest" : "Service Request", "serviceRequest" : "Service Request",
"newServiceRequest" : "New Service Request", "newServiceRequest" : "New Service Request",
"search": "Search",
"filter": "Filter",
"newGasRefillRequest" : "New Gas Refill Request", "newGasRefillRequest" : "New Gas Refill Request",
"newTransferRequest" : "New Transfer Request", "newTransferRequest" : "New Transfer Request",
"submitRequest" : "Submit Request", "submitRequest" : "Submit Request",

2
lib/models/enums/translation_keys.dart
Unescape Escape View File

@ -18,6 +18,8 @@ enum TranslationKeys {
transferRequest, transferRequest,
serviceRequest, serviceRequest,
newServiceRequest, newServiceRequest,
search,
filter,
newGasRefillRequest, newGasRefillRequest,
newTransferRequest, newTransferRequest,
submitRequest, submitRequest,

36
lib/new_views/common_widgets/app_search_field.dart
Unescape Escape View File

@ -0,0 +1,36 @@
import 'package:flutter/material.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import '../../models/enums/translation_keys.dart';
class AppSearchField extends StatefulWidget {
final Function(String) onChanged;
final Function(String) onSubmitted;
const AppSearchField({Key key, this.onChanged, this.onSubmitted}) : super(key: key);
@override
State<AppSearchField> createState() => _AppSearchFieldState();
}
class _AppSearchFieldState extends State<AppSearchField> {
@override
Widget build(BuildContext context) {
return TextField(
onChanged: widget.onChanged,
onSubmitted: widget.onSubmitted,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.search, color: AppColor.neutral20,),
hintText: context.translate(TranslationKeys.search),
hintStyle: TextStyle(
fontSize: Theme.of(context).textTheme.bodySmall.fontSize
),
filled: true,
fillColor: AppColor.neutral30,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15),
borderSide: BorderSide.none,
)),
);
}
}

23
lib/new_views/common_widgets/app_tab_bar.dart
Unescape Escape View File

@ -0,0 +1,23 @@
import 'package:flutter/material.dart';
class AppTabBar extends StatelessWidget {
const AppTabBar({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return TabBar(
tabs:[
Tab(
icon: Icon(Icons.cloud_outlined),
),
Tab(
icon: Icon(Icons.beach_access_sharp),
),
Tab(
icon: Icon(Icons.brightness_5_sharp),
),
],
);
}
}

20
lib/new_views/pages/land_page/land_page.dart
Unescape Escape View File

@ -5,7 +5,7 @@ import 'package:flutter/services.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/new_views/pages/land_page/home_app_bar.dart'; import 'package:test_sa/new_views/pages/land_page/home_app_bar.dart';
import 'package:test_sa/new_views/pages/land_page/my_assets_page.dart'; import 'package:test_sa/new_views/pages/land_page/my_assets_page.dart';
import 'package:test_sa/new_views/pages/land_page/my_requests_page.dart'; import 'package:test_sa/new_views/pages/land_page/my_request/my_requests_page.dart';
import '../../common_widgets/app_bottom_nav_bar.dart'; import '../../common_widgets/app_bottom_nav_bar.dart';
import '../../common_widgets/app_drawer.dart'; import '../../common_widgets/app_drawer.dart';
@ -24,6 +24,7 @@ class LandPage extends StatefulWidget {
class _LandPageState extends State<LandPage> { class _LandPageState extends State<LandPage> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
int currentPageIndex = 0; int currentPageIndex = 0;
bool showAppbar =true;
final List<Widget> _pages = const <Widget>[ final List<Widget> _pages = const <Widget>[
DashboardPage(), DashboardPage(),
MyRequestsPage(), MyRequestsPage(),
@ -53,11 +54,8 @@ class _LandPageState extends State<LandPage> {
}, },
child: Scaffold( child: Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
appBar: HomeAppBar(scaffoldKey: _scaffoldKey), appBar: showAppbar?HomeAppBar(scaffoldKey: _scaffoldKey): null,
body: Padding( body: _pages[currentPageIndex],
padding: EdgeInsetsDirectional.only(start: 16.toScreenWidth, end: 11.toScreenHeight),
child: _pages[currentPageIndex],
),
drawer: const AppDrawer(), drawer: const AppDrawer(),
floatingActionButton: const AppFloatingActionButton(), floatingActionButton: const AppFloatingActionButton(),
bottomNavigationBar: AppBottomNavigationBar( bottomNavigationBar: AppBottomNavigationBar(
@ -74,6 +72,16 @@ class _LandPageState extends State<LandPage> {
setState(() { setState(() {
currentPageIndex = index; currentPageIndex = index;
}); });
if(index == 1){
setState(() {
showAppbar =false;
});
}else{
setState(() {
showAppbar =true;
});
}
} }
}, },
), ),

52
lib/new_views/pages/land_page/my_request/my_requests_page.dart
Unescape Escape View File

@ -0,0 +1,52 @@
import 'package:flutter/material.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/models/enums/translation_keys.dart';
import '../../../app_style/app_color.dart';
import '../../../common_widgets/app_search_field.dart';
class MyRequestsPage extends StatelessWidget {
const MyRequestsPage({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
leadingWidth: 0,
title: Padding(
padding: const EdgeInsets.only(bottom: 10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(child: SizedBox(
height: 50,
child: AppSearchField())),
SizedBox(width: 20,),
Text(context.translate(TranslationKeys.filter), style: TextStyle(
color: AppColor.primary50,
fontSize: Theme.of(context).textTheme.bodySmall.fontSize,
fontWeight: FontWeight.w500
),)
],
),
),
),
body: TabBarView(
children: const <Widget>[
Center(
child: Text("It's cloudy here"),
),
Center(
child: Text("It's rainy here"),
),
Center(
child: Text("It's sunny here"),
),
],
),
);
}
}

14
lib/new_views/pages/land_page/my_requests_page.dart
Unescape Escape View File

@ -1,14 +0,0 @@
import 'package:flutter/material.dart';
class MyRequestsPage extends StatelessWidget {
const MyRequestsPage({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return const Scaffold(
body: Center(
child: Text("My Requests"),
),
);
}
}

95
lib/views/pages/user/gas_refill/track_gas_refill.dart
Unescape Escape View File

@ -4,12 +4,16 @@ import 'package:test_sa/controllers/localization/localization.dart';
import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart'; import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
import 'package:test_sa/views/widgets/gas_refill/gas_refill_list.dart'; import 'package:test_sa/views/widgets/gas_refill/gas_refill_list.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import '../../../../models/enums/translation_keys.dart';
import '../../../../new_views/app_style/app_color.dart';
import '../../../../new_views/common_widgets/app_search_field.dart';
import '../../../widgets/switch_button.dart'; import '../../../widgets/switch_button.dart';
class TrackGasRefillPage extends StatefulWidget { class TrackGasRefillPage extends StatefulWidget {
@ -31,13 +35,13 @@ class _TrackGasRefillPageState extends State<TrackGasRefillPage> with TickerProv
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (_gasRefillProvider == null) { if (_gasRefillProvider == null) {
_gasRefillProvider = Provider.of<GasRefillProvider>(context); _gasRefillProvider = Provider.of<GasRefillProvider>(context);
//_gasRefillProvider?.isLoading = false;
_gasRefillProvider.reset(); _gasRefillProvider.reset();
} }
_userProvider = Provider.of<UserProvider>(context); _userProvider = Provider.of<UserProvider>(context);
_settingProvider = Provider.of<SettingProvider>(context); _settingProvider = Provider.of<SettingProvider>(context);
return Scaffold( return Scaffold(
body: SafeArea( body: SafeArea(
child: LoadingManager( child: LoadingManager(
isLoading: _gasRefillProvider.isLoading, isLoading: _gasRefillProvider.isLoading,
@ -56,45 +60,64 @@ class _TrackGasRefillPageState extends State<TrackGasRefillPage> with TickerProv
Column( Column(
children: [ children: [
Container( Container(
color: AColors.white, color: Colors.white,
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 15),
child: Column( //margin: const EdgeInsets.all(10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Row( Expanded(child: SizedBox(
children: [ height: 40,
const ABackButton(), child: AppSearchField())),
Expanded( SizedBox(width: 20,),
child: Center( Text(context.translate(TranslationKeys.filter), style: TextStyle(
child: Text( color: AppColor.primary50,
"Gas Refill Requests", fontSize: Theme.of(context).textTheme.bodySmall.fontSize,
style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.grey3A, fontStyle: FontStyle.italic), fontWeight: FontWeight.w500
), ),)
),
),
const SizedBox(
width: 48,
)
],
),
], ],
), ),
), ),
Padding( // Container(
padding: const EdgeInsets.symmetric(horizontal: 16.0), // color: AColors.white,
child: ASwitchButton( // padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4),
title: "Most Recent", // child: Column(
value: mostRecent, // children: [
onChange: (value) async { // Row(
mostRecent = value; // children: [
_gasRefillProvider.reset(); // const ABackButton(),
await _gasRefillProvider.getRequests( // Expanded(
user: _userProvider.user, // child: Center(
host: _settingProvider.host, // child: Text(
mostRecent: mostRecent, // "Gas Refill Requests",
); // style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.grey3A, fontStyle: FontStyle.italic),
}, // ),
), // ),
), // ),
// const SizedBox(
// width: 48,
// )
// ],
// ),
// ],
// ),
// ),
// Padding(
// padding: const EdgeInsets.symmetric(horizontal: 16.0),
// child: ASwitchButton(
// title: "Most Recent",
// value: mostRecent,
// onChange: (value) async {
// mostRecent = value;
// _gasRefillProvider.reset();
// await _gasRefillProvider.getRequests(
// user: _userProvider.user,
// host: _settingProvider.host,
// mostRecent: mostRecent,
// );
// },
// ),
// ),
Expanded( Expanded(
child: GasRefillList( child: GasRefillList(
nextPage: _gasRefillProvider.nextPage, nextPage: _gasRefillProvider.nextPage,

153
lib/views/widgets/gas_refill/gas_refill_item.dart
Unescape Escape View File

@ -1,10 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:test_sa/controllers/localization/localization.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/models/gas_refill/gas_refill_model.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/app_style/sizing.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart';
import '../../../models/gas_refill/gas_refill_model.dart';
class GasRefillItem extends StatelessWidget { class GasRefillItem extends StatelessWidget {
final int index; final int index;
@ -15,20 +12,17 @@ class GasRefillItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Color itemColor = index % 2 == 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary;
Color onItemColor = index % 2 != 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary;
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 4), padding: const EdgeInsets.symmetric(vertical: 4),
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8), padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
backgroundColor: itemColor, backgroundColor: Colors.white,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)), borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
), ),
), ),
//padding: EdgeInsets.symmetric(vertical: 8,horizontal: 8),
onPressed: () { onPressed: () {
onPressed(item); onPressed(item);
}, },
@ -37,74 +31,81 @@ class GasRefillItem extends StatelessWidget {
children: [ children: [
Row( Row(
children: [ children: [
Expanded( Text("priority"),
child: Column( Text("process"),
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.title ?? "-----",
style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 16, fontWeight: FontWeight.bold),
),
Row(
children: [
Expanded(
child: Text(
context.translation.hospital,
style: Theme.of(context).textTheme.titleSmall.copyWith(
color: onItemColor,
),
),
),
if (item.clientName != null)
Text(
item.clientName,
style: Theme.of(context).textTheme.titleSmall.copyWith(
color: onItemColor,
),
),
],
),
Divider(color: onItemColor),
Row(
children: [
Expanded(
child: Text(context.translation.status, style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
),
if (item.status?.id != null) StatusLabel(label: item.status.name, backgroundColor: AColors.getGasStatusColor(item.status.id)),
],
),
if (item?.expectedDate != null) Divider(color: onItemColor),
if (item?.expectedDate != null)
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Expected Date", style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
Text(item.expectedDate.toIso8601String().split("T").first, style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
],
),
if (item?.details?.isNotEmpty ?? false) Divider(color: onItemColor),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (item?.details?.isNotEmpty ?? false) Text("Gas Type", style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: item.details
.map(
(gas) => gas?.type?.name?.isNotEmpty ?? false
? Text(gas?.type?.name, style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor))
: const SizedBox.shrink(),
)
.toList(),
)
],
),
],
),
),
], ],
), )
// Row(
// children: [
// Expanded(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Text(
// item.title ?? "-----",
// style: Theme.of(context).textTheme.titleLarge.copyWith(color: onItemColor, fontSize: 16, fontWeight: FontWeight.bold),
// ),
// Row(
// children: [
// Expanded(
// child: Text(
// subtitle.hospital,
// style: Theme.of(context).textTheme.titleSmall.copyWith(
// color: onItemColor,
// ),
// ),
// ),
// if (item.clientName != null)
// Text(
// item.clientName,
// style: Theme.of(context).textTheme.titleSmall.copyWith(
// color: onItemColor,
// ),
// ),
// ],
// ),
// Divider(color: onItemColor),
// Row(
// children: [
// Expanded(
// child: Text(subtitle.status, style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
// ),
// if (item.status?.id != null) StatusLabel(label: item.status.name, color: AColors.getGasStatusColor(item.status.id)),
// ],
// ),
// if (item?.expectedDate != null) Divider(color: onItemColor),
// if (item?.expectedDate != null)
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Text("Expected Date", style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
// Text(item.expectedDate.toIso8601String().split("T").first, style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
// ],
// ),
// if (item?.details?.isNotEmpty ?? false) Divider(color: onItemColor),
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// if (item?.details?.isNotEmpty ?? false) Text("Gas Type", style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor)),
// Column(
// crossAxisAlignment: CrossAxisAlignment.end,
// children: item.details
// .map(
// (gas) => gas?.type?.name?.isNotEmpty ?? false
// ? Text(gas?.type?.name, style: Theme.of(context).textTheme.titleSmall.copyWith(color: onItemColor))
// : const SizedBox.shrink(),
// )
// .toList(),
// )
// ],
// ),
// ],
// ),
// ),
// ],
// ),
], ],
), ),
), ),

8
pubspec.lock
Unescape Escape View File

@ -97,6 +97,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.1" version: "2.1.1"
buttons_tabbar:
dependency: "direct main"
description:
name: buttons_tabbar
sha256: "781128180f3e76cf93c093183f10395c664983dbee20bc4da2025be70085c2da"
url: "https://pub.dev"
source: hosted
version: "1.3.7+1"
cached_network_image: cached_network_image:
dependency: "direct main" dependency: "direct main"
description: description:

1
pubspec.yaml
Unescape Escape View File

@ -68,6 +68,7 @@ dependencies:
path_provider: ^2.1.0 path_provider: ^2.1.0
open_file: ^3.3.2 open_file: ^3.3.2
localization: ^2.1.0 localization: ^2.1.0
buttons_tabbar: ^1.3.7+1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

Write Preview
Loading…
Cancel
Save