Skip to content

Commit

Permalink
Format all files
Browse files Browse the repository at this point in the history
  • Loading branch information
brokoli18 committed Feb 16, 2025
1 parent 18e3a8b commit a9844a2
Show file tree
Hide file tree
Showing 58 changed files with 3,283 additions and 2,712 deletions.
55 changes: 35 additions & 20 deletions lib/api/bucket_implementation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@ class BucketAPIService extends APIService implements BucketService {
@override
Future<Bucket?> add(int projectId, int viewId, Bucket bucket) {
return client
.put('/projects/$projectId/views/$viewId/buckets',
body: bucket.toJSON())
.put(
'/projects/$projectId/views/$viewId/buckets',
body: bucket.toJSON(),
)
.then((response) {
if (response == null) return null;
return Bucket.fromJSON(response.body);
});
if (response == null) return null;
return Bucket.fromJSON(response.body);
});
}

@override
Future delete(int projectId, int viewId, int bucketId) {
return client
.delete('/projects/$projectId/views/$viewId/buckets/$bucketId');
return client.delete(
'/projects/$projectId/views/$viewId/buckets/$bucketId',
);
}

/* Not implemented in the Vikunja API
Expand All @@ -34,16 +37,26 @@ class BucketAPIService extends APIService implements BucketService {
*/

@override
Future<Response?> getAllByList(int projectId, int viewId,
[Map<String, List<String>>? queryParameters]) {
Future<Response?> getAllByList(
int projectId,
int viewId, [
Map<String, List<String>>? queryParameters,
]) {
return client
.get('/projects/$projectId/views/$viewId/tasks', queryParameters)
.then((response) => response != null
? new Response(
convertList(response.body, (result) => Bucket.fromJSON(result)),
response.statusCode,
response.headers)
: null);
.then(
(response) =>
response != null
? new Response(
convertList(
response.body,
(result) => Bucket.fromJSON(result),
),
response.statusCode,
response.headers,
)
: null,
);
}

@override
Expand All @@ -53,11 +66,13 @@ class BucketAPIService extends APIService implements BucketService {
@override
Future<Bucket?> update(Bucket bucket, int projectId, int viewId) {
return client
.post('/projects/$projectId/views/$viewId/buckets/${bucket.id}',
body: bucket.toJSON())
.post(
'/projects/$projectId/views/$viewId/buckets/${bucket.id}',
body: bucket.toJSON(),
)
.then((response) {
if (response == null) return null;
return Bucket.fromJSON(response.body);
});
if (response == null) return null;
return Bucket.fromJSON(response.body);
});
}
}
143 changes: 76 additions & 67 deletions lib/api/client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,25 @@ class Client {
String? base,
bool authenticated = false,
}) {
configure(
token: token,
base: base,
authenticated: authenticated,
);
configure(token: token, base: base, authenticated: authenticated);
}

http.Client get httpClient {
try {
if (Platform.isAndroid) {
final engine = cronet_http.CronetEngine.build(
cacheMode: cronet_http.CacheMode.memory, cacheMaxSize: 1000000);
cacheMode: cronet_http.CacheMode.memory,
cacheMaxSize: 1000000,
);
return cronet_http.CronetClient.fromCronetEngine(engine);
}
if (Platform.isIOS || Platform.isMacOS) {
final config = cupertino_http.URLSessionConfiguration
.ephemeralSessionConfiguration()
..cache =
cupertino_http.URLCache.withCapacity(memoryCapacity: 1000000);
final config =
cupertino_http
.URLSessionConfiguration.ephemeralSessionConfiguration()
..cache = cupertino_http.URLCache.withCapacity(
memoryCapacity: 1000000,
);
return cupertino_http.CupertinoClient.fromSessionConfiguration(config);
}
} catch (e) {
Expand All @@ -70,28 +70,25 @@ class Client {
ignoreCertificates = val ?? false;
HttpOverrides.global = new IgnoreCertHttpOverrides(ignoreCertificates);
if (global_scaffold_key == null ||
global_scaffold_key!.currentContext == null) return;
VikunjaGlobal.of(global_scaffold_key!.currentContext!)
.settingsManager
.setIgnoreCertificates(ignoreCertificates);
global_scaffold_key!.currentContext == null)
return;
VikunjaGlobal.of(
global_scaffold_key!.currentContext!,
).settingsManager.setIgnoreCertificates(ignoreCertificates);
}

get _headers => {
'Authorization': _token != '' ? 'Bearer $_token' : '',
'Content-Type': 'application/json',
'User-Agent': 'Vikunja Mobile App',
};
'Authorization': _token != '' ? 'Bearer $_token' : '',
'Content-Type': 'application/json',
'User-Agent': 'Vikunja Mobile App',
};

get headers => _headers;

@override
int get hashCode => _token.hashCode;

void configure({
String? token,
String? base,
bool? authenticated,
}) {
void configure({String? token, String? base, bool? authenticated}) {
if (token != null) _token = token;
if (base != null) {
base = base.replaceAll(" ", "");
Expand All @@ -105,20 +102,23 @@ class Client {
authenticated = false;
}

Future<Response?> get(String url,
[Map<String, List<String>>? queryParameters]) {
Future<Response?> get(
String url, [
Map<String, List<String>>? queryParameters,
]) {
Uri uri = Uri.tryParse('${this.base}$url')!;
// why are we doing it like this? because Uri doesnt have setters. wtf.

uri = Uri(
scheme: uri.scheme,
userInfo: uri.userInfo,
host: uri.host,
port: uri.port,
path: uri.path,
//queryParameters: {...uri.queryParameters, ...?queryParameters},
queryParameters: queryParameters,
fragment: uri.fragment);
scheme: uri.scheme,
userInfo: uri.userInfo,
host: uri.host,
port: uri.port,
path: uri.path,
//queryParameters: {...uri.queryParameters, ...?queryParameters},
queryParameters: queryParameters,
fragment: uri.fragment,
);

return httpClient
.get(uri, headers: _headers)
Expand All @@ -128,10 +128,7 @@ class Client {

Future<Response?> delete(String url) {
return httpClient
.delete(
'${this.base}$url'.toUri()!,
headers: _headers,
)
.delete('${this.base}$url'.toUri()!, headers: _headers)
.then(_handleResponse)
.onError((error, stackTrace) => _handleError(error, stackTrace));
}
Expand Down Expand Up @@ -163,8 +160,9 @@ class Client {
SnackBar snackBar = SnackBar(
content: Text("Error on request: " + e.toString()),
action: SnackBarAction(
label: "Clear",
onPressed: () => global_scaffold_key!.currentState?.clearSnackBars()),
label: "Clear",
onPressed: () => global_scaffold_key!.currentState?.clearSnackBars(),
),
);
global_scaffold_key!.currentState?.showSnackBar(snackBar);
return null;
Expand All @@ -185,35 +183,43 @@ class Client {

if (response.statusCode == 401 &&
globalNavigatorKey.currentContext != null) {
VikunjaGlobal.of(globalNavigatorKey.currentContext!)
.logoutUser(globalNavigatorKey.currentContext!);
VikunjaGlobal.of(
globalNavigatorKey.currentContext!,
).logoutUser(globalNavigatorKey.currentContext!);
}

final SnackBar snackBar = SnackBar(
content:
Text("Error code " + response.statusCode.toString() + " received."),
action: globalNavigatorKey.currentContext == null
? null
: SnackBarAction(
label: ("Details"),
onPressed: () {
showDialog(
content: Text(
"Error code " + response.statusCode.toString() + " received.",
),
action:
globalNavigatorKey.currentContext == null
? null
: SnackBarAction(
label: ("Details"),
onPressed: () {
showDialog(
context: globalNavigatorKey.currentContext!,
builder: (BuildContext context) => AlertDialog(
title: Text("Error ${response.statusCode}"),
content: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
"Message: ${error["message"]}",
textAlign: TextAlign.start,
),
Text("Url: ${response.request!.url.toString()}"),
],
)));
},
),
builder:
(BuildContext context) => AlertDialog(
title: Text("Error ${response.statusCode}"),
content: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
"Message: ${error["message"]}",
textAlign: TextAlign.start,
),
Text(
"Url: ${response.request!.url.toString()}",
),
],
),
),
);
},
),
);
if (global_scaffold_key != null && showSnackBar)
global_scaffold_key!.currentState?.showSnackBar(snackBar);
Expand All @@ -225,16 +231,19 @@ class Client {

Response? _handleResponse(http.Response response) {
_handleResponseErrors(response);
return Response(_decoder.convert(utf8.decode(response.bodyBytes)),
response.statusCode, response.headers);
return Response(
_decoder.convert(utf8.decode(response.bodyBytes)),
response.statusCode,
response.headers,
);
}
}

class InvalidRequestApiException extends ApiException {
final String message;

InvalidRequestApiException(int errorCode, String path, this.message)
: super(errorCode, path);
: super(errorCode, path);

@override
String toString() {
Expand Down
12 changes: 6 additions & 6 deletions lib/api/label_task.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ class LabelTaskAPIService extends APIService implements LabelTaskService {

@override
Future<Label?> create(LabelTask lt) async {
return client
.put('/tasks/${lt.task!.id}/labels', body: lt.toJSON())
.then((response) {
return client.put('/tasks/${lt.task!.id}/labels', body: lt.toJSON()).then((
response,
) {
if (response == null) return null;
return Label.fromJson(response.body);
});
}

@override
Future<Label?> delete(LabelTask lt) async {
return client
.delete('/tasks/${lt.task!.id}/labels/${lt.label.id}')
.then((response) {
return client.delete('/tasks/${lt.task!.id}/labels/${lt.label.id}').then((
response,
) {
if (response == null) return null;
return Label.fromJson(response.body);
});
Expand Down
16 changes: 10 additions & 6 deletions lib/api/label_task_bulk.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ class LabelTaskBulkAPIService extends APIService
Future<List<Label>?> update(Task task, List<Label>? labels) {
if (labels == null) labels = [];
return client
.post('/tasks/${task.id}/labels/bulk',
body: LabelTaskBulk(labels: labels).toJSON())
.post(
'/tasks/${task.id}/labels/bulk',
body: LabelTaskBulk(labels: labels).toJSON(),
)
.then((response) {
if (response == null) return null;
return convertList(
response.body['labels'], (result) => Label.fromJson(result));
});
if (response == null) return null;
return convertList(
response.body['labels'],
(result) => Label.fromJson(result),
);
});
}
}
4 changes: 1 addition & 3 deletions lib/api/project.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import 'package:vikunja_app/service/services.dart';
class ProjectAPIService extends APIService implements ProjectService {
FlutterSecureStorage _storage;

ProjectAPIService(client, storage)
: _storage = storage,
super(client);
ProjectAPIService(client, storage) : _storage = storage, super(client);

@override
Future<Project?> create(Project p) {
Expand Down
Loading

0 comments on commit a9844a2

Please sign in to comment.