peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-07-16 14:46:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added categorize in multi select menu

Browse Source
This commit is contained in:
Imran Remtulla
2022-12-27 20:15:56 -05:00
parent 8ddeb3d776
commit 8f16f745be
9 changed files with 106 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/translations/de.json
View File

@ -210,6 +210,7 @@
"label": "Bezeichnung",
"language": "Sprache",
"storagePermissionDenied": "Storage permission denied",
"selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
"tooManyRequestsTryAgainInMinutes": {
"one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
"other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut"

1
assets/translations/en.json
View File

@ -210,6 +210,7 @@
"label": "Label",
"language": "Language",
"storagePermissionDenied": "Storage permission denied",
"selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
"tooManyRequestsTryAgainInMinutes": {
"one": "Too many requests (rate limited) - try again in {} minute",
"other": "Too many requests (rate limited) - try again in {} minutes"

1
assets/translations/hu.json
View File

@ -209,6 +209,7 @@
"label": "Címke",
"language": "Language",
"storagePermissionDenied": "Storage permission denied",
"selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
"tooManyRequestsTryAgainInMinutes": {
"one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
"other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva"

1
assets/translations/it.json
View File

@ -210,6 +210,7 @@
"label": "Etichetta",
"language": "Lingua",
"storagePermissionDenied": "Storage permission denied",
"selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
"tooManyRequestsTryAgainInMinutes": {
"one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
"other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"

1
assets/translations/ja.json
View File

@ -210,6 +210,7 @@
"label": "ラベル",
"language": "言語",
"storagePermissionDenied": "Storage permission denied",
"selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
"tooManyRequestsTryAgainInMinutes": {
"one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
"other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"

1
assets/translations/zh.json
View File

@ -210,6 +210,7 @@
"label": "Label",
"language": "Language",
"storagePermissionDenied": "Storage permission denied",
"selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
"tooManyRequestsTryAgainInMinutes": {
"one": "请求过多 (API 限制) - 在 {} 分钟后重试",
"other": "请求过多 (API 限制) - 在 {} 分钟后重试"

30
lib/components/generated_form_modal.dart
View File

@ -10,13 +10,15 @@ class GeneratedFormModal extends StatefulWidget {
required this.items,
this.initValid = false,
this.message = '',
this.additionalWidgets = const []});
this.additionalWidgets = const [],
this.singleNullReturnButton});
final String title;
final String message;
final List<List<GeneratedFormItem>> items;
final bool initValid;
final List<Widget> additionalWidgets;
final String? singleNullReturnButton;
@override
State<GeneratedFormModal> createState() => _GeneratedFormModalState();
@ -64,17 +66,21 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
onPressed: () {
Navigator.of(context).pop(null);
},
child: Text(tr('cancel'))),
TextButton(
onPressed: !valid
? null
: () {
if (valid) {
HapticFeedback.selectionClick();
Navigator.of(context).pop(values);
}
},
child: Text(tr('continue')))
child: Text(widget.singleNullReturnButton == null
? tr('cancel')
: widget.singleNullReturnButton!)),
widget.singleNullReturnButton == null
? TextButton(
onPressed: !valid
? null
: () {
if (valid) {
HapticFeedback.selectionClick();
Navigator.of(context).pop(values);
}
},
child: Text(tr('continue')))
: const SizedBox.shrink()
],
);
}

86
lib/pages/apps.dart
View File

@ -55,7 +55,8 @@ class AppsPageState extends State<AppsPage> {
var appsProvider = context.watch<AppsProvider>();
var settingsProvider = context.watch<SettingsProvider>();
var sortedApps = appsProvider.apps.values.toList();
var currentFilterIsUpdatesOnly = filter.isIdenticalTo(updatesOnlyFilter);
var currentFilterIsUpdatesOnly =
filter.isIdenticalTo(updatesOnlyFilter, settingsProvider);
selectedApps = selectedApps
.where((element) => sortedApps.map((e) => e.app).contains(element))
@ -348,6 +349,7 @@ class AppsPageState extends State<AppsPage> {
children: [
selectedApps.isEmpty
? IconButton(
visualDensity: VisualDensity.compact,
onPressed: () {
selectThese(sortedApps.map((e) => e.app).toList());
},
@ -357,6 +359,8 @@ class AppsPageState extends State<AppsPage> {
),
tooltip: tr('selectAll'))
: TextButton.icon(
style:
const ButtonStyle(visualDensity: VisualDensity.compact),
onPressed: () {
selectedApps.isEmpty
? selectThese(sortedApps.map((e) => e.app).toList())
@ -501,6 +505,73 @@ class AppsPageState extends State<AppsPage> {
icon: const Icon(
Icons.file_download_outlined,
)),
selectedApps.isEmpty
? const SizedBox()
: IconButton(
visualDensity: VisualDensity.compact,
onPressed: () async {
try {
Set<String>? preselected;
var showPrompt = false;
for (var element in selectedApps) {
var currentCats = element.categories.toSet();
if (preselected == null) {
preselected = currentCats;
} else {
if (!settingsProvider.setEqual(
currentCats, preselected)) {
showPrompt = true;
break;
}
}
}
var cont = true;
if (showPrompt) {
cont = await showDialog<Map<String, dynamic>?>(
context: context,
builder: (BuildContext ctx) {
return GeneratedFormModal(
title: tr('categorize'),
items: const [],
initValid: true,
message:
tr('selectedCategorizeWarning'),
);
}) !=
null;
}
if (cont) {
await showDialog<Map<String, dynamic>?>(
context: context,
builder: (BuildContext ctx) {
return GeneratedFormModal(
title: tr('categorize'),
items: const [],
initValid: true,
singleNullReturnButton: tr('ok'),
additionalWidgets: [
CategoryEditorSelector(
preselected: preselected ?? {},
showLabelWhenNotEmpty: false,
onSelected: (categories) {
appsProvider
.saveApps(selectedApps.map((e) {
e.categories = categories;
return e;
}).toList());
},
)
],
);
});
}
} catch (err) {
showError(err, context);
}
},
tooltip: tr('categorize'),
icon: const Icon(Icons.category_outlined),
),
selectedApps.isEmpty
? const SizedBox()
: IconButton(
@ -697,12 +768,15 @@ class AppsPageState extends State<AppsPage> {
appsProvider.apps.isEmpty
? const SizedBox()
: TextButton.icon(
style:
const ButtonStyle(visualDensity: VisualDensity.compact),
label: Text(
filter.isIdenticalTo(neutralFilter)
filter.isIdenticalTo(neutralFilter, settingsProvider)
? tr('filter')
: tr('filterActive'),
style: TextStyle(
fontWeight: filter.isIdenticalTo(neutralFilter)
fontWeight: filter.isIdenticalTo(
neutralFilter, settingsProvider)
? FontWeight.normal
: FontWeight.bold),
),
@ -794,12 +868,10 @@ class AppsFilter {
includeNonInstalled = values['nonInstalledApps'];
}
bool isIdenticalTo(AppsFilter other) =>
bool isIdenticalTo(AppsFilter other, SettingsProvider settingsProvider) =>
authorFilter.trim() == other.authorFilter.trim() &&
nameFilter.trim() == other.nameFilter.trim() &&
includeUptodate == other.includeUptodate &&
includeNonInstalled == other.includeNonInstalled &&
categoryFilter.length == other.categoryFilter.length &&
categoryFilter.union(other.categoryFilter).length ==
categoryFilter.length;
settingsProvider.setEqual(categoryFilter, other.categoryFilter);
}

3
lib/providers/settings_provider.dart
View File

@ -176,4 +176,7 @@ class SettingsProvider with ChangeNotifier {
}
notifyListeners();
}
bool setEqual(Set<String> a, Set<String> b) =>
a.length == b.length && a.union(b).length == a.length;
}