Skip to content

Commit 549beff

Browse files
authored
1.0.6 (#20)
1 parent 6289adf commit 549beff

38 files changed

+500
-2486
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,5 @@ key.properties
7979

8080
google-services.json
8181

82-
temp/
82+
# gen_l10n untranslated messages output, see l10n.yaml
83+
untranslated-messages.txt

.vscode/launch.json

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,20 @@
99
"type": "dart",
1010
"request": "launch",
1111
"program": "lib/main.dart",
12-
"args": [
13-
// TODO: remove this when intl_translation supports nnbd https://github.com/dart-lang/intl_translation/issues/134
14-
"--no-sound-null-safety"
15-
],
16-
"codeLens": {
17-
"for": [
18-
"run-file",
19-
"debug-file",
20-
"run-test",
21-
"run-test-file",
22-
"debug-test",
23-
"debug-test-file",
24-
],
25-
// TODO: remove this intl_translation supports nnbd
26-
// See also https://github.com/Dart-Code/Dart-Code/issues/3356
27-
"title": "${debugType} (--no-sound-null-safety)"
28-
}
2912
},
3013
{
3114
"name": "profile",
3215
"type": "dart",
3316
"request": "launch",
3417
"program": "lib/main.dart",
35-
"flutterMode": "profile",
36-
"args": [
37-
"--no-sound-null-safety"
38-
]
18+
"flutterMode": "profile"
3919
},
4020
{
4121
"name": "release",
4222
"type": "dart",
4323
"request": "launch",
4424
"program": "lib/main.dart",
45-
"flutterMode": "release",
46-
"args": [
47-
"--no-sound-null-safety"
48-
]
25+
"flutterMode": "release"
4926
}
5027
]
5128
}

.vscode/settings.json

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
{
2-
"workbench.colorCustomizations": {
3-
"activityBar.activeBackground": "#a280ff",
4-
"activityBar.activeBorder": "#ffd0bf",
5-
"activityBar.background": "#a280ff",
6-
"activityBar.foreground": "#15202b",
7-
"activityBar.inactiveForeground": "#15202b99",
8-
"activityBarBadge.background": "#ffd0bf",
9-
"activityBarBadge.foreground": "#15202b",
10-
"statusBar.background": "#7c4dff",
11-
"statusBar.foreground": "#e7e7e7",
12-
"statusBarItem.hoverBackground": "#a280ff",
13-
"titleBar.activeBackground": "#7c4dff",
14-
"titleBar.activeForeground": "#e7e7e7",
15-
"titleBar.inactiveBackground": "#7c4dff99",
16-
"titleBar.inactiveForeground": "#e7e7e799"
17-
},
18-
"peacock.color": "#7c4dff",
19-
"[dart]": {
20-
"editor.defaultFormatter": "Dart-Code.flutter",
21-
},
1+
{
2+
"workbench.colorCustomizations": {
3+
"activityBar.activeBackground": "#a280ff",
4+
"activityBar.activeBorder": "#ffd0bf",
5+
"activityBar.background": "#a280ff",
6+
"activityBar.foreground": "#15202b",
7+
"activityBar.inactiveForeground": "#15202b99",
8+
"activityBarBadge.background": "#ffd0bf",
9+
"activityBarBadge.foreground": "#15202b",
10+
"statusBar.background": "#7c4dff",
11+
"statusBar.foreground": "#e7e7e7",
12+
"statusBarItem.hoverBackground": "#a280ff",
13+
"titleBar.activeBackground": "#7c4dff",
14+
"titleBar.activeForeground": "#e7e7e7",
15+
"titleBar.inactiveBackground": "#7c4dff99",
16+
"titleBar.inactiveForeground": "#e7e7e799",
17+
"sash.hoverBorder": "#a280ff",
18+
"statusBarItem.remoteBackground": "#7c4dff",
19+
"statusBarItem.remoteForeground": "#e7e7e7"
20+
},
21+
"peacock.color": "#7c4dff",
22+
"[dart]": {
23+
"editor.defaultFormatter": "Dart-Code.flutter",
24+
},
2225
}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 1.0.6
2+
3+
- Fix scrollbar crash
4+
- Not important for users:
5+
- bump dependencies and enable sound null-safety
6+
- dropped unmaintained `intl_localizations` package in favour of Flutter's `gen_l10n`
7+
18
## 1.0.5
29

310
- Fixed crash when album art couldn't be loaded on Android 10+

l10n.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
arb-dir: lib/localization/arb
2+
# Do not supply country code, gen_l10n currently doesn't handle it well
3+
# https://github.com/flutter/flutter/issues/92731
4+
template-arb-file: intl_en.arb
5+
output-localization-file: app_localizations.dart
6+
untranslated-messages-file: untranslated-messages.txt

lib/localization/arb/intl_messages.arb renamed to lib/localization/arb/intl_en.arb

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
2-
"@@last_modified": "2021-07-14T21:24:45.452638",
2+
"@@last_modified": "2021-05-26T20:48:04.796046",
33
"playback": "Playback",
44
"@playback": {
55
"type": "text",
6-
"placeholders": {}
6+
"placeholders": {},
7+
"description": "Used as notification channel name"
78
},
89
"playbackControls": "Playback controls",
910
"@playbackControls": {
1011
"type": "text",
11-
"placeholders": {}
12+
"placeholders": {},
13+
"description": " Used as notification channel description"
1214
},
1315
"play": "Play",
1416
"@play": {
@@ -63,7 +65,8 @@
6365
"artistUnknown": "Unknown artist",
6466
"@artistUnknown": {
6567
"type": "text",
66-
"placeholders": {}
68+
"placeholders": {},
69+
"description": "Label for unknown artist"
6770
},
6871
"tracks": "Tracks",
6972
"@tracks": {
@@ -151,12 +154,14 @@
151154
"shuffled": "Shuffled",
152155
"@shuffled": {
153156
"type": "text",
154-
"placeholders": {}
157+
"placeholders": {},
158+
"description": "NOTE: currently unused"
155159
},
156160
"modified": "Modified",
157161
"@modified": {
158162
"type": "text",
159-
"placeholders": {}
163+
"placeholders": {},
164+
"description": "NOTE: currently unused"
160165
},
161166
"byQuery": "By query",
162167
"@byQuery": {
@@ -166,7 +171,8 @@
166171
"selectedPlural": "Selected",
167172
"@selectedPlural": {
168173
"type": "text",
169-
"placeholders": {}
174+
"placeholders": {},
175+
"description": "Should be in plural form"
170176
},
171177
"newPlaylist": "New playlist",
172178
"@newPlaylist": {
@@ -191,12 +197,14 @@
191197
"playContentList": "Play",
192198
"@playContentList": {
193199
"type": "text",
194-
"placeholders": {}
200+
"placeholders": {},
201+
"description": "Displayed in list headers in button to play it"
195202
},
196203
"shuffleContentList": "Shuffle",
197204
"@shuffleContentList": {
198205
"type": "text",
199-
"placeholders": {}
206+
"placeholders": {},
207+
"description": "Displayed in list headers in button to shuffle it"
200208
},
201209
"debug": "Debug",
202210
"@debug": {
@@ -236,29 +244,34 @@
236244
"secondsShorthand": "s",
237245
"@secondsShorthand": {
238246
"type": "text",
239-
"placeholders": {}
247+
"placeholders": {},
248+
"description": "TODO: currently unused"
240249
},
241250
"minutesShorthand": "min",
242251
"@minutesShorthand": {
243252
"type": "text",
244-
"placeholders": {}
253+
"placeholders": {},
254+
"description": "TODO: currently unused"
245255
},
246256
"and": "And",
247257
"@and": {
248258
"type": "text",
249-
"placeholders": {}
259+
"placeholders": {},
260+
"description": "TODO: currently unused"
250261
},
251262
"more": "More",
252263
"@more": {
253264
"type": "text",
254-
"placeholders": {}
265+
"placeholders": {},
266+
"description": "TODO: currently unused"
255267
},
256268
"andNMore": "And {count} more",
257269
"@andNMore": {
258270
"type": "text",
259271
"placeholders": {
260272
"count": {}
261-
}
273+
},
274+
"description": "'And 3 more'"
262275
},
263276
"done": "Done",
264277
"@done": {
@@ -323,7 +336,8 @@
323336
"editMetadata": "Edit metadata",
324337
"@editMetadata": {
325338
"type": "text",
326-
"placeholders": {}
339+
"placeholders": {},
340+
"description": "TODO: currently unused"
327341
},
328342
"found": "Found",
329343
"@found": {
@@ -373,7 +387,8 @@
373387
"actions": "Actions",
374388
"@actions": {
375389
"type": "text",
376-
"placeholders": {}
390+
"placeholders": {},
391+
"description": "TODO: currently unused"
377392
},
378393
"goToAlbum": "Go to album",
379394
"@goToAlbum": {
@@ -403,7 +418,8 @@
403418
"addToFavorites": "Add to favorites",
404419
"@addToFavorites": {
405420
"type": "text",
406-
"placeholders": {}
421+
"placeholders": {},
422+
"description": "TODO: currently unused"
407423
},
408424
"addToQueue": "Add to queue",
409425
"@addToQueue": {
@@ -418,7 +434,8 @@
418434
"share": "Share",
419435
"@share": {
420436
"type": "text",
421-
"placeholders": {}
437+
"placeholders": {},
438+
"description": "TODO: currently unused"
422439
},
423440
"selectAll": "Select all",
424441
"@selectAll": {
@@ -473,19 +490,22 @@
473490
"onThePathToDevMode": "Something should happen now...",
474491
"@onThePathToDevMode": {
475492
"type": "text",
476-
"placeholders": {}
493+
"placeholders": {},
494+
"description": "Shown when user tapped 4 times on app logo"
477495
},
478496
"onThePathToDevModeLastClick": "only 1 click remaining...",
479497
"@onThePathToDevModeLastClick": {
480498
"type": "text",
481-
"placeholders": {}
499+
"placeholders": {},
500+
"description": "Shown when user is about to become a developer, part 2"
482501
},
483502
"onThePathToDevModeClicksRemaining": "only {remainingClicks} clicks remaining...",
484503
"@onThePathToDevModeClicksRemaining": {
485504
"type": "text",
486505
"placeholders": {
487506
"remainingClicks": {}
488-
}
507+
},
508+
"description": "Shown when user is about to become a developer, part 2, plural"
489509
},
490510
"devTestToast": "Test toast",
491511
"@devTestToast": {
@@ -545,7 +565,8 @@
545565
"searchHistoryRemoveEntryDescriptionP1": "Are you sure you want to remove ",
546566
"@searchHistoryRemoveEntryDescriptionP1": {
547567
"type": "text",
548-
"placeholders": {}
568+
"placeholders": {},
569+
"description": "The entry is the history entry to delete. The description is being splitted into rich text there."
549570
},
550571
"searchHistoryRemoveEntryDescriptionP2": " from your search history?",
551572
"@searchHistoryRemoveEntryDescriptionP2": {

0 commit comments

Comments
 (0)