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

Clearer version detection settings

Browse Source
This commit is contained in:
Imran Remtulla
2024-01-18 23:46:23 -05:00
parent 2da9a8cd59
commit 183fb26988
20 changed files with 94 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/add_app.dart
View File

@@ -135,8 +135,7 @@ class AddAppPageState extends State<AddAppPage> {
getReleaseDateAsVersionConfirmationIfNeeded(
bool userPickedTrackOnly) async {
return (!(additionalSettings['versionDetection'] ==
'releaseDateAsVersion' &&
return (!(additionalSettings['releaseDateAsVersion'] == true &&
// ignore: use_build_context_synchronously
await showDialog(
context: context,
@@ -192,8 +191,7 @@ class AddAppPageState extends State<AddAppPage> {
throw ObtainiumError(tr('appAlreadyAdded'));
}
if (app.additionalSettings['trackOnly'] == true ||
app.additionalSettings['versionDetection'] !=
'standardVersionDetection') {
app.additionalSettings['versionDetection'] != true) {
app.installedVersion = app.latestVersion;
}
app.categories = pickedCategories;

34
lib/pages/app.dart
View File

@@ -1,7 +1,6 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:obtainium/components/generated_form.dart';
import 'package:obtainium/components/generated_form_modal.dart';
import 'package:obtainium/custom_errors.dart';
import 'package:obtainium/main.dart';
@@ -54,13 +53,11 @@ class _AppPageState extends State<AppPage> {
var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
bool isVersionDetectionStandard =
app?.app.additionalSettings['versionDetection'] ==
'standardVersionDetection';
app?.app.additionalSettings['versionDetection'] == true;
bool installedVersionIsEstimate = trackOnly ||
(app?.app.installedVersion != null &&
app?.app.additionalSettings['versionDetection'] ==
'noVersionDetection');
app?.app.additionalSettings['versionDetection'] != true);
getInfoColumn() => Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -287,25 +284,6 @@ class _AppPageState extends State<AppPage> {
return row;
}).toList();
items = items.map((row) {
row = row.map((e) {
if (e.key == 'versionDetection' && e is GeneratedFormDropdown) {
e.disabledOptKeys ??= [];
if (app?.app.installedVersion != null &&
app?.app.additionalSettings['versionDetection'] !=
'releaseDateAsVersion' &&
!appsProvider.isVersionDetectionPossible(app)) {
e.disabledOptKeys!.add('standardVersionDetection');
}
if (app?.app.releaseDate == null) {
e.disabledOptKeys!.add('releaseDateAsVersion');
}
}
return e;
}).toList();
return row;
}).toList();
return GeneratedFormModal(
title: tr('additionalOptions'), items: items);
});
@@ -320,9 +298,8 @@ class _AppPageState extends State<AppPage> {
// ignore: use_build_context_synchronously
showMessage(tr('appsFromSourceAreTrackOnly'), context);
}
if (app.app.additionalSettings['versionDetection'] ==
'releaseDateAsVersion') {
if (originalSettings['versionDetection'] != 'releaseDateAsVersion') {
if (app.app.additionalSettings['releaseDateAsVersion'] == true) {
if (originalSettings['releaseDateAsVersion'] != true) {
if (app.app.releaseDate != null) {
bool isUpdated =
app.app.installedVersion == app.app.latestVersion;
@@ -333,8 +310,7 @@ class _AppPageState extends State<AppPage> {
}
}
}
} else if (originalSettings['versionDetection'] ==
'releaseDateAsVersion') {
} else if (originalSettings['releaseDateAsVersion'] == true) {
app.app.installedVersion =
app.installedInfo?.versionName ?? app.app.installedVersion;
}