fix: merge origin dev

This commit is contained in:
2024-03-05 15:43:52 +07:00
30 changed files with 1020 additions and 411 deletions

View File

@@ -49,11 +49,16 @@ class PathAssets {
static const String iconTicket = 'assets/icons/icon-ticket.png';
static const String iconGadget = 'assets/icons/icon-gadget.png';
static const String iconCar = 'assets/icons/icon-car.png';
static const String iconNavigationHome = 'assets/icons/icon-navigation-home.png';
static const String iconNavigationPlan = 'assets/icons/icon-navigation-plan.png';
static const String iconNavigationTransaction = 'assets/icons/icon-navigation-transaction.png';
static const String iconNavigationPortfolio = 'assets/icons/icon-navigation-portfolio.png';
static const String iconNavigationProfile = 'assets/icons/icon-navigation-profile.png';
static const String iconNavigationHome =
'assets/icons/icon-navigation-home.png';
static const String iconNavigationPlan =
'assets/icons/icon-navigation-plan.png';
static const String iconNavigationTransaction =
'assets/icons/icon-navigation-transaction.png';
static const String iconNavigationPortfolio =
'assets/icons/icon-navigation-portfolio.png';
static const String iconNavigationProfile =
'assets/icons/icon-navigation-profile.png';
static const String iconRemove = 'assets/icons/icon-remove.png';
static const String iconCat = 'assets/icons/icon-cat.png';
static const String iconProfile = 'assets/icons/icon-profile.png';
@@ -62,6 +67,12 @@ class PathAssets {
static const String iconSetting = 'assets/icons/icon-setting.png';
static const String iconFaqs = 'assets/icons/icon-faqs.png';
static const String iconLogout = 'assets/icons/icon-logout.png';
static const String iconEducation = 'assets/icons/icon-education.png';
static const String iconFund = 'assets/icons/icon-fund.png';
static const String iconHome = 'assets/icons/icon-home.png';
static const String iconShop = 'assets/icons/icon-shop.png';
static const String iconGadgetOutline =
'assets/icons/icon-gadget-outline.png';
/// IMAGE
static const String imgSplashLogo = 'assets/images/splash-logo.png';
@@ -96,11 +107,14 @@ class PathAssets {
static const String imgGuide1 = 'assets/images/img-guide1.png';
static const String imgGuide2 = 'assets/images/img-guide2.png';
static const String imgOpenShopping = 'assets/images/img-open-shopping.png';
static const String imgPaymentSuccess = 'assets/images/img-payment-success.png';
static const String imgPaymentSuccess =
'assets/images/img-payment-success.png';
static const String frameSignature = 'assets/images/frame-signature.png';
static const String imgFinish = 'assets/images/img-finish.png';
static const String imgDashboardProfile =
'assets/images/img-dashboard-profile.png';
static const String imgEmptyTransaction =
'assets/images/img-empty-transaction.png';
static const Map<String, String> goalInvestIcon = {
'Education': iconToga,

View File

@@ -0,0 +1,100 @@
import 'package:cims_apps/application/component/image/image_view.dart';
import 'package:cims_apps/application/theme/color_palette.dart';
import 'package:cims_apps/core/utils/size_config.dart';
import 'package:flutter/material.dart';
class CardTransactionView extends StatelessWidget {
final VoidCallback onTap;
final String iconPath, type, amount, subs, step;
final String? timeTransaction;
const CardTransactionView({
Key? key,
required this.step,
required this.type,
required this.amount,
required this.iconPath,
required this.subs,
required this.onTap,
this.timeTransaction,
}) : super(key: key);
@override
Widget build(BuildContext context) {
TextTheme textTheme = Theme.of(context).textTheme;
return GestureDetector(
onTap: onTap,
child: Container(
margin: const EdgeInsets.symmetric(vertical: 16.0),
padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(width: 1, color: ColorPalette.slate200),
borderRadius: const BorderRadius.all(Radius.circular(12)),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: SizeConfig.width * .4,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
ImageView(
image: iconPath, width: SizeConfig.width * .12),
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: Text(
type,
style: textTheme.headlineSmall,
),
),
],
),
Padding(
padding: const EdgeInsets.only(top: 16.0),
child: Text(
amount,
style: textTheme.headlineSmall,
),
),
],
)),
SizedBox(
width: SizeConfig.width * .4,
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SizedBox(
height: SizeConfig.height * .08,
child: Text(
subs,
style: const TextStyle(color: ColorPalette.primary),
)),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
step == 'waiting'
? const Icon(Icons.access_time_sharp,
color: ColorPalette.slate400)
: const SizedBox(),
step == 'waiting'
? Text(timeTransaction.toString())
: const SizedBox(),
const Padding(
padding: EdgeInsets.only(left: 16.0),
child: Icon(Icons.arrow_forward_ios),
),
],
),
],
)),
],
),
),
);
}
}

View File

@@ -0,0 +1,44 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_view.dart';
import 'package:cims_apps/application/component/image/image_view.dart';
import 'package:cims_apps/core/utils/size_config.dart';
import 'package:flutter/material.dart';
class EmptyCardTransaction extends StatelessWidget {
final VoidCallback onPressedButton;
const EmptyCardTransaction({Key? key, required this.onPressedButton})
: super(key: key);
@override
Widget build(BuildContext context) {
TextTheme textTheme = Theme.of(context).textTheme;
return Container(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
ImageView(
image: PathAssets.imgEmptyTransaction,
width: SizeConfig.width * .4,
),
Text(
'No Transaction Yet',
style: textTheme.headlineSmall,
),
Text(
"Let's keep building your investment for even greater financial growth!",
style: textTheme.bodyMedium,
textAlign: TextAlign.center,
),
ButtonView(
name: 'Investing Now',
width: SizeConfig.width * .5,
onPressed: onPressedButton,
),
],
),
),
);
}
}

View File

@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_view.dart';
import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
import 'package:cims_apps/application/component/image/image_view.dart';
import 'package:cims_apps/application/component/take_picture_screen/take_picture_screen.dart';
import 'package:cims_apps/application/theme/color_palette.dart';
@@ -94,10 +95,8 @@ class _DisplayPictureScreenState extends State<DisplayPictureScreen> {
return Consumer<SubmissionDataViewModel>(
builder: (context, provider, child) {
return Scaffold(
appBar: AppBar(
title: const Text('Preview'),
automaticallyImplyLeading: false,
),
appBar: CustomAppBar(
height: SizeConfig.height * .08, title: 'Preview'),
body: Container(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Column(

View File

@@ -1,5 +1,6 @@
import 'package:camera/camera.dart';
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
import 'package:cims_apps/application/component/image/image_view.dart';
import 'package:cims_apps/application/component/take_picture_screen/display_picture_screen.dart';
import 'package:cims_apps/core/route/route.dart';
@@ -27,7 +28,6 @@ class TakePictureScreenState extends State<TakePictureScreen> {
late String _takeContent;
Future<void> changeFlash() async {
await _controller.setFlashMode(FlashMode.auto);
setState(() {
isFlash = !isFlash;
});
@@ -44,6 +44,7 @@ class TakePictureScreenState extends State<TakePictureScreen> {
// Next, initialize the controller. This returns a Future.
_initializeControllerFuture = _controller.initialize();
_takeContent = widget.takeContent;
_controller.setFlashMode(isFlash ? FlashMode.torch : FlashMode.off);
}
@override
@@ -57,9 +58,10 @@ class TakePictureScreenState extends State<TakePictureScreen> {
Widget build(BuildContext context) {
// Fill this out in the next steps.
return Scaffold(
appBar: AppBar(
title: const Text('Registration'),
actions: [
appBar: CustomAppBar(
title: 'Registration',
height: SizeConfig.height * .08,
trailing: [
IconButton(
onPressed: () {
changeFlash();