Update codebase
This commit is contained in:
@@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_driver/views/home/my_wallet/pay_out_screen.dart';
|
||||
import 'package:tripz_driver/views/home/my_wallet/pay_out_screen.dart';
|
||||
|
||||
import '../../../constant/box_name.dart';
|
||||
import '../../../constant/colors.dart';
|
||||
@@ -96,7 +96,7 @@ class CardSeferWalletDriver extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Text(
|
||||
'رصيد سيرو',
|
||||
'رصيد تريبز',
|
||||
style: AppStyle.headTitle.copyWith(
|
||||
fontFamily: 'Amiri', // خط يوحي بالفخامة
|
||||
color: Colors.white,
|
||||
|
||||
@@ -8,7 +8,7 @@ import '../../../constant/links.dart';
|
||||
import '../../../constant/style.dart';
|
||||
import '../../../controller/functions/crud.dart';
|
||||
import '../../../main.dart';
|
||||
import '../../widgets/ui/siro_ui.dart';
|
||||
import '../../widgets/ui/tripz_ui.dart';
|
||||
|
||||
// --- ملاحظات هامة ---
|
||||
// 1. تأكد من إضافة الرابط الجديد إلى ملف AppLink الخاص بك:
|
||||
@@ -163,7 +163,7 @@ class _EcashDriverPaymentScreenState extends State<EcashDriverPaymentScreen> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SiroPage(
|
||||
return TripzPage(
|
||||
title: 'Complete Payment'.tr,
|
||||
body: WebViewWidget(controller: _controller),
|
||||
);
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:local_auth/local_auth.dart';
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/main.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/main.dart';
|
||||
|
||||
import '../../../controller/payment/smsPaymnet/pay_out_syria_controller.dart';
|
||||
import '../../widgets/ui/siro_ui.dart';
|
||||
import '../../widgets/ui/tripz_ui.dart';
|
||||
|
||||
class PayoutScreen extends StatefulWidget {
|
||||
// استقبال كل البيانات المطلوبة جاهزة
|
||||
@@ -129,10 +129,10 @@ class _PayoutScreenState extends State<PayoutScreen> {
|
||||
// حساب المبلغ الإجمالي المخصوم
|
||||
final totalDeducted = widget.amountToWithdraw + PayoutService.payoutFee;
|
||||
|
||||
return SiroPage(
|
||||
return TripzPage(
|
||||
title: "تأكيد سحب الأموال",
|
||||
body: SingleChildScrollView(
|
||||
padding: SiroUi.pageInsets,
|
||||
padding: TripzUi.pageInsets,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
@@ -165,7 +165,7 @@ class _PayoutScreenState extends State<PayoutScreen> {
|
||||
}
|
||||
|
||||
Widget _buildSummaryCard(double totalDeducted) {
|
||||
return SiroCard(
|
||||
return TripzCard(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
children: [
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
|
||||
import 'package:siro_driver/constant/finance_design_system.dart';
|
||||
import 'package:tripz_driver/constant/finance_design_system.dart';
|
||||
import '../../../controller/payment/driver_payment_controller.dart';
|
||||
import 'widgets/transaction_preview_item.dart';
|
||||
import '../../widgets/ui/siro_ui.dart';
|
||||
import '../../widgets/ui/tripz_ui.dart';
|
||||
|
||||
class PaymentHistoryDriverPage extends StatelessWidget {
|
||||
const PaymentHistoryDriverPage({super.key});
|
||||
@@ -13,12 +13,12 @@ class PaymentHistoryDriverPage extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
Get.put(DriverWalletHistoryController());
|
||||
|
||||
return SiroPage(
|
||||
return TripzPage(
|
||||
title: 'Payment History'.tr,
|
||||
body: GetBuilder<DriverWalletHistoryController>(
|
||||
builder: (controller) {
|
||||
if (controller.isLoading) {
|
||||
return const SiroLoading();
|
||||
return const TripzLoading();
|
||||
}
|
||||
|
||||
if (controller.archive.isEmpty) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import '../../../constant/links.dart';
|
||||
import '../../../controller/functions/crud.dart';
|
||||
import '../../widgets/ui/siro_ui.dart';
|
||||
import '../../widgets/ui/tripz_ui.dart';
|
||||
|
||||
class PaymentScreenCliq extends StatefulWidget {
|
||||
final double amount;
|
||||
@@ -105,7 +105,7 @@ class _PaymentScreenCliqState extends State<PaymentScreenCliq>
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SiroPage(
|
||||
return TripzPage(
|
||||
title: "Cliq Payment",
|
||||
body: SafeArea(
|
||||
child: Padding(
|
||||
|
||||
@@ -5,7 +5,7 @@ import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import '../../../constant/links.dart';
|
||||
import '../../../controller/functions/crud.dart';
|
||||
import '../../widgets/ui/siro_ui.dart';
|
||||
import '../../widgets/ui/tripz_ui.dart';
|
||||
|
||||
class PaymentScreenMtn extends StatefulWidget {
|
||||
final double amount;
|
||||
@@ -90,7 +90,7 @@ class _PaymentScreenMtnState extends State<PaymentScreenMtn> with SingleTickerPr
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SiroPage(
|
||||
return TripzPage(
|
||||
title: "MTN Payment",
|
||||
body: SafeArea(
|
||||
child: Padding(
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:local_auth/local_auth.dart';
|
||||
import 'package:siro_driver/controller/home/payment/captain_wallet_controller.dart';
|
||||
import 'package:siro_driver/controller/payment/payment_controller.dart';
|
||||
import 'package:siro_driver/controller/payment/smsPaymnet/payment_services.dart';
|
||||
import 'package:tripz_driver/controller/home/payment/captain_wallet_controller.dart';
|
||||
import 'package:tripz_driver/controller/payment/payment_controller.dart';
|
||||
import 'package:tripz_driver/controller/payment/smsPaymnet/payment_services.dart';
|
||||
import 'package:webview_flutter/webview_flutter.dart';
|
||||
|
||||
import '../../../constant/box_name.dart';
|
||||
@@ -188,7 +188,7 @@ class PointsCaptain extends StatelessWidget {
|
||||
_buildPaymentMethodTile(
|
||||
icon: Icons.qr_code_scanner_rounded,
|
||||
title: 'CliQ'.tr,
|
||||
subtitle: 'Pay via CliQ (Alias: siroapp)'.tr,
|
||||
subtitle: 'Pay via CliQ (Alias: tripzapp)'.tr,
|
||||
color: Colors.purple,
|
||||
onTap: () => _showPhoneInputDialog(context, 'CliQ'),
|
||||
),
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import 'package:siro_driver/constant/style.dart';
|
||||
import 'package:siro_driver/views/widgets/elevated_btn.dart';
|
||||
import 'package:siro_driver/views/widgets/my_scafold.dart';
|
||||
import 'package:siro_driver/views/widgets/my_textField.dart';
|
||||
import 'package:siro_driver/views/widgets/mycircular.dart';
|
||||
import 'package:siro_driver/views/widgets/mydialoug.dart';
|
||||
import 'package:tripz_driver/constant/style.dart';
|
||||
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
|
||||
import 'package:tripz_driver/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_driver/views/widgets/my_textField.dart';
|
||||
import 'package:tripz_driver/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_driver/views/widgets/mydialoug.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
|
||||
import '../../../controller/home/payment/captain_wallet_controller.dart';
|
||||
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'package:siro_driver/constant/recharge_tiers.dart';
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
import 'package:tripz_driver/constant/recharge_tiers.dart';
|
||||
import 'package:local_auth/local_auth.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_driver/constant/finance_design_system.dart';
|
||||
import 'package:siro_driver/controller/home/payment/captain_wallet_controller.dart';
|
||||
import 'package:siro_driver/views/widgets/elevated_btn.dart';
|
||||
import 'package:siro_driver/views/widgets/my_textField.dart';
|
||||
import 'package:siro_driver/views/widgets/mydialoug.dart';
|
||||
import 'package:siro_driver/views/widgets/error_snakbar.dart';
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/constant/links.dart';
|
||||
import 'package:siro_driver/controller/functions/crud.dart';
|
||||
import 'package:siro_driver/main.dart';
|
||||
import 'package:siro_driver/views/home/my_wallet/payment_history_driver_page.dart';
|
||||
import 'package:siro_driver/controller/payment/driver_payment_controller.dart';
|
||||
import 'package:tripz_driver/constant/finance_design_system.dart';
|
||||
import 'package:tripz_driver/controller/home/payment/captain_wallet_controller.dart';
|
||||
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
|
||||
import 'package:tripz_driver/views/widgets/my_textField.dart';
|
||||
import 'package:tripz_driver/views/widgets/mydialoug.dart';
|
||||
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/constant/links.dart';
|
||||
import 'package:tripz_driver/controller/functions/crud.dart';
|
||||
import 'package:tripz_driver/main.dart';
|
||||
import 'package:tripz_driver/views/home/my_wallet/payment_history_driver_page.dart';
|
||||
import 'package:tripz_driver/controller/payment/driver_payment_controller.dart';
|
||||
|
||||
// Import new widgets
|
||||
import 'points_captain.dart';
|
||||
@@ -24,7 +24,7 @@ import 'widgets/quick_actions.dart';
|
||||
import 'widgets/financial_summary_card.dart';
|
||||
import 'widgets/promo_gamification_card.dart';
|
||||
import 'widgets/transaction_preview_item.dart';
|
||||
import '../../widgets/ui/siro_ui.dart';
|
||||
import '../../widgets/ui/tripz_ui.dart';
|
||||
|
||||
class WalletCaptainRefactored extends StatefulWidget {
|
||||
const WalletCaptainRefactored({super.key});
|
||||
@@ -50,7 +50,7 @@ class _WalletCaptainRefactoredState extends State<WalletCaptainRefactored> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// شريط العنوان من الثيم — لا ألوان مبنيّة يدوياً هنا.
|
||||
return SiroPage(
|
||||
return TripzPage(
|
||||
title: 'Driver Balance'.tr,
|
||||
actions: [
|
||||
IconButton(
|
||||
@@ -62,7 +62,7 @@ class _WalletCaptainRefactoredState extends State<WalletCaptainRefactored> {
|
||||
body: GetBuilder<CaptainWalletController>(
|
||||
builder: (controller) {
|
||||
if (controller.isLoading) {
|
||||
return const SiroLoading();
|
||||
return const TripzLoading();
|
||||
}
|
||||
return SingleChildScrollView(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_driver/constant/finance_design_system.dart';
|
||||
import 'package:tripz_driver/constant/finance_design_system.dart';
|
||||
import '../../../controller/payment/driver_payment_controller.dart';
|
||||
import 'widgets/transaction_preview_item.dart';
|
||||
import '../../widgets/ui/siro_ui.dart';
|
||||
import '../../widgets/ui/tripz_ui.dart';
|
||||
|
||||
class WeeklyPaymentPage extends StatelessWidget {
|
||||
const WeeklyPaymentPage({super.key});
|
||||
@@ -14,12 +14,12 @@ class WeeklyPaymentPage extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
Get.put(DriverWalletHistoryController());
|
||||
|
||||
return SiroPage(
|
||||
return TripzPage(
|
||||
title: 'Weekly Summary'.tr,
|
||||
body: GetBuilder<DriverWalletHistoryController>(
|
||||
builder: (controller) {
|
||||
if (controller.isLoading) {
|
||||
return const SiroLoading();
|
||||
return const TripzLoading();
|
||||
}
|
||||
|
||||
return Column(
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import '../../../../constant/finance_design_system.dart';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import '../../../../constant/finance_design_system.dart';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import '../../../../constant/finance_design_system.dart';
|
||||
|
||||
Reference in New Issue
Block a user