Compare commits

...

8 Commits

Author SHA1 Message Date
a2edc86bfa Merge pull request #437 from ImranR98/dev
Added simple APK try auto-select by CPU arch #436
2023-04-06 22:37:55 -04:00
0804e680b2 Added simple APK try auto-select by CPU arch #436
Plus minor form switch UI fixes (overflow, spacing)
2023-04-06 22:37:24 -04:00
49affd1bd4 Merge pull request #434 from ImranR98/dev
Store APK names with URLs (#432)
2023-04-05 18:56:16 -04:00
202ce4f0d5 Store APK names with URLs (#432) 2023-04-05 18:50:19 -04:00
361a3e1bc2 Merge pull request #426 from ImranR98/dev
Increment version
2023-04-04 21:46:15 -04:00
f33a26d4f4 Increment version 2023-04-04 21:45:57 -04:00
7aaf56ec8c Merge pull request #425 from HRTK92/main
Add long-press URL copy and snackbar message
2023-04-04 21:44:35 -04:00
ed120016d9 Add long-press URL copy and snackbar message 2023-04-05 10:32:56 +09:00
28 changed files with 118 additions and 46 deletions

View File

@ -207,6 +207,7 @@
"addCategory": "Kategorie hinzufügen",
"label": "Bezeichnung",
"language": "Sprache",
"copiedToClipboard": "Copied to Clipboard",
"storagePermissionDenied": "Speicherberechtigung verweigert",
"selectedCategorizeWarning": "Dadurch werden alle bestehenden Kategorieeinstellungen für die ausgewählten Apps ersetzt.",
"filterAPKsByRegEx": "APKs nach regulärem Ausdruck filtern",
@ -221,6 +222,7 @@
"versionDetection": "Versionserkennung",
"standardVersionDetection": "Standardversionserkennung",
"groupByCategory": "Group by Category",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "App entfernen?",
"other": "App entfernen?"
@ -269,4 +271,4 @@
"one": "{} und 1 weitere Anwendung wurden aktualisiert.",
"other": "{} und {} weitere Anwendungen wurden aktualisiert."
}
}
}

View File

@ -207,6 +207,7 @@
"addCategory": "Add Category",
"label": "Label",
"language": "Language",
"copiedToClipboard": "Copied to Clipboard",
"storagePermissionDenied": "Storage permission denied",
"selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
"filterAPKsByRegEx": "Filter APKs by Regular Expression",
@ -221,6 +222,7 @@
"versionDetection": "Version Detection",
"standardVersionDetection": "Standard version detection",
"groupByCategory": "Group by Category",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "Remove App?",
"other": "Remove Apps?"
@ -269,4 +271,4 @@
"one": "{} and 1 more app were updated.",
"other": "{} and {} more apps were updated."
}
}
}

View File

@ -207,6 +207,7 @@
"addCategory": "اضافه کردن دسته",
"label": "برچسب",
"language": "زبان",
"copiedToClipboard": "Copied to Clipboard",
"storagePermissionDenied": "مجوز ذخیره سازی رد شد",
"selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
"filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",
@ -221,6 +222,7 @@
"versionDetection": "تشخیص نسخه",
"standardVersionDetection": "تشخیص نسخه استاندارد",
"groupByCategory": "Group by Category",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "برنامه حذف شود؟",
"other": "برنامه ها حذف شوند؟"

View File

@ -207,6 +207,7 @@
"addCategory": "Ajouter une catégorie",
"label": "Étiquette",
"language": "Langue",
"copiedToClipboard": "Copied to Clipboard",
"storagePermissionDenied": "Autorisation de stockage refusée",
"selectedCategorizeWarning": "Cela remplacera tous les paramètres de catégorie existants pour les applications sélectionnées.",
"filterAPKsByRegEx": "Filtrer les APK par expression régulière",
@ -221,6 +222,7 @@
"versionDetection": "Détection des versions",
"standardVersionDetection": "Détection de version standard",
"groupByCategory": "Group by Category",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "Supprimer l'application ?",
"other": "Supprimer les applications ?"

View File

@ -206,6 +206,7 @@
"addCategory": "Új kategória",
"label": "Címke",
"language": "Nyelv",
"copiedToClipboard": "Copied to Clipboard",
"storagePermissionDenied": "Tárhely engedély megtagadva",
"selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
"filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
@ -220,6 +221,7 @@
"versionDetection": "Verzió érzékelés",
"standardVersionDetection": "Alapért. verzió érzékelés",
"groupByCategory": "Csoportosítás Kategória alapján",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "Eltávolítja az alkalmazást?",
"other": "Eltávolítja az alkalmazást?"

View File

@ -207,6 +207,7 @@
"addCategory": "Aggiungi categoria",
"label": "Etichetta",
"language": "Lingua",
"copiedToClipboard": "Copied to Clipboard",
"storagePermissionDenied": "Accesso ai file non autorizzato",
"selectedCategorizeWarning": "Ciò sostituirà le impostazioni di categoria esistenti per le App selezionate.",
"filterAPKsByRegEx": "Filtra file APK con espressioni regolari",
@ -221,6 +222,7 @@
"versionDetection": "Rilevamento di versione",
"standardVersionDetection": "Rilevamento di versione standard",
"groupByCategory": "Group by Category",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "Rimuovere l'App?",
"other": "Rimuovere le App?"

View File

@ -207,6 +207,7 @@
"addCategory": "カテゴリを追加",
"label": "ラベル",
"language": "言語",
"copiedToClipboard": "クリップボードにコピーしました",
"storagePermissionDenied": "ストレージ権限が拒否されました",
"selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
"filterAPKsByRegEx": "正規表現でAPKを絞り込む",
@ -221,6 +222,7 @@
"versionDetection": "バージョン検出",
"standardVersionDetection": "標準のバージョン検出",
"groupByCategory": "Group by Category",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "アプリを削除しますか?",
"other": "アプリを削除しますか?"
@ -269,4 +271,4 @@
"one": "{} とさらに {} 個のアプリがアップデートされました",
"other": "{} とさらに {} 個のアプリがアップデートされました"
}
}
}

View File

@ -208,6 +208,7 @@
"addCategory": "添加类别",
"label": "标签",
"language": "语言",
"copiedToClipboard": "Copied to Clipboard",
"storagePermissionDenied": "存储权限已被拒绝",
"selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
"filterAPKsByRegEx": "Filter APKs by Regular Expression",
@ -221,6 +222,7 @@
"versionDetection": "Version Detection",
"standardVersionDetection": "Standard version detection",
"groupByCategory": "Group by Category",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"removeAppQuestion": {
"one": "删除应用?",
"other": "删除应用?"
@ -269,4 +271,4 @@
"one": "{} 和 {} 更多应用已被安装",
"other": "{} 和 {} 更多应用已被安装"
}
}
}

View File

@ -68,7 +68,7 @@ class Codeberg extends AppSource {
if (res.statusCode == 200) {
var releases = jsonDecode(res.body) as List<dynamic>;
List<String> getReleaseAPKUrls(dynamic release) =>
List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) =>
(release['assets'] as List<dynamic>?)
?.map((e) {
return e['name'] != null && e['browser_download_url'] != null
@ -77,7 +77,6 @@ class Codeberg extends AppSource {
: const MapEntry('', '');
})
.where((element) => element.key.toLowerCase().endsWith('.apk'))
.map((e) => e.value)
.toList() ??
[];
@ -119,7 +118,9 @@ class Codeberg extends AppSource {
throw NoVersionError();
}
var changeLog = targetRelease['body'].toString();
return APKDetails(version, targetRelease['apkUrls'] as List<String>,
return APKDetails(
version,
targetRelease['apkUrls'] as List<MapEntry<String, String>>,
getAppNames(standardUrl),
releaseDate: releaseDate,
changeLog: changeLog.isEmpty ? null : changeLog);

View File

@ -50,7 +50,7 @@ class FDroid extends AppSource {
.where((element) => element['versionName'] == latestVersion)
.map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
.toList();
return APKDetails(latestVersion, apkUrls,
return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
AppNames(name, Uri.parse(standardUrl).pathSegments.last));
} else {
throw getObtainiumHttpError(res);

View File

@ -80,7 +80,8 @@ class FDroidRepo extends AppSource {
element.querySelector('apkname') != null)
.map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
.toList();
return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName),
return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
AppNames(authorName, appName),
releaseDate: releaseDate);
} else {
throw getObtainiumHttpError(res);

View File

@ -161,7 +161,9 @@ class GitHub extends AppSource {
throw NoVersionError();
}
var changeLog = targetRelease['body'].toString();
return APKDetails(version, targetRelease['apkUrls'] as List<String>,
return APKDetails(
version,
getApkUrlsFromUrls(targetRelease['apkUrls'] as List<String>),
getAppNames(standardUrl),
releaseDate: releaseDate,
changeLog: changeLog.isEmpty ? null : changeLog);

View File

@ -60,7 +60,8 @@ class GitLab extends AppSource {
if (version == null) {
throw NoVersionError();
}
return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl),
return APKDetails(version, getApkUrlsFromUrls(apkUrls),
GitHub().getAppNames(standardUrl),
releaseDate: releaseDate);
} else {
throw getObtainiumHttpError(res);

View File

@ -42,7 +42,8 @@ class HTML extends AppSource {
? '${uri.origin}/$e'
: '${uri.origin}/${uri.path}/$e')
.toList();
return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
return APKDetails(
version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app')));
} else {
throw getObtainiumHttpError(res);
}

View File

@ -58,7 +58,7 @@ class Mullvad extends AppSource {
}
return APKDetails(
versions[0],
['https://mullvad.net/download/app/apk/latest'],
getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
AppNames(name, 'Mullvad-VPN'),
changeLog: changeLog);
} else {

View File

@ -98,7 +98,7 @@ class NeutronCode extends AppSource {
? (customDateParse(dateStringOriginal))
: null;
var changeLogElements = http.querySelectorAll('.pd-fdesc p');
return APKDetails(version, [apkUrl],
return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
releaseDate: dateString != null ? DateTime.parse(dateString) : null,
changeLog: changeLogElements.isNotEmpty

View File

@ -28,7 +28,8 @@ class Signal extends AppSource {
if (version == null) {
throw NoVersionError();
}
return APKDetails(version, apkUrls, AppNames(name, 'Signal'));
return APKDetails(
version, getApkUrlsFromUrls(apkUrls), AppNames(name, 'Signal'));
} else {
throw getObtainiumHttpError(res);
}

View File

@ -50,7 +50,7 @@ class SourceForge extends AppSource {
.toList();
return APKDetails(
version,
apkUrlList,
getApkUrlsFromUrls(apkUrlList),
AppNames(
name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
} else {

View File

@ -53,7 +53,8 @@ class SteamMobile extends AppSource {
var version = links[0].substring(
versionMatch.start + apkNamePrefix.length + 2, versionMatch.end - 4);
var apkUrls = [links[0]];
return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!));
return APKDetails(version, getApkUrlsFromUrls(apkUrls),
AppNames(name, apks[apkNamePrefix]!));
} else {
throw getObtainiumHttpError(res);
}

View File

@ -32,7 +32,8 @@ class TelegramApp extends AppSource {
throw NoVersionError();
}
String? apkUrl = 'https://telegram.org/dl/android/apk';
return APKDetails(version, [apkUrl], AppNames('Telegram', 'Telegram'));
return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
AppNames('Telegram', 'Telegram'));
} else {
throw getObtainiumHttpError(res);
}

View File

@ -54,7 +54,8 @@ class VLC extends AppSource {
throw getObtainiumHttpError(res2);
}
return APKDetails(version, apkUrls, AppNames('VideoLAN', 'VLC'));
return APKDetails(
version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
} else {
throw getObtainiumHttpError(res);
}

View File

@ -64,9 +64,9 @@ class WhatsApp extends AppSource {
vLines[0].substring(versionMatch.start, versionMatch.end);
return APKDetails(
version,
[
getApkUrlsFromUrls([
'https://www.whatsapp.com/android?v=$version&=thisIsaPlaceholder&a=realURLPrefetchedAtDownloadTime'
],
]),
AppNames('Meta', 'WhatsApp'));
} else {
throw getObtainiumHttpError(res);

View File

@ -267,7 +267,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
formInputs[r][e] = Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(widget.items[r][e].label),
Flexible(child: Text(widget.items[r][e].label)),
const SizedBox(
width: 8,
),
Switch(
value: values[widget.items[r][e].key],
onChanged: (value) {

View File

@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
// ignore: implementation_imports
import 'package:easy_localization/src/localization.dart';
const String currentVersion = '0.11.23';
const String currentVersion = '0.11.26';
const String currentReleaseTag =
'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

View File

@ -61,6 +61,12 @@ class _AppPageState extends State<AppPage> {
mode: LaunchMode.externalApplication);
}
},
onLongPress: () {
Clipboard.setData(ClipboardData(text: app?.app.url ?? ''));
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(tr('copiedToClipboard')),
));
},
child: Text(
app?.app.url ?? '',
textAlign: TextAlign.center,

View File

@ -169,7 +169,7 @@ class AppsProvider with ChangeNotifier {
'${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
String downloadUrl = await SourceProvider()
.getSource(app.url)
.apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
.apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value);
var notif = DownloadNotification(app.name, 100);
notificationsProvider?.cancel(notif.id);
int? prevProg;
@ -296,9 +296,10 @@ class AppsProvider with ChangeNotifier {
await intent.launch();
}
Future<String?> confirmApkUrl(App app, BuildContext? context) async {
Future<MapEntry<String, String>?> confirmApkUrl(
App app, BuildContext? context) async {
// If the App has more than one APK, the user should pick one (if context provided)
String? apkUrl = app.apkUrls[app.preferredApkIndex];
MapEntry<String, String>? apkUrl = app.apkUrls[app.preferredApkIndex];
// get device supported architecture
List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
@ -321,14 +322,14 @@ class AppsProvider with ChangeNotifier {
// If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
if (apkUrl != null &&
getHost(apkUrl) != getHost(app.url) &&
getHost(apkUrl.value) != getHost(app.url) &&
context != null) {
// ignore: use_build_context_synchronously
if (await showDialog(
context: context,
builder: (BuildContext ctx) {
return APKOriginWarningDialog(
sourceUrl: app.url, apkUrl: apkUrl!);
sourceUrl: app.url, apkUrl: apkUrl!.value);
}) !=
true) {
apkUrl = null;
@ -353,7 +354,7 @@ class AppsProvider with ChangeNotifier {
if (apps[id] == null) {
throw ObtainiumError(tr('appNotFound'));
}
String? apkUrl;
MapEntry<String, String>? apkUrl;
var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
if (!trackOnly) {
apkUrl = await confirmApkUrl(apps[id]!.app, context);
@ -923,7 +924,7 @@ class APKPicker extends StatefulWidget {
const APKPicker({super.key, required this.app, this.initVal, this.archs});
final App app;
final String? initVal;
final MapEntry<String, String>? initVal;
final List<String>? archs;
@override
@ -931,7 +932,7 @@ class APKPicker extends StatefulWidget {
}
class _APKPickerState extends State<APKPicker> {
String? apkUrl;
MapEntry<String, String>? apkUrl;
@override
Widget build(BuildContext context) {
@ -944,15 +945,13 @@ class _APKPickerState extends State<APKPicker> {
const SizedBox(height: 16),
...widget.app.apkUrls.map(
(u) => RadioListTile<String>(
title: Text(Uri.parse(u)
.pathSegments
.where((element) => element.isNotEmpty)
.last),
value: u,
groupValue: apkUrl,
title: Text(u.key),
value: u.value,
groupValue: apkUrl!.value,
onChanged: (String? val) {
setState(() {
apkUrl = val;
apkUrl =
widget.app.apkUrls.where((e) => e.value == val).first;
});
}),
),

View File

@ -3,6 +3,7 @@
import 'dart:convert';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:html/dom.dart';
import 'package:http/http.dart';
@ -34,7 +35,7 @@ class AppNames {
class APKDetails {
late String version;
late List<String> apkUrls;
late List<MapEntry<String, String>> apkUrls;
late AppNames names;
late DateTime? releaseDate;
late String? changeLog;
@ -50,7 +51,7 @@ class App {
late String name;
String? installedVersion;
late String latestVersion;
List<String> apkUrls = [];
List<MapEntry<String, String>> apkUrls = [];
late int preferredApkIndex;
late Map<String, dynamic> additionalSettings;
late DateTime? lastUpdateCheck;
@ -134,6 +135,23 @@ class App {
if (preferredApkIndex < 0) {
preferredApkIndex = 0;
}
// apkUrls can either be old list or new named list apkUrls
List<MapEntry<String, String>> apkUrls = [];
if (json['apkUrls'] != null) {
var apkUrlJson = jsonDecode(json['apkUrls']);
try {
apkUrls = getApkUrlsFromUrls(List<String>.from(apkUrlJson));
} catch (e) {
apkUrls = List<dynamic>.from(apkUrlJson)
.map((e) => MapEntry(e[0] as String, e[1] as String))
.toList();
}
}
// Arch based APK filter option should be disabled if it previously did not exist
if (json['additionalSettings'] != null &&
jsonDecode(json['additionalSettings'])['autoApkFilterByArch'] == null) {
additionalSettings['autoApkFilterByArch'] = false;
}
return App(
json['id'] as String,
json['url'] as String,
@ -143,9 +161,7 @@ class App {
? null
: json['installedVersion'] as String,
json['latestVersion'] as String,
json['apkUrls'] == null
? []
: List<String>.from(jsonDecode(json['apkUrls'])),
apkUrls,
preferredApkIndex,
additionalSettings,
json['lastUpdateCheck'] == null
@ -173,7 +189,7 @@ class App {
'name': name,
'installedVersion': installedVersion,
'latestVersion': latestVersion,
'apkUrls': jsonEncode(apkUrls),
'apkUrls': jsonEncode(apkUrls.map((e) => [e.key, e.value]).toList()),
'preferredApkIndex': preferredApkIndex,
'additionalSettings': jsonEncode(additionalSettings),
'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
@ -225,6 +241,11 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
.reduce((value, element) => [...value, ...element]));
}
getApkUrlsFromUrls(List<String> urls) => urls
.map((e) =>
MapEntry(e.split('/').where((el) => el.trim().isNotEmpty).last, e))
.toList();
class AppSource {
String? host;
late String name;
@ -279,6 +300,10 @@ class AppSource {
}
])
],
[
GeneratedFormSwitch('autoApkFilterByArch',
label: tr('autoApkFilterByArch'), defaultValue: true)
],
[GeneratedFormTextField('appName', label: tr('appName'), required: false)]
];
@ -422,11 +447,24 @@ class SourceProvider {
if (additionalSettings['apkFilterRegEx'] != null) {
var reg = RegExp(additionalSettings['apkFilterRegEx']);
apk.apkUrls =
apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
apk.apkUrls.where((element) => reg.hasMatch(element.key)).toList();
}
if (apk.apkUrls.isEmpty && !trackOnly) {
throw NoAPKError();
}
if (apk.apkUrls.length > 1 &&
additionalSettings['autoApkFilterByArch'] == true) {
var abis = (await DeviceInfoPlugin().androidInfo).supportedAbis;
for (var abi in abis) {
var urls2 = apk.apkUrls
.where((element) => RegExp('.*$abi.*').hasMatch(element.key))
.toList();
if (urls2.isNotEmpty && urls2.length < apk.apkUrls.length) {
apk.apkUrls = urls2;
break;
}
}
}
String apkVersion = apk.version.replaceAll('/', '-');
var name = currentApp != null ? currentApp.name.trim() : '';
name = name.isNotEmpty

View File

@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 0.11.23+145 # When changing this, update the tag in main() accordingly
version: 0.11.26+148 # When changing this, update the tag in main() accordingly
environment:
sdk: '>=2.18.2 <3.0.0'