0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update header in case of subscription expiry

Browse source
This commit is contained in:
Vishnu Mohandas 2021-02-02 22:27:16 +05:30
parent a10ad8c279
commit cfee0a0120
3 changed files with 100 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/events/sync_status_update_event.dart
View file

@ -6,6 +6,7 @@ class SyncStatusUpdate extends Event {
final bool wasStopped;
final SyncStatus status;
final String reason;
final Error error;
SyncStatusUpdate(
this.status, {
@ -13,6 +14,7 @@ class SyncStatusUpdate extends Event {
this.total,
this.wasStopped = false,
this.reason = "",
this.error,
});
}

11
lib/services/sync_service.dart
View file

@ -96,7 +96,7 @@ class SyncService {
.fire(SyncStatusUpdate(SyncStatus.completed, wasStopped: true));
} on NoActiveSubscriptionError {
Bus.instance.fire(SyncStatusUpdate(SyncStatus.error,
reason: "your subscription has expired"));
error: NoActiveSubscriptionError()));
} catch (e, s) {
_logger.severe(e, s);
Bus.instance.fire(SyncStatusUpdate(SyncStatus.error));
@ -289,16 +289,9 @@ class SyncService {
await Future.wait(futures, eagerError: true);
} on InvalidFileError {
// Do nothing
} on WiFiUnavailableError {
throw WiFiUnavailableError();
} on SyncStopRequestedError {
throw SyncStopRequestedError();
} on NoActiveSubscriptionError {
throw NoActiveSubscriptionError();
} catch (e, s) {
_isSyncInProgress = false;
Bus.instance.fire(SyncStatusUpdate(SyncStatus.error));
_logger.severe("Error in syncing files", e, s);
throw e;
}
return uploadCounter > 0;
}

141
lib/ui/sync_indicator.dart
View file

@ -5,6 +5,9 @@ import 'package:photos/core/configuration.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/events/sync_status_update_event.dart';
import 'package:photos/services/sync_service.dart';
import 'package:photos/ui/common_elements.dart';
import 'package:photos/ui/subscription_page.dart';
import 'package:photos/utils/file_uploader.dart';
class SyncIndicator extends StatefulWidget {
const SyncIndicator({Key key}) : super(key: key);
@ -49,57 +52,105 @@ class _SyncIndicatorState extends State<SyncIndicator> {
} else {
_containerHeight = 48;
}
var icon;
if (_event.status == SyncStatus.completed) {
icon = Icon(
Icons.cloud_done_outlined,
color: Theme.of(context).accentColor,
);
} else if (_event.status == SyncStatus.error) {
icon = Icon(
Icons.error_outline,
color: Theme.of(context).accentColor,
if (_event.status != SyncStatus.error) {
var icon;
if (_event.status == SyncStatus.completed) {
icon = Icon(
Icons.cloud_done_outlined,
color: Theme.of(context).accentColor,
);
} else {
icon = CircularProgressIndicator(strokeWidth: 2);
}
return AnimatedContainer(
duration: Duration(milliseconds: 300),
height: _containerHeight,
width: double.infinity,
padding: EdgeInsets.all(8),
alignment: Alignment.center,
child: SingleChildScrollView(
physics: NeverScrollableScrollPhysics(),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 20,
height: 20,
child: icon,
),
Padding(
padding: const EdgeInsets.fromLTRB(12, 4, 0, 0),
child: Text(_getRefreshingText()),
),
],
),
Padding(padding: EdgeInsets.all(4)),
Divider(),
],
),
),
);
} else {
icon = CircularProgressIndicator(strokeWidth: 2);
return _getErrorWidget();
}
return AnimatedContainer(
duration: Duration(milliseconds: 300),
height: _containerHeight,
width: double.infinity,
padding: EdgeInsets.all(8),
alignment: Alignment.center,
child: SingleChildScrollView(
physics: NeverScrollableScrollPhysics(),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 20,
height: 20,
child: icon,
),
Padding(
padding: const EdgeInsets.fromLTRB(12, 4, 0, 0),
child: Text(_getRefreshingText()),
),
],
),
Padding(padding: EdgeInsets.all(4)),
Divider(),
],
),
),
);
}
return Container();
}
Widget _getErrorWidget() {
if (_event.error is NoActiveSubscriptionError) {
return Container(
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Icon(
Icons.error_outline,
color: Theme.of(context).accentColor,
),
Padding(padding: EdgeInsets.all(4)),
Text("your subscription has expired"),
],
),
Padding(padding: EdgeInsets.all(6)),
Container(
width: double.infinity,
height: 64,
padding: const EdgeInsets.fromLTRB(80, 0, 80, 0),
child: button("subscribe", onPressed: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (BuildContext context) {
return SubscriptionPage();
},
),
);
}),
),
Padding(padding: EdgeInsets.all(8)),
],
),
);
} else {
return Row(
children: [
Icon(
Icons.error_outline,
color: Theme.of(context).accentColor,
),
Text(_event.reason ?? "upload failed"),
],
);
}
}
String _getRefreshingText() {
if (_event == null ||
_event.status == SyncStatus.applying_local_diff ||
@ -125,7 +176,7 @@ class _SyncIndicatorState extends State<SyncIndicator> {
return "all memories preserved";
}
}
// _event.status == SyncStatus.error)
// _event.status == SyncStatus.error
return _event.reason ?? "upload failed";
}
}