peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-10-22 10:23:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

GitLab search (#422) + better settings UI

Browse Source
This commit is contained in:
Imran Remtulla
2023-05-06 00:06:48 -04:00
parent 8ca5964d31
commit b4642e16ad
15 changed files with 138 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pages/add_app.dart
View File

@@ -248,9 +248,18 @@ class _AddAppPageState extends State<AddAppPage> {
searching = true;
});
try {
var results = await Future.wait(sourceProvider.sources
.where((e) => e.canSearch)
.map((e) => e.search(searchQuery)));
var results = await Future.wait(
sourceProvider.sources.where((e) => e.canSearch).map((e) async {
try {
return await e.search(searchQuery);
} catch (err) {
if (err is! CredsNeededError) {
rethrow;
} else {
return <String, List<String>>{};
}
}
}));
// .then((results) async {
// Interleave results instead of simple reduce

45
lib/pages/settings.dart
View File

@@ -205,6 +205,10 @@ class _SettingsPageState extends State<SettingsPage> {
height: 16,
);
const height32 = SizedBox(
height: 32,
);
return Scaffold(
backgroundColor: Theme.of(context).colorScheme.surface,
body: CustomScrollView(slivers: <Widget>[
@@ -217,9 +221,26 @@ class _SettingsPageState extends State<SettingsPage> {
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
tr('updates'),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.primary),
),
intervalDropdown,
height32,
Text(
tr('sourceSpecific'),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.primary),
),
...sourceSpecificFields,
height32,
Text(
tr('appearance'),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.primary),
),
themeDropdown,
@@ -332,31 +353,11 @@ class _SettingsPageState extends State<SettingsPage> {
})
],
),
const Divider(
height: 16,
),
height16,
Text(
tr('updates'),
style: TextStyle(
color: Theme.of(context).colorScheme.primary),
),
intervalDropdown,
const Divider(
height: 48,
),
Text(
tr('sourceSpecific'),
style: TextStyle(
color: Theme.of(context).colorScheme.primary),
),
...sourceSpecificFields,
const Divider(
height: 48,
),
height32,
Text(
tr('categories'),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.primary),
),
height16,