|
|
|
@ -262,6 +262,7 @@ class _AppScaffoldState extends State<AppScaffold> {
|
|
|
|
showCenterLogo: widget.showCenteredLogo,
|
|
|
|
showCenterLogo: widget.showCenteredLogo,
|
|
|
|
isShowLanguageChanger: widget.isShowLanguageChanger,
|
|
|
|
isShowLanguageChanger: widget.isShowLanguageChanger,
|
|
|
|
showSavedLoginBar: widget.showLastLoginScreenBar,
|
|
|
|
showSavedLoginBar: widget.showLastLoginScreenBar,
|
|
|
|
|
|
|
|
showHomeAppBarIcon: widget.showHomeAppBarIcon,
|
|
|
|
onTap: () {
|
|
|
|
onTap: () {
|
|
|
|
widget.onTap;
|
|
|
|
widget.onTap;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -297,11 +298,7 @@ class _AppScaffoldState extends State<AppScaffold> {
|
|
|
|
icon: widget.icon,
|
|
|
|
icon: widget.icon,
|
|
|
|
)
|
|
|
|
)
|
|
|
|
: widget.baseViewModel != null
|
|
|
|
: widget.baseViewModel != null
|
|
|
|
? NetworkBaseView(
|
|
|
|
? NetworkBaseView(child: buildBodyWidget(context), baseViewModel: widget.baseViewModel, showLoader: widget.showLoader)
|
|
|
|
child: buildBodyWidget(context),
|
|
|
|
|
|
|
|
baseViewModel: widget.baseViewModel,
|
|
|
|
|
|
|
|
showLoader : widget.showLoader
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
: buildBodyWidget(context),
|
|
|
|
: buildBodyWidget(context),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
bottomNavigationBar: widget.isBottomBar
|
|
|
|
bottomNavigationBar: widget.isBottomBar
|
|
|
|
@ -369,6 +366,7 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
|
|
|
|
final bool isShowLanguageChanger;
|
|
|
|
final bool isShowLanguageChanger;
|
|
|
|
final bool showCenterLogo;
|
|
|
|
final bool showCenterLogo;
|
|
|
|
final bool showSavedLoginBar;
|
|
|
|
final bool showSavedLoginBar;
|
|
|
|
|
|
|
|
final bool? showHomeAppBarIcon;
|
|
|
|
|
|
|
|
|
|
|
|
String currentLang = 'ar';
|
|
|
|
String currentLang = 'ar';
|
|
|
|
|
|
|
|
|
|
|
|
@ -388,6 +386,7 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
|
|
|
|
this.isShowLanguageChanger = false,
|
|
|
|
this.isShowLanguageChanger = false,
|
|
|
|
this.showCenterLogo = false,
|
|
|
|
this.showCenterLogo = false,
|
|
|
|
this.showSavedLoginBar = false,
|
|
|
|
this.showSavedLoginBar = false,
|
|
|
|
|
|
|
|
this.showHomeAppBarIcon = true,
|
|
|
|
}) : super(key: key);
|
|
|
|
}) : super(key: key);
|
|
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
@override
|
|
|
|
@ -586,17 +585,19 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
|
|
|
|
if (appBarIcons != null)
|
|
|
|
if (appBarIcons != null)
|
|
|
|
...appBarIcons!
|
|
|
|
...appBarIcons!
|
|
|
|
else
|
|
|
|
else
|
|
|
|
IconButton(
|
|
|
|
showHomeAppBarIcon!
|
|
|
|
onPressed: () {
|
|
|
|
? IconButton(
|
|
|
|
AppSharedPreferences().remove(IS_LIVECARE_APPOINTMENT);
|
|
|
|
onPressed: () {
|
|
|
|
Navigator.pushAndRemoveUntil(
|
|
|
|
AppSharedPreferences().remove(IS_LIVECARE_APPOINTMENT);
|
|
|
|
context,
|
|
|
|
Navigator.pushAndRemoveUntil(
|
|
|
|
MaterialPageRoute(builder: (context) => LandingPage()),
|
|
|
|
context,
|
|
|
|
(Route<dynamic> route) => false,
|
|
|
|
MaterialPageRoute(builder: (context) => LandingPage()),
|
|
|
|
);
|
|
|
|
(Route<dynamic> route) => false,
|
|
|
|
},
|
|
|
|
);
|
|
|
|
icon: Icon(Icons.home),
|
|
|
|
},
|
|
|
|
),
|
|
|
|
icon: Icon(Icons.home),
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
: Container(),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -623,7 +624,7 @@ class AppBarWidget extends StatefulWidget implements PreferredSizeWidget {
|
|
|
|
|
|
|
|
|
|
|
|
AppBarWidget(
|
|
|
|
AppBarWidget(
|
|
|
|
{this.appBarTitle,
|
|
|
|
{this.appBarTitle,
|
|
|
|
this.showHomeAppBarIcon,
|
|
|
|
this.showHomeAppBarIcon = true,
|
|
|
|
this.appBarIcons,
|
|
|
|
this.appBarIcons,
|
|
|
|
this.isPharmacy = true,
|
|
|
|
this.isPharmacy = true,
|
|
|
|
this.isshowBackButton = true,
|
|
|
|
this.isshowBackButton = true,
|
|
|
|
|