saved login fixes & design changes.

merge-update-with-lab-changes
Aamir Muhammad 7 months ago committed by haroon amjad
parent e306bfd69b
commit b60bfde04f

@ -375,7 +375,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
sharedPref.remove(REGISTER_DATA_FOR_LOGIIN); sharedPref.remove(REGISTER_DATA_FOR_LOGIIN);
if (data != null) { if (data != null) {
SelectDeviceIMEIRES savedData = SelectDeviceIMEIRES.fromJson(data); SelectDeviceIMEIRES savedData = SelectDeviceIMEIRES.fromJson(data);
Navigator.of(context).pushReplacement( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (BuildContext context) => SavedLogin(savedData), builder: (BuildContext context) => SavedLogin(savedData),
), ),
@ -390,7 +390,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
if (value != null) { if (value != null) {
SelectDeviceIMEIRES savedData = SelectDeviceIMEIRES.fromJson(data); SelectDeviceIMEIRES savedData = SelectDeviceIMEIRES.fromJson(data);
setUserValues(value); setUserValues(value);
Navigator.of(context).pushReplacement( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (BuildContext context) => SavedLogin(savedData), builder: (BuildContext context) => SavedLogin(savedData),
), ),

@ -66,7 +66,7 @@ class _SavedLogin extends State<SavedLogin> {
appBarTitle: TranslationBase.of(context).register, appBarTitle: TranslationBase.of(context).register,
isShowDecPage: false, isShowDecPage: false,
isShowAppBar: true, isShowAppBar: true,
isshowBackButton: false, isshowBackButton: true,
showNewAppBar: true, showNewAppBar: true,
backgroundColor: Color(0xffF8F8F8), backgroundColor: Color(0xffF8F8F8),
showNewAppBarTitle: false, showNewAppBarTitle: false,

@ -395,11 +395,15 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
backgroundColor: showTitle ? Colors.white : Colors.transparent, backgroundColor: showTitle ? Colors.white : Colors.transparent,
// backgroundColor: Colors.red, // backgroundColor: Colors.red,
// automaticallyImplyLeading: false, // automaticallyImplyLeading: false,
leading: isShowBackButton leading: isShowBackButton && showSavedLoginBar
? ArrowBack( ? ArrowBack(
onTap: onTap, onTap: onTap,
) ).withHorizontalPadding(24)
: null, : isShowBackButton
? ArrowBack(
onTap: onTap,
)
: null,
// centerTitle: showCenterLogo, // centerTitle: showCenterLogo,
titleSpacing: -8, titleSpacing: -8,
// centerTitle: showSavedLoginBar, // centerTitle: showSavedLoginBar,
@ -408,11 +412,11 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
SvgPicture.asset( // SvgPicture.asset(
'assets/images/svg/card_user.svg', // 'assets/images/svg/card_user.svg',
height: 32, // height: 32,
width: 32, // width: 32,
).withHorizontalPadding(24), // ).withHorizontalPadding(24),
if (showCenterLogo) Expanded(child: SvgPicture.asset('assets/images/svg/habiblogo.svg', height: 32, width: 32)), if (showCenterLogo) Expanded(child: SvgPicture.asset('assets/images/svg/habiblogo.svg', height: 32, width: 32)),
if (showDropDown! && isShowLanguageChanger) if (showDropDown! && isShowLanguageChanger)
Directionality( Directionality(

Loading…
Cancel
Save