Fix and improvements

lib/src/api/assos_utc.dart

@@ -0,0 +1,48 @@
+import 'package:dio/dio.dart';
+
+class AssosUTC {
+  //dio get https://assos.utc.fr/api/v1/semesters
+  static Future<List<Semester>> getSemesters() async {
+    final response = await Dio().get('https://assos.utc.fr/api/v1/semesters');
+    if (response.statusCode == 200) {
+      return (response.data as List)
+          .map<Semester>((e) => Semester.fromJson(e))
+          .toList();
+    } else {
+      throw Exception('Failed to load semesters');
+    }
+  }
+}
+
+//{
+// "id": "052f21d0-6c88-11ec-9f69-2306293b178e",
+// "name": "A22",
+// "is_spring": false,
+// "begin_at": "2022-09-01 00:00:00",
+// "end_at": "2023-01-31 23:59:59"
+// }
+class Semester {
+  final String id;
+  final String name;
+  final bool isSpring;
+  final DateTime beginAt;
+  final DateTime endAt;
+
+  Semester({
+    required this.id,
+    required this.name,
+    required this.isSpring,
+    required this.beginAt,
+    required this.endAt,
+  });
+
+  factory Semester.fromJson(Map<String, dynamic> json) {
+    return Semester(
+      id: json['id'],
+      name: json['name'],
+      isSpring: json['is_spring'],
+      beginAt: DateTime.parse(json['begin_at']),
+      endAt: DateTime.parse(json['end_at']),
+    );
+  }
+}

lib/src/services/app.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 
 import 'package:dio/dio.dart';
 
+import 'package:payutc/src/api/assos_utc.dart';
 import 'package:payutc/src/api/cas.dart';
 import 'package:payutc/src/api/ginger.dart';
 import 'package:payutc/src/api/nemopay.dart';
@@ -60,14 +61,17 @@ class AppService extends ChangeNotifier {
 
   Owner get user => userWallet!.user;
 
+  List<Semester> semesters = [];
+
   Future<bool> initApp() async {
     await storageService.init();
-    if (await isFirstConnect) return false;
-    UserData d = (await storageService.userData)!;
+    UserData? d = (await storageService.userData);
+    if (await isFirstConnect || d == null) return false;
     userName = await (d.isCas ? _casConnect() : _classicConnect());
     appProperties = await nemoPayApi.getAppProperties();
     await walletService.forceLoad();
     await historyService.forceLoadHistory();
+    semesters = await AssosUTC.getSemesters();
     return true;
   }
 

lib/src/ui/component/payutc_item.dart

@@ -102,9 +102,19 @@ class PayUtcItemWidget extends StatelessWidget {
             s,
             style: const TextStyle(color: Colors.white),
           ),
-          Text(
-            t,
-            style: const TextStyle(color: Colors.white),
+          const SizedBox(
+            width: 10,
+          ),
+          Expanded(
+            child: Align(
+              alignment: Alignment.centerRight,
+              child: Text(
+                t,
+                style: const TextStyle(color: Colors.white),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
           ),
         ],
       );
@@ -132,16 +142,18 @@ class PayUtcItemWidget extends StatelessWidget {
                     ),
                     _row("Montant", item.amountParse.toStringAsFixed(2)),
                     _row("Dénomination", item.nameExtracted(context)),
-                    _row("Service", item.service(context)),
+                    if (!item.isVirement)
+                      _row("Service", item.service(context)),
                     _row("Date", DateFormat("dd/MM/yyyy").format(item.date)),
                     _row("Heure", DateFormat("HH:mm").format(item.date)),
                     const SizedBox(
                       height: 10,
                     ),
                     if (item.isVirement) ...[
-                      const Text(
-                        "Message",
-                        style: TextStyle(color: Colors.white, fontSize: 18),
+                      Text(
+                        "${item.userVirName} a écrit :",
+                        style:
+                            const TextStyle(color: Colors.white, fontSize: 18),
                       ),
                       const SizedBox(
                         height: 5,

lib/src/ui/screen/account_screen.dart

@@ -120,7 +120,9 @@ class _AccountPageState extends State<AccountPage> {
                         Translate.of(context).nousContacter,
                         () {
                           launchUrlString(
-                              "mailto:payutc@assos.utc.fr?subject=[App]&body=Bonjour,\n");
+                            "mailto:payutc@assos.utc.fr?subject=[App]&body=Bonjour,\n",
+                            mode: LaunchMode.externalApplication,
+                          );
                         },
                       ),
                       if (showLogConsole)

lib/src/ui/screen/home.dart

@@ -1,6 +1,9 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+import 'package:skeletons/skeletons.dart';
+
 import 'package:payutc/generated/l10n.dart';
 import 'package:payutc/src/services/app.dart';
 import 'package:payutc/src/services/history.dart';
@@ -12,8 +15,6 @@ import 'package:payutc/src/ui/screen/stats.dart';
 import 'package:payutc/src/ui/screen/transfert_select_amount.dart';
 import 'package:payutc/src/ui/style/color.dart';
 import 'package:payutc/src/ui/style/theme.dart';
-import 'package:skeletons/skeletons.dart';
-
 import '../component/rounded_icon.dart';
 import 'account_screen.dart';
 import 'receive.dart';
@@ -146,7 +147,7 @@ class _HomePageState extends State<HomePage>
                               children: [
                                 Text(
                                   AppService.instance.translateMoney(
-                                      (AppService.instance.userWallet?.credit ??
+                                      (historyController.history?.credit ??
                                               00) /
                                           100),
                                   style: const TextStyle(

lib/src/ui/screen/reload.dart

@@ -4,12 +4,14 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:url_launcher/url_launcher_string.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 import 'package:payutc/generated/l10n.dart';
 import 'package:payutc/src/env.dart';
 import 'package:payutc/src/services/app.dart';
 import 'package:payutc/src/ui/screen/select_amount.dart';
+import 'package:payutc/src/ui/style/color.dart';
 
 class PaymentFlowPage extends StatefulWidget {
   final double amount;
@@ -50,6 +52,27 @@ class PaymentFlowPage extends StatefulWidget {
 }
 
 class _PaymentFlowPageState extends State<PaymentFlowPage> {
+  String? _url, _error;
+
+  @override
+  void initState() {
+    AppService.instance.nemoPayApi
+        .requestTransfertUrl(widget.amount)
+        .then((value) => setState(() {
+              _url = value;
+              if (mounted) {
+                setState(() {});
+              }
+            }))
+        .catchError((e) {
+      _error = "Une erreur est survenue";
+      if (mounted) {
+        setState(() {});
+      }
+    });
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     return WillPopScope(
@@ -82,11 +105,50 @@ class _PaymentFlowPageState extends State<PaymentFlowPage> {
           elevation: 0,
           iconTheme: const IconThemeData(color: Colors.white),
           systemOverlayStyle: SystemUiOverlayStyle.light,
+          actions: [
+            if (_url != null)
+              IconButton(
+                icon: const Icon(Icons.open_in_new),
+                onPressed: () => showDialog(
+                  context: context,
+                  builder: (_) {
+                    return AlertDialog(
+                      elevation: 0,
+                      shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(15)),
+                      title: const Text("Ouvrir dans le navigateur"),
+                      content: const Text(
+                        "Tu n'arrive pas à accéder à la page ou au "
+                        "paiement ? Tu peux essayer d'ouvrir la page dans "
+                        "un navigateur. (Il faudra ensuite revenir sur l'application)",
+                        style: TextStyle(fontSize: 12),
+                      ),
+                      actions: [
+                        TextButton(
+                          onPressed: () => Navigator.pop(context, false),
+                          child: const Text("Annuler"),
+                        ),
+                        TextButton(
+                          style: TextButton.styleFrom(
+                              foregroundColor: Colors.black54),
+                          onPressed: () {
+                            Navigator.pop(context, true);
+                            Navigator.pop(context, true);
+                            launchUrlString(_url!,
+                                mode: LaunchMode.externalApplication);
+                          },
+                          child: const Text("Passer par le navigateur"),
+                        ),
+                      ],
+                    );
+                  },
+                ),
+              ),
+          ],
         ),
         backgroundColor: Colors.black,
-        body: FutureBuilder<String>(
-            future: AppService.instance.nemoPayApi
-                .requestTransfertUrl(widget.amount),
+        body: FutureBuilder<String?>(
+            future: Future.value(_url),
             builder: (context, snapshot) {
               if (snapshot.data != null) {
                 return ClipRRect(
@@ -108,13 +170,24 @@ class _PaymentFlowPageState extends State<PaymentFlowPage> {
                   )),
                 );
               }
-              if (!snapshot.hasData &&
-                  snapshot.connectionState == ConnectionState.waiting) {
-                return const Center(
-                  child: CircularProgressIndicator(),
+              if (_error != null) {
+                return Center(
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(15),
+                    ),
+                    padding: const EdgeInsets.all(16),
+                    child: Text(
+                      "$_error",
+                      style: const TextStyle(color: AppColors.red),
+                    ),
+                  ),
                 );
               }
-              return const SizedBox();
+              return const Center(
+                child: CircularProgressIndicator(),
+              );
             }),
       ),
     );

lib/src/ui/screen/splash.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -11,6 +12,7 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:payutc/compil.dart';
 import 'package:payutc/generated/l10n.dart';
 import 'package:payutc/src/services/app.dart';
+import 'package:payutc/src/ui/component/ui_utils.dart';
 import 'package:payutc/src/ui/screen/home.dart';
 import 'package:payutc/src/ui/style/color.dart';
 
@@ -54,7 +56,7 @@ class _SplashPageState extends State<SplashPage> {
               height: 30,
             ),
             const Text(
-              "Pay'ut",
+              "Pay'UTC",
               style: TextStyle(color: Colors.white, fontSize: 30),
             ),
             const SizedBox(
@@ -287,6 +289,21 @@ class _LoginPageState extends State<LoginPage> {
                         const SizedBox(
                           height: 5,
                         ),
+                        Text.rich(
+                          TextSpan(
+                            text: Translate.of(context).connect_mention_legs,
+                            children: [
+                              TextSpan(
+                                  text:
+                                      " ${Translate.of(context).mentionsLgales}",
+                                  style: const TextStyle(
+                                    color: AppColors.orange,
+                                  ),
+                                  recognizer: TapGestureRecognizer()
+                                    ..onTap = _mentionsLeg)
+                            ],
+                          ),
+                        ),
                       ],
                     ),
                   ),
@@ -299,6 +316,14 @@ class _LoginPageState extends State<LoginPage> {
     );
   }
 
+  void _mentionsLeg() {
+    showWebView(
+      context,
+      "assets/therms/cgu.html",
+      Translate.of(context).mentionsLgales,
+    );
+  }
+
   void _connect(BuildContext context) async {
     if (!Form.of(context)!.validate()) return;
     setState(() {