ReVanced-Mirror
/
revanced-manager
mirror of https://github.com/revanced/revanced-manager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: working app selector.

This commit is contained in:
Alberto Ponces 2022-08-09 00:01:06 +01:00
parent 960646ba77
commit 51801b5748
13 changed files with 129 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app/app.locator.dart
View File

@ -12,6 +12,7 @@ import 'package:stacked_core/stacked_core.dart';
import 'package:stacked_services/src/navigation/navigation_service.dart';
import '../services/patcher_api.dart';
import '../ui/views/patcher/patcher_viewmodel.dart';
final locator = StackedLocator.instance;
@ -24,4 +25,5 @@ Future<void> setupLocator(
// Register dependencies
locator.registerLazySingleton(() => NavigationService());
locator.registerLazySingleton(() => PatcherService());
locator.registerLazySingleton(() => PatcherViewModel());
}

2
lib/main.dart
View File

@ -51,7 +51,7 @@ class Navigation extends StatelessWidget {
Widget build(BuildContext context) {
return ViewModelBuilder<MainViewModel>.reactive(
viewModelBuilder: () => MainViewModel(),
builder: (context, MainViewModel model, child) => Scaffold(
builder: (context, model, child) => Scaffold(
body: getViewForIndex(model.currentIndex),
bottomNavigationBar: NavigationBar(
onDestinationSelected: model.setIndex,

2
lib/services/manager_api.dart
View File

@ -3,7 +3,7 @@ import 'package:dio/dio.dart';
import 'package:injectable/injectable.dart';
import 'package:path_provider/path_provider.dart' as p;
import 'package:revanced_manager/constants.dart';
import 'github_api.dart';
import 'package:revanced_manager/services/github_api.dart';
// use path_provider to get the path of the storage directory
@lazySingleton

19
lib/services/patcher_api.dart
View File

@ -1,21 +1,30 @@
import 'dart:io';
import 'package:flutter/services.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:injectable/injectable.dart';
import 'package:installed_apps/app_info.dart';
import 'package:installed_apps/installed_apps.dart';
import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/services/github_api.dart';
import 'package:revanced_manager/utils/string.dart';
@lazySingleton
class PatcherService {
File? _patchBundleFile;
final GithubAPI githubAPI = GithubAPI();
final List<AppInfo> _filteredPackages = [];
final Map<String, List<Patch>> _filteredPatches = <String, List<Patch>>{};
final GithubAPI githubAPI = GithubAPI();
File? _patchBundleFile;
String _selectedApp = '';
List<Patch> _selectedPatches = [];
static const platform = MethodChannel('app.revanced/patcher');
static final PatcherService _instance = PatcherService.internal();
factory PatcherService() => _instance;
PatcherService.internal();
String getSelectedApp() => _selectedApp;
void setSelectedApp(String app) => _selectedApp = app;
List<Patch> getSelectedPatches() => _selectedPatches;
void setSelectedPatches(List<Patch> patches) => _selectedPatches = patches;
Future<void> loadPatches() async {
if (_patchBundleFile == null) {

61
lib/ui/views/app_selector/app_selector_view.dart
View File

@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:installed_apps/app_info.dart';
import 'package:installed_apps/installed_apps.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/services/patcher_api.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/installed_app_item.dart';
import 'package:revanced_manager/ui/widgets/search_bar.dart';
import 'package:stacked/stacked.dart';
@ -15,23 +16,13 @@ class AppSelectorView extends StatefulWidget {
}
class _AppSelectorViewState extends State<AppSelectorView> {
List<AppInfo> apps = [];
final PatcherService patcherService = locator<PatcherService>();
String query = '';
void getApps() async {
apps = await InstalledApps.getInstalledApps(false, true);
setState(() {});
}
@override
void initState() {
getApps();
super.initState();
}
@override
Widget build(BuildContext context) {
return ViewModelBuilder.reactive(
return ViewModelBuilder<AppSelectorViewModel>.reactive(
onModelReady: (model) => model.initialise(),
builder: (context, model, child) => Scaffold(
body: SafeArea(
child: Padding(
@ -51,41 +42,53 @@ class _AppSelectorViewState extends State<AppSelectorView> {
},
),
if (query.isEmpty || query.length < 2)
apps.isEmpty
model.apps.isEmpty
? const Center(
child: CircularProgressIndicator(),
)
: Expanded(
child: ListView.builder(
itemCount: apps.length,
itemCount: model.apps.length,
itemBuilder: (context, index) {
//sort alphabetically
apps.sort((a, b) => a.name!.compareTo(b.name!));
return InstalledAppItem(
name: apps[index].name!,
pkgName: apps[index].packageName!,
icon: apps[index].icon!,
model.apps
.sort((a, b) => a.name!.compareTo(b.name!));
return InkWell(
onTap: () {
patcherService.setSelectedApp(
model.apps[index].packageName!);
Navigator.of(context).pop();
locator<PatcherViewModel>().notifyListeners();
},
child: InstalledAppItem(
name: model.apps[index].name!,
pkgName: model.apps[index].packageName!,
icon: model.apps[index].icon!,
),
);
},
),
),
if (query.isNotEmpty)
apps.isEmpty
model.apps.isEmpty
? Center(
child: I18nText('appSelectorCard.noAppsLabel'),
)
: Expanded(
child: ListView.builder(
itemCount: apps.length,
itemCount: model.apps.length,
itemBuilder: (context, index) {
apps.sort((a, b) => a.name!.compareTo(b.name!));
if (apps[index].name!.toLowerCase().contains(
model.apps
.sort((a, b) => a.name!.compareTo(b.name!));
if (model.apps[index].name!
.toLowerCase()
.contains(
query.toLowerCase(),
)) {
return InstalledAppItem(
name: apps[index].name!,
pkgName: apps[index].packageName!,
icon: apps[index].icon!,
name: model.apps[index].name!,
pkgName: model.apps[index].packageName!,
icon: model.apps[index].icon!,
);
} else {
return const SizedBox();

14
lib/ui/views/app_selector/app_selector_viewmodel.dart
View File

@ -1,16 +1,20 @@
import 'package:installed_apps/app_info.dart';
import 'package:installed_apps/installed_apps.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/services/patcher_api.dart';
import 'package:stacked/stacked.dart';
class AppSelectorViewModel extends BaseViewModel {
final PatcherService patcherService = locator<PatcherService>();
List<AppInfo> apps = [];
String query = '';
void initialization() {
getApps();
Future<void> initialise() async {
await getApps();
notifyListeners();
}
void getApps() async {
apps = await InstalledApps.getInstalledApps(false, true);
Future<void> getApps() async {
await patcherService.loadPatches();
apps = await patcherService.getFilteredInstalledApps();
}
}

2
lib/ui/views/home/home_view.dart
View File

@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/available_updates_card.dart';
import 'package:revanced_manager/ui/widgets/installed_apps_card.dart';
import 'package:revanced_manager/ui/widgets/latest_commit_card.dart';
import 'package:stacked/stacked.dart';
import 'home_viewmodel.dart';
class HomeView extends StatelessWidget {
const HomeView({Key? key}) : super(key: key);

7
lib/ui/views/patcher/patcher_view.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/ui/widgets/app_selector_card.dart';
import 'package:revanced_manager/ui/widgets/patch_selector_card.dart';
import 'package:stacked/stacked.dart';
@ -12,8 +13,8 @@ class PatcherView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ViewModelBuilder.reactive(
builder: (context, PatcherViewModel model, child) => Scaffold(
return ViewModelBuilder<PatcherViewModel>.reactive(
builder: (context, model, child) => Scaffold(
floatingActionButton: FloatingActionButton(
onPressed: () {},
child: const Icon(
@ -51,7 +52,7 @@ class PatcherView extends StatelessWidget {
),
),
),
viewModelBuilder: () => PatcherViewModel(),
viewModelBuilder: () => locator<PatcherViewModel>(),
);
}
}

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

@ -18,9 +18,9 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
@override
Widget build(BuildContext context) {
return ViewModelBuilder.reactive(
return ViewModelBuilder<PatchesSelectorViewModel>.reactive(
viewModelBuilder: () => PatchesSelectorViewModel(),
builder: (context, PatchesSelectorViewModel model, child) => Scaffold(
builder: (context, model, child) => Scaffold(
body: Container(
margin: const EdgeInsets.fromLTRB(6.0, 26.0, 6.0, 0),
child: Column(

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

@ -1,23 +1,21 @@
import 'package:installed_apps/app_info.dart';
import 'package:installed_apps/installed_apps.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/services/patcher_api.dart';
import 'package:stacked/stacked.dart';
class PatchesSelectorViewModel extends BaseViewModel {
PatcherService patcherService = PatcherService();
List<Patch>? patches = [];
final PatcherService patcherService = locator<PatcherService>();
AppInfo? appInfo;
Future<void> getApp() async {
AppInfo app = await InstalledApps.getAppInfo("com.google.android.youtube");
appInfo = app;
}
Future<List<Patch>?>? getPatches() async {
Future<List<Patch>?> getPatches() async {
getApp();
PatcherService patcherService = PatcherService();
patcherService.loadPatches();
return patcherService.getFilteredPatches(appInfo);
}
}
}

25
lib/ui/widgets/app_selector_card.dart
View File

@ -1,15 +1,19 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/constants.dart';
import 'package:revanced_manager/services/patcher_api.dart';
class AppSelectorCard extends StatelessWidget {
final Function()? onPressed;
const AppSelectorCard({
AppSelectorCard({
Key? key,
this.onPressed,
}) : super(key: key);
final PatcherService patcherService = locator<PatcherService>();
@override
Widget build(BuildContext context) {
return GestureDetector(
@ -35,13 +39,18 @@ class AppSelectorCard extends StatelessWidget {
),
),
const SizedBox(height: 10),
I18nText(
'appSelectorCard.widgetSubtitle',
child: Text(
'',
style: robotoTextStyle,
),
),
patcherService.getSelectedApp().isNotEmpty
? Text(
patcherService.getSelectedApp(),
style: robotoTextStyle,
)
: I18nText(
'appSelectorCard.widgetSubtitle',
child: Text(
'',
style: robotoTextStyle,
),
),
],
),
),

83
lib/ui/widgets/installed_app_item.dart
View File

@ -23,52 +23,49 @@ class InstalledAppItem extends StatefulWidget {
class _InstalledAppItemState extends State<InstalledAppItem> {
@override
Widget build(BuildContext context) {
return InkWell(
onTap: () => Navigator.pop(context),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: Container(
padding: const EdgeInsets.all(12.0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: const Color(0xff1B222B),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
width: 48,
height: 48,
padding: const EdgeInsets.symmetric(vertical: 4.0),
alignment: Alignment.center,
child: CircleAvatar(
child: Image.memory(widget.icon),
),
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: Container(
padding: const EdgeInsets.all(12.0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: const Color(0xff1B222B),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
width: 48,
height: 48,
padding: const EdgeInsets.symmetric(vertical: 4.0),
alignment: Alignment.center,
child: CircleAvatar(
child: Image.memory(widget.icon),
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
widget.name,
maxLines: 2,
overflow: TextOverflow.visible,
style: GoogleFonts.inter(
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
widget.name,
maxLines: 2,
overflow: TextOverflow.visible,
style: GoogleFonts.inter(
fontSize: 16,
fontWeight: FontWeight.w500,
),
const SizedBox(height: 4),
Text(
widget.pkgName,
style: robotoTextStyle,
),
],
),
),
const SizedBox(height: 4),
Text(
widget.pkgName,
style: robotoTextStyle,
),
],
),
],
),
),
],
),
),
);

1
lib/ui/widgets/patch_item.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
// ignore: must_be_immutable
class PatchItem extends StatefulWidget {
final String name;
final String description;