Fix user status handling
This commit is contained in:
parent
bcc03b4c9a
commit
c1da0da897
7 changed files with 85 additions and 158 deletions
|
@ -1,5 +1,6 @@
|
|||
import 'dart:async';
|
||||
import 'package:contacts_plus_plus/hub_manager.dart';
|
||||
import 'package:contacts_plus_plus/models/users/online_status.dart';
|
||||
import 'package:contacts_plus_plus/models/users/user_status.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
|
@ -57,12 +58,15 @@ class MessagingClient extends ChangeNotifier {
|
|||
final Logger _logger = Logger("Messaging");
|
||||
final NotificationClient _notificationClient;
|
||||
final HubManager _hubManager = HubManager();
|
||||
|
||||
Friend? selectedFriend;
|
||||
|
||||
Timer? _notifyOnlineTimer;
|
||||
Timer? _autoRefresh;
|
||||
Timer? _unreadSafeguard;
|
||||
String? _initStatus;
|
||||
UserStatus _userStatus = UserStatus.empty().copyWith(onlineStatus: OnlineStatus.online);
|
||||
|
||||
UserStatus get userStatus => _userStatus;
|
||||
|
||||
MessagingClient({required ApiClient apiClient, required NotificationClient notificationClient})
|
||||
: _apiClient = apiClient,
|
||||
|
@ -72,11 +76,6 @@ class MessagingClient extends ChangeNotifier {
|
|||
box.delete(_lastUpdateKey);
|
||||
});
|
||||
_setupHub();
|
||||
_notifyOnlineTimer = Timer.periodic(const Duration(seconds: 60), (timer) async {
|
||||
// We should probably let the MessagingClient handle the entire state of USerStatus instead of mirroring like this
|
||||
// but I don't feel like implementing that right now.
|
||||
setUserStatus(await UserApi.getUserStatus(apiClient, userId: apiClient.userId));
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
|
@ -146,18 +145,23 @@ class MessagingClient extends ChangeNotifier {
|
|||
Future<void> setUserStatus(UserStatus status) async {
|
||||
final pkginfo = await PackageInfo.fromPlatform();
|
||||
|
||||
status = status.copyWith(
|
||||
_userStatus = status.copyWith(
|
||||
appVersion: "${pkginfo.version} of ${pkginfo.appName}",
|
||||
isMobile: true,
|
||||
lastStatusChange: DateTime.now(),
|
||||
);
|
||||
|
||||
_hubManager.send("BroadcastStatus", arguments: [
|
||||
status.toMap(),
|
||||
_userStatus.toMap(),
|
||||
{
|
||||
"group": 0,
|
||||
"targetIds": [],
|
||||
}
|
||||
]);
|
||||
|
||||
final self = getAsFriend(_apiClient.userId);
|
||||
await _updateContact(self!.copyWith(userStatus: _userStatus));
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void addUnread(Message message) {
|
||||
|
|
|
@ -14,6 +14,7 @@ import 'package:contacts_plus_plus/widgets/update_notifier.dart';
|
|||
import 'package:dynamic_color/dynamic_color.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_downloader/flutter_downloader.dart';
|
||||
import 'package:flutter_phoenix/flutter_phoenix.dart';
|
||||
import 'package:hive_flutter/hive_flutter.dart';
|
||||
|
@ -132,14 +133,12 @@ class _ContactsPlusPlusState extends State<ContactsPlusPlus> {
|
|||
theme: ThemeData(
|
||||
useMaterial3: true,
|
||||
textTheme: _typography.black,
|
||||
canvasColor: lightDynamic?.surfaceVariant,
|
||||
colorScheme:
|
||||
lightDynamic ?? ColorScheme.fromSeed(seedColor: Colors.purple, brightness: Brightness.light),
|
||||
),
|
||||
darkTheme: ThemeData(
|
||||
useMaterial3: true,
|
||||
textTheme: _typography.white,
|
||||
canvasColor: darkDynamic?.surfaceVariant,
|
||||
colorScheme: darkDynamic ?? ColorScheme.fromSeed(seedColor: Colors.purple, brightness: Brightness.dark),
|
||||
),
|
||||
themeMode: ThemeMode.values[widget.settingsClient.currentSettings.themeMode.valueOrDefault],
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
import 'package:contacts_plus_plus/apis/user_api.dart';
|
||||
import 'package:contacts_plus_plus/client_holder.dart';
|
||||
import 'package:contacts_plus_plus/clients/messaging_client.dart';
|
||||
import 'package:contacts_plus_plus/models/users/online_status.dart';
|
||||
import 'package:contacts_plus_plus/models/users/user_status.dart';
|
||||
import 'package:contacts_plus_plus/widgets/friends/user_search.dart';
|
||||
import 'package:contacts_plus_plus/widgets/my_profile_dialog.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
@ -18,33 +16,6 @@ class FriendsListAppBar extends StatefulWidget {
|
|||
}
|
||||
|
||||
class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKeepAliveClientMixin {
|
||||
Future<UserStatus>? _userStatusFuture;
|
||||
ClientHolder? _clientHolder;
|
||||
|
||||
@override
|
||||
void didChangeDependencies() async {
|
||||
super.didChangeDependencies();
|
||||
final clientHolder = ClientHolder.of(context);
|
||||
if (_clientHolder != clientHolder) {
|
||||
_clientHolder = clientHolder;
|
||||
_refreshUserStatus();
|
||||
}
|
||||
}
|
||||
|
||||
void _refreshUserStatus() {
|
||||
final apiClient = _clientHolder!.apiClient;
|
||||
final messagingClient = Provider.of<MessagingClient>(context, listen: false);
|
||||
_userStatusFuture ??= UserApi.getUserStatus(apiClient, userId: apiClient.userId).then((value) async {
|
||||
if (value.onlineStatus == OnlineStatus.offline) {
|
||||
final newStatus = value.copyWith(
|
||||
onlineStatus:
|
||||
OnlineStatus.values[_clientHolder!.settingsClient.currentSettings.lastOnlineStatus.valueOrDefault]);
|
||||
await messagingClient.setUserStatus(newStatus);
|
||||
return newStatus;
|
||||
}
|
||||
return value;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
@ -52,14 +23,10 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
|
|||
return AppBar(
|
||||
title: const Text("Contacts++"),
|
||||
systemOverlayStyle: SystemUiOverlayStyle(
|
||||
systemNavigationBarColor: Theme.of(context).colorScheme.surfaceVariant,
|
||||
systemNavigationBarColor: Theme.of(context).navigationBarTheme.backgroundColor,
|
||||
),
|
||||
actions: [
|
||||
FutureBuilder(
|
||||
future: _userStatusFuture,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
final userStatus = snapshot.data as UserStatus;
|
||||
Consumer<MessagingClient>(builder: (context, client, _) {
|
||||
return PopupMenuButton<OnlineStatus>(
|
||||
child: Row(
|
||||
children: [
|
||||
|
@ -68,32 +35,25 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
|
|||
child: Icon(
|
||||
Icons.circle,
|
||||
size: 16,
|
||||
color: userStatus.onlineStatus.color(context),
|
||||
color: client.userStatus.onlineStatus.color(context),
|
||||
),
|
||||
),
|
||||
Text(toBeginningOfSentenceCase(userStatus.onlineStatus.name) ?? "Unknown"),
|
||||
Text(toBeginningOfSentenceCase(client.userStatus.onlineStatus.name) ?? "Unknown"),
|
||||
],
|
||||
),
|
||||
onSelected: (OnlineStatus onlineStatus) async {
|
||||
final newStatus = client.userStatus.copyWith(onlineStatus: onlineStatus);
|
||||
final settingsClient = ClientHolder.of(context).settingsClient;
|
||||
try {
|
||||
final messagingClient = Provider.of<MessagingClient>(context, listen: false);
|
||||
final newStatus = userStatus.copyWith(onlineStatus: onlineStatus);
|
||||
setState(() {
|
||||
_userStatusFuture = Future.value(newStatus.copyWith(lastStatusChange: DateTime.now()));
|
||||
});
|
||||
final settingsClient = _clientHolder!.settingsClient;
|
||||
await messagingClient.setUserStatus(newStatus);
|
||||
await settingsClient.changeSettings(
|
||||
settingsClient.currentSettings.copyWith(lastOnlineStatus: onlineStatus.index));
|
||||
await client.setUserStatus(newStatus);
|
||||
await settingsClient
|
||||
.changeSettings(settingsClient.currentSettings.copyWith(lastOnlineStatus: onlineStatus.index));
|
||||
} catch (e, s) {
|
||||
FlutterError.reportError(FlutterErrorDetails(exception: e, stack: s));
|
||||
if (context.mounted) {
|
||||
ScaffoldMessenger.of(context)
|
||||
.showSnackBar(const SnackBar(content: Text("Failed to set online-status.")));
|
||||
}
|
||||
setState(() {
|
||||
_userStatusFuture = Future.value(userStatus);
|
||||
});
|
||||
}
|
||||
},
|
||||
itemBuilder: (BuildContext context) => OnlineStatus.values
|
||||
|
@ -117,41 +77,9 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
|
|||
),
|
||||
),
|
||||
)
|
||||
.toList());
|
||||
} else if (snapshot.hasError) {
|
||||
return TextButton.icon(
|
||||
style: TextButton.styleFrom(
|
||||
foregroundColor: Theme.of(context).colorScheme.onSurface,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 2)),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
_userStatusFuture =
|
||||
UserApi.getUserStatus(_clientHolder!.apiClient, userId: _clientHolder!.apiClient.userId);
|
||||
});
|
||||
},
|
||||
icon: const Icon(Icons.warning),
|
||||
label: const Text("Retry"),
|
||||
.toList(),
|
||||
);
|
||||
} else {
|
||||
return TextButton.icon(
|
||||
style: TextButton.styleFrom(
|
||||
disabledForegroundColor: Theme.of(context).colorScheme.onSurface,
|
||||
),
|
||||
onPressed: null,
|
||||
icon: Container(
|
||||
width: 16,
|
||||
height: 16,
|
||||
margin: const EdgeInsets.only(right: 4),
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
color: Theme.of(context).colorScheme.onSurface,
|
||||
),
|
||||
),
|
||||
label: const Text("Loading"),
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
}),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 4, right: 4),
|
||||
child: PopupMenuButton<MenuItemDefinition>(
|
||||
|
|
|
@ -47,13 +47,9 @@ class _HomeState extends State<Home> {
|
|||
SettingsPage(),
|
||||
],
|
||||
),
|
||||
bottomNavigationBar: BottomNavigationBar(
|
||||
backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
|
||||
type: BottomNavigationBarType.fixed,
|
||||
unselectedItemColor: Theme.of(context).colorScheme.onBackground,
|
||||
selectedItemColor: Theme.of(context).colorScheme.primary,
|
||||
currentIndex: _selectedPage,
|
||||
onTap: (index) {
|
||||
bottomNavigationBar: NavigationBar(
|
||||
selectedIndex: _selectedPage,
|
||||
onDestinationSelected: (index) {
|
||||
_pageController.animateToPage(
|
||||
index,
|
||||
duration: const Duration(milliseconds: 200),
|
||||
|
@ -63,20 +59,20 @@ class _HomeState extends State<Home> {
|
|||
_selectedPage = index;
|
||||
});
|
||||
},
|
||||
items: const [
|
||||
BottomNavigationBarItem(
|
||||
destinations: const [
|
||||
NavigationDestination(
|
||||
icon: Icon(Icons.message),
|
||||
label: "Chat",
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
NavigationDestination(
|
||||
icon: Icon(Icons.public),
|
||||
label: "Sessions",
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
NavigationDestination(
|
||||
icon: Icon(Icons.inventory),
|
||||
label: "Inventory",
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
NavigationDestination(
|
||||
icon: Icon(Icons.settings),
|
||||
label: "Settings",
|
||||
),
|
||||
|
|
|
@ -62,14 +62,14 @@ class _InventoryBrowserAppBarState extends State<InventoryBrowserAppBar> {
|
|||
key: const ValueKey("default-appbar"),
|
||||
title: const Text("Inventory"),
|
||||
systemOverlayStyle: SystemUiOverlayStyle(
|
||||
systemNavigationBarColor: Theme.of(context).colorScheme.surfaceVariant,
|
||||
systemNavigationBarColor: Theme.of(context).navigationBarTheme.backgroundColor,
|
||||
),
|
||||
)
|
||||
: AppBar(
|
||||
key: const ValueKey("selection-appbar"),
|
||||
title: Text("${iClient.selectedRecordCount} Selected"),
|
||||
systemOverlayStyle: SystemUiOverlayStyle(
|
||||
systemNavigationBarColor: Theme.of(context).colorScheme.surfaceVariant,
|
||||
systemNavigationBarColor: Theme.of(context).navigationBarTheme.backgroundColor,
|
||||
),
|
||||
leading: IconButton(
|
||||
onPressed: () {
|
||||
|
|
|
@ -17,7 +17,7 @@ class _SessionListAppBarState extends State<SessionListAppBar> {
|
|||
return AppBar(
|
||||
title: const Text("Sessions"),
|
||||
systemOverlayStyle: SystemUiOverlayStyle(
|
||||
systemNavigationBarColor: Theme.of(context).colorScheme.surfaceVariant,
|
||||
systemNavigationBarColor: Theme.of(context).navigationBarTheme.backgroundColor,
|
||||
),
|
||||
actions: [
|
||||
Padding(
|
||||
|
|
|
@ -9,7 +9,7 @@ class SettingsAppBar extends StatelessWidget {
|
|||
return AppBar(
|
||||
title: const Text("Settings"),
|
||||
systemOverlayStyle: SystemUiOverlayStyle(
|
||||
systemNavigationBarColor: Theme.of(context).colorScheme.surfaceVariant,
|
||||
systemNavigationBarColor: Theme.of(context).navigationBarTheme.backgroundColor,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue