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