dev #2

Merged
aefril merged 6 commits from dev into main 2026-01-18 16:03:40 +00:00
5 changed files with 66 additions and 42 deletions
Showing only changes of commit 7887704a5c - Show all commits

View File

@ -21,6 +21,6 @@ List<Service> services = [
Service(
name: 'Take Away',
description: 'Pesan dan bawa pulang',
imagePath: Assets.icons.dineIn.path,
imagePath: Assets.icons.takeaway.path,
),
];

View File

@ -5,10 +5,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../../application/auth/auth_bloc.dart';
import '../../../../../application/customer/customer_point_loader/customer_point_loader_bloc.dart';
import '../../../../../common/constant/app_constant.dart';
import '../../../../../common/theme/theme.dart';
import '../../../../components/image/image.dart';
import '../../../../router/app_router.gr.dart';
import 'widgets/lottery_card.dart';
import 'widgets/banner_card.dart';
import 'widgets/point_card.dart';
import 'widgets/popular_merchant_section.dart';
import 'widgets/service_section.dart';
@ -53,7 +54,13 @@ class _HomePageState extends State<HomePage> {
_buildHeaderSection(),
const SizedBox(height: 70),
HomeServiceSection(),
HomeLotteryBanner(onTap: () => context.router.push(DrawRoute())),
HomeBanner(
title: '🎰 My Rewards',
subtitle:
'Main dan tepat menangkan produk gratis dari ${AppConstant.appName}.',
actionText: 'Mainkan Sekarang',
onTap: () => context.router.push(DrawRoute()),
),
HomePopularMerchantSection(),
],
),

View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import '../../../../../../common/theme/theme.dart';
class HomeLotteryBanner extends StatefulWidget {
const HomeLotteryBanner({
class HomeBanner extends StatefulWidget {
const HomeBanner({
super.key,
this.onTap,
this.title = "🎰 UNDIAN BERHADIAH",
@ -18,11 +18,10 @@ class HomeLotteryBanner extends StatefulWidget {
final String actionText;
@override
State<HomeLotteryBanner> createState() => _HomeLotteryBannerState();
State<HomeBanner> createState() => _HomeBannerState();
}
class _HomeLotteryBannerState extends State<HomeLotteryBanner>
with TickerProviderStateMixin {
class _HomeBannerState extends State<HomeBanner> with TickerProviderStateMixin {
late AnimationController _pulseController;
late AnimationController _shimmerController;
late AnimationController _floatingController;
@ -290,7 +289,7 @@ class _HomeLotteryBannerState extends State<HomeLotteryBanner>
children: [
const Center(
child: Icon(
Icons.casino,
Icons.games,
color: Colors.white,
size: 32,
shadows: [

View File

@ -23,10 +23,8 @@ class HomeServiceSection extends StatelessWidget {
onTap: () =>
context.router.push(MenuRoute(service: services[index])),
child: GradientCard(
child: _content(
services[index].name,
services[index].description,
),
padding: EdgeInsets.zero,
child: _content(services[index]),
),
),
),
@ -36,12 +34,21 @@ class HomeServiceSection extends StatelessWidget {
);
}
Column _content(String title, String subtitle) {
return Column(
Stack _content(Service service) {
return Stack(
children: [
Positioned(
right: 4,
top: 4,
child: Image.asset(service.imagePath, width: 60, height: 60),
),
Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
title,
service.name,
style: AppStyle.lg.copyWith(
color: AppColor.white,
fontWeight: FontWeight.bold,
@ -49,13 +56,16 @@ class HomeServiceSection extends StatelessWidget {
),
SizedBox(height: 8),
Text(
subtitle,
service.description,
style: AppStyle.md.copyWith(
color: AppColor.white,
fontWeight: FontWeight.w500,
),
),
],
),
),
],
);
}
}

View File

@ -39,7 +39,10 @@ class MenuHeader extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Service
Column(
Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
@ -58,6 +61,11 @@ class MenuHeader extends StatelessWidget {
),
],
),
),
SizedBox(width: 12),
Image.asset(service.imagePath, width: 60, height: 60),
],
),
SizedBox(height: 16),
// Merchant