This commit is contained in:
Imran Remtulla
2023-12-16 03:43:55 -05:00
parent ffefa4b30e
commit 5720c55301
4 changed files with 26 additions and 26 deletions

View File

@@ -77,11 +77,9 @@ class _HomePageState extends State<HomePage> {
} else if (action == 'app') {
await context
.read<AppsProvider>()
.importApps('[${Uri.decodeComponent(data)}]');
.import('[${Uri.decodeComponent(data)}]');
} else if (action == 'apps') {
await context
.read<AppsProvider>()
.importApps(Uri.decodeComponent(data));
await context.read<AppsProvider>().import(Uri.decodeComponent(data));
} else {
throw ObtainiumError(tr('unknown'));
}
@@ -145,13 +143,13 @@ class _HomePageState extends State<HomePage> {
AppsProvider appsProvider = context.watch<AppsProvider>();
SettingsProvider settingsProvider = context.watch<SettingsProvider>();
if (!prevIsLoading &&
prevAppCount >= 0 &&
appsProvider.apps.length > prevAppCount &&
selectedIndexHistory.isNotEmpty &&
selectedIndexHistory.last == 1) {
switchToPage(0);
}
// if (!prevIsLoading &&
// prevAppCount >= 0 &&
// appsProvider.apps.length > prevAppCount &&
// selectedIndexHistory.isNotEmpty &&
// selectedIndexHistory.last == 1) {
// switchToPage(0);
// }
prevAppCount = appsProvider.apps.length;
prevIsLoading = appsProvider.loadingApps;

View File

@@ -106,7 +106,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
runObtainiumExport({bool pickOnly = false}) async {
HapticFeedback.selectionClick();
appsProvider
.exportApps(
.export(
pickOnly:
pickOnly || (await settingsProvider.getExportDir()) == null,
sp: settingsProvider)
@@ -132,7 +132,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
} catch (e) {
throw ObtainiumError(tr('invalidInput'));
}
appsProvider.importApps(data).then((value) {
appsProvider.import(data).then((value) {
var cats = settingsProvider.categories;
appsProvider.apps.forEach((key, value) {
for (var c in value.app.categories) {
@@ -143,7 +143,10 @@ class _ImportExportPageState extends State<ImportExportPage> {
});
appsProvider.addMissingCategories(settingsProvider);
showMessage(
tr('importedX', args: [plural('apps', value)]), context);
'${tr('importedX', args: [
plural('apps', value.key)
])}${value.value ? ' + ${tr('settings')}' : ''}',
context);
});
} else {
// User canceled the picker