Skip to content

Commit b5d6c91

Browse files
authored
Merge pull request #163 from zivshek/main
support ordering by 'addedAt' and fix custom speed control texts
2 parents 87621e5 + 399b75c commit b5d6c91

File tree

11 files changed

+24
-4
lines changed

11 files changed

+24
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
migrate_working_dir/
1212
.env
1313
.secrets
14+
.vscode
1415

1516
# IntelliJ related
1617
*.iml

android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ android {
5353
targetCompatibility = JavaVersion.VERSION_17
5454
}
5555

56+
kotlinOptions {
57+
jvmTarget = "17"
58+
}
59+
60+
5661
defaultConfig {
5762
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
5863
applicationId = "de.vito.absapp.abs_flutter"

lib/features/library/notch/sort_button.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class SortButton extends ConsumerWidget {
1818
"media.metadata.language": S.current.language,
1919
"media.duration": S.current.duration,
2020
"sequence": S.current.sequence,
21+
"addedAt": S.current.addedAt,
2122
};
2223
}
2324

lib/features/player/modules/speed_control.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ class SpeedControl extends ConsumerWidget {
9797
mainAxisSize: MainAxisSize.min,
9898
children: [
9999
Padding(
100-
padding: const EdgeInsets.symmetric(
101-
vertical: 4, horizontal: 4),
100+
padding: const EdgeInsets.symmetric(horizontal: 4),
102101
child: PlatformTextButton(
103102
child: PlatformText("-0.05x"),
104103
onPressed: () {
@@ -120,8 +119,7 @@ class SpeedControl extends ConsumerWidget {
120119
color: Theme.of(context).dividerColor,
121120
),
122121
Padding(
123-
padding: const EdgeInsets.symmetric(
124-
vertical: 4, horizontal: 4),
122+
padding: const EdgeInsets.symmetric(horizontal: 4),
125123
child: PlatformTextButton(
126124
child: PlatformText("+0.05x"),
127125
onPressed: () {

lib/generated/intl/messages_de.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class MessageLookup extends MessageLookupByLibrary {
9494
),
9595
"addUser": MessageLookupByLibrary.simpleMessage("Benutzer hinzufügen"),
9696
"added": MessageLookupByLibrary.simpleMessage("Hinzugefügt"),
97+
"addedAt": MessageLookupByLibrary.simpleMessage("Hinzugefügt am"),
9798
"advanced": MessageLookupByLibrary.simpleMessage("Erweitert"),
9899
"aggressiveCaching": MessageLookupByLibrary.simpleMessage(
99100
"Aggressives Caching",

lib/generated/intl/messages_en.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class MessageLookup extends MessageLookupByLibrary {
9191
"addANewUser": MessageLookupByLibrary.simpleMessage("Add a New User"),
9292
"addUser": MessageLookupByLibrary.simpleMessage("Add User"),
9393
"added": MessageLookupByLibrary.simpleMessage("Added"),
94+
"addedAt": MessageLookupByLibrary.simpleMessage("Added At"),
9495
"advanced": MessageLookupByLibrary.simpleMessage("Advanced"),
9596
"aggressiveCaching": MessageLookupByLibrary.simpleMessage(
9697
"Aggressive Caching",

lib/generated/intl/messages_fr.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class MessageLookup extends MessageLookupByLibrary {
9393
),
9494
"addUser": MessageLookupByLibrary.simpleMessage("Ajouter un utilisateur"),
9595
"added": MessageLookupByLibrary.simpleMessage("Ajouté"),
96+
"addedAt": MessageLookupByLibrary.simpleMessage("Ajouté le"),
9697
"aggressiveCaching": MessageLookupByLibrary.simpleMessage(
9798
"Mise en mémoire tampon agressive",
9899
),

lib/generated/l10n.dart

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/l10n/intl_de.arb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"@addUser": {},
77
"added": "Hinzugefügt",
88
"@added": {},
9+
"addedAt": "Hinzugefügt am",
10+
"@addedAt": {},
911
"advanced": "Erweitert",
1012
"@advanced": {},
1113
"aggressiveCaching": "Aggressives Caching",

lib/l10n/intl_en.arb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"@addUser": {},
77
"added": "Added",
88
"@added": {},
9+
"addedAt": "Added At",
10+
"@addedAt": {},
911
"advanced": "Advanced",
1012
"@advanced": {},
1113
"aggressiveCaching": "Aggressive Caching",

0 commit comments

Comments
 (0)