ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager.git synced 2025-06-12 04:37:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve app and patches loaders

Browse Source
This commit is contained in:
Alberto Ponces
2022-08-24 16:07:40 +01:00
parent 2a2a386bae
commit 56e85ca7cf
4 changed files with 97 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
lib/ui/views/patches_selector/patches_selector_view.dart
View File

@ -14,8 +14,7 @@ class PatchesSelectorView extends StatefulWidget {
}
class _PatchesSelectorViewState extends State<PatchesSelectorView> {
final List<PatchItem> _items = [];
String query = '';
String _query = '';
@override
Widget build(BuildContext context) {
@ -27,8 +26,13 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
child: Padding(
padding:
const EdgeInsets.symmetric(vertical: 4.0, horizontal: 12.0),
child: model.patches.isNotEmpty
? Column(
child: model.patches.isEmpty
? Center(
child: CircularProgressIndicator(
color: Theme.of(context).colorScheme.secondary,
),
)
: Column(
children: [
SearchBar(
showSelectIcon: true,
@ -41,15 +45,28 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
hintTextColor: Theme.of(context).colorScheme.tertiary,
onQueryChanged: (searchQuery) {
setState(() {
query = searchQuery;
_query = searchQuery;
});
},
onSelectAll: (value) => model.selectAllPatches(value),
),
const SizedBox(height: 12),
query.isEmpty || query.length < 2
? _getAllResults(model)
: _getFilteredResults(model),
Expanded(
child: ListView(
children: model
.getFilteredPatches(_query)
.map((patch) => PatchItem(
name: patch.name,
simpleName: patch.simpleName,
version: patch.version,
description: patch.description,
isSelected: model.isSelected(patch),
onChanged: (value) =>
model.selectPatch(patch, value),
))
.toList(),
),
),
MaterialButton(
textColor: Colors.white,
color: Theme.of(context).colorScheme.secondary,
@ -68,65 +85,10 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
child: I18nText('patchesSelectorView.doneButton'),
),
],
)
: Center(
child: CircularProgressIndicator(
color: Theme.of(context).colorScheme.secondary,
),
),
),
),
),
);
}
Widget _getAllResults(PatchesSelectorViewModel model) {
_items.clear();
return Expanded(
child: ListView.builder(
itemCount: model.patches.length,
itemBuilder: (context, index) {
model.patches.sort((a, b) => a.simpleName.compareTo(b.simpleName));
PatchItem item = PatchItem(
name: model.patches[index].name,
simpleName: model.patches[index].simpleName,
version: model.patches[index].version,
description: model.patches[index].description,
isSelected: model.isSelected(index),
onChanged: (value) => model.selectPatch(index, value),
);
_items.add(item);
return item;
},
),
);
}
Widget _getFilteredResults(PatchesSelectorViewModel model) {
_items.clear();
return Expanded(
child: ListView.builder(
itemCount: model.patches.length,
itemBuilder: (context, index) {
model.patches.sort((a, b) => a.simpleName.compareTo(b.simpleName));
if (model.patches[index].simpleName.toLowerCase().contains(
query.toLowerCase(),
)) {
PatchItem item = PatchItem(
name: model.patches[index].name,
simpleName: model.patches[index].simpleName,
version: model.patches[index].version,
description: model.patches[index].description,
isSelected: model.isSelected(index),
onChanged: (value) => model.selectPatch(index, value),
);
_items.add(item);
return item;
} else {
return const SizedBox();
}
},
),
);
}
}

19
lib/ui/views/patches_selector/patches_selector_viewmodel.dart
View File

@ -14,6 +14,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
patches.addAll(await _patcherAPI.getFilteredPatches(
locator<PatcherViewModel>().selectedApp,
));
patches.sort((a, b) => a.simpleName.compareTo(b.simpleName));
for (Patch p in patches) {
if (p.include) {
selectedPatches.add(p);
@ -22,14 +23,13 @@ class PatchesSelectorViewModel extends BaseViewModel {
notifyListeners();
}
bool isSelected(int index) {
bool isSelected(Patch patch) {
return selectedPatches.any(
(element) => element.name == patches[index].name,
(element) => element.name == patch.name,
);
}
void selectPatch(int index, bool isSelected) {
Patch patch = patches.firstWhere((p) => p.name == patches[index].name);
void selectPatch(Patch patch, bool isSelected) {
if (isSelected && !selectedPatches.contains(patch)) {
selectedPatches.add(patch);
} else {
@ -50,4 +50,15 @@ class PatchesSelectorViewModel extends BaseViewModel {
locator<PatcherViewModel>().selectedPatches = selectedPatches;
locator<PatcherViewModel>().notifyListeners();
}
List<Patch> getFilteredPatches(String query) {
return patches
.where((patch) =>
query.isEmpty ||
query.length < 2 ||
patch.simpleName.toLowerCase().contains(
query.toLowerCase(),
))
.toList();
}
}