diff --git a/assets/esign.webp b/assets/esign.webp new file mode 100644 index 0000000..6397515 Binary files /dev/null and b/assets/esign.webp differ diff --git a/lib/pages/validate_detail_page.dart b/lib/pages/validate_detail_page.dart index c69b0dd..ddd2cf8 100644 --- a/lib/pages/validate_detail_page.dart +++ b/lib/pages/validate_detail_page.dart @@ -5,6 +5,7 @@ import 'package:gap/gap.dart'; import 'package:ocbo_esign_mobile/blocs/qr/functions/bloc_getqr.dart'; import 'package:ocbo_esign_mobile/functions/get_api.dart'; import 'package:ocbo_esign_mobile/widgets/box_widget.dart'; +import 'package:ocbo_esign_mobile/widgets/image_widget.dart'; import 'package:ocbo_esign_mobile/widgets/input_widget.dart'; import 'package:ocbo_esign_mobile/widgets/text_widget.dart'; import 'package:intl/intl.dart'; @@ -30,9 +31,9 @@ class _ValidateDetailPageState extends State { _total = double.parse(total).toInt(); }); - final response = await getApi('get-transactions', name, null); - final applicationNoList = response['result']; - final dateList = response['result2']; + // final response = await getApi('get-transactions', name, null); + // final applicationNoList = response['result']; + // final dateList = response['result2']; } @override @@ -63,11 +64,18 @@ class _ValidateDetailPageState extends State { ), ), child: SizedBox( - width: MediaQuery.of(context).size.width - 90, + width: MediaQuery.of(context).size.width - 104, child: Column( children: [ const Gap(88), - InputWidget(controller: _searchController, password: false, placeholder: 'Specify Application Number'), + ClipRRect( + borderRadius: BorderRadius.circular(36), + child: InputWidget( + controller: _searchController, + password: false, + placeholder: 'Search Application Number', + ), + ), const Gap(24), BoxWidget( circular: 16, @@ -76,7 +84,7 @@ class _ValidateDetailPageState extends State { children: [ Column( children: [ - TextWidget(text: formatter.format(_total), size: 64, bold: true), + TextWidget(text: formatter.format(_total), size: 50, bold: true), TextWidget(text: 'Total Signed Applications', size: 16), ], ), @@ -84,20 +92,74 @@ class _ValidateDetailPageState extends State { ), ), const Gap(16), - const BoxWidget( - circular: 16, - content: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Column( + (Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + BoxWidget( + alignment: CrossAxisAlignment.center, + circular: 16, + content: Row( children: [ - TextWidget(text: '23-000123', size: 24, bold: true), - TextWidget(text: 'Total Signed Applications', size: 20), + const ImageWidget(imagePath: 'assets/esign.webp', size: 48, measureByHeight: true), + const Gap(16), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + TextWidget(text: '23-000123', size: 18, bold: true), + const Gap(4), + TextWidget(text: 'Total Signed Applications', size: 12), + ], + ), ], ), - ], - ), - ), + ), + const Gap(8), + BoxWidget( + alignment: CrossAxisAlignment.center, + circular: 16, + content: Row( + children: [ + const ImageWidget(imagePath: 'assets/esign.webp', size: 48, measureByHeight: true), + const Gap(16), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + TextWidget(text: '23-000123', size: 18, bold: true), + const Gap(4), + TextWidget(text: 'Total Signed Applications', size: 12), + const Gap(4), + Expanded( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [TextWidget(text: 'Dates', size: 8)], + ), + ), + ], + ), + ], + ), + ), + const Gap(8), + BoxWidget( + alignment: CrossAxisAlignment.center, + circular: 16, + content: Row( + children: [ + const ImageWidget(imagePath: 'assets/esign.webp', size: 48, measureByHeight: true), + const Gap(16), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + TextWidget(text: '23-000123', size: 18, bold: true), + const Gap(4), + TextWidget(text: 'Total Signed Applications', size: 12), + ], + ), + ], + ), + ), + ], + )), ], ), ), diff --git a/lib/widgets/box_widget.dart b/lib/widgets/box_widget.dart index fa9eb85..d47e058 100644 --- a/lib/widgets/box_widget.dart +++ b/lib/widgets/box_widget.dart @@ -1,13 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:gap/gap.dart'; -import 'package:ocbo_esign_mobile/widgets/text_widget.dart'; class BoxWidget extends StatelessWidget { final Widget content; final double? circular; + final CrossAxisAlignment? alignment; // final double? titleSize; - const BoxWidget({super.key, required this.content, this.circular = 8}); + const BoxWidget({super.key, required this.content, this.circular = 8, this.alignment = CrossAxisAlignment.start}); @override Widget build(BuildContext context) { @@ -20,7 +19,7 @@ class BoxWidget extends StatelessWidget { ), width: MediaQuery.of(context).size.width - 30, child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: alignment ?? CrossAxisAlignment.start, children: [Padding(padding: const EdgeInsets.all(16), child: content)], ), ); diff --git a/pubspec.yaml b/pubspec.yaml index 85df586..3123689 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,3 +45,4 @@ flutter: - .env - assets/logo.webp - assets/pat-alcala.webp + - assets/esign.webp