From da0b0b7670c4cc17e5ee7a609d38268b25bd38a0 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Thu, 30 Nov 2023 10:04:57 +0400 Subject: [PATCH 1/2] fix(devices): Make devices state remember current device on refresh - Resolve https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.app/issues/258 --- lib/logic/cubit/devices/devices_cubit.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/logic/cubit/devices/devices_cubit.dart b/lib/logic/cubit/devices/devices_cubit.dart index 5debf20e..7713254b 100644 --- a/lib/logic/cubit/devices/devices_cubit.dart +++ b/lib/logic/cubit/devices/devices_cubit.dart @@ -21,7 +21,7 @@ class ApiDevicesCubit } Future refresh() async { - emit(const ApiDevicesState([], LoadingStatus.refreshing)); + emit(ApiDevicesState([state.thisDevice], LoadingStatus.refreshing)); _refetch(); } From 5b94cc0cc06436bc6ad89b66d65548fef6bdb46c Mon Sep 17 00:00:00 2001 From: NaiJi Date: Thu, 30 Nov 2023 12:15:56 +0400 Subject: [PATCH 2/2] fix(devices): Add refresh indicator to 'Other devices' section - Resolve https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.app/issues/163 --- lib/ui/pages/devices/devices.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/ui/pages/devices/devices.dart b/lib/ui/pages/devices/devices.dart index 52fffdbe..91fa0d38 100644 --- a/lib/ui/pages/devices/devices.dart +++ b/lib/ui/pages/devices/devices.dart @@ -91,6 +91,12 @@ class _DevicesInfo extends StatelessWidget { color: Theme.of(context).colorScheme.secondary, ), ), + if (devicesStatus.status == LoadingStatus.refreshing) ...[ + const Center( + heightFactor: 4, + child: CircularProgressIndicator(), + ), + ], ...devicesStatus.otherDevices .map((final device) => _DeviceTile(device: device)), ],