Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/design/dialogs/component_dialog/ion_double_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ class IonDoubleButtom implements IonComponentDialog {
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(bottom: 20),
padding: EdgeInsets.only(bottom: 8.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
if (divider) const Divider(),
SizedBox(
height: 14.h,
height: 8.h,
),
if (txtFirstButton != null)
Column(
Expand All @@ -43,7 +43,7 @@ class IonDoubleButtom implements IonComponentDialog {
text: txtFirstButton!,
),
SizedBox(
height: 12.h,
height: 8.h,
),
],
),
Expand Down
28 changes: 16 additions & 12 deletions lib/design/dialogs/component_dialog/ion_icon_text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,27 @@ class IonIconText implements IonComponentDialog {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (icon != null)
CircleAvatar(
backgroundColor: Colors.grey[200],
child: SvgPicture.asset(
icon!,
package: 'ion_mobile',
height: 18.h,
width: 18.w,
),
Row(
children: [
CircleAvatar(
backgroundColor: Colors.grey[200],
child: SvgPicture.asset(
icon!,
package: 'ion_mobile',
height: 18.h,
width: 18.w,
),
),
SizedBox(
width: 16.w,
),
],
),
SizedBox(
width: 16.w,
),
text
],
)
],
),
);
}
}
}
7 changes: 4 additions & 3 deletions lib/design/dialogs/component_dialog/ion_media.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class IonMedia implements IonComponentDialog {
final String? imageUrl;
final Future<Object?>? future;
final VideoPlayerController? videoController;
final bool externalImage;
final bool? roundedBorder;
final double? height;
final double? width;
Expand All @@ -18,11 +19,11 @@ class IonMedia implements IonComponentDialog {
this.height,
this.width,
this.imageUrl,
this.externalImage=false,
this.roundedBorder});

@override
Widget build(BuildContext context) {

return Padding(
padding: const EdgeInsets.only(bottom: 8).h,
child: Column(
Expand All @@ -33,7 +34,7 @@ class IonMedia implements IonComponentDialog {
fit: BoxFit.cover,
height: height,
width: width,
package: 'ion_mobile'),
package: externalImage!?'ion_mobile':null),
if (videoController != null)
SizedBox(
height: 280,
Expand All @@ -56,4 +57,4 @@ class IonMedia implements IonComponentDialog {
),
);
}
}
}
9 changes: 6 additions & 3 deletions lib/design/dialogs/component_dialog/ion_title.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@ class IonTitle implements IonComponentDialog {
? MainAxisAlignment.spaceBetween
: MainAxisAlignment.center,
children: [
Text(title,
style: const IonTextStyleH2(
ionFontWeight: IonFontWeight.medium)),
Expanded(
child: Text(title,
textAlign: TextAlign.center,
style: const IonTextStyleH4(
ionFontWeight: IonFontWeight.medium)),
),
if (close)
IconButton(
onPressed: onTapClose ?? () => Navigator.of(context).pop(),
Expand Down
5 changes: 3 additions & 2 deletions lib/design/dialogs/custom_dialog/custom_dialog.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:ion_mobile/design/dialogs/component_dialog/ion_component_dialog.dart';

class IonCustomDialog extends StatelessWidget {
Expand All @@ -16,7 +17,7 @@ class IonCustomDialog extends StatelessWidget {
children: [
Dialog(
elevation: 0,
insetPadding: const EdgeInsets.all(25),
insetPadding: EdgeInsets.all(18.h),
backgroundColor: Colors.transparent,
child: Center(
child: Container(
Expand All @@ -31,7 +32,7 @@ class IonCustomDialog extends StatelessWidget {
),
child: SingleChildScrollView(
child: Container(
padding: const EdgeInsets.all(24),
padding: EdgeInsets.only(top: 20.h, left: 20.w, right: 20.w, bottom: 12.h),
width: width,
height: height,
decoration: BoxDecoration(
Expand Down
2 changes: 1 addition & 1 deletion lib/design/typography/heading.dart
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class IonTextStyleH4 extends IonTextStyle {

enum IonH1FontSizeHeight {
regular(40, 1.2),
medium(32, 1.25),
medium(30, 1.25),
small(24, 1.333);

final double fontSize;
Expand Down