jusax23/actions-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Simplified network requests & snackbars

Browse source 
and rewrote the component's network requests.

showSimpleSnackbar, allows displaying a simple snackbar,
with text and one action button, that can be clicked.

doNetworkRequest is supposed to be a wrapper for the
already existing post* functions.
It aims to make network requests and error handling easier,
by containing all the try&catch blocks
and being able to show snackbars.
This commit is contained in:
Jakob Meier 2023-03-23 14:48:53 +01:00
parent eabb6b93ae
commit 5d333522a5
No known key found for this signature in database
GPG key ID: 66BDC7E6A01A6152
11 changed files with 637 additions and 751 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/backend/room.dart
View file

@ -187,10 +187,10 @@ class RoomIcon {
} }
class Room { class Room {
final String id; String id;
final String serverTag; String serverTag;
final String name; String name;
final String description; String description;
RoomIcon? icon = RoomIcon.other; RoomIcon? icon = RoomIcon.other;
RoomVisibility? visibility = RoomVisibility.private; RoomVisibility? visibility = RoomVisibility.private;
@ -202,6 +202,17 @@ class Room {
this.icon, this.icon,
this.visibility}); this.visibility});
int compareTo(Room r) {
final me = humanReadable;
final other = r.humanReadable;
return me.compareTo(other);
}
String get humanReadable {
return '$id@$serverTag';
}
// get list of all known rooms // get list of all known rooms
static Future<List<Room>> listRooms() async { static Future<List<Room>> listRooms() async {
final db = Localstore.instance; final db = Localstore.instance;

9
lib/backend/user.dart
View file

@ -30,6 +30,12 @@ class User {
); );
} }
static Future<void> removeDisk() async {
final db = Localstore.instance;
await db.collection('meta').doc('auth').delete();
return;
}
static listen(Function(Map<String, dynamic>) cb) async { static listen(Function(Map<String, dynamic>) cb) async {
final db = Localstore.instance; final db = Localstore.instance;
final stream = db.collection('meta').stream; final stream = db.collection('meta').stream;
@ -60,7 +66,6 @@ class AccountMeta {
maxRoomSize: json['maxRoomSize'], maxRoomSize: json['maxRoomSize'],
maxRoomCount: json['maxRooms'], maxRoomCount: json['maxRooms'],
maxRoomMemberCount: json['maxUsersPerRoom'], maxRoomMemberCount: json['maxUsersPerRoom'],
discvoverable: json['viewable'] == 1 discvoverable: json['viewable'] == 1);
);
} }
} }

52
lib/main.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:outbag_app/backend/user.dart'; import 'package:outbag_app/backend/user.dart';
import 'package:outbag_app/screens/room/join.dart'; import 'package:outbag_app/screens/room/join.dart';
import 'package:outbag_app/screens/room/new.dart'; import 'package:outbag_app/screens/room/new.dart';
import 'package:outbag_app/tools/fetch_wrapper.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import './screens/home.dart'; import './screens/home.dart';
import './screens/welcome.dart'; import './screens/welcome.dart';
@ -58,38 +59,30 @@ class _OutbagAppState extends State {
// try to obtain user account information // try to obtain user account information
// with existing details // with existing details
// NOTE: also functions as a way to verify ther data // NOTE: also functions as a way to verify ther data
(() async { doNetworkRequest(
User credentials; null,
try { req: (user) => postWithCreadentials(
credentials = await User.fromDisk(); target: (user?.server)!,
} catch (_) {
// invalid credentials
// log out
setState(() {
isAuthorized = false;
});
return;
}
try {
final resp = await postWithCreadentials(
target: credentials.server,
path: 'getMyAccount', path: 'getMyAccount',
credentials: credentials, credentials: user!,
body: {}); body: {}),
if (resp.res == Result.ok) { onOK: (body) {
final info = AccountMeta.fromJSON(resp.body['data']); final info = AccountMeta.fromJSON(body['data']);
setState(() { setState(() {
isAuthorized = true; isAuthorized = true;
this.info = info; this.info = info;
}); });
} else { },
onServerErr: (body) {
// credentials are wrong // credentials are wrong
// log out // log out
setState(() { setState(() {
isAuthorized = false; isAuthorized = false;
}); });
} return true;
} catch (_) { },
onNetworkErr: () {
// user is currently offline // user is currently offline
// approve login, // approve login,
// until user goes back offline // until user goes back offline
@ -97,8 +90,17 @@ class _OutbagAppState extends State {
setState(() { setState(() {
isAuthorized = true; isAuthorized = true;
}); });
return true;
},
onUserErr: () {
// invalid credentials
// log out
setState(() {
isAuthorized = false;
});
return true;
} }
})(); );
// wait for user to be authorized // wait for user to be authorized
User.listen((data) async { User.listen((data) async {
@ -115,7 +117,9 @@ class _OutbagAppState extends State {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MultiProvider( return MultiProvider(
providers: [ providers: [
Provider<AccountMeta?>.value(value: info,), Provider<AccountMeta?>.value(
value: info,
),
], ],
child: MaterialApp.router( child: MaterialApp.router(
title: "Outbag", title: "Outbag",

109
lib/screens/auth.dart
View file

@ -1,6 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:outbag_app/backend/request.dart'; import 'package:outbag_app/backend/request.dart';
import 'package:outbag_app/backend/user.dart'; import 'package:outbag_app/backend/user.dart';
import 'package:outbag_app/tools/fetch_wrapper.dart';
import 'package:outbag_app/tools/snackbar.dart';
import 'package:routemaster/routemaster.dart'; import 'package:routemaster/routemaster.dart';
import '../backend/resolve_url.dart'; import '../backend/resolve_url.dart';
import '../backend/errors.dart'; import '../backend/errors.dart';
@ -173,6 +175,8 @@ class _AuthPageState extends State<AuthPage> {
showSpinner = true; showSpinner = true;
}); });
final scaffMgr = ScaffoldMessenger.of(context);
// verify that both passwords are the same // verify that both passwords are the same
if (widget.mode != Mode.signin) { if (widget.mode != Mode.signin) {
if (_ctrPassword.text != _ctrPasswordRpt.text) { if (_ctrPassword.text != _ctrPasswordRpt.text) {
@ -180,19 +184,8 @@ class _AuthPageState extends State<AuthPage> {
showSpinner = false; showSpinner = false;
}); });
final snackBar = SnackBar( showSimpleSnackbar(scaffMgr,
behavior: SnackBarBehavior.floating, text: 'Passwords do not match', action: 'Dismiss');
content: const Text('Passwords do not match'),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
},
),
);
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar(snackBar);
_ctrPasswordRpt.clear(); _ctrPasswordRpt.clear();
return; return;
@ -205,28 +198,15 @@ class _AuthPageState extends State<AuthPage> {
showSpinner = false; showSpinner = false;
}); });
final snackBar = SnackBar( showSimpleSnackbar(scaffMgr,
behavior: SnackBarBehavior.floating, text: 'Password has to be at least 6 characters longs',
content: const Text( action: 'Dismiss');
'Password has to be at least 6 characters long'),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
},
),
);
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar(snackBar);
_ctrPasswordRpt.clear(); _ctrPasswordRpt.clear();
return; return;
} }
final scaffMgr = ScaffoldMessenger.of(context); // resolve homeserver url
// TODO: resolve homeserver url
OutbagServer server; OutbagServer server;
try { try {
server = await getOutbagServerUrl(_ctrServer.text); server = await getOutbagServerUrl(_ctrServer.text);
@ -238,31 +218,24 @@ class _AuthPageState extends State<AuthPage> {
showSpinner = false; showSpinner = false;
}); });
final snackBar = SnackBar( showSimpleSnackbar(scaffMgr,
behavior: SnackBarBehavior.floating, text:
content: Text( 'Unable to find valid outbag server on ${_ctrServer.text}',
'Unable to find valid outbag server on ${_ctrServer.text}'), action: 'Dismiss');
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
},
),
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
return; return;
} }
// hash password
var bytes = utf8.encode(_ctrPassword.text); var bytes = utf8.encode(_ctrPassword.text);
final password = sha256.convert(bytes).toString(); final password = sha256.convert(bytes).toString();
try {
Response resp; doNetworkRequest(
// validate account scaffMgr,
needUser: false,
req: (_) {
if (widget.mode == Mode.signin) { if (widget.mode == Mode.signin) {
resp = await postUnauthorized( return postUnauthorized(
target: server, target: server,
path: 'signin', path: 'signin',
body: { body: {
@ -271,7 +244,7 @@ class _AuthPageState extends State<AuthPage> {
'accountKey': password 'accountKey': password
}); });
} else if (widget.mode == Mode.signup) { } else if (widget.mode == Mode.signup) {
resp = await postUnauthorized( return postUnauthorized(
target: server, target: server,
path: 'signup', path: 'signup',
body: { body: {
@ -281,7 +254,7 @@ class _AuthPageState extends State<AuthPage> {
}); });
} else { } else {
// signup OTA // signup OTA
resp = await postUnauthorized( return postUnauthorized(
target: server, target: server,
path: 'signupOTA', path: 'signupOTA',
body: { body: {
@ -291,49 +264,21 @@ class _AuthPageState extends State<AuthPage> {
'OTA': _ctrOTA.text 'OTA': _ctrOTA.text
}); });
} }
if (resp.res == Result.err) {
// error
final snackBar = SnackBar(
behavior: SnackBarBehavior.floating,
content: Text(errorAsString(resp.body)),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
}, },
), onOK: (body) async {
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
} else {
// authorize user // authorize user
await User( await User(
username: _ctrUsername.text, username: _ctrUsername.text,
password: password, password: password,
server: server) server: server)
.toDisk(); .toDisk();
}
} catch (_) {
final snackBar = SnackBar(
behavior: SnackBarBehavior.floating,
content: const Text('Network error'),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
}, },
), after: () {
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}
setState(() { setState(() {
showSpinner = false; showSpinner = false;
}); });
}
);
}, },
label: Text(modeName), label: Text(modeName),
icon: const Icon(Icons.check), icon: const Icon(Icons.check),

42
lib/screens/home.dart
View file

@ -5,6 +5,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:outbag_app/backend/permissions.dart'; import 'package:outbag_app/backend/permissions.dart';
import 'package:outbag_app/backend/request.dart'; import 'package:outbag_app/backend/request.dart';
import 'package:outbag_app/backend/user.dart'; import 'package:outbag_app/backend/user.dart';
import 'package:outbag_app/tools/fetch_wrapper.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:routemaster/routemaster.dart'; import 'package:routemaster/routemaster.dart';
import '../backend/room.dart'; import '../backend/room.dart';
@ -31,6 +32,13 @@ class _HomePageState extends State<HomePage> {
}); });
} catch (_) {} } catch (_) {}
}); });
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
final sm = ScaffoldMessenger.of(context);
// load cached rooms // load cached rooms
(() async { (() async {
@ -42,32 +50,20 @@ class _HomePageState extends State<HomePage> {
} catch (_) {} } catch (_) {}
})(); })();
// fetch room list doNetworkRequest(sm,
(() async { req: (user) => postWithCreadentials(
User user;
try {
user = await User.fromDisk();
} catch (_) {
// probably not logged in
return;
}
try {
final resp = await postWithCreadentials(
path: 'listRooms', path: 'listRooms',
credentials: user, credentials: user!,
target: user.server, target: user.server,
body: {}); body: {}),
if (resp.res == Result.ok) { onOK: (body) async {
final List<Room> list = resp.body['data'].map<Room>((json){ final List<Room> list = body['data'].map<Room>((json) {
return Room.fromJSON(json); return Room.fromJSON(json);
}).toList(); }).toList();
for (Room r in list) { for (Room r in list) {
await r.toDisk(); await r.toDisk();
} }
} });
} catch (_) {}
})();
} }
@override @override
@ -106,7 +102,10 @@ class _HomePageState extends State<HomePage> {
Routemaster.of(context).push("/settings"); Routemaster.of(context).push("/settings");
}), }),
...(context.watch<AccountMeta?>() != null && ...(context.watch<AccountMeta?>() != null &&
(context.watch<AccountMeta?>()?.permissions)! & ServerPermission.allManagement != 0)?[ (context.watch<AccountMeta?>()?.permissions)! &
ServerPermission.allManagement !=
0)
? [
MenuItemButton( MenuItemButton(
leadingIcon: const Icon(Icons.dns), leadingIcon: const Icon(Icons.dns),
child: const Text('Server Dashboard'), child: const Text('Server Dashboard'),
@ -114,7 +113,8 @@ class _HomePageState extends State<HomePage> {
// show settings screen // show settings screen
Routemaster.of(context).push("/server"); Routemaster.of(context).push("/server");
}), }),
]:[], ]
: [],
MenuItemButton( MenuItemButton(
leadingIcon: const Icon(Icons.info_rounded), leadingIcon: const Icon(Icons.info_rounded),
child: const Text('About'), child: const Text('About'),

143
lib/screens/room/join.dart
View file

@ -4,6 +4,7 @@ import 'package:outbag_app/backend/errors.dart';
import 'package:outbag_app/backend/request.dart'; import 'package:outbag_app/backend/request.dart';
import 'package:outbag_app/backend/room.dart'; import 'package:outbag_app/backend/room.dart';
import 'package:outbag_app/backend/user.dart'; import 'package:outbag_app/backend/user.dart';
import 'package:outbag_app/tools/fetch_wrapper.dart';
import 'package:routemaster/routemaster.dart'; import 'package:routemaster/routemaster.dart';
import 'dart:math'; import 'dart:math';
@ -17,45 +18,42 @@ class JoinRoomPage extends StatefulWidget {
class _JoinRoomPageState extends State { class _JoinRoomPageState extends State {
List<Room> rooms = []; List<Room> rooms = [];
void fetchData() async { @override
User user; void didChangeDependencies() {
try { super.didChangeDependencies();
user = await User.fromDisk();
} catch (_) {
return;
}
try { final sm = ScaffoldMessenger.of(context);
final resp = await postWithCreadentials(
doNetworkRequest(null,
req: (user) => postWithCreadentials(
path: 'listPublicRooms', path: 'listPublicRooms',
credentials: user, credentials: user!,
target: user.server, target: user.server,
body: {}); body: {}),
if (resp.res == Result.ok) { onOK: (body) async {
// parse rooms // parse rooms
final list = resp.body['data']; final list = body['data'];
// try to fetch a list of rooms the user is a member of // try to fetch a list of rooms the user is a member of
// use an empty blacklist when request is not successful // use an empty blacklist when request is not successful
final blacklist = []; final List<Room> blacklist = [];
try { doNetworkRequest(sm,
final resp = await postWithCreadentials( req: (user) => postWithCreadentials(
path: 'listRooms', path: 'listRooms',
credentials: user, credentials: user!,
target: user.server, target: user.server,
body: {}); body: {}),
if (resp.res == Result.ok) { onOK: (body) {
final List<Room> list = resp.body['data'].map<Room>((json) { final List<Room> list = body['data'].map<Room>((json) {
return Room.fromJSON(json); return Room.fromJSON(json);
}).toList(); }).toList();
for (Room r in list) { for (Room r in list) {
blacklist.add(r); blacklist.add(r);
} }
} });
} catch (_) {}
// process the list of public rooms // process the list of public rooms
List<Room> builder = []; final List<Room> builder = [];
processor: processor:
for (dynamic raw in list) { for (dynamic raw in list) {
try { try {
@ -65,7 +63,7 @@ class _JoinRoomPageState extends State {
// only add room to list, // only add room to list,
// if not on blacklist // if not on blacklist
for (Room r in blacklist) { for (Room r in blacklist) {
if (room.serverTag == r.serverTag && room.id == r.id) { if (r.compareTo(room) == 0) {
// server on white list // server on white list
// move to next iteration on outer for loop // move to next iteration on outer for loop
continue processor; continue processor;
@ -77,25 +75,15 @@ class _JoinRoomPageState extends State {
// ignore room // ignore room
} }
} }
builder.sort();
setState(() { setState(() {
rooms = builder; rooms = builder;
}); });
} else { });
throw Error();
}
} catch (_) {
// network error
// unable to load room list
// NOTE: might want to show snackbar
// with warning
}
} }
@override @override
void initState() { void initState() {
super.initState(); super.initState();
fetchData();
} }
@override @override
@ -133,7 +121,7 @@ class _JoinRoomPageState extends State {
tooltip: "Refresh", tooltip: "Refresh",
onPressed: () { onPressed: () {
// fetch public rooms again // fetch public rooms again
fetchData(); didChangeDependencies();
}, },
), ),
MenuAnchor( MenuAnchor(
@ -261,24 +249,13 @@ class _JoinRoomPageState extends State {
final nav = final nav =
Navigator.of(context); Navigator.of(context);
// join room & close screen doNetworkRequest(scaffMgr,
User user; req: (user) =>
try { postWithCreadentials(
user = await User credentials:
.fromDisk(); user!,
} catch (_) { target: user
// user data invalid .server,
// NOTE: shouldn't happen
// because the main.dart watches the auth meta data
// and auto logs-out the user
return;
}
try {
final resp =
await postWithCreadentials(
target:
user.server,
path: path:
'joinPublicRoom', 'joinPublicRoom',
body: { body: {
@ -286,65 +263,13 @@ class _JoinRoomPageState extends State {
room.id, room.id,
'server': room 'server': room
.serverTag .serverTag
}, }),
credentials: onOK: (body) async {
user);
if (resp.res ==
Result.ok) {
// successfully joined room
await room.toDisk(); await room.toDisk();
nav.pop(); nav.pop();
rmaster.replace( rmaster.replace(
'/r/${room.serverTag}/${room.id}'); '/r/${room.serverTag}/${room.id}');
} else { });
// server error
final snackBar =
SnackBar(
behavior:
SnackBarBehavior
.floating,
content: Text(
errorAsString(
resp.body)),
action:
SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr
.hideCurrentSnackBar();
},
),
);
scaffMgr
.hideCurrentSnackBar();
scaffMgr.showSnackBar(
snackBar);
}
} catch (_) {
// network error
final snackBar =
SnackBar(
behavior:
SnackBarBehavior
.floating,
content: const Text(
'Network error'),
action:
SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr
.hideCurrentSnackBar();
},
),
);
scaffMgr
.hideCurrentSnackBar();
scaffMgr.showSnackBar(
snackBar);
}
}, },
)) ))
]) ])

61
lib/screens/room/main.dart
View file

@ -6,6 +6,7 @@ import 'package:outbag_app/screens/room/pages/about.dart';
import 'package:outbag_app/screens/room/pages/categories.dart'; import 'package:outbag_app/screens/room/pages/categories.dart';
import 'package:outbag_app/screens/room/pages/products.dart'; import 'package:outbag_app/screens/room/pages/products.dart';
import 'package:outbag_app/screens/room/pages/list.dart'; import 'package:outbag_app/screens/room/pages/list.dart';
import 'package:outbag_app/tools/fetch_wrapper.dart';
import 'package:routemaster/routemaster.dart'; import 'package:routemaster/routemaster.dart';
class RoomPage extends StatefulWidget { class RoomPage extends StatefulWidget {
@ -27,61 +28,52 @@ class _RoomPageState extends State<RoomPage> {
// fetch room information // fetch room information
void fetchInfo() async { void fetchInfo() async {
bool foundData = false; final sm = ScaffoldMessenger.of(context);
try { try {
final diskRoom = final diskRoom =
await Room.fromDisk(serverTag: widget.server, id: widget.tag); await Room.fromDisk(serverTag: widget.server, id: widget.tag);
foundData = true;
setState(() { setState(() {
room = diskRoom; room = diskRoom;
}); });
} catch (_) {} } catch (_) {}
// fetch additional data from web doNetworkRequest(sm,
User user; req: (user) => postWithCreadentials(
try {
user = await User.fromDisk();
} catch (_) {
// probably not logged in
return;
}
try {
final resp = await postWithCreadentials(
path: 'getRoomInfo', path: 'getRoomInfo',
credentials: user, credentials: user!,
target: user.server, target: (user.server),
body: {'room': widget.tag, 'server': widget.server}); body: {'room': widget.tag, 'server': widget.server}),
if (resp.res == Result.ok) { onOK: (body) async {
final info = RoomInfo.fromJSON(resp.body['data']); final info = RoomInfo.fromJSON(body['data']);
final room = Room.fromJSON(resp.body['data']); final room = Room.fromJSON(body['data']);
room.toDisk(); room.toDisk();
foundData = true;
setState(() { setState(() {
this.info = info; this.info = info;
}); });
} return true;
} catch (_) {} },
onNetworkErr: () {
if (!foundData) { // user offline
if (room == null) {
// no room data available // no room data available
// TODO: close room // NOTE: close room?
// or show snackbar
// BUG: there is currently no way of implementing this,
// because there is no context available here
} }
return true;
},
onServerErr: (json) {
// user no longer in room
// TODO: close room
return true;
});
} }
@override @override
void initState() { void initState() {
super.initState(); super.initState();
// schedule info-get
fetchInfo();
_ctr.addListener(() { _ctr.addListener(() {
setState(() { setState(() {
page = _ctr.page?.toInt() ?? _ctr.initialPage; page = _ctr.page?.toInt() ?? _ctr.initialPage;
@ -104,6 +96,13 @@ class _RoomPageState extends State<RoomPage> {
}); });
} }
@override
void didChangeDependencies() {
super.didChangeDependencies();
// schedule info-get
fetchInfo();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(

79
lib/screens/room/new.dart
View file

@ -4,6 +4,8 @@ import 'package:outbag_app/backend/errors.dart';
import 'package:outbag_app/backend/request.dart'; import 'package:outbag_app/backend/request.dart';
import 'package:outbag_app/backend/room.dart'; import 'package:outbag_app/backend/room.dart';
import 'package:outbag_app/backend/user.dart'; import 'package:outbag_app/backend/user.dart';
import 'package:outbag_app/tools/fetch_wrapper.dart';
import 'package:outbag_app/tools/snackbar.dart';
import 'package:routemaster/routemaster.dart'; import 'package:routemaster/routemaster.dart';
import 'dart:math'; import 'dart:math';
@ -182,41 +184,23 @@ class _NewRoomPageState extends State {
// ID should be at least three characters long // ID should be at least three characters long
if (_ctrID.text.length < 3) { if (_ctrID.text.length < 3) {
final snackBar = SnackBar( showSimpleSnackbar(scaffMgr,
behavior: SnackBarBehavior.floating, text: _ctrID.text.isEmpty
content: Text(_ctrID.text.isEmpty
? 'Please specify a Room ID' ? 'Please specify a Room ID'
: 'Room ID has to be at least three characters long'), : 'Room ID has to be at least three characters long',
action: SnackBarAction( action: 'OK');
label: 'Ok',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
},
),
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
return; return;
} }
// name may not be empty // name may not be empty
if (_ctrName.text.isEmpty) { if (_ctrName.text.isEmpty) {
final snackBar = SnackBar( showSimpleSnackbar(
behavior: SnackBarBehavior.floating, scaffMgr,
content: const Text('Please specify a room name'), text: 'Please specify a room name',
action: SnackBarAction( action: 'OK'
label: 'Ok',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
},
),
); );
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
return; return;
} }
@ -236,8 +220,9 @@ class _NewRoomPageState extends State {
description: _ctrDescription.text, description: _ctrDescription.text,
icon: _ctrIcon, icon: _ctrIcon,
visibility: _ctrVis); visibility: _ctrVis);
try {
final resp = await postWithCreadentials( doNetworkRequest(scaffMgr,
req: (_) => postWithCreadentials(
target: user.server, target: user.server,
credentials: user, credentials: user,
path: 'createRoom', path: 'createRoom',
@ -247,45 +232,17 @@ class _NewRoomPageState extends State {
'description': room.description, 'description': room.description,
'icon': room.icon?.type, 'icon': room.icon?.type,
'visibility': room.visibility?.type 'visibility': room.visibility?.type
} }),
); onOK: (_) async {
if (resp.res == Result.ok) {
// room was created // room was created
// save room // save room
await room.toDisk(); await room.toDisk();
// move to home page // move to home page
rmaster.replace('/'); rmaster.replace('/');
} else {
// error
final snackBar = SnackBar(
behavior: SnackBarBehavior.floating,
content: Text(errorAsString(resp.body)),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
}, },
), // we manually fetch the user data above
); // because we need the serverTag
needUser: false);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}
} catch (_) {
final snackBar = SnackBar(
behavior: SnackBarBehavior.floating,
content: const Text('Network error'),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
},
),
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}
}, },
label: const Text('Create'), label: const Text('Create'),
icon: const Icon(Icons.add)), icon: const Icon(Icons.add)),

133
lib/screens/room/pages/about.dart
View file

@ -8,6 +8,7 @@ import 'dart:math';
import 'package:outbag_app/backend/user.dart'; import 'package:outbag_app/backend/user.dart';
import 'package:outbag_app/screens/room/edit.dart'; import 'package:outbag_app/screens/room/edit.dart';
import 'package:outbag_app/tools/fetch_wrapper.dart';
import 'package:routemaster/routemaster.dart'; import 'package:routemaster/routemaster.dart';
class AboutRoomPage extends StatefulWidget { class AboutRoomPage extends StatefulWidget {
@ -109,71 +110,28 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
ScaffoldMessenger.of(context); ScaffoldMessenger.of(context);
final nav = Navigator.of(context); final nav = Navigator.of(context);
User user; doNetworkRequest(scaffMgr,
try { req: (user) =>
user = await User.fromDisk(); postWithCreadentials(
} catch (_) {
// probably not logged in
nav.pop();
return;
}
try {
final resp =
await postWithCreadentials(
path: 'setVisibility', path: 'setVisibility',
target: user.server, target: (user?.server)!,
body: { body: {
'room': widget.room?.id, 'room':
'server': (widget widget.room?.id,
.room?.serverTag)!, 'server': (widget.room
'visibility': vset.first ?.serverTag)!,
'visibility':
vset.first
}, },
credentials: user); credentials: user!),
if (resp.res == Result.ok) { onOK: (_) {
Room r = widget.room!; Room r = widget.room!;
r.visibility = vis; r.visibility = vis;
r.toDisk(); r.toDisk();
} else {
// server error
final snackBar = SnackBar(
behavior:
SnackBarBehavior.floating,
content: Text(
errorAsString(resp.body)),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr
.hideCurrentSnackBar();
}, },
), after: () {
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}
} catch (_) {
// network error
final snackBar = SnackBar(
behavior:
SnackBarBehavior.floating,
content:
const Text('Network error'),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr
.hideCurrentSnackBar();
},
),
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}
nav.pop(); nav.pop();
});
}, },
child: const Text('Ok'), child: const Text('Ok'),
) )
@ -210,10 +168,9 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
// show edit room screen // show edit room screen
showDialog( showDialog(
context: context, context: context,
builder: (context)=>Dialog.fullscreen( builder: (context) => Dialog.fullscreen(
child: EditRoomPage(widget.room!), child: EditRoomPage(widget.room!),
) ));
);
}, },
), ),
] ]
@ -284,28 +241,20 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
final nav = Navigator.of(ctx); final nav = Navigator.of(ctx);
final rmaster = Routemaster.of(ctx); final rmaster = Routemaster.of(ctx);
User user; doNetworkRequest(
try { scaffMgr,
user = await User.fromDisk(); req: (user)=>postWithCreadentials(
} catch (_) {
// probably not logged in
nav.pop();
return;
}
try {
final resp = await postWithCreadentials(
path: ((widget.info?.isOwner)!) path: ((widget.info?.isOwner)!)
? 'deleteRoom' ? 'deleteRoom'
: 'leaveRoom', : 'leaveRoom',
target: user.server, target: (user?.server)!,
body: { body: {
'room': widget.room?.id, 'room': widget.room?.id,
'server': 'server':
(widget.room?.serverTag)!, (widget.room?.serverTag)!,
}, },
credentials: user); credentials: user!),
if (resp.res == Result.ok) { onOK: (_) async {
// try delete room from disk // try delete room from disk
try { try {
await widget.room?.removeDisk(); await widget.room?.removeDisk();
@ -313,42 +262,12 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
// go back home // go back home
rmaster.replace('/'); rmaster.replace('/');
} else {
// server error
final snackBar = SnackBar(
behavior: SnackBarBehavior.floating,
content:
Text(errorAsString(resp.body)),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
}, },
), after: () {
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}
} catch (_) {
// network error
final snackBar = SnackBar(
behavior: SnackBarBehavior.floating,
content: const Text('Network error'),
action: SnackBarAction(
label: 'Dismiss',
onPressed: () {
scaffMgr.hideCurrentSnackBar();
},
),
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}
// close popup // close popup
nav.pop(); nav.pop();
}
);
}, },
child: Text(((widget.info?.isOwner)!) child: Text(((widget.info?.isOwner)!)
? 'Delete' ? 'Delete'

100
lib/tools/fetch_wrapper.dart Normal file
View file

@ -0,0 +1,100 @@
import 'package:flutter/material.dart';
import 'package:outbag_app/backend/errors.dart';
import 'package:outbag_app/backend/request.dart';
import 'package:outbag_app/backend/user.dart';
import 'package:outbag_app/tools/snackbar.dart';
void doNetworkRequest(ScaffoldMessengerState? sm,
{required Future<Response> Function(User?) req,
Function(Map<String, dynamic>)? onOK,
bool Function()? onNetworkErr,
bool Function()? onUnknownErr,
bool Function()? onUserErr,
Function()? after,
bool Function(Map<String, dynamic>)? onServerErr,
bool needUser = true}) async {
User? user;
try {
user = await User.fromDisk();
} catch (_) {
// no user data available
if (needUser) {
// show error & quit
bool showBar = true;
if (onUserErr != null) {
showBar = onUserErr();
}
if (showBar && sm != null) {
showSimpleSnackbar(sm, text: 'No user found', action: 'Authorize',
onTap: () {
try {
// try to remove broken user
User.removeDisk();
} catch (_) {}
});
}
if (after != null) {
after();
}
return;
}
}
Response res;
try {
res = await req(user);
} catch (_) {
// network error
bool showBar = true;
if (onNetworkErr != null) {
showBar = onNetworkErr();
}
if (showBar && sm != null) {
showSimpleSnackbar(sm, text: 'Network Error', action: 'Dismiss');
}
if (after != null) {
after();
}
return;
}
try {
if (res.res == Result.ok) {
if (onOK != null) {
await onOK(res.body);
}
} else {
// server error
bool showBar = true;
if (onServerErr != null) {
showBar = onServerErr(res.body);
}
if (showBar && sm != null) {
showSimpleSnackbar(sm, text: errorAsString(res.body), action: 'OK');
}
}
} catch (e) {
bool showBar = true;
print(e);
if (onUnknownErr != null) {
showBar = onUnknownErr();
}
if (showBar && sm != null) {
showSimpleSnackbar(sm, text: 'Unknown Error', action: 'OK');
}
}
if (after != null) {
after();
}
}

21
lib/tools/snackbar.dart Normal file
View file

@ -0,0 +1,21 @@
import 'package:flutter/material.dart';
void showSimpleSnackbar(ScaffoldMessengerState scaffMgr,
{required String text, required String action, Function? onTap}) {
final snackBar = SnackBar(
behavior: SnackBarBehavior.floating,
content: Text(text),
action: SnackBarAction(
label: action,
onPressed: () {
scaffMgr.hideCurrentSnackBar();
if (onTap != null) {
onTap();
}
},
),
);
scaffMgr.hideCurrentSnackBar();
scaffMgr.showSnackBar(snackBar);
}