final
This commit is contained in:
@@ -8,19 +8,16 @@ import '../models/product.dart';
|
||||
class AttributeSelection extends StatelessWidget {
|
||||
final Product product;
|
||||
final Business business;
|
||||
final GlobalKey startKey;
|
||||
final GlobalKey? startKey;
|
||||
|
||||
const AttributeSelection({Key key, this.product, this.business, this.startKey}) : super(key: key);
|
||||
const AttributeSelection({Key? key, required this.product, required this.business, this.startKey}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileAttributeSelection(product: product, business: business, startKey: startKey,),
|
||||
tablet: MobileAttributeSelection(product: product, business: business, startKey: startKey,),
|
||||
desktop: MobileAttributeSelection(product: product, business: business, startKey: startKey,),
|
||||
),
|
||||
return ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileAttributeSelection(product: product, business: business, startKey: startKey),
|
||||
tablet: (context) => MobileAttributeSelection(product: product, business: business, startKey: startKey),
|
||||
desktop: (context) => MobileAttributeSelection(product: product, business: business, startKey: startKey),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,24 +8,20 @@ import '../widgets/desktop/desktop_blog.dart';
|
||||
import '../widgets/mobile/mobile_blog.dart';
|
||||
|
||||
class Blog extends StatelessWidget {
|
||||
final Key key;
|
||||
final int businessId;
|
||||
|
||||
const Blog({this.key, int businessId}) :
|
||||
const Blog({Key? key, required int businessId}) :
|
||||
businessId = businessId ?? Constants.BUSINESS_ID;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileBlog(businessId: businessId,),
|
||||
tablet: DesktopBlog(businessId: businessId,),
|
||||
desktop: Scrollbar(
|
||||
isAlwaysShown: true,
|
||||
child: DesktopBlog(businessId: businessId,),
|
||||
),
|
||||
),
|
||||
return ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBlog(businessId: businessId),
|
||||
tablet: (context) => DesktopBlog(businessId: businessId),
|
||||
desktop: (context) => Scrollbar(
|
||||
thumbVisibility: true,
|
||||
child: DesktopBlog(businessId: businessId),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,10 +19,10 @@ import '../widgets/mobile/mobile_renew_license.dart';
|
||||
class BuyService extends StatefulWidget {
|
||||
final int gid;
|
||||
final String serviceName;
|
||||
final String domain;
|
||||
final int sid;
|
||||
final String? domain;
|
||||
final int? sid;
|
||||
|
||||
const BuyService(this.gid, this.serviceName, {Key key, this.domain, this.sid = 0}) :
|
||||
const BuyService(this.gid, this.serviceName, {Key? key, this.domain, this.sid = 0}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -30,7 +30,7 @@ class BuyService extends StatefulWidget {
|
||||
}
|
||||
|
||||
class BuyServiceState extends State<BuyService> {
|
||||
Map<String, dynamic> data;
|
||||
Map<String, dynamic>? data;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -48,13 +48,10 @@ class BuyServiceState extends State<BuyService> {
|
||||
);
|
||||
}
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileBuyService(data),
|
||||
tablet: DesktopBuyService(data),
|
||||
desktop: DesktopBuyService(data),
|
||||
),
|
||||
return ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBuyService(data),
|
||||
tablet: (context) => DesktopBuyService(data),
|
||||
desktop: (context) => DesktopBuyService(data),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -73,7 +70,7 @@ class BuyServiceState extends State<BuyService> {
|
||||
}
|
||||
).then((value) {
|
||||
data = value;
|
||||
data['domain'] = widget.domain;
|
||||
data?['domain'] = widget.domain;
|
||||
print('data: $data');
|
||||
setState(() {});
|
||||
}).onError((error, stackTrace) {
|
||||
|
||||
@@ -15,7 +15,7 @@ import '../widgets/mobile/mobile_change_mobile_or_email.dart';
|
||||
class ChangeMobileOrEmail extends StatelessWidget {
|
||||
final bool isMobile;
|
||||
|
||||
const ChangeMobileOrEmail(this.isMobile, {Key key}) : super(key: key);
|
||||
const ChangeMobileOrEmail(this.isMobile, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -31,15 +31,15 @@ class ChangeMobileOrEmail extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileChangeMobileOrEmail(isMobile),
|
||||
tablet: DesktopChangeMobileOrEmail(isMobile),
|
||||
desktop: DesktopChangeMobileOrEmail(isMobile),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileChangeMobileOrEmail(isMobile),
|
||||
tablet: (context) => DesktopChangeMobileOrEmail(isMobile),
|
||||
desktop: (context) => DesktopChangeMobileOrEmail(isMobile),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -29,15 +29,15 @@ class ChangePassword extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileChangePassword(),
|
||||
tablet: DesktopChangePassword(),
|
||||
desktop: DesktopChangePassword(),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileChangePassword(),
|
||||
tablet: (context) => DesktopChangePassword(),
|
||||
desktop: (context) => DesktopChangePassword(),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -11,7 +11,7 @@ import '../widgets/mobile/mobile_checkout.dart';
|
||||
class Checkout extends StatelessWidget {
|
||||
final int businessId;
|
||||
|
||||
const Checkout(this.businessId, {Key key}) :
|
||||
const Checkout(this.businessId, {Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -20,10 +20,10 @@ class Checkout extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileCheckout(businessId),
|
||||
tablet: DesktopCheckout(businessId),
|
||||
desktop: DesktopCheckout(businessId),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileCheckout(businessId),
|
||||
tablet: (context) => DesktopCheckout(businessId),
|
||||
desktop: (context) => DesktopCheckout(businessId),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ import '../widgets/mobile/mobile_contact_us.dart';
|
||||
class ContactUs extends StatefulWidget {
|
||||
final int businessId;
|
||||
|
||||
const ContactUs({this.businessId, Key key}) :
|
||||
const ContactUs({required this.businessId, Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -22,7 +22,7 @@ class ContactUs extends StatefulWidget {
|
||||
}
|
||||
|
||||
class ContactUsState extends State<ContactUs> {
|
||||
Business business;
|
||||
Business? business;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -42,10 +42,10 @@ class ContactUsState extends State<ContactUs> {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileContactUs(business),
|
||||
tablet: DesktopContactUs(business),
|
||||
desktop: DesktopContactUs(business),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileContactUs(business!),
|
||||
tablet: (context) => DesktopContactUs(business!),
|
||||
desktop: (context) => DesktopContactUs(business!),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import '../widgets/mobile/mobile_coupons.dart';
|
||||
class Coupons extends StatelessWidget {
|
||||
final int contactId;
|
||||
|
||||
const Coupons(this.contactId, {Key key}) :
|
||||
const Coupons(this.contactId, {Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ class Coupons extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileCoupons(contactId,),
|
||||
tablet: DesktopCoupons(contactId,),
|
||||
desktop: DesktopCoupons(contactId,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileCoupons(contactId,),
|
||||
tablet: (context) => DesktopCoupons(contactId,),
|
||||
desktop: (context) => DesktopCoupons(contactId,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import '../widgets/mobile/create_online_store_1.dart' as mobile;
|
||||
|
||||
class CreateOnlineStore1 extends StatefulWidget {
|
||||
|
||||
const CreateOnlineStore1({Key key}) :
|
||||
const CreateOnlineStore1({Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -33,10 +33,10 @@ class CreateOnlineStore1State extends State<CreateOnlineStore1> {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: mobile.CreateOnlineStore1(Constants.BUSINESS_ID),
|
||||
tablet: desktop.CreateOnlineStore1(Constants.BUSINESS_ID),
|
||||
desktop: desktop.CreateOnlineStore1(Constants.BUSINESS_ID),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => mobile.CreateOnlineStore1(Constants.BUSINESS_ID),
|
||||
tablet: (context) => desktop.CreateOnlineStore1(Constants.BUSINESS_ID),
|
||||
desktop: (context) => desktop.CreateOnlineStore1(Constants.BUSINESS_ID),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ class Download extends StatefulWidget {
|
||||
|
||||
class DownloadState extends State<Download> {
|
||||
final _scaffoldKey = GlobalKey<ScaffoldState>();
|
||||
Map<String, dynamic> data;
|
||||
Map<String, dynamic>? data;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -57,18 +57,18 @@ class DownloadState extends State<Download> {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? MobileNavigationDrawer() : null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileDownloadApps(data),
|
||||
tablet: DesktopDownloadApps(data),
|
||||
desktop: Scrollbar(
|
||||
isAlwaysShown: true,
|
||||
child: DesktopDownloadApps(data),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileDownloadApps(data!),
|
||||
tablet: (context) => DesktopDownloadApps(data!),
|
||||
desktop: (context) => Scrollbar(
|
||||
thumbVisibility: true,
|
||||
child: DesktopDownloadApps(data!),
|
||||
),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -79,7 +79,7 @@ class DownloadState extends State<Download> {
|
||||
super.initState();
|
||||
eventBus.on<OpenDrawer>().listen((event) {
|
||||
if (mounted) {
|
||||
_scaffoldKey.currentState.openDrawer();
|
||||
_scaffoldKey.currentState?.openDrawer();
|
||||
}
|
||||
});
|
||||
_loadData();
|
||||
|
||||
@@ -13,20 +13,19 @@ import '../widgets/general/navigationbar.dart';
|
||||
import '../widgets/mobile/MobileBottomNav.dart';
|
||||
|
||||
class EditAddress extends StatelessWidget {
|
||||
final Key key;
|
||||
final Address address;
|
||||
final int businessId;
|
||||
const EditAddress(this.address, {this.key, int businessId}) :
|
||||
final Address? address;
|
||||
final int? businessId;
|
||||
const EditAddress(this.address, {Key? key, int? businessId}) :
|
||||
businessId = businessId ?? Constants.BUSINESS_ID;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileEditAddress(address, businessId: businessId,),
|
||||
tablet: DesktopEditAddress(address, businessId: businessId,),
|
||||
desktop: DesktopEditAddress(address, businessId: businessId,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileEditAddress(address, businessId: businessId,),
|
||||
tablet: (context) => DesktopEditAddress(address, businessId: businessId,),
|
||||
desktop: (context) => DesktopEditAddress(address, businessId: businessId,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import '../widgets/general/navigationbar.dart';
|
||||
import '../widgets/mobile/MobileBottomNav.dart';
|
||||
|
||||
class ForgotPassword extends StatelessWidget {
|
||||
const ForgotPassword({Key key}) : super(key: key);
|
||||
const ForgotPassword({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -28,15 +28,15 @@ class ForgotPassword extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileForgotPassword(),
|
||||
tablet: DesktopForgotPassword(),
|
||||
desktop: DesktopForgotPassword(),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileForgotPassword(),
|
||||
tablet: (context) => DesktopForgotPassword(),
|
||||
desktop: (context) => DesktopForgotPassword(),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -34,7 +34,7 @@ import '../widgets/mobile/mobile_navigation_drawer.dart';
|
||||
class Home extends StatefulWidget {
|
||||
final String title;
|
||||
|
||||
Home({Key key, this.title = ''}) : super(key: key);
|
||||
Home({Key? key, this.title = ''}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
@@ -46,11 +46,11 @@ class Home extends StatefulWidget {
|
||||
class HomeState extends State<Home> {
|
||||
final _scaffoldKey = GlobalKey<ScaffoldState>();
|
||||
List<Gallery> galleries = [];
|
||||
String content1Message;
|
||||
Map<String, dynamic> content2;
|
||||
String? content1Message;
|
||||
Map<String, dynamic>? content2;
|
||||
|
||||
StreamSubscription _sub;
|
||||
Uri _latestUri;
|
||||
StreamSubscription? _sub;
|
||||
Uri? _latestUri;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -74,8 +74,8 @@ class HomeState extends State<Home> {
|
||||
appBar: MiniNavigationBar(),
|
||||
drawer: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? MobileNavigationDrawer() : null,
|
||||
body: DoubleBackToCloseAppWrapper(
|
||||
child: ScreenTypeLayout(
|
||||
mobile: SingleChildScrollView(
|
||||
child: ScreenTypeLayout.builder(
|
||||
mobile: (context) => SingleChildScrollView(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
@@ -86,7 +86,7 @@ class HomeState extends State<Home> {
|
||||
],
|
||||
),
|
||||
),
|
||||
tablet: SingleChildScrollView(
|
||||
tablet: (context) => SingleChildScrollView(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
@@ -98,8 +98,8 @@ class HomeState extends State<Home> {
|
||||
],
|
||||
),
|
||||
),
|
||||
desktop: Scrollbar(
|
||||
isAlwaysShown: true,
|
||||
desktop: (context) => Scrollbar(
|
||||
thumbVisibility: true,
|
||||
child: SingleChildScrollView(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
@@ -115,10 +115,10 @@ class HomeState extends State<Home> {
|
||||
),
|
||||
),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -136,7 +136,7 @@ class HomeState extends State<Home> {
|
||||
_loadData();
|
||||
eventBus.on<OpenDrawer>().listen((event) {
|
||||
if (mounted) {
|
||||
_scaffoldKey.currentState.openDrawer();
|
||||
_scaffoldKey.currentState?.openDrawer();
|
||||
}
|
||||
});
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
||||
@@ -163,7 +163,9 @@ class HomeState extends State<Home> {
|
||||
if (!mounted) return;
|
||||
_latestUri = Uri.base;
|
||||
print('uri base $_latestUri');
|
||||
eventBus.fire(OnGotDeepLinkUri(_latestUri));
|
||||
if (_latestUri != null) {
|
||||
eventBus.fire(OnGotDeepLinkUri(_latestUri!));
|
||||
}
|
||||
} else {
|
||||
// _sub = getUriLinksStream().listen((Uri uri) {
|
||||
// print('_sub should get uri $uri');
|
||||
|
||||
@@ -16,7 +16,7 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_igoshow_learn_more.dart';
|
||||
|
||||
class IGoShowLearnMore extends StatefulWidget {
|
||||
const IGoShowLearnMore({Key key}) : super(key: key);
|
||||
const IGoShowLearnMore({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
@@ -26,7 +26,7 @@ class IGoShowLearnMore extends StatefulWidget {
|
||||
|
||||
class IGoShowLearnMoreState extends State<IGoShowLearnMore> {
|
||||
final _scaffoldKey = GlobalKey<ScaffoldState>();
|
||||
Map<String, dynamic> data;
|
||||
Map<String, dynamic>? data;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -55,15 +55,15 @@ class IGoShowLearnMoreState extends State<IGoShowLearnMore> {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileiGoShowLearnMore(data),
|
||||
tablet: DesktopiGoShowLearnMore(data),
|
||||
desktop: DesktopiGoShowLearnMore(data),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileiGoShowLearnMore(data!),
|
||||
tablet: (context) => DesktopiGoShowLearnMore(data!),
|
||||
desktop: (context) => DesktopiGoShowLearnMore(data!),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -14,9 +14,7 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_login.dart';
|
||||
|
||||
class Login extends StatefulWidget {
|
||||
final Key key;
|
||||
|
||||
const Login({this.key}) : super(key: key);
|
||||
const Login({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
@@ -50,15 +48,15 @@ class LoginState extends State<Login> {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileLogin(),
|
||||
tablet: DesktopLogin(),
|
||||
desktop: DesktopLogin(),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileLogin(),
|
||||
tablet: (context) => DesktopLogin(),
|
||||
desktop: (context) => DesktopLogin(),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -15,9 +15,7 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_me.dart';
|
||||
|
||||
class Me extends StatefulWidget {
|
||||
final Key key;
|
||||
|
||||
const Me({this.key}) : super(key: key);
|
||||
const Me({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
@@ -52,16 +50,16 @@ class MeState extends State<Me> {
|
||||
),
|
||||
drawer: null,
|
||||
body: DoubleBackToCloseAppWrapper(
|
||||
child: ScreenTypeLayout(
|
||||
mobile: MobileMe(),
|
||||
tablet: DesktopMe(),
|
||||
desktop: DesktopMe(),
|
||||
child: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileMe(),
|
||||
tablet: (context) => DesktopMe(),
|
||||
desktop: (context) => DesktopMe(),
|
||||
),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 3,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 3,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -16,7 +16,7 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_minipos_learn_more.dart';
|
||||
|
||||
class MiniPosLearnMore extends StatefulWidget {
|
||||
const MiniPosLearnMore({Key key}) : super(key: key);
|
||||
const MiniPosLearnMore({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
@@ -26,7 +26,7 @@ class MiniPosLearnMore extends StatefulWidget {
|
||||
|
||||
class MiniPosLearnMoreState extends State<MiniPosLearnMore> {
|
||||
final _scaffoldKey = GlobalKey<ScaffoldState>();
|
||||
Map<String, dynamic> data;
|
||||
Map<String, dynamic>? data;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -42,35 +42,36 @@ class MiniPosLearnMoreState extends State<MiniPosLearnMore> {
|
||||
);
|
||||
}
|
||||
|
||||
return WillPopScope(
|
||||
child: ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
Scaffold(
|
||||
key: _scaffoldKey,
|
||||
appBar: MiniNavigationBar(
|
||||
title: S.of(context).minipos,
|
||||
back: true,
|
||||
breadCrumbs: [
|
||||
BreadCrumb(S.of(context).minipos, null),
|
||||
],
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileMiniPosLearnMore(data),
|
||||
tablet: DesktopMiniPosLearnMore(data),
|
||||
desktop: DesktopMiniPosLearnMore(data),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
),
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) => PopScope(
|
||||
canPop: true,
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (didPop) return;
|
||||
// 可以在这里处理返回逻辑
|
||||
},
|
||||
child: Scaffold(
|
||||
key: _scaffoldKey,
|
||||
appBar: MiniNavigationBar(
|
||||
title: S.of(context).minipos,
|
||||
back: true,
|
||||
breadCrumbs: [
|
||||
BreadCrumb(S.of(context).minipos, null),
|
||||
],
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileMiniPosLearnMore(data!),
|
||||
tablet: (context) => DesktopMiniPosLearnMore(data!),
|
||||
desktop: (context) => DesktopMiniPosLearnMore(data!),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
),
|
||||
onWillPop: () async {
|
||||
return true;
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,20 +8,19 @@ import '../widgets/desktop/desktop_my_addresses.dart';
|
||||
import '../widgets/mobile/mobile_my_addresses.dart';
|
||||
|
||||
class MyAddresses extends StatelessWidget {
|
||||
final Key key;
|
||||
final int businessId;
|
||||
|
||||
const MyAddresses({this.key, int businessId}) :
|
||||
const MyAddresses({Key? key, int? businessId}) :
|
||||
businessId = businessId ?? Constants.BUSINESS_ID;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileMyAddresses(businessId: businessId,),
|
||||
tablet: DesktopMyAddresses(businessId: businessId,),
|
||||
desktop: DesktopMyAddresses(businessId: businessId,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileMyAddresses(businessId: businessId,),
|
||||
tablet: (context) => DesktopMyAddresses(businessId: businessId,),
|
||||
desktop: (context) => DesktopMyAddresses(businessId: businessId,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -35,10 +35,10 @@ class MyCards extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileMyCards(),
|
||||
tablet: DesktopMyCards(),
|
||||
desktop: DesktopMyCards(),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileMyCards(),
|
||||
tablet: (context) => DesktopMyCards(),
|
||||
desktop: (context) => DesktopMyCards(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -8,20 +8,19 @@ import '../widgets/desktop/desktop_my_support.dart';
|
||||
import '../widgets/mobile/mobile_my_support.dart';
|
||||
|
||||
class MySupport extends StatelessWidget {
|
||||
final Key key;
|
||||
final int businessId;
|
||||
|
||||
const MySupport({this.key, int businessId}) :
|
||||
const MySupport({Key? key, int? businessId}) :
|
||||
businessId = businessId ?? Constants.BUSINESS_ID;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileMySupport(businessId: businessId,),
|
||||
tablet: DesktopMySupport(businessId: businessId,),
|
||||
desktop: DesktopMySupport(businessId: businessId,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileMySupport(businessId: businessId,),
|
||||
tablet: (context) => DesktopMySupport(businessId: businessId,),
|
||||
desktop: (context) => DesktopMySupport(businessId: businessId,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7,25 +7,24 @@ import '../widgets/desktop/desktop_new_address.dart';
|
||||
import '../widgets/mobile/mobile_new_address.dart';
|
||||
|
||||
class NewAddress extends StatelessWidget {
|
||||
final Key key;
|
||||
final LocatedAddress locatedAddress;
|
||||
final int businessId;
|
||||
const NewAddress({this.key, this.locatedAddress, this.businessId}) : super(key: key);
|
||||
final LocatedAddress? locatedAddress;
|
||||
final int? businessId;
|
||||
const NewAddress({Key? key, this.locatedAddress, this.businessId}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileNewAddress(
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileNewAddress(
|
||||
locatedAddress: locatedAddress,
|
||||
businessId: businessId,
|
||||
),
|
||||
tablet: DesktopNewAddress(
|
||||
tablet: (context) => DesktopNewAddress(
|
||||
locatedAddress: locatedAddress,
|
||||
businessId: businessId,
|
||||
),
|
||||
desktop: DesktopNewAddress(
|
||||
desktop: (context) => DesktopNewAddress(
|
||||
locatedAddress: locatedAddress,
|
||||
businessId: businessId,
|
||||
),
|
||||
|
||||
@@ -10,7 +10,7 @@ import '../widgets/mobile/mobile_new_comment.dart';
|
||||
class NewComment extends StatelessWidget {
|
||||
final int orderId;
|
||||
|
||||
const NewComment(this.orderId, {Key key}) :
|
||||
const NewComment(this.orderId, {Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ class NewComment extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileNewComment(orderId,),
|
||||
tablet: DesktopNewComment(orderId,),
|
||||
desktop: DesktopNewComment(orderId,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileNewComment(orderId,),
|
||||
tablet: (context) => DesktopNewComment(orderId,),
|
||||
desktop: (context) => DesktopNewComment(orderId,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -14,10 +14,9 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_new_ticket.dart';
|
||||
|
||||
class NewTicket extends StatefulWidget {
|
||||
final Key key;
|
||||
final int businessId;
|
||||
final int? businessId;
|
||||
|
||||
const NewTicket({this.key, int businessId}) :
|
||||
const NewTicket({Key? key, int? businessId}) :
|
||||
businessId = businessId ?? Constants.BUSINESS_ID;
|
||||
|
||||
@override
|
||||
@@ -52,15 +51,15 @@ class NewTicketState extends State<NewTicket> {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileNewTicket(businessId: widget.businessId,),
|
||||
tablet: DesktopNewTicket(businessId: widget.businessId,),
|
||||
desktop: DesktopNewTicket(businessId: widget.businessId,),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileNewTicket(businessId: widget.businessId!,),
|
||||
tablet: (context) => DesktopNewTicket(businessId: widget.businessId!,),
|
||||
desktop: (context) => DesktopNewTicket(businessId: widget.businessId!,),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -12,7 +12,7 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_new_user.dart';
|
||||
|
||||
class NewUser extends StatelessWidget {
|
||||
const NewUser({Key key}) : super(key: key);
|
||||
const NewUser({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -28,15 +28,15 @@ class NewUser extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileNewUser(),
|
||||
tablet: DesktopNewUser(),
|
||||
desktop: DesktopNewUser(),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileNewUser(),
|
||||
tablet: (context) => DesktopNewUser(),
|
||||
desktop: (context) => DesktopNewUser(),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -11,7 +11,7 @@ class OrderDetail extends StatelessWidget {
|
||||
final int orderId;
|
||||
final bool fromOrders;
|
||||
|
||||
const OrderDetail(this.orderId, {this.fromOrders = false, Key key}) :
|
||||
const OrderDetail(this.orderId, {this.fromOrders = false, Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -20,10 +20,10 @@ class OrderDetail extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileOrderDetail(orderId, fromOrders: fromOrders,),
|
||||
tablet: DesktopOrderDetail(orderId, fromOrders: fromOrders,),
|
||||
desktop: DesktopOrderDetail(orderId, fromOrders: fromOrders,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileOrderDetail(orderId, fromOrders: fromOrders,),
|
||||
tablet: (context) => DesktopOrderDetail(orderId, fromOrders: fromOrders,),
|
||||
desktop: (context) => DesktopOrderDetail(orderId, fromOrders: fromOrders,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import '../widgets/mobile/mobile_pay_now.dart';
|
||||
class PayNow extends StatelessWidget {
|
||||
final int orderId;
|
||||
|
||||
const PayNow(this.orderId, {Key key}) :
|
||||
const PayNow(this.orderId, {Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ class PayNow extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobilePayNow(orderId,),
|
||||
tablet: DesktopPayNow(orderId,),
|
||||
desktop: DesktopPayNow(orderId,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobilePayNow(orderId,),
|
||||
tablet: (context) => DesktopPayNow(orderId,),
|
||||
desktop: (context) => DesktopPayNow(orderId,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -13,9 +13,9 @@ import '../utils/utils.dart';
|
||||
|
||||
class PlainPage extends StatefulWidget {
|
||||
final int businessId;
|
||||
final String slug;
|
||||
final String? slug;
|
||||
|
||||
const PlainPage(this.slug, {this.businessId, Key key}) :
|
||||
const PlainPage(this.slug, {required this.businessId, Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -23,7 +23,7 @@ class PlainPage extends StatefulWidget {
|
||||
}
|
||||
|
||||
class PlainPageState extends State<PlainPage> {
|
||||
Blog blog;
|
||||
Blog? blog;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -43,10 +43,10 @@ class PlainPageState extends State<PlainPage> {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobilePlainPage(blog),
|
||||
tablet: DesktopPlainPage(blog),
|
||||
desktop: DesktopPlainPage(blog),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobilePlainPage(blog!),
|
||||
tablet: (context) => DesktopPlainPage(blog!),
|
||||
desktop: (context) => DesktopPlainPage(blog!),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ class ProductDetailPage extends StatelessWidget {
|
||||
final Business business;
|
||||
final Product product;
|
||||
|
||||
const ProductDetailPage({this.business, this.product, Key key}) :
|
||||
const ProductDetailPage({required this.business, required this.product, Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
|
||||
@@ -23,10 +23,10 @@ class ProductDetailPage extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileProductDetailPage(business: business, product: product,),
|
||||
tablet: DesktopProductDetailPage(business: business, product: product,),
|
||||
desktop: DesktopProductDetailPage(business: business, product: product,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileProductDetailPage(business: business, product: product,),
|
||||
tablet: (context) => DesktopProductDetailPage(business: business, product: product,),
|
||||
desktop: (context) => DesktopProductDetailPage(business: business, product: product,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@ import '../widgets/mobile/product_search.dart' as mobile;
|
||||
class ProductSearch extends StatelessWidget {
|
||||
final Business business;
|
||||
|
||||
const ProductSearch(this.business, {Key key}) : super(key: key);
|
||||
const ProductSearch(this.business, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: mobile.ProductSearch(business),
|
||||
tablet: desktop.ProductSearch(business),
|
||||
desktop: desktop.ProductSearch(business),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => mobile.ProductSearch(business),
|
||||
tablet: (context) => desktop.ProductSearch(business),
|
||||
desktop: (context) => desktop.ProductSearch(business),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import '../widgets/mobile/mobile_renew_license.dart';
|
||||
|
||||
class RenewLicense extends StatefulWidget {
|
||||
|
||||
const RenewLicense({Key key}) :
|
||||
const RenewLicense({Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -28,10 +28,10 @@ class RenewLicenseState extends State<RenewLicense> {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileRenewLicense(Constants.BUSINESS_ID),
|
||||
tablet: DesktopRenewLicense(Constants.BUSINESS_ID),
|
||||
desktop: DesktopRenewLicense(Constants.BUSINESS_ID),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileRenewLicense(Constants.BUSINESS_ID),
|
||||
tablet: (context) => DesktopRenewLicense(Constants.BUSINESS_ID),
|
||||
desktop: (context) => DesktopRenewLicense(Constants.BUSINESS_ID),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ import '../widgets/mobile/mobile_renew_license.dart';
|
||||
class RenewMiniOffice extends StatefulWidget {
|
||||
final int gid;
|
||||
|
||||
const RenewMiniOffice(this.gid, {Key key}) :
|
||||
const RenewMiniOffice(this.gid, {Key? key}) :
|
||||
super(key: key);
|
||||
|
||||
@override
|
||||
@@ -25,7 +25,7 @@ class RenewMiniOffice extends StatefulWidget {
|
||||
}
|
||||
|
||||
class RenewMiniOfficeState extends State<RenewMiniOffice> {
|
||||
Map<String, dynamic> data;
|
||||
Map<String, dynamic>? data;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -45,10 +45,10 @@ class RenewMiniOfficeState extends State<RenewMiniOffice> {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileRenewMiniOffice(data),
|
||||
tablet: DesktopRenewMiniOffice(data),
|
||||
desktop: DesktopRenewMiniOffice(data),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileRenewMiniOffice(data!),
|
||||
tablet: (context) => DesktopRenewMiniOffice(data!),
|
||||
desktop: (context) => DesktopRenewMiniOffice(data!),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ import '../widgets/mobile/mobile_reset_password.dart';
|
||||
class ResetPassword extends StatelessWidget {
|
||||
final String mobile;
|
||||
final String code;
|
||||
const ResetPassword(this.mobile, {Key key, this.code}) : super(key: key);
|
||||
const ResetPassword(this.mobile, {Key? key, required this.code}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -30,15 +30,15 @@ class ResetPassword extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileResetPassword(mobile, code: code,),
|
||||
tablet: DesktopResetPassword(mobile, code: code,),
|
||||
desktop: DesktopResetPassword(mobile, code: code,),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileResetPassword(mobile, code: code,),
|
||||
tablet: (context) => DesktopResetPassword(mobile, code: code,),
|
||||
desktop: (context) => DesktopResetPassword(mobile, code: code,),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -5,18 +5,17 @@ import '../widgets/mobile/mobile_search_place.dart';
|
||||
import 'package:responsive_builder/responsive_builder.dart';
|
||||
|
||||
class SearchPlace extends StatelessWidget {
|
||||
final Key key;
|
||||
final int businessId;
|
||||
const SearchPlace(this.businessId, {this.key}) : super(key: key);
|
||||
const SearchPlace(this.businessId, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileSearchPlace(businessId),
|
||||
tablet: DesktopSearchPlace(businessId),
|
||||
desktop: DesktopSearchPlace(businessId),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileSearchPlace(businessId),
|
||||
tablet: (context) => DesktopSearchPlace(businessId),
|
||||
desktop: (context) => DesktopSearchPlace(businessId),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ import '../widgets/mobile/mobile_set_password.dart';
|
||||
class SetPassword extends StatelessWidget {
|
||||
final String mobile;
|
||||
final String code;
|
||||
const SetPassword(this.mobile, {Key key, this.code}) : super(key: key);
|
||||
const SetPassword(this.mobile, {Key? key, required this.code}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -30,15 +30,15 @@ class SetPassword extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileSetPassword(mobile, code: code,),
|
||||
tablet: DesktopSetPassword(mobile, code: code,),
|
||||
desktop: DesktopSetPassword(mobile, code: code,),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileSetPassword(mobile, code: code,),
|
||||
tablet: (context) => DesktopSetPassword(mobile, code: code,),
|
||||
desktop: (context) => DesktopSetPassword(mobile, code: code,),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -8,9 +8,9 @@ import '../widgets/desktop/shop.dart' as desktop;
|
||||
import '../widgets/mobile/shop.dart' as mobile;
|
||||
|
||||
class Shop extends StatefulWidget {
|
||||
final int businessId;
|
||||
final int? businessId;
|
||||
|
||||
const Shop({this.businessId, Key key}) : super(key: key);
|
||||
const Shop({this.businessId, Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() => ShopState();
|
||||
@@ -20,17 +20,17 @@ class ShopState extends State<Shop> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
int _businessId =
|
||||
widget.businessId == null ? Utils.getBusinessId() : widget.businessId;
|
||||
widget.businessId == null ? Utils.getBusinessId() : widget.businessId!;
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) => ScreenTypeLayout(
|
||||
mobile: mobile.Shop(
|
||||
builder: (context, sizingInformation) => ScreenTypeLayout.builder(
|
||||
mobile: (context) => mobile.Shop(
|
||||
businessId: _businessId,
|
||||
),
|
||||
tablet: desktop.Shop(
|
||||
tablet: (context) => desktop.Shop(
|
||||
businessId: _businessId,
|
||||
),
|
||||
desktop: desktop.Shop(
|
||||
desktop: (context) => desktop.Shop(
|
||||
businessId: _businessId,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -15,7 +15,7 @@ import '../widgets/mobile/mobile_store_product_search.dart';
|
||||
class StoreProductSearch extends StatelessWidget {
|
||||
final Business business;
|
||||
|
||||
const StoreProductSearch(this.business, {Key key}) : super(key: key);
|
||||
const StoreProductSearch(this.business, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -31,15 +31,15 @@ class StoreProductSearch extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileStoreProductSearch(business,),
|
||||
tablet: DesktopStoreProductSearch(business),
|
||||
desktop: DesktopStoreProductSearch(business),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileStoreProductSearch(business,),
|
||||
tablet: (context) => DesktopStoreProductSearch(business),
|
||||
desktop: (context) => DesktopStoreProductSearch(business),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 1,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 1,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -13,7 +13,7 @@ import '../widgets/mobile/mobile_stripe_pay_web.dart';
|
||||
class StripePayWeb extends StatelessWidget {
|
||||
final Order order;
|
||||
final PaymentPlatform paymentPlatform;
|
||||
final StripePaymentMethod stripePaymentMethod;
|
||||
final StripePaymentMethod? stripePaymentMethod;
|
||||
|
||||
const StripePayWeb(this.order, this.paymentPlatform, {this.stripePaymentMethod});
|
||||
|
||||
@@ -23,10 +23,10 @@ class StripePayWeb extends StatelessWidget {
|
||||
|
||||
return ResponsiveBuilder(
|
||||
builder: (context, sizingInformation) =>
|
||||
ScreenTypeLayout(
|
||||
mobile: MobileStripePayWeb(order, paymentPlatform, stripePaymentMethod: stripePaymentMethod,),
|
||||
tablet: DesktopStripePayWeb(order, paymentPlatform, stripePaymentMethod: stripePaymentMethod,),
|
||||
desktop: DesktopStripePayWeb(order, paymentPlatform, stripePaymentMethod: stripePaymentMethod,),
|
||||
ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileStripePayWeb(order, paymentPlatform, stripePaymentMethod: stripePaymentMethod,),
|
||||
tablet: (context) => DesktopStripePayWeb(order, paymentPlatform, stripePaymentMethod: stripePaymentMethod,),
|
||||
desktop: (context) => DesktopStripePayWeb(order, paymentPlatform, stripePaymentMethod: stripePaymentMethod,),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_user_profile.dart';
|
||||
|
||||
class UserProfile extends StatelessWidget {
|
||||
const UserProfile({Key key}) : super(key: key);
|
||||
const UserProfile({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -29,15 +29,15 @@ class UserProfile extends StatelessWidget {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileUserProfile(),
|
||||
tablet: DesktopUserProfile(),
|
||||
desktop: DesktopUserProfile(),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileUserProfile(),
|
||||
tablet: (context) => DesktopUserProfile(),
|
||||
desktop: (context) => DesktopUserProfile(),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -14,10 +14,9 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_view_blog.dart';
|
||||
|
||||
class ViewBlog extends StatefulWidget {
|
||||
final Key key;
|
||||
final int bid;
|
||||
|
||||
const ViewBlog(this.bid, {this.key}) : super(key: key);
|
||||
const ViewBlog(this.bid, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
@@ -51,15 +50,15 @@ class ViewBlogState extends State<ViewBlog> {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileViewBlog(widget.bid),
|
||||
tablet: DesktopViewBlog(widget.bid),
|
||||
desktop: DesktopViewBlog(widget.bid),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileViewBlog(widget.bid),
|
||||
tablet: (context) => DesktopViewBlog(widget.bid),
|
||||
desktop: (context) => DesktopViewBlog(widget.bid),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -14,10 +14,9 @@ import '../widgets/mobile/MobileBottomNav.dart';
|
||||
import '../widgets/mobile/mobile_view_ticket.dart';
|
||||
|
||||
class ViewTicket extends StatefulWidget {
|
||||
final Key key;
|
||||
final int ticketId;
|
||||
|
||||
const ViewTicket(this.ticketId, {this.key}) : super(key: key);
|
||||
const ViewTicket(this.ticketId, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
@@ -51,15 +50,15 @@ class ViewTicketState extends State<ViewTicket> {
|
||||
breadCrumbHeight: sizingInformation.deviceScreenType == DeviceScreenType.mobile ? null : Constants.BREADCRUMB_HEIGHT,
|
||||
),
|
||||
drawer: null,
|
||||
body: ScreenTypeLayout(
|
||||
mobile: MobileViewTicket(widget.ticketId),
|
||||
tablet: DesktopViewTicket(widget.ticketId),
|
||||
desktop: DesktopViewTicket(widget.ticketId),
|
||||
body: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileViewTicket(widget.ticketId),
|
||||
tablet: (context) => DesktopViewTicket(widget.ticketId),
|
||||
desktop: (context) => DesktopViewTicket(widget.ticketId),
|
||||
),
|
||||
bottomNavigationBar: ScreenTypeLayout(
|
||||
mobile: MobileBottomNav(currentIndex: 0,),
|
||||
tablet: BottomNav(),
|
||||
desktop: BottomNav(),
|
||||
bottomNavigationBar: ScreenTypeLayout.builder(
|
||||
mobile: (context) => MobileBottomNav(currentIndex: 0,),
|
||||
tablet: (context) => BottomNav(),
|
||||
desktop: (context) => BottomNav(),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user