prototype complete
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:timeago/timeago.dart' as timeago;
|
||||
import 'package:qpay/screens/home/home_controller.dart';
|
||||
import 'package:qpay/screens/pay/pay_controller.dart';
|
||||
import 'package:qpay/screens/transaction_controller.dart';
|
||||
import 'package:skeletonizer/skeletonizer.dart';
|
||||
import 'dart:async';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
class HomeScreen extends StatefulWidget {
|
||||
const HomeScreen({super.key});
|
||||
@@ -17,34 +20,35 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late AnimationController _controller;
|
||||
late Animation<AlignmentGeometry> _alignAnimation;
|
||||
final List<Animation<Offset>> _animations = [];
|
||||
final List<Animation<Offset>> _alignListAnimations = [];
|
||||
|
||||
late TransactionController transactionController;
|
||||
late bool _loading = true;
|
||||
Timer? _loadingTimer;
|
||||
late SharedPreferences prefs;
|
||||
late HomeController homeController;
|
||||
|
||||
bool get _isLoggedIn => true;
|
||||
Timer? _loadingTimer;
|
||||
bool get _isLoggedIn => false;
|
||||
String _selectedFilter = 'All';
|
||||
|
||||
final HomeController homeController = HomeController();
|
||||
final List<Animation<Offset>> _animations = [];
|
||||
final List<Animation<Offset>> _alignListAnimations = [];
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
homeController.getCategories();
|
||||
homeController.getProviders();
|
||||
transactionController = Provider.of<TransactionController>(
|
||||
context,
|
||||
listen: false,
|
||||
);
|
||||
|
||||
// Reset the transaction controller model
|
||||
transactionController.model = TransactionModel();
|
||||
|
||||
_controller = AnimationController(
|
||||
duration: const Duration(milliseconds: 600),
|
||||
vsync: this,
|
||||
)..forward();
|
||||
|
||||
_alignAnimation = Tween<AlignmentGeometry>(
|
||||
begin: Alignment.centerLeft,
|
||||
end: Alignment.center,
|
||||
).animate(CurvedAnimation(parent: _controller, curve: Curves.easeOut));
|
||||
|
||||
List tranListIndices = [0, 1];
|
||||
for (int i = 0; i < tranListIndices.length; i++) {
|
||||
_alignListAnimations.add(
|
||||
@@ -57,17 +61,12 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
);
|
||||
}
|
||||
|
||||
List buttonIndices = [0, 1, 2];
|
||||
for (int i = 0; i < buttonIndices.length; i++) {
|
||||
_animations.add(
|
||||
Tween<Offset>(begin: Offset(-0.15, 0), end: Offset.zero).animate(
|
||||
CurvedAnimation(
|
||||
parent: _controller,
|
||||
curve: Interval(0.075 * i, 1.0, curve: Curves.easeOut),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
_alignAnimation = Tween<AlignmentGeometry>(
|
||||
begin: Alignment.centerLeft,
|
||||
end: Alignment.center,
|
||||
).animate(CurvedAnimation(parent: _controller, curve: Curves.easeOut));
|
||||
|
||||
setupDataAndTransitions();
|
||||
|
||||
// Simulate a delay to mimic loading state
|
||||
_loadingTimer = Timer(const Duration(seconds: 1), () {
|
||||
@@ -79,6 +78,35 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> setupDataAndTransitions() async {
|
||||
homeController = HomeController(context);
|
||||
await homeController.getCategories();
|
||||
await homeController.getProviders();
|
||||
|
||||
List<int> buttonIndices = List.generate(
|
||||
homeController.model.providers.length,
|
||||
(index) => index,
|
||||
);
|
||||
for (int i = 0; i < buttonIndices.length; i++) {
|
||||
_animations.add(
|
||||
Tween<Offset>(begin: Offset(-0.15, 0), end: Offset.zero).animate(
|
||||
CurvedAnimation(
|
||||
parent: _controller,
|
||||
curve: Interval(0.055 * i, 1.0, curve: Curves.easeOut),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
prefs = await SharedPreferences.getInstance();
|
||||
|
||||
if (prefs.getString("userId") == null) {
|
||||
prefs.setString("userId", Uuid().v4());
|
||||
}
|
||||
|
||||
await homeController.getTransactions(prefs.getString("userId")!);
|
||||
}
|
||||
|
||||
getBoxDecoration(String? clientId) {
|
||||
// BillProvider? provider = homeController.model.selectedProvider;
|
||||
//
|
||||
@@ -108,19 +136,11 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
);
|
||||
}
|
||||
|
||||
void _showErrorSnackBar(String? message) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(message.toString()),
|
||||
behavior: SnackBarBehavior.floating,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_loadingTimer?.cancel();
|
||||
_controller.dispose();
|
||||
homeController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -128,184 +148,199 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: SafeArea(
|
||||
child: CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
floating: true,
|
||||
title: Image(image: AssetImage('assets/icon.png'), width: 85),
|
||||
actions: [
|
||||
IconButton(
|
||||
icon: const Icon(Icons.notifications_outlined),
|
||||
onPressed: () {},
|
||||
),
|
||||
],
|
||||
),
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: ListenableBuilder(
|
||||
listenable: homeController,
|
||||
builder: (context, child) {
|
||||
if (homeController.model.errorMessage != null) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
_showErrorSnackBar(homeController.model.errorMessage);
|
||||
});
|
||||
}
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (_isLoggedIn)
|
||||
AlignTransition(
|
||||
alignment: _alignAnimation,
|
||||
child: Skeletonizer(
|
||||
enabled: _loading,
|
||||
child: Column(
|
||||
children: [
|
||||
Text(
|
||||
"Vusumuzi Khoza",
|
||||
style: TextStyle(fontSize: 15),
|
||||
),
|
||||
Text(
|
||||
"USD 4.02",
|
||||
style: TextStyle(
|
||||
fontSize: 30,
|
||||
fontWeight: FontWeight.bold,
|
||||
child: RefreshIndicator(
|
||||
onRefresh: () async {
|
||||
await homeController.getTransactions(prefs.getString("userId")!);
|
||||
},
|
||||
child: CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
stretch: true,
|
||||
stretchTriggerOffset: 100.0,
|
||||
expandedHeight: 50.0,
|
||||
surfaceTintColor: Colors.transparent,
|
||||
floating: true,
|
||||
title: Image(image: AssetImage('assets/peak.png'), width: 85),
|
||||
actions: [
|
||||
// IconButton(
|
||||
// icon: const Icon(Icons.notifications_outlined),
|
||||
// onPressed: () {},
|
||||
// ),
|
||||
],
|
||||
),
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
child: ListenableBuilder(
|
||||
listenable: homeController,
|
||||
builder: (context, child) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (_isLoggedIn)
|
||||
AlignTransition(
|
||||
alignment: _alignAnimation,
|
||||
child: Skeletonizer(
|
||||
enabled: _loading,
|
||||
child: Column(
|
||||
children: [
|
||||
Text(
|
||||
"Vusumuzi Khoza",
|
||||
style: TextStyle(fontSize: 15),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
],
|
||||
Text(
|
||||
"USD 4.02",
|
||||
style: TextStyle(
|
||||
fontSize: 30,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
_buildFilterChips(homeController),
|
||||
SizedBox(height: 10),
|
||||
Column(
|
||||
children: [
|
||||
...homeController.model.filterableProviders.map(
|
||||
(e) => _buildProviderItem(e, context),
|
||||
),
|
||||
],
|
||||
),
|
||||
_buildFilterChips(homeController),
|
||||
SizedBox(height: 10),
|
||||
Column(
|
||||
children: [
|
||||
...homeController.model.filterableProviders.map(
|
||||
(e) => _buildProviderItem(e, context),
|
||||
),
|
||||
],
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
const Text(
|
||||
'Recent Activity',
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
context.go('/history');
|
||||
},
|
||||
child: const Text(
|
||||
'View All',
|
||||
const SizedBox(height: 20),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const Text(
|
||||
'Recent Activity',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.normal,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
Skeletonizer(
|
||||
enabled: _loading,
|
||||
child: ListView(
|
||||
shrinkWrap: true,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
children: [
|
||||
SlideTransition(
|
||||
position: _alignListAnimations[0],
|
||||
child: ListTile(
|
||||
leading: Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context)
|
||||
.colorScheme
|
||||
.primary
|
||||
.withValues(alpha: 0.1),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
child: Icon(
|
||||
Icons.electric_bolt,
|
||||
color:
|
||||
Theme.of(context).colorScheme.primary,
|
||||
),
|
||||
),
|
||||
title: Text(
|
||||
'Electricity Bill',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
subtitle: Text(
|
||||
'Paid USD 50.00',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.normal,
|
||||
),
|
||||
),
|
||||
trailing: Text(
|
||||
'-USD 50.00',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
SlideTransition(
|
||||
position: _alignListAnimations[1],
|
||||
child: ListTile(
|
||||
leading: Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context)
|
||||
.colorScheme
|
||||
.primary
|
||||
.withValues(alpha: 0.1),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
child: Icon(
|
||||
Icons.phone_android,
|
||||
color:
|
||||
Theme.of(context).colorScheme.primary,
|
||||
),
|
||||
),
|
||||
title: Text(
|
||||
'Airtime Purchase',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
subtitle: Text(
|
||||
'Purchased USD 10.00',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.normal,
|
||||
),
|
||||
),
|
||||
trailing: Text(
|
||||
'-USD 10.00',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
context.go('/history');
|
||||
},
|
||||
child: Text(
|
||||
'View All',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
const SizedBox(height: 5),
|
||||
if (homeController.model.transactions.isEmpty)
|
||||
Column(
|
||||
children: [
|
||||
SizedBox(height: 30),
|
||||
Center(
|
||||
child: Text(
|
||||
'No transactions yet. Make a payment to see your recent activity.',
|
||||
style: TextStyle(fontSize: 16),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (homeController.model.transactions.isNotEmpty)
|
||||
ListView(
|
||||
shrinkWrap: true,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
children: [
|
||||
...homeController.model.transactions.map(
|
||||
(e) => _buildTransactionItem(e, context),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildTransactionItem(Map<String, dynamic> e, BuildContext context) {
|
||||
return SlideTransition(
|
||||
position: _alignListAnimations[0],
|
||||
child: Skeletonizer(
|
||||
enabled: homeController.model.isLoading,
|
||||
child: InkWell(
|
||||
customBorder: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
onTap: () {
|
||||
transactionController.updateReceiptData(e);
|
||||
context.push("/receipt");
|
||||
},
|
||||
child: ListTile(
|
||||
leading: Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(
|
||||
context,
|
||||
).colorScheme.primary.withValues(alpha: 0.1),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
child: Image(
|
||||
image: AssetImage("assets/${e['paymentProcessorImage']}"),
|
||||
),
|
||||
),
|
||||
],
|
||||
title: Row(
|
||||
children: [
|
||||
Text(
|
||||
e['billName'],
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
SizedBox(width: 10),
|
||||
Icon(
|
||||
e['status'] == 'SUCCESS'
|
||||
? Icons.check_circle
|
||||
: e['status'] == 'PENDING'
|
||||
? Icons.pending
|
||||
: Icons.cancel,
|
||||
size: 16,
|
||||
color:
|
||||
e['status'] == 'SUCCESS'
|
||||
? Colors.green
|
||||
: e['status'] == 'PENDING'
|
||||
? Colors.orange
|
||||
: Colors.red,
|
||||
),
|
||||
],
|
||||
),
|
||||
subtitle: Text(
|
||||
e['createdAt'] != null
|
||||
? timeago.format(DateTime.parse(e['createdAt']))
|
||||
: '',
|
||||
style: TextStyle(fontSize: 12),
|
||||
),
|
||||
trailing: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(
|
||||
e['amount'].toStringAsFixed(2),
|
||||
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
|
||||
),
|
||||
Text(
|
||||
e['totalAmount'].toStringAsFixed(2),
|
||||
style: TextStyle(fontSize: 12),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -317,7 +352,7 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
Skeletonizer(
|
||||
enabled: homeController.model.isLoading,
|
||||
child: SlideTransition(
|
||||
position: _alignListAnimations[1],
|
||||
position: _animations[homeController.model.providers.indexOf(e)],
|
||||
child: Container(
|
||||
decoration: getBoxDecoration(e.clientId),
|
||||
child: InkWell(
|
||||
@@ -326,7 +361,8 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
),
|
||||
onTap: () {
|
||||
homeController.updateSelectedProvider(e);
|
||||
context.go("/make-payment");
|
||||
transactionController.updateSelectedProvider(e);
|
||||
context.push("/recipients");
|
||||
},
|
||||
child: ListTile(
|
||||
leading: Container(
|
||||
@@ -345,7 +381,10 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
),
|
||||
subtitle: Text(
|
||||
e.description,
|
||||
style: TextStyle(fontWeight: FontWeight.normal, fontSize: 10),
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.normal,
|
||||
fontSize: 10,
|
||||
),
|
||||
),
|
||||
trailing: Icon(
|
||||
Icons.chevron_right,
|
||||
@@ -383,29 +422,42 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
Category? category,
|
||||
]) {
|
||||
final isSelected = _selectedFilter == label;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(right: 8),
|
||||
child: FilterChip(
|
||||
selected: isSelected,
|
||||
label: Text(label),
|
||||
onSelected: (selected) {
|
||||
setState(() {
|
||||
_selectedFilter = label;
|
||||
});
|
||||
if (category != null) {
|
||||
controller.updateSelectedCategory(category);
|
||||
} else {
|
||||
controller.updateSelectedCategory(null);
|
||||
}
|
||||
},
|
||||
backgroundColor: Theme.of(context).colorScheme.surface,
|
||||
selectedColor: Theme.of(context).colorScheme.primary.withOpacity(0.2),
|
||||
checkmarkColor: Theme.of(context).colorScheme.primary,
|
||||
labelStyle: TextStyle(
|
||||
color:
|
||||
isSelected
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Theme.of(context).colorScheme.onSurface,
|
||||
return Skeletonizer(
|
||||
enabled: controller.model.isLoading,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(right: 8),
|
||||
child: FilterChip(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
side: BorderSide(
|
||||
color: Theme.of(
|
||||
context,
|
||||
).colorScheme.primary.withValues(alpha: 0.2),
|
||||
),
|
||||
),
|
||||
selected: isSelected,
|
||||
label: Text(label),
|
||||
onSelected: (selected) {
|
||||
setState(() {
|
||||
_selectedFilter = label;
|
||||
});
|
||||
if (category != null) {
|
||||
controller.updateSelectedCategory(category);
|
||||
} else {
|
||||
controller.updateSelectedCategory(null);
|
||||
}
|
||||
},
|
||||
backgroundColor: Theme.of(context).colorScheme.surface,
|
||||
selectedColor: Theme.of(context).colorScheme.primary.withOpacity(0.2),
|
||||
checkmarkColor: Theme.of(context).colorScheme.primary,
|
||||
labelStyle: TextStyle(
|
||||
color:
|
||||
isSelected
|
||||
? Theme.of(
|
||||
context,
|
||||
).colorScheme.secondary.withValues(alpha: 0.7)
|
||||
: Theme.of(context).colorScheme.onSurface,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user