TM-164,165,167 bugs fixed
This commit is contained in:
@@ -16,9 +16,11 @@ class BaseButton extends StatelessWidget {
|
||||
final double? borderRadius;
|
||||
final double? elevation;
|
||||
final double? width;
|
||||
final double? height;
|
||||
final bool isLoading;
|
||||
final String? icon;
|
||||
final Color? iconColor;
|
||||
final double? fontSize;
|
||||
|
||||
const BaseButton({
|
||||
required this.isEnabled,
|
||||
@@ -31,9 +33,11 @@ class BaseButton extends StatelessWidget {
|
||||
this.borderRadius,
|
||||
this.elevation,
|
||||
this.width,
|
||||
this.height,
|
||||
this.isLoading = false,
|
||||
this.icon,
|
||||
this.iconColor,
|
||||
this.fontSize,
|
||||
super.key,
|
||||
});
|
||||
|
||||
@@ -42,7 +46,7 @@ class BaseButton extends StatelessWidget {
|
||||
return isLoading
|
||||
? Container(
|
||||
width: double.infinity,
|
||||
height: 55.0.h(),
|
||||
height: height ?? 55.0.h(),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.mainBlue,
|
||||
borderRadius: BorderRadius.circular(28.0.w()),
|
||||
@@ -60,7 +64,7 @@ class BaseButton extends StatelessWidget {
|
||||
)
|
||||
: SizedBox(
|
||||
width: width ?? double.infinity,
|
||||
height: 55.0.h(),
|
||||
height: height ?? 55.0.h(),
|
||||
child: ElevatedButton(
|
||||
onPressed: isEnabled ? onPressed : null,
|
||||
style: ElevatedButton.styleFrom(
|
||||
@@ -94,7 +98,7 @@ class BaseButton extends StatelessWidget {
|
||||
Text(
|
||||
text ?? LoginStrings.loginButton,
|
||||
style: TextStyle(
|
||||
fontSize: 16.0.sp(),
|
||||
fontSize: fontSize ?? 16.0.sp(),
|
||||
fontWeight: FontWeight.bold,
|
||||
color: textColor ?? AppColors.white,
|
||||
),
|
||||
@@ -104,7 +108,7 @@ class BaseButton extends StatelessWidget {
|
||||
: Text(
|
||||
text ?? LoginStrings.loginButton,
|
||||
style: TextStyle(
|
||||
fontSize: 16.0.sp(),
|
||||
fontSize: fontSize ?? 16.0.sp(),
|
||||
fontWeight: FontWeight.bold,
|
||||
color: textColor ?? AppColors.white,
|
||||
),
|
||||
|
||||
@@ -36,7 +36,20 @@ class DesktopNavigationWidget extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const SizedBox(width: 40),
|
||||
SvgPicture.asset(AssetsManager.logoSmall),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
if (currentIndex == 0) {
|
||||
return;
|
||||
} else {
|
||||
Router.neglect(
|
||||
context,
|
||||
() => const HomeRouteData().go(context),
|
||||
);
|
||||
context.read<HomeViewModel>().init();
|
||||
}
|
||||
},
|
||||
child: SvgPicture.asset(AssetsManager.logoSmall),
|
||||
),
|
||||
const Spacer(),
|
||||
_navigationItem(
|
||||
context: context,
|
||||
|
||||
Reference in New Issue
Block a user