Skip to content

GitLab

Commit c92f4c79 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

ios changes in Navigation swipe gestures.

parent ee178d55
Expand all Hide whitespace changes
Inline Side-by-side
ios/Podfile.lock
View file @ c92f4c79
PODS: PODS:
- app_settings (5.1.1):
- Flutter
- camera_avfoundation (0.0.1): - camera_avfoundation (0.0.1):
- Flutter - Flutter
- connectivity_plus (0.0.1): - connectivity_plus (0.0.1):
...@@ -167,6 +169,7 @@ PODS: ...@@ -167,6 +169,7 @@ PODS:
- FlutterMacOS - FlutterMacOS
DEPENDENCIES: DEPENDENCIES:
- app_settings (from `.symlinks/plugins/app_settings/ios`)
- camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`) - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
...@@ -219,6 +222,8 @@ SPEC REPOS: ...@@ -219,6 +222,8 @@ SPEC REPOS:
- SDWebImageWebPCoder - SDWebImageWebPCoder
EXTERNAL SOURCES: EXTERNAL SOURCES:
app_settings:
:path: ".symlinks/plugins/app_settings/ios"
camera_avfoundation: camera_avfoundation:
:path: ".symlinks/plugins/camera_avfoundation/ios" :path: ".symlinks/plugins/camera_avfoundation/ios"
connectivity_plus: connectivity_plus:
...@@ -281,6 +286,7 @@ EXTERNAL SOURCES: ...@@ -281,6 +286,7 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
SPEC CHECKSUMS: SPEC CHECKSUMS:
app_settings: 58017cd26b604ae98c3e65acbdd8ba173703cc82
camera_avfoundation: adb0207d868b2d873e895371d88448399ab78d87 camera_avfoundation: adb0207d868b2d873e895371d88448399ab78d87
connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342 device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
......
lib/Notifiers/commonProvider/accountsListProvider.dart
View file @ c92f4c79
...@@ -334,7 +334,7 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -334,7 +334,7 @@ class Accountslistprovider extends ChangeNotifier {
MaterialPageRoute( MaterialPageRoute(
builder: (context) => Accountslistdetails(accountID: data.id), builder: (context) => Accountslistdetails(accountID: data.id),
), ),
(Route<dynamic> route) { (Route<dynamic> route) {
return route.settings.arguments == 'Financedashboard'; return route.settings.arguments == 'Financedashboard';
}, },
); );
...@@ -610,6 +610,7 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -610,6 +610,7 @@ class Accountslistprovider extends ChangeNotifier {
} }
resetValues() { resetValues() {
print("rv");
_selectedAccountType = null; _selectedAccountType = null;
_selectedState = null; _selectedState = null;
_selectedDistricts = null; _selectedDistricts = null;
......
lib/Notifiers/financeProvider/RequestionListProvider.dart
View file @ c92f4c79
...@@ -975,6 +975,7 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -975,6 +975,7 @@ class Requestionlistprovider extends ChangeNotifier {
// } // }
void resetForm() { void resetForm() {
print("ios calling");
_submitClicked = false; _submitClicked = false;
accountSearchController.clear(); accountSearchController.clear();
paymentAccountSearchController.clear(); paymentAccountSearchController.clear();
......
lib/Notifiers/financeProvider/paymentReceiptsProvider.dart
View file @ c92f4c79
...@@ -448,10 +448,10 @@ class Paymentreceiptsprovider extends ChangeNotifier { ...@@ -448,10 +448,10 @@ class Paymentreceiptsprovider extends ChangeNotifier {
...data.receiptAccounts!, ...data.receiptAccounts!,
]; ];
_receiptPaymentModes = data.paymentModes!; _receiptPaymentModes = data.paymentModes!;
_receiptPaymentModes = [PaymentModes( _receiptPaymentModes = [
name: "Select", PaymentModes(name: "Select", id: ""),
id: "" ...data.paymentModes!,
),...data.paymentModes!]; ];
_receiptAccounts = data.accounts!; _receiptAccounts = data.accounts!;
_receiptAccounts = [ _receiptAccounts = [
Accounts(name: "Select", id: ""), Accounts(name: "Select", id: ""),
...@@ -709,6 +709,7 @@ class Paymentreceiptsprovider extends ChangeNotifier { ...@@ -709,6 +709,7 @@ class Paymentreceiptsprovider extends ChangeNotifier {
} }
void resetForm() { void resetForm() {
print("rf");
_submitClicked = false; _submitClicked = false;
accountSearchController.clear(); accountSearchController.clear();
paymentAccountSearchController.clear(); paymentAccountSearchController.clear();
......
lib/Utils/GlobalConstants.dart
View file @ c92f4c79
String didPushed = ""; String didPushed = "";
String didPopped = ""; String didPopped = "";
String routeSettingName = "";
lib/Utils/commonWidgets.dart
View file @ c92f4c79
...@@ -208,11 +208,10 @@ NoNetwork(context) { ...@@ -208,11 +208,10 @@ NoNetwork(context) {
// Image.asset('assets/images/no_wifi.png', width: 100, height: 100), // Image.asset('assets/images/no_wifi.png', width: 100, height: 100),
SizedBox(height: 10), SizedBox(height: 10),
Center( Center(
child: Text("You are Offline", child: Text(
style: TextStyle( "You are Offline",
fontSize: 16, style: TextStyle(fontSize: 16, color: AppColors.semi_black),
color: AppColors.semi_black ),
),),
), ),
SizedBox(height: 10), SizedBox(height: 10),
Text( Text(
...@@ -306,16 +305,18 @@ class MyNavigatorObserver extends NavigatorObserver { ...@@ -306,16 +305,18 @@ class MyNavigatorObserver extends NavigatorObserver {
super.didPush(route, previousRoute); super.didPush(route, previousRoute);
// Called when a route has been pushed onto the navigator. // Called when a route has been pushed onto the navigator.
didPushed = "true"; didPushed = "true";
routeSettingName = route.settings.name.toString();
print('Route pushed: ${route.settings.name}'); print('Route pushed: ${route.settings.name}');
print('didPushed$didPushed'); print('didPushed: $didPushed');
} }
@override @override
void didPop(Route route, Route? previousRoute) { void didPop(Route route, Route? previousRoute) {
super.didPop(route, previousRoute); super.didPop(route, previousRoute);
didPopped = "true"; didPopped = "true";
routeSettingName = route.settings.name.toString();
// Called when a route has been popped off the navigator. // Called when a route has been popped off the navigator.
print('Route popped: ${route.settings.name}'); print('Route popped: ${route.settings.name}');
print('didPopped${didPopped}'); print('didPopped: ${didPopped}');
} }
} }
lib/screens/commom/accountLedger.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/commom/accountsList.dart
View file @ c92f4c79
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/commonProvider/accountsListProvider.dart'; import 'package:generp/Notifiers/commonProvider/accountsListProvider.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonServices.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/screens/commom/accountsListDetails.dart'; import 'package:generp/screens/commom/accountsListDetails.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
...@@ -20,75 +22,102 @@ class _AccountslistState extends State<Accountslist> { ...@@ -20,75 +22,102 @@ class _AccountslistState extends State<Accountslist> {
ScrollController scrollController = ScrollController(); ScrollController scrollController = ScrollController();
FocusNode focusNode1 = FocusNode(); FocusNode focusNode1 = FocusNode();
FocusNode focusNode2 = FocusNode(); FocusNode focusNode2 = FocusNode();
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Accountslistprovider>(context, listen: false); var provider = Provider.of<Accountslistprovider>(context, listen: false);
provider.commonAccountListAPIFunction(context); provider.commonAccountListAPIFunction(context);
provider.pageNum = 1; provider.pageNum = 1;
provider.commonAccountListAPIFunction(context); provider.commonAccountListAPIFunction(context);
// if (scrollController.position.maxScrollExtent == // if (scrollController.position.maxScrollExtent ==
// scrollController.offset) { // scrollController.offset) {
scrollController.addListener(() { scrollController.addListener(() {
if (scrollController.position.pixels >= if (scrollController.position.pixels >=
scrollController.position.maxScrollExtent * 0.9 && scrollController.position.maxScrollExtent * 0.9 &&
!provider.isLoading && !provider.isLoading &&
provider.hasMoreData) { provider.hasMoreData) {
provider provider.commonAccountListAPIFunction(context);
.commonAccountListAPIFunction(context); }
} });
});
}); });
} }
@override
@override
void dispose() { void dispose() {
// TODO: implement dispose // TODO: implement dispose
super.dispose(); super.dispose();
scrollController.dispose(); scrollController.dispose();
_connectivity.disposeStream();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
switch (_source.keys.toList()[0]) {
case ConnectivityResult.mobile:
connection = 'Online';
break;
case ConnectivityResult.wifi:
connection = 'Online';
break;
case ConnectivityResult.none:
default:
connection = 'Offline';
}
return (connection == "Online")
? Platform.isAndroid
? WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context)
: NoNetwork(context);
}
@override
Widget _scaffold(BuildContext context) {
return Consumer<Accountslistprovider>( return Consumer<Accountslistprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
var accountList = provider.accountsList; var accountList = provider.accountsList;
print(accountList.length); print(accountList.length);
return WillPopScope( return Scaffold(
child: SafeArea( resizeToAvoidBottomInset: true,
top: false, appBar: appbar2(
bottom: Platform.isIOS?false:true, context,
child: Scaffold( "Account List",
resizeToAvoidBottomInset: true, provider.resetValues,
appBar: appbar2( Container(
context, padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
"Account List",
provider.resetValues,
Container(
padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
_showFilterSheet(context); _showFilterSheet(context);
}, },
child: SvgPicture.asset( child: SvgPicture.asset("assets/svg/filter_ic.svg", height: 18),
"assets/svg/filter_ic.svg",
height: 18,
),
),
),
), ),
backgroundColor: AppColors.scaffold_bg_color, ),
body: provider.isLoading? ),
Center( backgroundColor: AppColors.scaffold_bg_color,
body:
provider.isLoading
? Center(
child: CircularProgressIndicator( child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation(AppColors.app_blue), valueColor: AlwaysStoppedAnimation(AppColors.app_blue),
), ),
) )
: : accountList.isNotEmpty
accountList.isNotEmpty
? SizedBox( ? SizedBox(
child: Scrollbar( child: Scrollbar(
child: SingleChildScrollView( child: SingleChildScrollView(
...@@ -96,7 +125,11 @@ class _AccountslistState extends State<Accountslist> { ...@@ -96,7 +125,11 @@ class _AccountslistState extends State<Accountslist> {
child: Column( child: Column(
children: [ children: [
ListView.builder( ListView.builder(
itemCount: accountList.length + (provider.hasMoreData && provider.isLoading ? 1 : 0), itemCount:
accountList.length +
(provider.hasMoreData && provider.isLoading
? 1
: 0),
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) { itemBuilder: (context, index) {
...@@ -112,13 +145,12 @@ class _AccountslistState extends State<Accountslist> { ...@@ -112,13 +145,12 @@ class _AccountslistState extends State<Accountslist> {
return Padding( return Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: Center( child: Center(
child: child: CircularProgressIndicator.adaptive(
CircularProgressIndicator.adaptive( valueColor:
valueColor: AlwaysStoppedAnimation<Color>(
AlwaysStoppedAnimation<Color>( AppColors.app_blue,
AppColors.app_blue, ),
), ),
),
), ),
); );
} }
...@@ -171,8 +203,7 @@ class _AccountslistState extends State<Accountslist> { ...@@ -171,8 +203,7 @@ class _AccountslistState extends State<Accountslist> {
"JakartaMedium", "JakartaMedium",
fontSize: 14, fontSize: 14,
color: color:
AppColors AppColors.semi_black,
.semi_black,
), ),
), ),
Text( Text(
...@@ -183,8 +214,7 @@ class _AccountslistState extends State<Accountslist> { ...@@ -183,8 +214,7 @@ class _AccountslistState extends State<Accountslist> {
fontFamily: fontFamily:
"JakartaMedium", "JakartaMedium",
fontSize: 14, fontSize: 14,
color: color: AppColors.app_blue,
AppColors.app_blue,
), ),
), ),
], ],
...@@ -223,11 +253,9 @@ class _AccountslistState extends State<Accountslist> { ...@@ -223,11 +253,9 @@ class _AccountslistState extends State<Accountslist> {
child: Text( child: Text(
headings[j], headings[j],
style: TextStyle( style: TextStyle(
fontFamily: fontFamily: "JakartaMedium",
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: color: AppColors.semi_black,
AppColors.semi_black,
), ),
), ),
), ),
...@@ -236,11 +264,9 @@ class _AccountslistState extends State<Accountslist> { ...@@ -236,11 +264,9 @@ class _AccountslistState extends State<Accountslist> {
child: Text( child: Text(
subHeadings[j] ?? "-", subHeadings[j] ?? "-",
style: TextStyle( style: TextStyle(
fontFamily: fontFamily: "JakartaMedium",
"JakartaMedium",
fontSize: 14, fontSize: 14,
color: color: AppColors.grey_thick,
AppColors.grey_thick,
), ),
), ),
), ),
...@@ -303,12 +329,6 @@ class _AccountslistState extends State<Accountslist> { ...@@ -303,12 +329,6 @@ class _AccountslistState extends State<Accountslist> {
), ),
) )
: Emptywidget(context), : Emptywidget(context),
),
),
onWillPop: () {
provider.pageNum = 1;
return _onBackPressed(context);
},
); );
}, },
); );
...@@ -367,7 +387,7 @@ class _AccountslistState extends State<Accountslist> { ...@@ -367,7 +387,7 @@ class _AccountslistState extends State<Accountslist> {
null, null,
focusNode1, focusNode1,
focusNode2, focusNode2,
TextInputAction.next TextInputAction.next,
), ),
textControllerWidget( textControllerWidget(
context, context,
...@@ -381,7 +401,7 @@ class _AccountslistState extends State<Accountslist> { ...@@ -381,7 +401,7 @@ class _AccountslistState extends State<Accountslist> {
focusNode2, focusNode2,
null, null,
TextInputAction.done, TextInputAction.done,
10 10,
), ),
InkResponse( InkResponse(
onTap: () { onTap: () {
......
lib/screens/commom/accountsListDetails.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/commom/addCommonPayment.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/LeadDetailsByMode.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/LeadListByMode.dart
View file @ c92f4c79
import 'dart:io'; import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
...@@ -10,6 +11,7 @@ import 'package:generp/Models/crmModels/GetSourceOnReferenceResponse.dart'; ...@@ -10,6 +11,7 @@ import 'package:generp/Models/crmModels/GetSourceOnReferenceResponse.dart';
import 'package:generp/Models/crmModels/GetSubLocOnDistrictResponse.dart'; import 'package:generp/Models/crmModels/GetSubLocOnDistrictResponse.dart';
import 'package:generp/Models/crmModels/LeadListViewResponse.dart'; import 'package:generp/Models/crmModels/LeadListViewResponse.dart';
import 'package:generp/Notifiers/crmProvider/LeadListProvider.dart'; import 'package:generp/Notifiers/crmProvider/LeadListProvider.dart';
import 'package:generp/Utils/commonServices.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:generp/screens/screensExports.dart'; import 'package:generp/screens/screensExports.dart';
...@@ -36,11 +38,17 @@ class Leadlistbymode extends StatefulWidget { ...@@ -36,11 +38,17 @@ class Leadlistbymode extends StatefulWidget {
class _LeadlistbymodeState extends State<Leadlistbymode> { class _LeadlistbymodeState extends State<Leadlistbymode> {
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
final provider = Provider.of<Leadlistprovider>(context, listen: false); final provider = Provider.of<Leadlistprovider>(context, listen: false);
provider.crmLeadListViewAPIFunction(context, widget.mode); provider.crmLeadListViewAPIFunction(context, widget.mode);
...@@ -78,40 +86,67 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -78,40 +86,67 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
}); });
} }
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
switch (_source.keys.toList()[0]) {
case ConnectivityResult.mobile:
connection = 'Online';
break;
case ConnectivityResult.wifi:
connection = 'Online';
break;
case ConnectivityResult.none:
default:
connection = 'Offline';
}
return (connection == "Online")
? Platform.isAndroid
? WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context)
: NoNetwork(context);
}
Widget _scaffold(BuildContext context) {
return Consumer<Leadlistprovider>( return Consumer<Leadlistprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
final crmLists = provider.crmLeadList; final crmLists = provider.crmLeadList;
return WillPopScope( return Scaffold(
onWillPop: () { resizeToAvoidBottomInset: true,
return onBackPressed(context); appBar: appbar2(
}, context,
child: SafeArea( widget.pageTitleName,
top: false, provider.resetForm,
bottom: Platform.isIOS?false:true, Row(
child: Scaffold( children: [
resizeToAvoidBottomInset: true, InkResponse(
appBar: appbar2( onTap: () async {
context, _showFilterSheet(context);
widget.pageTitleName, },
provider.resetForm, child: SvgPicture.asset(
Row( "assets/svg/filter_ic.svg",
children: [ height: 25,
InkResponse( ),
onTap: () async {
_showFilterSheet(context);
},
child: SvgPicture.asset(
"assets/svg/filter_ic.svg",
height: 25,
),
),
],
), ),
), ],
backgroundColor: AppColors.scaffold_bg_color, ),
body: provider.isLoading ),
backgroundColor: AppColors.scaffold_bg_color,
body:
provider.isLoading
? Center( ? Center(
child: CircularProgressIndicator.adaptive( child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
...@@ -130,9 +165,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -130,9 +165,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
if (crmLists.isEmpty) { if (crmLists.isEmpty) {
return SizedBox( return SizedBox(
child: Center( child: Center(child: Text("No Data Available")),
child: Text("No Data Available"),
),
); );
} }
return Container( return Container(
...@@ -160,8 +193,9 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -160,8 +193,9 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFE6F6FF), color: Color(0xFFE6F6FF),
borderRadius: borderRadius: BorderRadius.circular(
BorderRadius.circular(8), 8,
),
), ),
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/se_block_head.svg", "assets/svg/se_block_head.svg",
...@@ -196,8 +230,9 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -196,8 +230,9 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
vertical: 10, vertical: 10,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius: BorderRadius.circular(
BorderRadius.circular(8), 8,
),
color: Color(0xFFE3FFE0), color: Color(0xFFE3FFE0),
), ),
child: Center( child: Center(
...@@ -234,9 +269,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -234,9 +269,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
crmLists[index].openStatus, crmLists[index].openStatus,
]; ];
return Container( return Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(vertical: 5),
vertical: 5,
),
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
...@@ -283,9 +316,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -283,9 +316,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
); );
}, },
child: Container( child: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(vertical: 5),
vertical: 5,
),
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.center, CrossAxisAlignment.center,
...@@ -316,8 +347,6 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -316,8 +347,6 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
), ),
) )
: Emptywidget(context), : Emptywidget(context),
),
),
); );
}, },
); );
......
lib/screens/crm/NearbyOpenLeads.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/ProspectDetailsByMode.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/ProspectListByMode.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/addProspectLeads.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/crmDashboard.dart
View file @ c92f4c79
...@@ -39,12 +39,14 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> { ...@@ -39,12 +39,14 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
prov.crmPendingTasksAPIFunction(context); prov.crmPendingTasksAPIFunction(context);
}); });
} }
@override
@override
void dispose() { void dispose() {
// TODO: implement dispose // TODO: implement dispose
super.dispose(); super.dispose();
_connectivity.disposeStream(); _connectivity.disposeStream();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
switch (_source.keys.toList()[0]) { switch (_source.keys.toList()[0]) {
...@@ -517,7 +519,12 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> { ...@@ -517,7 +519,12 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkResponse( floatingActionButton: InkResponse(
onTap: () { onTap: () {
_showPaymentOptionsSheet(context); if (provider.accessPages
.where((page) => [8, 9].contains(page.id))
.toList()
.contains([8, 9])) {
_showPaymentOptionsSheet(context);
}
}, },
child: Container( child: Container(
height: 45, height: 45,
......
lib/screens/crm/productDetails.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/prospectContactDetails.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/crm/prospectLeadDetails.dart
View file @ c92f4c79
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment