fix functional bugs

This commit is contained in:
2026-05-29 11:40:55 +03:00
parent 591265a7fc
commit 134ffdde60
50 changed files with 1086 additions and 771 deletions

View File

@@ -1,13 +1,18 @@
import 'package:be_happy/presentation/components/gradient_button.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import '../../domain/entities/subscription.dart';
import '../event/subscription_list_event.dart';
class SubscriptionCard extends StatelessWidget {
final Subscription subscription;
final bool isActive;
final DateTime? expiredAt;
final VoidCallback? onRefresh;
const SubscriptionCard({super.key, required this.subscription, required this.isActive});
const SubscriptionCard({super.key, required this.subscription, required this.isActive, this.expiredAt, this.onRefresh});
@override
Widget build(BuildContext context) {
@@ -15,9 +20,9 @@ class SubscriptionCard extends StatelessWidget {
? subscription.options.reduce((a, b) => a.price < b.price ? a : b)
: null;
final maxDaysOption = subscription.options.isNotEmpty
/*final maxDaysOption = subscription.options.isNotEmpty
? subscription.options.reduce((a, b) => a.days > b.days ? a : b)
: null;
: null;*/
return Container(
margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
@@ -43,7 +48,7 @@ class SubscriptionCard extends StatelessWidget {
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.3),
borderRadius: BorderRadius.circular(12), // Опционально: скругление углов
borderRadius: BorderRadius.circular(12),
),
child: Text(
"АКТИВНА",
@@ -64,12 +69,19 @@ class SubscriptionCard extends StatelessWidget {
subscription.shortDescription,
style: TextStyle(color: Colors.white.withOpacity(0.7), fontSize: 14),
),
const SizedBox(height: 16),
if (maxDaysOption != null) ...[
if (isActive && expiredAt != null) ...[
const SizedBox(height: 16),
Text(
"Период действия: до ${maxDaysOption.days} дней",
style: const TextStyle(color: Colors.white, fontSize: 14),
Builder(
builder: (context) {
final day = expiredAt!.day.toString().padLeft(2, '0');
final month = expiredAt!.month.toString().padLeft(2, '0');
final year = expiredAt!.year;
return Text(
"Период действия: до $day.$month.$year",
style: const TextStyle(color: Colors.white, fontSize: 14),
);
},
),
],
const SizedBox(height: 20),
@@ -83,15 +95,17 @@ class SubscriptionCard extends StatelessWidget {
)
else
const SizedBox.shrink(),
ElevatedButton(
onPressed: () => context.push("/home/subscriptions/${subscription.id}"),
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF80FFD1),
foregroundColor: Colors.black,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
),
child: const Text("Подробнее", style: TextStyle(fontWeight: FontWeight.bold)),
GradientButton(
onTap: () async {
final isSubscribed = await context.push<bool>("/home/subscriptions/${subscription.id}");
if (isSubscribed == true && onRefresh != null) {
onRefresh!();
}
},
text: "Подробнее",
enabled: true,
width: 120,
height: 40,
),
],
),