add new featurs like new stat page

2026-05-08 22:44:55 +03:00
parent efbc921273
commit 8f555691b9
33 changed files with 1194 additions and 585 deletions
--- a/lib/views/home/my_wallet/payment_history_driver_page.dart
+++ b/lib/views/home/my_wallet/payment_history_driver_page.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
-import 'package:sefer_driver/constant/colors.dart';
-import 'package:sefer_driver/constant/style.dart';
 import 'package:sefer_driver/constant/finance_design_system.dart';
 import 'package:sefer_driver/views/widgets/mycircular.dart';
 import '../../../controller/payment/driver_payment_controller.dart';
@@ -19,12 +17,12 @@ class PaymentHistoryDriverPage extends StatelessWidget {
      backgroundColor: FinanceDesignSystem.backgroundColor,
      appBar: AppBar(
        title: Text('Payment History'.tr,
-            style: const TextStyle(fontWeight: FontWeight.bold, color: FinanceDesignSystem.primaryDark)),
+            style: TextStyle(fontWeight: FontWeight.bold, color: FinanceDesignSystem.primaryDark)),
        backgroundColor: Colors.transparent,
        elevation: 0,
        centerTitle: true,
        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios_new_rounded, color: FinanceDesignSystem.primaryDark, size: 20),
+          icon: Icon(Icons.arrow_back_ios_new_rounded, color: FinanceDesignSystem.primaryDark, size: 20),
          onPressed: () => Get.back(),
        ),
      ),
--- a/lib/views/home/my_wallet/points_captain.dart
+++ b/lib/views/home/my_wallet/points_captain.dart
@@ -3,8 +3,6 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:local_auth/local_auth.dart';
-import 'package:sefer_driver/constant/colors.dart';
-import 'package:sefer_driver/constant/style.dart';
 import 'package:sefer_driver/controller/home/payment/captain_wallet_controller.dart';
 import 'package:sefer_driver/controller/payment/payment_controller.dart';
 import 'package:sefer_driver/controller/payment/smsPaymnet/payment_services.dart';
@@ -45,7 +43,7 @@ class PointsCaptain extends StatelessWidget {
        color: Colors.white,
        borderRadius: BorderRadius.circular(20),
        elevation: 4,
-        shadowColor: kolor.withOpacity(0.3),
+        shadowColor: kolor.withValues(alpha: 0.3),
        child: InkWell(
          onTap: () => _showPaymentOptions(context),
          borderRadius: BorderRadius.circular(20),
@@ -58,11 +56,12 @@ class PointsCaptain extends StatelessWidget {
                begin: Alignment.topLeft,
                end: Alignment.bottomRight,
                colors: [
-                  kolor.withOpacity(0.05),
+                  kolor.withValues(alpha: 0.05),
                  Colors.white,
                ],
              ),
-              border: Border.all(color: kolor.withOpacity(0.2), width: 1.5),
+              border:
+                  Border.all(color: kolor.withValues(alpha: 0.2), width: 1.5),
            ),
            child: Column(
              mainAxisAlignment: MainAxisAlignment.center,
@@ -70,7 +69,7 @@ class PointsCaptain extends StatelessWidget {
                Container(
                  padding: const EdgeInsets.all(10),
                  decoration: BoxDecoration(
-                    color: kolor.withOpacity(0.1),
+                    color: kolor.withValues(alpha: 0.1),
                    shape: BoxShape.circle,
                  ),
                  child: Icon(Icons.account_balance_wallet_rounded,
@@ -79,7 +78,7 @@ class PointsCaptain extends StatelessWidget {
                const SizedBox(height: 10),
                Text(
                  '$countPoint ${'SYP'.tr}',
-                  style: const TextStyle(
+                  style: TextStyle(
                    fontWeight: FontWeight.w900,
                    fontSize: 15,
                    color: FinanceDesignSystem.primaryDark,
@@ -110,9 +109,9 @@ class PointsCaptain extends StatelessWidget {
          maxHeight: MediaQuery.of(context).size.height * 0.8,
        ),
        padding: const EdgeInsets.fromLTRB(24, 24, 24, 32),
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
          color: Colors.white,
-          borderRadius: BorderRadius.vertical(top: Radius.circular(32)),
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
        ),
        child: SingleChildScrollView(
          child: Column(
@@ -131,8 +130,7 @@ class PointsCaptain extends StatelessWidget {
                ],
              ),
              const SizedBox(height: 8),
-              Text(
-                  "${'Amount to charge:'.tr} $countPoint ${'SYP'.tr}",
+              Text("${'Amount to charge:'.tr} $countPoint ${'SYP'.tr}",
                  style: FinanceDesignSystem.subHeadingStyle),
              const SizedBox(height: 24),
              _buildPaymentMethodTile(
@@ -211,7 +209,7 @@ class PointsCaptain extends StatelessWidget {
                  borderRadius: BorderRadius.circular(14),
                  boxShadow: [
                    BoxShadow(
-                      color: color.withOpacity(0.1),
+                      color: color.withValues(alpha: 0.1),
                      blurRadius: 10,
                      offset: const Offset(0, 4),
                    ),
@@ -227,7 +225,7 @@ class PointsCaptain extends StatelessWidget {
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
                    Text(title,
-                        style: const TextStyle(
+                        style: TextStyle(
                            fontWeight: FontWeight.bold,
                            fontSize: 16,
                            color: FinanceDesignSystem.primaryDark)),
@@ -285,8 +283,7 @@ class PaymentScreen extends StatefulWidget {
  final String countPrice;

  const PaymentScreen(
-      {required this.iframeUrl, Key? key, required this.countPrice})
-      : super(key: key);
+      {required this.iframeUrl, super.key, required this.countPrice});

  @override
  State<PaymentScreen> createState() => _PaymentScreenState();
@@ -439,8 +436,7 @@ class PaymentScreenWallet extends StatefulWidget {
  final String countPrice;

  const PaymentScreenWallet(
-      {required this.iframeUrl, Key? key, required this.countPrice})
-      : super(key: key);
+      {required this.iframeUrl, super.key, required this.countPrice});

  @override
  State<PaymentScreenWallet> createState() => _PaymentScreenWalletState();
@@ -472,7 +468,7 @@ class _PaymentScreenWalletState extends State<PaymentScreenWallet> {
  }

  Future<void> _fetchPaymentStatus() async {
-    final String userId = '+963' + box.read(BoxName.phoneWallet);
+    final String userId = '+963${box.read(BoxName.phoneWallet)}';
    await Future.delayed(const Duration(seconds: 2));

    try {
--- a/lib/views/home/my_wallet/walet_captain.dart
+++ b/lib/views/home/my_wallet/walet_captain.dart
@@ -36,20 +36,20 @@ class WalletCaptainRefactored extends StatelessWidget {
      backgroundColor: FinanceDesignSystem.backgroundColor,
      appBar: AppBar(
        title: Text('Driver Balance'.tr,
-            style: const TextStyle(
+            style: TextStyle(
                fontWeight: FontWeight.bold,
                color: FinanceDesignSystem.primaryDark)),
        backgroundColor: Colors.transparent,
        elevation: 0,
        centerTitle: true,
        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios_new_rounded,
+          icon: Icon(Icons.arrow_back_ios_new_rounded,
              color: FinanceDesignSystem.primaryDark, size: 20),
          onPressed: () => Get.back(),
        ),
        actions: [
          IconButton(
-            icon: const Icon(Icons.refresh_rounded,
+            icon: Icon(Icons.refresh_rounded,
                color: FinanceDesignSystem.primaryDark),
            onPressed: () => controller.refreshCaptainWallet(),
            tooltip: 'Refresh'.tr,
@@ -204,7 +204,7 @@ class WalletCaptainRefactored extends StatelessWidget {
                        Get.to(() => const PaymentHistoryDriverPage());
                      },
                      child: Text('View All'.tr,
-                          style: const TextStyle(
+                          style: TextStyle(
                              color: FinanceDesignSystem.accentBlue,
                              fontWeight: FontWeight.bold)),
                    ),
@@ -255,9 +255,9 @@ class WalletCaptainRefactored extends StatelessWidget {
    Get.bottomSheet(
      Container(
        padding: const EdgeInsets.all(24),
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
          color: Colors.white,
-          borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
        ),
        child: Column(
          mainAxisSize: MainAxisSize.min,
@@ -272,9 +272,10 @@ class WalletCaptainRefactored extends StatelessWidget {
              leading: Container(
                padding: const EdgeInsets.all(10),
                decoration: BoxDecoration(
-                    color: FinanceDesignSystem.accentBlue.withOpacity(0.1),
+                    color:
+                        FinanceDesignSystem.accentBlue.withValues(alpha: 0.1),
                    borderRadius: BorderRadius.circular(12)),
-                child: const Icon(Icons.account_balance_wallet_rounded,
+                child: Icon(Icons.account_balance_wallet_rounded,
                    color: FinanceDesignSystem.accentBlue),
              ),
              title: Text("Pay from my budget".tr),
--- a/lib/views/home/my_wallet/weekly_payment_page.dart
+++ b/lib/views/home/my_wallet/weekly_payment_page.dart
@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:intl/intl.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
-import 'package:sefer_driver/constant/colors.dart';
-import 'package:sefer_driver/constant/style.dart';
+import 'package:get/get.dart';
 import 'package:sefer_driver/constant/finance_design_system.dart';
 import 'package:sefer_driver/views/widgets/mycircular.dart';
 import '../../../controller/payment/driver_payment_controller.dart';
@@ -20,12 +17,15 @@ class WeeklyPaymentPage extends StatelessWidget {
      backgroundColor: FinanceDesignSystem.backgroundColor,
      appBar: AppBar(
        title: Text('Weekly Summary'.tr,
-            style: const TextStyle(fontWeight: FontWeight.bold, color: FinanceDesignSystem.primaryDark)),
+            style: TextStyle(
+                fontWeight: FontWeight.bold,
+                color: FinanceDesignSystem.primaryDark)),
        backgroundColor: Colors.transparent,
        elevation: 0,
        centerTitle: true,
        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios_new_rounded, color: FinanceDesignSystem.primaryDark, size: 20),
+          icon: Icon(Icons.arrow_back_ios_new_rounded,
+              color: FinanceDesignSystem.primaryDark, size: 20),
          onPressed: () => Get.back(),
        ),
      ),
@@ -45,9 +45,11 @@ class WeeklyPaymentPage extends StatelessWidget {
                padding: const EdgeInsets.symmetric(horizontal: 20),
                child: Row(
                  children: [
-                    Text('Transactions this week'.tr, style: FinanceDesignSystem.headingStyle),
+                    Text('Transactions this week'.tr,
+                        style: FinanceDesignSystem.headingStyle),
                    const Spacer(),
-                    Icon(Icons.list_rounded, color: Colors.grey.shade400, size: 20),
+                    Icon(Icons.list_rounded,
+                        color: Colors.grey.shade400, size: 20),
                  ],
                ),
              ),
@@ -61,7 +63,9 @@ class WeeklyPaymentPage extends StatelessWidget {
                          itemCount: controller.weeklyList.length,
                          itemBuilder: (BuildContext context, int index) {
                            final tx = controller.weeklyList[index];
-                            final double amount = double.tryParse(tx['amount']?.toString() ?? '0') ?? 0;
+                            final double amount = double.tryParse(
+                                    tx['amount']?.toString() ?? '0') ??
+                                0;
                            return AnimationConfiguration.staggeredList(
                              position: index,
                              duration: const Duration(milliseconds: 250),
@@ -69,10 +73,12 @@ class WeeklyPaymentPage extends StatelessWidget {
                                verticalOffset: 25,
                                child: FadeInAnimation(
                                  child: TransactionPreviewItem(
-                                    title: amount >= 0 ? 'Credit'.tr : 'Debit'.tr,
+                                    title:
+                                        amount >= 0 ? 'Credit'.tr : 'Debit'.tr,
                                    subtitle: tx['dateUpdated'] ?? '',
                                    amount: amount.abs().toStringAsFixed(0),
-                                    date: tx['dateUpdated']?.split(' ')[0] ?? '',
+                                    date:
+                                        tx['dateUpdated']?.split(' ')[0] ?? '',
                                    type: amount >= 0 ? 'credit' : 'debit',
                                    method: tx['paymentMethod'],
                                    onTap: () {},
@@ -95,7 +101,7 @@ class WeeklyPaymentPage extends StatelessWidget {
    final totalAmount = controller.weeklyList.isEmpty
        ? '0.00'
        : controller.weeklyList[0]['totalAmount']?.toString() ?? '0.00';
-    
+
    final double earnings = double.tryParse(totalAmount) ?? 0;
    final int trips = controller.weeklyList.length;
    final double commission = earnings * 0.15; // Example 15%
@@ -109,7 +115,7 @@ class WeeklyPaymentPage extends StatelessWidget {
        borderRadius: BorderRadius.circular(24),
        boxShadow: [
          BoxShadow(
-            color: FinanceDesignSystem.primaryDark.withOpacity(0.3),
+            color: FinanceDesignSystem.primaryDark.withValues(alpha: 0.3),
            blurRadius: 20,
            offset: const Offset(0, 8),
          ),
@@ -118,17 +124,24 @@ class WeeklyPaymentPage extends StatelessWidget {
      child: Column(
        children: [
          Text('Total Weekly Earnings'.tr,
-              style: TextStyle(color: Colors.white.withOpacity(0.8), fontSize: 14)),
+              style: TextStyle(
+                  color: Colors.white.withValues(alpha: 0.8), fontSize: 14)),
          const SizedBox(height: 8),
          Text('${earnings.toStringAsFixed(0)} SYP',
-              style: const TextStyle(color: Colors.white, fontSize: 36, fontWeight: FontWeight.bold)),
+              style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 36,
+                  fontWeight: FontWeight.bold)),
          const SizedBox(height: 24),
          Row(
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
            children: [
-              _buildStatItem('Total Trips'.tr, trips.toString(), Icons.directions_car_rounded),
-              _buildStatItem('Commission'.tr, '${commission.toStringAsFixed(0)}', Icons.percent_rounded),
-              _buildStatItem('Net Profit'.tr, '${netProfit.toStringAsFixed(0)}', Icons.account_balance_rounded),
+              _buildStatItem('Total Trips'.tr, trips.toString(),
+                  Icons.directions_car_rounded),
+              _buildStatItem('Commission'.tr, commission.toStringAsFixed(0),
+                  Icons.percent_rounded),
+              _buildStatItem('Net Profit'.tr, netProfit.toStringAsFixed(0),
+                  Icons.account_balance_rounded),
            ],
          ),
        ],
@@ -141,12 +154,20 @@ class WeeklyPaymentPage extends StatelessWidget {
      children: [
        Container(
          padding: const EdgeInsets.all(8),
-          decoration: BoxDecoration(color: Colors.white.withOpacity(0.1), borderRadius: BorderRadius.circular(10)),
+          decoration: BoxDecoration(
+              color: Colors.white.withValues(alpha: 0.1),
+              borderRadius: BorderRadius.circular(10)),
          child: Icon(icon, color: Colors.white, size: 18),
        ),
        const SizedBox(height: 8),
-        Text(value, style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 14)),
-        Text(label, style: TextStyle(color: Colors.white.withOpacity(0.6), fontSize: 10)),
+        Text(value,
+            style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+                fontSize: 14)),
+        Text(label,
+            style: TextStyle(
+                color: Colors.white.withValues(alpha: 0.6), fontSize: 10)),
      ],
    );
  }
@@ -159,18 +180,27 @@ class WeeklyPaymentPage extends StatelessWidget {
        decoration: BoxDecoration(
          color: Colors.white,
          borderRadius: BorderRadius.circular(16),
-          boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.02), blurRadius: 10)],
+          boxShadow: [
+            BoxShadow(
+                color: Colors.black.withValues(alpha: 0.02), blurRadius: 10)
+          ],
        ),
        child: Row(
          children: [
-            IconButton(icon: const Icon(Icons.chevron_left_rounded), onPressed: () {}),
+            IconButton(
+                icon: const Icon(Icons.chevron_left_rounded), onPressed: () {}),
            Expanded(
              child: Center(
                child: Text('Dec 15 - Dec 21, 2024'.tr,
-                    style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14, color: FinanceDesignSystem.primaryDark)),
+                    style: TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 14,
+                        color: FinanceDesignSystem.primaryDark)),
              ),
            ),
-            IconButton(icon: const Icon(Icons.chevron_right_rounded), onPressed: () {}),
+            IconButton(
+                icon: const Icon(Icons.chevron_right_rounded),
+                onPressed: () {}),
          ],
        ),
      ),
@@ -184,7 +214,9 @@ class WeeklyPaymentPage extends StatelessWidget {
        children: [
          Icon(Icons.bar_chart_rounded, size: 64, color: Colors.grey.shade300),
          const SizedBox(height: 16),
-          Text('No transactions this week'.tr, style: const TextStyle(fontWeight: FontWeight.bold, color: Colors.grey)),
+          Text('No transactions this week'.tr,
+              style: const TextStyle(
+                  fontWeight: FontWeight.bold, color: Colors.grey)),
        ],
      ),
    );
--- a/lib/views/home/my_wallet/widgets/financial_summary_card.dart
+++ b/lib/views/home/my_wallet/widgets/financial_summary_card.dart
@@ -40,7 +40,7 @@ class FinancialSummaryCard extends StatelessWidget {
            borderRadius: BorderRadius.circular(FinanceDesignSystem.cardRadius),
            boxShadow: [
              BoxShadow(
-                color: Colors.black.withOpacity(0.03),
+                color: Colors.black.withValues(alpha: 0.03),
                blurRadius: 10,
                offset: const Offset(0, 4),
              ),
@@ -51,7 +51,7 @@ class FinancialSummaryCard extends StatelessWidget {
            physics: const NeverScrollableScrollPhysics(),
            itemCount: items.length,
            separatorBuilder: (context, index) =>
-                Divider(color: Colors.grey.withOpacity(0.1), height: 24),
+                Divider(color: Colors.grey.withValues(alpha: 0.1), height: 24),
            itemBuilder: (context, index) {
              final item = items[index];
              return Row(
@@ -59,7 +59,7 @@ class FinancialSummaryCard extends StatelessWidget {
                  Container(
                    padding: const EdgeInsets.all(10),
                    decoration: BoxDecoration(
-                      color: item.color.withOpacity(0.1),
+                      color: item.color.withValues(alpha: 0.1),
                      borderRadius: BorderRadius.circular(10),
                    ),
                    child: Icon(item.icon, color: item.color, size: 20),
@@ -71,7 +71,7 @@ class FinancialSummaryCard extends StatelessWidget {
                      children: [
                        Text(
                          item.label,
-                          style: const TextStyle(
+                          style: TextStyle(
                            fontSize: 14,
                            fontWeight: FontWeight.w500,
                            color: FinanceDesignSystem.primaryDark,
@@ -93,7 +93,7 @@ class FinancialSummaryCard extends StatelessWidget {
                    children: [
                      Text(
                        "${item.amount} ${'SYP'.tr}",
-                        style: const TextStyle(
+                        style: TextStyle(
                          fontSize: 16,
                          fontWeight: FontWeight.bold,
                          color: FinanceDesignSystem.primaryDark,
--- a/lib/views/home/my_wallet/widgets/promo_gamification_card.dart
+++ b/lib/views/home/my_wallet/widgets/promo_gamification_card.dart
@@ -50,7 +50,7 @@ class PromoGamificationCard extends StatelessWidget {
                  children: [
                    Text(
                      title,
-                      style: const TextStyle(
+                      style: TextStyle(
                        fontSize: 16,
                        fontWeight: FontWeight.bold,
                        color: FinanceDesignSystem.primaryDark,
--- a/lib/views/home/my_wallet/widgets/quick_actions.dart
+++ b/lib/views/home/my_wallet/widgets/quick_actions.dart
@@ -96,7 +96,7 @@ class _ActionItem extends StatelessWidget {
              const SizedBox(height: 8),
              Text(
                label,
-                style: const TextStyle(
+                style: TextStyle(
                  fontSize: 13,
                  fontWeight: FontWeight.bold,
                  color: FinanceDesignSystem.primaryDark,
--- a/lib/views/home/my_wallet/widgets/transaction_preview_item.dart
+++ b/lib/views/home/my_wallet/widgets/transaction_preview_item.dart
@@ -59,7 +59,7 @@ class TransactionPreviewItem extends StatelessWidget {
                  children: [
                    Text(
                      title,
-                      style: const TextStyle(
+                      style: TextStyle(
                        fontSize: 15,
                        fontWeight: FontWeight.bold,
                        color: FinanceDesignSystem.primaryDark,