1.0.6 (#20)

nt4f04uNd · Dec 26, 2021 · 549beff · 549beff
1 parent 6289adf
commit 549beff
Show file tree

Hide file tree

Showing 38 changed files with 500 additions and 2,486 deletions.
diff --git a/.gitignore b/.gitignore
@@ -79,4 +79,5 @@ key.properties
 
 google-services.json
 
-temp/
+# gen_l10n untranslated messages output, see l10n.yaml
+untranslated-messages.txt
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,43 +9,20 @@
          "type": "dart",
          "request": "launch",
          "program": "lib/main.dart",
-         "args": [
-            // TODO: remove this when intl_translation supports nnbd https://github.com/dart-lang/intl_translation/issues/134
-            "--no-sound-null-safety"
-         ],
-         "codeLens": {
-            "for": [
-               "run-file",
-               "debug-file",
-               "run-test",
-               "run-test-file",
-               "debug-test",
-               "debug-test-file",
-            ],
-            // TODO: remove this intl_translation supports nnbd
-            // See also https://github.com/Dart-Code/Dart-Code/issues/3356
-            "title": "${debugType} (--no-sound-null-safety)"
-         }
       },
       {
          "name": "profile",
          "type": "dart",
          "request": "launch",
          "program": "lib/main.dart",
-         "flutterMode": "profile",
-         "args": [
-            "--no-sound-null-safety"
-         ]
+         "flutterMode": "profile"
       },
       {
          "name": "release",
          "type": "dart",
          "request": "launch",
          "program": "lib/main.dart",
-         "flutterMode": "release",
-         "args": [
-            "--no-sound-null-safety"
-         ]
+         "flutterMode": "release"
       }
    ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,22 +1,25 @@
-{
-   "workbench.colorCustomizations": {
-      "activityBar.activeBackground": "#a280ff",
-      "activityBar.activeBorder": "#ffd0bf",
-      "activityBar.background": "#a280ff",
-      "activityBar.foreground": "#15202b",
-      "activityBar.inactiveForeground": "#15202b99",
-      "activityBarBadge.background": "#ffd0bf",
-      "activityBarBadge.foreground": "#15202b",
-      "statusBar.background": "#7c4dff",
-      "statusBar.foreground": "#e7e7e7",
-      "statusBarItem.hoverBackground": "#a280ff",
-      "titleBar.activeBackground": "#7c4dff",
-      "titleBar.activeForeground": "#e7e7e7",
-      "titleBar.inactiveBackground": "#7c4dff99",
-      "titleBar.inactiveForeground": "#e7e7e799"
-   },
-   "peacock.color": "#7c4dff",
-   "[dart]": {
-      "editor.defaultFormatter": "Dart-Code.flutter",
-   },
+{
+   "workbench.colorCustomizations": {
+      "activityBar.activeBackground": "#a280ff",
+      "activityBar.activeBorder": "#ffd0bf",
+      "activityBar.background": "#a280ff",
+      "activityBar.foreground": "#15202b",
+      "activityBar.inactiveForeground": "#15202b99",
+      "activityBarBadge.background": "#ffd0bf",
+      "activityBarBadge.foreground": "#15202b",
+      "statusBar.background": "#7c4dff",
+      "statusBar.foreground": "#e7e7e7",
+      "statusBarItem.hoverBackground": "#a280ff",
+      "titleBar.activeBackground": "#7c4dff",
+      "titleBar.activeForeground": "#e7e7e7",
+      "titleBar.inactiveBackground": "#7c4dff99",
+      "titleBar.inactiveForeground": "#e7e7e799",
+      "sash.hoverBorder": "#a280ff",
+      "statusBarItem.remoteBackground": "#7c4dff",
+      "statusBarItem.remoteForeground": "#e7e7e7"
+   },
+   "peacock.color": "#7c4dff",
+   "[dart]": {
+      "editor.defaultFormatter": "Dart-Code.flutter",
+   },
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.0.6
+
+- Fix scrollbar crash
+- Not important for users:
+  - bump dependencies and enable sound null-safety
+  - dropped unmaintained `intl_localizations` package in favour of Flutter's `gen_l10n`
+
 ## 1.0.5
 
 - Fixed crash when album art couldn't be loaded on Android 10+

diff --git a/l10n.yaml b/l10n.yaml
@@ -0,0 +1,6 @@
+arb-dir: lib/localization/arb
+#  Do not supply country code, gen_l10n currently doesn't handle it well
+#  https://github.com/flutter/flutter/issues/92731
+template-arb-file: intl_en.arb
+output-localization-file: app_localizations.dart
+untranslated-messages-file: untranslated-messages.txt
diff --git a/lib/localization/arb/intl_messages.arb → lib/localization/arb/intl_en.arb b/lib/localization/arb/intl_messages.arb → lib/localization/arb/intl_en.arb
@@ -1,14 +1,16 @@
 {
-  "@@last_modified": "2021-07-14T21:24:45.452638",
+  "@@last_modified": "2021-05-26T20:48:04.796046",
   "playback": "Playback",
   "@playback": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "Used as notification channel name"
   },
   "playbackControls": "Playback controls",
   "@playbackControls": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": " Used as notification channel description"
   },
   "play": "Play",
   "@play": {
@@ -63,7 +65,8 @@
   "artistUnknown": "Unknown artist",
   "@artistUnknown": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "Label for unknown artist"
   },
   "tracks": "Tracks",
   "@tracks": {
@@ -151,12 +154,14 @@
   "shuffled": "Shuffled",
   "@shuffled": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "NOTE: currently unused"
   },
   "modified": "Modified",
   "@modified": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "NOTE: currently unused"
   },
   "byQuery": "By query",
   "@byQuery": {
@@ -166,7 +171,8 @@
   "selectedPlural": "Selected",
   "@selectedPlural": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "Should be in plural form"
   },
   "newPlaylist": "New playlist",
   "@newPlaylist": {
@@ -191,12 +197,14 @@
   "playContentList": "Play",
   "@playContentList": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "Displayed in list headers in button to play it"
   },
   "shuffleContentList": "Shuffle",
   "@shuffleContentList": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "Displayed in list headers in button to shuffle it"
   },
   "debug": "Debug",
   "@debug": {
@@ -236,29 +244,34 @@
   "secondsShorthand": "s",
   "@secondsShorthand": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "minutesShorthand": "min",
   "@minutesShorthand": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "and": "And",
   "@and": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "more": "More",
   "@more": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "andNMore": "And {count} more",
   "@andNMore": {
     "type": "text",
     "placeholders": {
       "count": {}
-    }
+    },
+    "description": "'And 3 more'"
   },
   "done": "Done",
   "@done": {
@@ -323,7 +336,8 @@
   "editMetadata": "Edit metadata",
   "@editMetadata": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "found": "Found",
   "@found": {
@@ -373,7 +387,8 @@
   "actions": "Actions",
   "@actions": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "goToAlbum": "Go to album",
   "@goToAlbum": {
@@ -403,7 +418,8 @@
   "addToFavorites": "Add to favorites",
   "@addToFavorites": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "addToQueue": "Add to queue",
   "@addToQueue": {
@@ -418,7 +434,8 @@
   "share": "Share",
   "@share": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "TODO: currently unused"
   },
   "selectAll": "Select all",
   "@selectAll": {
@@ -473,19 +490,22 @@
   "onThePathToDevMode": "Something should happen now...",
   "@onThePathToDevMode": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "Shown when user tapped 4 times on app logo"
   },
   "onThePathToDevModeLastClick": "only 1 click remaining...",
   "@onThePathToDevModeLastClick": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "Shown when user is about to become a developer, part 2"
   },
   "onThePathToDevModeClicksRemaining": "only {remainingClicks} clicks remaining...",
   "@onThePathToDevModeClicksRemaining": {
     "type": "text",
     "placeholders": {
       "remainingClicks": {}
-    }
+    },
+    "description": "Shown when user is about to become a developer, part 2, plural"
   },
   "devTestToast": "Test toast",
   "@devTestToast": {
@@ -545,7 +565,8 @@
   "searchHistoryRemoveEntryDescriptionP1": "Are you sure you want to remove ",
   "@searchHistoryRemoveEntryDescriptionP1": {
     "type": "text",
-    "placeholders": {}
+    "placeholders": {},
+    "description": "The entry is the history entry to delete. The description is being splitted into rich text there."
   },
   "searchHistoryRemoveEntryDescriptionP2": " from your search history?",
   "@searchHistoryRemoveEntryDescriptionP2": {