Skip to content

Commit 056b2d7

Browse files
denysvitalidenysvitali
authored
chore: format code with dart format (#71)
This PR formats all code with dart format and adds a step to the CI so that it will be checked on every push and PR.
1 parent 43b9fe6 commit 056b2d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1563
-1349
lines changed

‎.github/workflows/flutter-format.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Flutter Check Format
2+
3+
on:
4+
pull_request: {}
5+
push: {}
6+
7+
jobs:
8+
release:
9+
name: Build
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v1
14+
15+
- name: Setup Flutter
16+
uses: subosito/flutter-action@v1
17+
with:
18+
channel: stable
19+
- name: Check Dart Format
20+
run: dart format --set-exit-if-changed .

‎lib/api/bucket_implementation.dart

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ class BucketAPIService extends APIService implements BucketService {
1212
return client
1313
.put('/projects/$projectId/buckets', body: bucket.toJSON())
1414
.then((response) {
15-
if (response == null) return null;
16-
return Bucket.fromJSON(response.body);
17-
});
15+
if (response == null) return null;
16+
return Bucket.fromJSON(response.body);
17+
});
1818
}
1919

2020
@override
2121
Future delete(int projectId, int bucketId) {
22-
return client
23-
.delete('/projects/$projectId/buckets/$bucketId');
22+
return client.delete('/projects/$projectId/buckets/$bucketId');
2423
}
2524

2625
/* Not implemented in the Vikunja API
@@ -35,13 +34,13 @@ class BucketAPIService extends APIService implements BucketService {
3534
@override
3635
Future<Response?> getAllByList(int projectId,
3736
[Map<String, List<String>>? queryParameters]) {
38-
return client
39-
.get('/projects/$projectId/buckets', queryParameters)
40-
.then((response) => response != null ? new Response(
41-
convertList(response.body, (result) => Bucket.fromJSON(result)),
42-
response.statusCode,
43-
response.headers
44-
) : null);
37+
return client.get('/projects/$projectId/buckets', queryParameters).then(
38+
(response) => response != null
39+
? new Response(
40+
convertList(response.body, (result) => Bucket.fromJSON(result)),
41+
response.statusCode,
42+
response.headers)
43+
: null);
4544
}
4645

4746
@override
@@ -51,10 +50,11 @@ class BucketAPIService extends APIService implements BucketService {
5150
@override
5251
Future<Bucket?> update(Bucket bucket) {
5352
return client
54-
.post('/projects/${bucket.projectId}/buckets/${bucket.id}', body: bucket.toJSON())
53+
.post('/projects/${bucket.projectId}/buckets/${bucket.id}',
54+
body: bucket.toJSON())
5555
.then((response) {
56-
if (response == null) return null;
57-
return Bucket.fromJSON(response.body);
58-
});
56+
if (response == null) return null;
57+
return Bucket.fromJSON(response.body);
58+
});
5959
}
60-
}
60+
}

‎lib/api/client.dart

Lines changed: 67 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:vikunja_app/global.dart';
1010

1111
import '../main.dart';
1212

13-
1413
class Client {
1514
GlobalKey<ScaffoldMessengerState>? global_scaffold_key;
1615
final JsonDecoder _decoder = new JsonDecoder();
@@ -26,8 +25,6 @@ class Client {
2625

2726
String? post_body;
2827

29-
30-
3128
bool operator ==(dynamic otherClient) {
3229
return otherClient._token == _token;
3330
}
@@ -40,15 +37,14 @@ class Client {
4037
void reload_ignore_certs(bool? val) {
4138
ignoreCertificates = val ?? false;
4239
HttpOverrides.global = new IgnoreCertHttpOverrides(ignoreCertificates);
43-
if(global_scaffold_key == null || global_scaffold_key!.currentContext == null) return;
44-
VikunjaGlobal
45-
.of(global_scaffold_key!.currentContext!)
40+
if (global_scaffold_key == null ||
41+
global_scaffold_key!.currentContext == null) return;
42+
VikunjaGlobal.of(global_scaffold_key!.currentContext!)
4643
.settingsManager
4744
.setIgnoreCertificates(ignoreCertificates);
4845
}
4946

50-
get _headers =>
51-
{
47+
get _headers => {
5248
'Authorization': _token != '' ? 'Bearer $_token' : '',
5349
'Content-Type': 'application/json',
5450
'User-Agent': 'Vikunja Mobile App'
@@ -60,20 +56,15 @@ class Client {
6056
int get hashCode => _token.hashCode;
6157

6258
void configure({String? token, String? base, bool? authenticated}) {
63-
if (token != null)
64-
_token = token;
59+
if (token != null) _token = token;
6560
if (base != null) {
6661
base = base.replaceAll(" ", "");
67-
if(base.endsWith("/"))
68-
base = base.substring(0,base.length-1);
62+
if (base.endsWith("/")) base = base.substring(0, base.length - 1);
6963
_base = base.endsWith('/api/v1') ? base : '$base/api/v1';
7064
}
71-
if (authenticated != null)
72-
this.authenticated = authenticated;
73-
65+
if (authenticated != null) this.authenticated = authenticated;
7466
}
7567

76-
7768
void reset() {
7869
_token = _base = '';
7970
authenticated = false;
@@ -85,54 +76,61 @@ class Client {
8576
// why are we doing it like this? because Uri doesnt have setters. wtf.
8677

8778
uri = Uri(
88-
scheme: uri.scheme,
79+
scheme: uri.scheme,
8980
userInfo: uri.userInfo,
9081
host: uri.host,
9182
port: uri.port,
9283
path: uri.path,
9384
//queryParameters: {...uri.queryParameters, ...?queryParameters},
9485
queryParameters: queryParameters,
95-
fragment: uri.fragment
96-
);
86+
fragment: uri.fragment);
9787

98-
return http.get(uri, headers: _headers)
99-
.then(_handleResponse).onError((error, stackTrace) =>
100-
_handleError(error, stackTrace));
88+
return http
89+
.get(uri, headers: _headers)
90+
.then(_handleResponse)
91+
.onError((error, stackTrace) => _handleError(error, stackTrace));
10192
}
10293

10394
Future<Response?> delete(String url) {
104-
return http.delete(
105-
'${this.base}$url'.toUri()!,
106-
headers: _headers,
107-
).then(_handleResponse).onError((error, stackTrace) =>
108-
_handleError(error, stackTrace));
95+
return http
96+
.delete(
97+
'${this.base}$url'.toUri()!,
98+
headers: _headers,
99+
)
100+
.then(_handleResponse)
101+
.onError((error, stackTrace) => _handleError(error, stackTrace));
109102
}
110103

111104
Future<Response?> post(String url, {dynamic body}) {
112-
return http.post(
113-
'${this.base}$url'.toUri()!,
114-
headers: _headers,
115-
body: _encoder.convert(body),
116-
)
117-
.then(_handleResponse).onError((error, stackTrace) =>
118-
_handleError(error, stackTrace));
105+
return http
106+
.post(
107+
'${this.base}$url'.toUri()!,
108+
headers: _headers,
109+
body: _encoder.convert(body),
110+
)
111+
.then(_handleResponse)
112+
.onError((error, stackTrace) => _handleError(error, stackTrace));
119113
}
120114

121115
Future<Response?> put(String url, {dynamic body}) {
122-
return http.put(
123-
'${this.base}$url'.toUri()!,
124-
headers: _headers,
125-
body: _encoder.convert(body),
126-
)
127-
.then(_handleResponse).onError((error, stackTrace) =>
128-
_handleError(error, stackTrace));
116+
return http
117+
.put(
118+
'${this.base}$url'.toUri()!,
119+
headers: _headers,
120+
body: _encoder.convert(body),
121+
)
122+
.then(_handleResponse)
123+
.onError((error, stackTrace) => _handleError(error, stackTrace));
129124
}
130125

131126
Response? _handleError(Object? e, StackTrace? st) {
132-
if(global_scaffold_key == null) return null;
127+
if (global_scaffold_key == null) return null;
133128
SnackBar snackBar = SnackBar(
134129
content: Text("Error on request: " + e.toString()),
135-
action: SnackBarAction(label: "Clear", onPressed: () => global_scaffold_key!.currentState?.clearSnackBars()),);
130+
action: SnackBarAction(
131+
label: "Clear",
132+
onPressed: () => global_scaffold_key!.currentState?.clearSnackBars()),
133+
);
136134
global_scaffold_key!.currentState?.showSnackBar(snackBar);
137135
return null;
138136
}
@@ -145,39 +143,38 @@ class Client {
145143
return map;
146144
}
147145

148-
149146
Error? _handleResponseErrors(http.Response response) {
150-
if (response.statusCode < 200 ||
151-
response.statusCode >= 400) {
147+
if (response.statusCode < 200 || response.statusCode >= 400) {
152148
Map<String, dynamic> error;
153149
error = _decoder.convert(response.body);
154150

155-
156151
final SnackBar snackBar = SnackBar(
157-
content: Text(
158-
"Error code " + response.statusCode.toString() + " received."),
159-
action: globalNavigatorKey.currentContext == null ? null : SnackBarAction(
160-
label: ("Details"),
161-
onPressed: () {
162-
showDialog(
163-
context: globalNavigatorKey.currentContext!,
164-
builder: (BuildContext context) =>
165-
AlertDialog(
166-
title: Text("Error ${response.statusCode}"),
167-
content: Column(
168-
crossAxisAlignment: CrossAxisAlignment.start,
169-
mainAxisSize: MainAxisSize.min,
170-
children: [
171-
Text("Message: ${error["message"]}", textAlign: TextAlign.start,),
172-
Text("Url: ${response.request!.url.toString()}"),
173-
],
174-
)
175-
)
176-
);
177-
},
178-
),
152+
content:
153+
Text("Error code " + response.statusCode.toString() + " received."),
154+
action: globalNavigatorKey.currentContext == null
155+
? null
156+
: SnackBarAction(
157+
label: ("Details"),
158+
onPressed: () {
159+
showDialog(
160+
context: globalNavigatorKey.currentContext!,
161+
builder: (BuildContext context) => AlertDialog(
162+
title: Text("Error ${response.statusCode}"),
163+
content: Column(
164+
crossAxisAlignment: CrossAxisAlignment.start,
165+
mainAxisSize: MainAxisSize.min,
166+
children: [
167+
Text(
168+
"Message: ${error["message"]}",
169+
textAlign: TextAlign.start,
170+
),
171+
Text("Url: ${response.request!.url.toString()}"),
172+
],
173+
)));
174+
},
175+
),
179176
);
180-
if(global_scaffold_key != null && showSnackBar)
177+
if (global_scaffold_key != null && showSnackBar)
181178
global_scaffold_key!.currentState?.showSnackBar(snackBar);
182179
else
183180
print("error on request: ${error["message"]}");

‎lib/api/label_task.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,27 @@ class LabelTaskAPIService extends APIService implements LabelTaskService {
1414
.then((response) {
1515
if (response == null) return null;
1616
return Label.fromJson(response.body);
17-
});
17+
});
1818
}
1919

2020
@override
2121
Future<Label?> delete(LabelTask lt) async {
2222
return client
2323
.delete('/tasks/${lt.task!.id}/labels/${lt.label.id}')
2424
.then((response) {
25-
if (response == null) return null;
26-
return Label.fromJson(response.body);
27-
});
25+
if (response == null) return null;
26+
return Label.fromJson(response.body);
27+
});
2828
}
2929

3030
@override
3131
Future<List<Label>?> getAll(LabelTask lt, {String? query}) async {
3232
String? params =
3333
query == null ? null : '?s=' + Uri.encodeQueryComponent(query);
3434

35-
return client.get('/tasks/${lt.task!.id}/labels$params').then(
36-
(label) {
37-
if (label == null) return null;
38-
return convertList(label, (result) => Label.fromJson(result));
39-
});
35+
return client.get('/tasks/${lt.task!.id}/labels$params').then((label) {
36+
if (label == null) return null;
37+
return convertList(label, (result) => Label.fromJson(result));
38+
});
4039
}
4140
}

‎lib/api/label_task_bulk.dart

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ class LabelTaskBulkAPIService extends APIService
1111

1212
@override
1313
Future<List<Label>?> update(Task task, List<Label>? labels) {
14-
if(labels == null)
15-
labels = [];
14+
if (labels == null) labels = [];
1615
return client
1716
.post('/tasks/${task.id}/labels/bulk',
1817
body: LabelTaskBulk(labels: labels).toJSON())
1918
.then((response) {
20-
if (response == null) return null;
21-
return convertList(
22-
response.body['labels'], (result) => Label.fromJson(result));
23-
});
19+
if (response == null) return null;
20+
return convertList(
21+
response.body['labels'], (result) => Label.fromJson(result));
22+
});
2423
}
2524
}

0 commit comments

Comments
 (0)