prepa 1.4.0

byackee · byackee · commit 934fe6569552 · 2024-11-17T22:36:23.000+01:00
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -38,6 +38,8 @@
     <string>Cette application utilise la bibliothèque de photos pour permettre aux utilisateurs de sélectionner et d'envoyer des images.</string>
     <key>UIApplicationSupportsIndirectInputEvents</key>
     <true/>
+    	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app requires access to your location to provide location-based services.</string>
     <key>UIBackgroundModes</key>
     <array>
         <string>processing</string>
diff --git a/lib/api/data_manager.dart b/lib/api/data_manager.dart
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -201,6 +201,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "secondary": MessageLookupByLibrary.simpleMessage("Secondary"),
         "secondary_offers_related_to_token": MessageLookupByLibrary.simpleMessage("YAMM offers related to token"),
         "section8paid": MessageLookupByLibrary.simpleMessage("Section 8"),
+        "sell_token": MessageLookupByLibrary.simpleMessage("Sell"),
         "sendDonations": MessageLookupByLibrary.simpleMessage("Send your donations to the following address:"),
         "serviceStatusPage": MessageLookupByLibrary.simpleMessage("Services status"),
         "settings": MessageLookupByLibrary.simpleMessage("Settings"),
diff --git a/lib/generated/intl/messages_es.dart b/lib/generated/intl/messages_es.dart
@@ -201,6 +201,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "secondary": MessageLookupByLibrary.simpleMessage("Secundario"),
         "secondary_offers_related_to_token": MessageLookupByLibrary.simpleMessage("Ofertas YAMM relacionadas con el token"),
         "section8paid": MessageLookupByLibrary.simpleMessage("Sección 8"),
+        "sell_token": MessageLookupByLibrary.simpleMessage("Vender"),
         "sendDonations": MessageLookupByLibrary.simpleMessage("Envía tus donaciones a la siguiente dirección:"),
         "serviceStatusPage": MessageLookupByLibrary.simpleMessage("Estado de los servicios"),
         "settings": MessageLookupByLibrary.simpleMessage("Configuración"),
diff --git a/lib/generated/intl/messages_fr.dart b/lib/generated/intl/messages_fr.dart
@@ -202,6 +202,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "secondary": MessageLookupByLibrary.simpleMessage("Secondaire"),
         "secondary_offers_related_to_token": MessageLookupByLibrary.simpleMessage("Offres YAMM liées au token"),
         "section8paid": MessageLookupByLibrary.simpleMessage("Section 8"),
+        "sell_token": MessageLookupByLibrary.simpleMessage("Vendre"),
         "sendDonations": MessageLookupByLibrary.simpleMessage("Envoyez vos dons à l\'adresse suivante :"),
         "serviceStatusPage": MessageLookupByLibrary.simpleMessage("Statut des services"),
         "settings": MessageLookupByLibrary.simpleMessage("Paramètres"),
diff --git a/lib/generated/intl/messages_it.dart b/lib/generated/intl/messages_it.dart
@@ -201,6 +201,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "secondary": MessageLookupByLibrary.simpleMessage("Secondario"),
         "secondary_offers_related_to_token": MessageLookupByLibrary.simpleMessage("Offerte YAMM legate al token"),
         "section8paid": MessageLookupByLibrary.simpleMessage("Sezione 8"),
+        "sell_token": MessageLookupByLibrary.simpleMessage("Vendere"),
         "sendDonations": MessageLookupByLibrary.simpleMessage("Invia le tue donazioni al seguente indirizzo:"),
         "serviceStatusPage": MessageLookupByLibrary.simpleMessage("Stato dei servizi"),
         "settings": MessageLookupByLibrary.simpleMessage("Impostazioni"),
diff --git a/lib/generated/intl/messages_pt.dart b/lib/generated/intl/messages_pt.dart
@@ -201,6 +201,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "secondary": MessageLookupByLibrary.simpleMessage("Secundário"),
         "secondary_offers_related_to_token": MessageLookupByLibrary.simpleMessage("Ofertas YAMM relacionadas ao token"),
         "section8paid": MessageLookupByLibrary.simpleMessage("Seção 8"),
+        "sell_token": MessageLookupByLibrary.simpleMessage("Vender"),
         "sendDonations": MessageLookupByLibrary.simpleMessage("Envie suas doações para o endereço abaixo:"),
         "serviceStatusPage": MessageLookupByLibrary.simpleMessage("Status dos Serviços"),
         "settings": MessageLookupByLibrary.simpleMessage("Configurações"),
diff --git a/lib/generated/intl/messages_zh.dart b/lib/generated/intl/messages_zh.dart
@@ -198,6 +198,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "secondary": MessageLookupByLibrary.simpleMessage("次要"),
         "secondary_offers_related_to_token": MessageLookupByLibrary.simpleMessage("与代币相关的YAMM报价"),
         "section8paid": MessageLookupByLibrary.simpleMessage("第8条"),
+        "sell_token": MessageLookupByLibrary.simpleMessage("卖出"),
         "sendDonations": MessageLookupByLibrary.simpleMessage("将您的捐款发送至以下地址："),
         "serviceStatusPage": MessageLookupByLibrary.simpleMessage("服务状态"),
         "settings": MessageLookupByLibrary.simpleMessage("设置"),
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -221,6 +221,7 @@
   "delta_price": "Delta Price",
   "creation_date": "Creation Date",
   "buy_token": "Buy",
+  "sell_token": "Sell",
     "secondary_offers_related_to_token": "YAMM offers related to token",
   "error_occurred": "Error: {error}",
   "properties_for_sale": "Properties For Sale",
diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb
@@ -221,6 +221,7 @@
   "delta_price": "Diferencia de precio",
   "creation_date": "Fecha de creación",
   "buy_token": "Comprar",
+  "sell_token": "Vender",
     "secondary_offers_related_to_token": "Ofertas YAMM relacionadas con el token",
   "error_occurred": "Error: {error}",
   "properties_for_sale": "Propiedades en venta",
diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
@@ -221,6 +221,7 @@
   "delta_price": "Différence de prix",
   "creation_date": "Date de création",
   "buy_token": "Acheter",
+  "sell_token": "Vendre",
    "secondary_offers_related_to_token": "Offres YAMM liées au token",
   "error_occurred": "Erreur : {error}",
   "properties_for_sale": "Propriétés à vendre",
diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb
@@ -221,6 +221,7 @@
   "delta_price": "Differenza di prezzo",
   "creation_date": "Data di creazione",
   "buy_token": "Acquista",
+  "sell_token": "Vendere",
    "secondary_offers_related_to_token": "Offerte YAMM legate al token",
   "error_occurred": "Errore: {error}",
   "properties_for_sale": "Proprietà in vendita",
diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb
@@ -221,6 +221,7 @@
   "delta_price": "Diferença de preço",
   "creation_date": "Data de criação",
   "buy_token": "Comprar",
+  "sell_token": "Vender",
     "secondary_offers_related_to_token": "Ofertas YAMM relacionadas ao token",
   "error_occurred": "Erro: {error}",
   "properties_for_sale": "Propriedades à venda",
diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb
@@ -221,6 +221,7 @@
     "delta_price": "价格差异",
     "creation_date": "创建日期",
     "buy_token": "购买代币",
+    "sell_token": "卖出",
      "secondary_offers_related_to_token": "与代币相关的YAMM报价",
   "error_occurred": "错误：{error}",
   "properties_for_sale": "待售物业",
diff --git a/lib/main.dart b/lib/main.dart
@@ -33,6 +33,7 @@ void main() async {
     Hive.openBox('realTokens'),
     Hive.openBox('balanceHistory'),
     Hive.openBox('walletValueArchive'),
+    Hive.openBox('roiValueArchive'),
     Hive.openBox('customInitPrices'),
     Hive.openBox('YamMarket'),
   ]);
diff --git a/lib/pages/Statistics/portfolio_stats.dart b/lib/pages/Statistics/portfolio_stats.dart
@@ -153,13 +153,15 @@ class _PortfolioStats extends State<PortfolioStats> {
                       return _buildRentGraphCard(groupedData, dataManager!);
                     case 1:
                       return _buildWalletBalanceCard(dataManager!);
-                    case 2:
-                      return _buildTokenDistributionCard(dataManager!);
+                      case 2:
+                      return _buildRoiHistoryCard(dataManager!);
                     case 3:
-                      return _buildTokenDistributionByCountryCard(dataManager!);
+                      return _buildTokenDistributionCard(dataManager!);
                     case 4:
-                      return _buildTokenDistributionByRegionCard(dataManager!);
+                      return _buildTokenDistributionByCountryCard(dataManager!);
                     case 5:
+                      return _buildTokenDistributionByRegionCard(dataManager!);
+                    case 6:
                       return _buildTokenDistributionByCityCard(dataManager!);
                     default:
                       return Container();
@@ -471,6 +473,136 @@ class _PortfolioStats extends State<PortfolioStats> {
     );
   }
 
+ Widget _buildRoiHistoryCard(DataManager dataManager) {
+    final appState = Provider.of<AppState>(context);
+
+    // Récupérer les données de l'historique des balances du wallet
+    List<FlSpot> roiHistoryData = _buildRoiHistoryChartData(dataManager);
+
+    return Card(
+      elevation: 0,
+      color: Theme.of(context).cardColor,
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Text(
+                  S.of(context).walletBalanceHistory, // Clé de traduction pour "Historique du Wallet"
+                  style: TextStyle(
+                    fontSize: 20 + appState.getTextSizeOffset(),
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                Spacer(),
+
+              ],
+            ),
+            const SizedBox(height: 20),
+            SizedBox(
+              height: 250,
+              child: LineChart(
+                LineChartData(
+                  gridData: FlGridData(show: true, drawVerticalLine: false),
+                  titlesData: FlTitlesData(
+                    topTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)),
+                    leftTitles: AxisTitles(
+                      sideTitles: SideTitles(
+                        showTitles: true,
+                        reservedSize: 45,
+                        getTitlesWidget: (value, meta) {
+                          // Remplacez `highestValue` par la valeur maximale que vous souhaitez ignorer
+                          final highestValue = roiHistoryData.map((e) => e.y).reduce((a, b) => a > b ? a : b);
+
+                          // Vérifier si la valeur est la plus haute pour l'ignorer
+                          if (value == highestValue) {
+                            return const SizedBox.shrink();
+                          }
+
+                         
+                          return Transform.rotate(
+                            angle: -0.5,
+                            child: Text(
+                              value as String,
+                              style: TextStyle(fontSize: 10 + appState.getTextSizeOffset()),
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+                    bottomTitles: AxisTitles(
+                      sideTitles: SideTitles(
+                        showTitles: true,
+                        interval: _calculateBottomInterval(roiHistoryData.cast<Map<String, dynamic>>()),
+                        getTitlesWidget: (value, meta) {
+                          List<String> labels = _buildDateLabelsForRoi(dataManager);
+                          if (value.toInt() >= 0 && value.toInt() < labels.length) {
+                            return Transform.rotate(
+                              angle: -0.5,
+                              child: Text(
+                                labels[value.toInt()],
+                                style: TextStyle(fontSize: 10 + appState.getTextSizeOffset()),
+                              ),
+                            );
+                          } else {
+                            return const Text('');
+                          }
+                        },
+                      ),
+                    ),
+                    rightTitles: AxisTitles(
+                      sideTitles: SideTitles(showTitles: false),
+                    ),
+                  ),
+                  borderData: FlBorderData(show: false),
+                  minX: 0,
+                  maxX: (roiHistoryData.length - 1).toDouble(),
+                  minY: 0, // Définit la valeur minimale de l'axe de gauche à 0
+                  lineBarsData: [
+                    LineChartBarData(
+                      spots: roiHistoryData,
+                      isCurved: false,
+                      barWidth: 2,
+                      color: Colors.purple,
+                      dotData: FlDotData(show: false),
+                      belowBarData: BarAreaData(
+                        show: true,
+                        gradient: LinearGradient(
+                          colors: [
+                            Colors.purple.withOpacity(0.4),
+                            Colors.purple.withOpacity(0),
+                          ],
+                          begin: Alignment.topCenter,
+                          end: Alignment.bottomCenter,
+                        ),
+                      ),
+                    ),
+                  ],
+                  lineTouchData: LineTouchData(
+                    touchTooltipData: LineTouchTooltipData(
+                      getTooltipItems: (List<LineBarSpot> touchedSpots) {
+                        return touchedSpots.map((touchedSpot) {
+                          final value = touchedSpot.y;
+                          return LineTooltipItem(
+                            Utils.formatCurrency(dataManager.convert(value), dataManager.currencySymbol),
+                            const TextStyle(color: Colors.white),
+                          );
+                        }).toList();
+                      },
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+
   void _showEditModal(BuildContext context, DataManager dataManager) {
     final appState = Provider.of<AppState>(context, listen: false);
     showModalBottomSheet(
@@ -606,10 +738,25 @@ class _PortfolioStats extends State<PortfolioStats> {
     return spots;
   }
 
+  List<FlSpot> _buildRoiHistoryChartData(DataManager dataManager) {
+    List<FlSpot> spots = [];
+    List<RoiRecord> roiHistory = dataManager.roiHistory;
+
+    for (var i = 0; i <roiHistory.length; i++) {
+      double roiValue = roiHistory[i].roi;
+      spots.add(FlSpot(i.toDouble(), roiValue));
+    }
+    return spots;
+  }
+
   List<String> _buildDateLabelsForWallet(DataManager dataManager) {
     return dataManager.walletBalanceHistory.map((record) => DateFormat('yy-MM-dd').format(record.timestamp)).toList();
   }
 
+  List<String> _buildDateLabelsForRoi(DataManager dataManager) {
+    return dataManager.roiHistory.map((record) => DateFormat('yy-MM-dd').format(record.timestamp)).toList();
+  }
+
 // Méthode pour calculer un intervalle optimisé pour l'axe des dates
   double _calculateBottomInterval(List<Map<String, dynamic>> data) {
     if (data.isEmpty) return 1;
diff --git a/lib/pages/dashboard/dashboard_page.dart b/lib/pages/dashboard/dashboard_page.dart
@@ -89,7 +89,7 @@ class DashboardPageState extends State<DashboardPage> {
 
   double _getPortfolioBarGraphData(DataManager dataManager) {
     // Calcul du pourcentage de rentabilité (ROI)
-    return (dataManager.getTotalRentReceived() / (dataManager.initialTotalValue) * 100); // ROI en %
+    return (dataManager.roiGlobalValue); // ROI en %
   }
 
   Widget _buildPieChart(double rentedPercentage, BuildContext context) {
diff --git a/lib/pages/portfolio/portfolio_display_1.dart b/lib/pages/portfolio/portfolio_display_1.dart
@@ -1,3 +1,4 @@
+import 'package:realtokens_apps/api/data_manager.dart';
 import 'package:realtokens_apps/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:cached_network_image/cached_network_image.dart';
@@ -56,6 +57,7 @@ class PortfolioDisplay1 extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final appState = Provider.of<AppState>(context);
+    final dataManager = Provider.of<DataManager>(context, listen: false);
 
     return Scaffold(
       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
@@ -313,7 +315,7 @@ class PortfolioDisplay1 extends StatelessWidget {
                                     ],
                                   ),
                                   Text(
-                                    '${S.of(context).totalValue}: ${formatCurrency(context, token['totalValue'] ?? 0)}',
+                                    '${S.of(context).totalValue}: ${Utils.formatCurrency(token['totalValue'] ?? 0, dataManager.currencySymbol)}',
                                     style: TextStyle(fontSize: 13 + appState.getTextSizeOffset()),
                                   ),
                                   Text(
@@ -340,21 +342,21 @@ class PortfolioDisplay1 extends StatelessWidget {
                                         Column(
                                           children: [
                                             Text(S.of(context).week, style: TextStyle(fontSize: 13 + appState.getTextSizeOffset())),
-                                            Text(formatCurrency(context, token['dailyIncome'] * 7 ?? 0),
+                                            Text(Utils.formatCurrency(token['dailyIncome'] * 7 ?? 0, dataManager.currencySymbol),
                                                 style: TextStyle(fontSize: 13 + appState.getTextSizeOffset())),
                                           ],
                                         ),
                                         Column(
                                           children: [
                                             Text(S.of(context).month, style: TextStyle(fontSize: 13 + appState.getTextSizeOffset())),
-                                            Text(formatCurrency(context, token['monthlyIncome'] ?? 0),
+                                            Text(Utils.formatCurrency(token['monthlyIncome'] ?? 0, dataManager.currencySymbol),
                                                 style: TextStyle(fontSize: 13 + appState.getTextSizeOffset())),
                                           ],
                                         ),
                                         Column(
                                           children: [
                                             Text(S.of(context).year, style: TextStyle(fontSize: 13 + appState.getTextSizeOffset())),
-                                            Text(formatCurrency(context, token['yearlyIncome'] ?? 0),
+                                            Text(Utils.formatCurrency(token['yearlyIncome'] ?? 0, dataManager.currencySymbol),
                                                 style: TextStyle(fontSize: 13 + appState.getTextSizeOffset())),
                                           ],
                                         ),
diff --git a/lib/pages/portfolio/portfolio_display_2.dart b/lib/pages/portfolio/portfolio_display_2.dart
diff --git a/lib/pages/propertiesForSale/PropertiesForSaleSecondary.dart b/lib/pages/propertiesForSale/PropertiesForSaleSecondary.dart
diff --git a/lib/pages/token_bottom_sheet.dart b/lib/pages/token_bottom_sheet.dart
diff --git a/pubspec.yaml b/pubspec.yaml
