Skip to content

Commit cc0594e

Browse files
authored
chore: don't use connectivity_plus (yet) because it needs snap change (#89)
1 parent 2364b23 commit cc0594e

17 files changed

+38
-58
lines changed

.fvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.32.7"
2+
"flutter": "3.32.8"
33
}

lib/app/view/error_page.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:yaru/yaru.dart';
3+
import '../../common/view/ui_constants.dart';
34
import '../../l10n/l10n.dart';
45

56
class ErrorPage extends StatelessWidget {
@@ -27,6 +28,11 @@ class ErrorBody extends StatelessWidget {
2728

2829
@override
2930
Widget build(BuildContext context) {
30-
return Center(child: Text('An error occurred: $error'));
31+
return Center(
32+
child: Padding(
33+
padding: const EdgeInsets.all(kBigPadding),
34+
child: Text('An error occurred: $error'),
35+
),
36+
);
3137
}
3238
}

lib/common/client_x.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'dart:convert';
22
import 'dart:io';
33
import 'dart:math';
44

5-
import 'package:connectivity_plus/connectivity_plus.dart';
65
import 'package:flutter/foundation.dart';
76
import 'package:flutter/services.dart';
87
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -16,15 +15,13 @@ import 'package:universal_html/html.dart' as html;
1615

1716
import '../app/app_config.dart';
1817
import '../settings/settings_service.dart';
19-
import 'connecvitiy_x.dart';
2018
import 'logging.dart';
2119
import 'platforms.dart';
2220

2321
extension ClientX on Client {
2422
static Future<Client> registerAsync({
2523
required SettingsService settingsService,
2624
required FlutterSecureStorage flutterSecureStorage,
27-
required Connectivity connectivity,
2825
}) async {
2926
await vod.init(wasmPath: './assets/assets/vodozemac/');
3027
final client = Client(
@@ -44,10 +41,10 @@ extension ClientX on Client {
4441
flutterSecureStorage,
4542
),
4643
);
47-
// This reads potential credentials that might exist from previous sessions.
48-
if (connectivity.isOnline(await connectivity.checkConnectivity())) {
49-
await client.init().timeout(const Duration(seconds: 55));
50-
}
44+
// This reads potential credentials that might exist from previous sessions
45+
// to determine whether the user is logged in or not.
46+
await client.init().timeout(const Duration(seconds: 55));
47+
5148
return client;
5249
}
5350

lib/common/connecvitiy_x.dart

Lines changed: 0 additions & 7 deletions
This file was deleted.

lib/common/date_time_x.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ extension DateTimeX on DateTime {
88
final now = DateTime.now();
99
final l10n = context.l10n;
1010

11-
var localeName = WidgetsBinding.instance.platformDispatcher.locale
12-
.toString();
11+
var localeName = context.l10n.localeName;
1312
var bool = localeName == 'und' || localeName == 'US';
1413
final countryCode = bool ? 'en' : localeName;
1514

@@ -32,7 +31,7 @@ extension DateTimeX on DateTime {
3231

3332
if (year == now.year && month == now.month) {
3433
if (day == now.day - 1) {
35-
return context.l10n.yesterday;
34+
return context.l10n.today;
3635
}
3736
}
3837
return DateFormat.yMd(locale).format(this);

lib/l10n/app_de.arb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2783,6 +2783,7 @@
27832783
"seconds": { "type": "int" }
27842784
}
27852785
},
2786-
"yesterday": "Gestern"
2786+
"yesterday": "Gestern",
2787+
"today": "Heute"
27872788
}
27882789

lib/l10n/app_en.arb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2783,6 +2783,7 @@
27832783
"seconds": { "type": "int" }
27842784
}
27852785
},
2786-
"yesterday": "Yesterday"
2786+
"yesterday": "Yesterday",
2787+
"today": "Today"
27872788
}
27882789

lib/l10n/app_localizations.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4131,6 +4131,12 @@ abstract class AppLocalizations {
41314131
/// In en, this message translates to:
41324132
/// **'Yesterday'**
41334133
String get yesterday;
4134+
4135+
/// No description provided for @today.
4136+
///
4137+
/// In en, this message translates to:
4138+
/// **'Today'**
4139+
String get today;
41344140
}
41354141

41364142
class _AppLocalizationsDelegate

lib/l10n/app_localizations_de.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,4 +2357,7 @@ class AppLocalizationsDe extends AppLocalizations {
23572357

23582358
@override
23592359
String get yesterday => 'Gestern';
2360+
2361+
@override
2362+
String get today => 'Heute';
23602363
}

lib/l10n/app_localizations_en.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,4 +2357,7 @@ class AppLocalizationsEn extends AppLocalizations {
23572357

23582358
@override
23592359
String get yesterday => 'Yesterday';
2360+
2361+
@override
2362+
String get today => 'Today';
23602363
}

0 commit comments

Comments
 (0)