peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-08-18 20:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed APK picker + UX tweak

Browse Source
This commit is contained in:
Imran Remtulla
2022-08-27 15:43:29 -04:00
parent 4253203dca
commit 6c076751ab
3 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/app.dart
View File

@@ -50,8 +50,10 @@ class _AppPageState extends State<AppPage> {
appsProvider
.downloadAndInstallLatestApp(
[app!.app.id],
context).then((_) {
context).then((res) {
if (res) {
Navigator.of(context).pop();
}
});
}
: null,

10
lib/pages/settings.dart
View File

@@ -170,6 +170,11 @@ class _SettingsPageState extends State<SettingsPage> {
)
]),
actions: [
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: const Text('Cancel')),
TextButton(
onPressed: () {
if (formKey.currentState!
@@ -198,11 +203,6 @@ class _SettingsPageState extends State<SettingsPage> {
}
},
child: const Text('Import')),
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: const Text('Cancel'))
],
);
});

84
lib/providers/apps_provider.dart
View File

@@ -82,7 +82,7 @@ class AppsProvider with ChangeNotifier {
// Given an AppId, uses stored info about the app to download an APK (with user input if needed) and install it
// Installs can only be done in the foreground, so a notification is sent to get the user's attention if needed
// Returns upon successful download, regardless of installation result
Future<void> downloadAndInstallLatestApp(
Future<bool> downloadAndInstallLatestApp(
List<String> appIds, BuildContext context) async {
NotificationsProvider notificationsProvider =
context.read<NotificationsProvider>();
@@ -91,37 +91,17 @@ class AppsProvider with ChangeNotifier {
if (apps[id] == null) {
throw 'App not found';
}
String apkUrl = apps[id]!.app.apkUrls.last;
String? apkUrl = apps[id]!.app.apkUrls.last;
if (apps[id]!.app.apkUrls.length > 1) {
await showDialog(
apkUrl = await showDialog(
context: context,
builder: (BuildContext ctx) {
return AlertDialog(
scrollable: true,
title: const Text('Pick an APK'),
content: Column(children: [
Text(
'${apps[id]!.app.name} has more than one package - pick one.'),
...apps[id]!.app.apkUrls.map((u) => ListTile(
title: Text(Uri.parse(u).pathSegments.last),
leading: Radio<String>(
value: u,
groupValue: apkUrl,
onChanged: (String? val) {
apkUrl = val!;
})))
]),
actions: [
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: const Text('Continue'))
],
);
return APKPicker(app: apps[id]!.app, initVal: apkUrl);
});
}
appsToInstall.putIfAbsent(id, () => apkUrl);
if (apkUrl != null) {
appsToInstall.putIfAbsent(id, () => apkUrl!);
}
}
List<ApkFile> downloadedFiles = await Future.wait(appsToInstall.entries
@@ -144,6 +124,8 @@ class AppsProvider with ChangeNotifier {
apps[f.appId]!.app.installedVersion = apps[f.appId]!.app.latestVersion;
await saveApp(apps[f.appId]!.app);
}
return downloadedFiles.isNotEmpty;
}
Future<Directory> getAppsDir() async {
@@ -281,3 +263,51 @@ class AppsProvider with ChangeNotifier {
super.dispose();
}
}
class APKPicker extends StatefulWidget {
const APKPicker({super.key, required this.app, this.initVal});
final App app;
final String? initVal;
@override
State<APKPicker> createState() => _APKPickerState();
}
class _APKPickerState extends State<APKPicker> {
String? apkUrl;
@override
Widget build(BuildContext context) {
apkUrl ??= widget.initVal;
return AlertDialog(
scrollable: true,
title: const Text('Pick an APK'),
content: Column(children: [
Text('${widget.app.name} has more than one package - pick one.'),
...widget.app.apkUrls.map((u) => ListTile(
title: Text(Uri.parse(u).pathSegments.last),
leading: Radio<String>(
value: u,
groupValue: apkUrl,
onChanged: (String? val) {
setState(() {
apkUrl = val;
});
})))
]),
actions: [
TextButton(
onPressed: () {
Navigator.of(context).pop(null);
},
child: const Text('Cancel')),
TextButton(
onPressed: () {
Navigator.of(context).pop(apkUrl);
},
child: const Text('Continue'))
],
);
}
}