Compare commits

...

22 Commits

Author SHA1 Message Date
Imran Remtulla
dc52fb6181 Merge pull request #473 from ImranR98/dev
Sourceforge apk url extraction bugfix
2023-04-15 15:19:08 -04:00
Imran Remtulla
9e4ac397d8 Sourceforge apk url extraction bugfix 2023-04-15 15:18:32 -04:00
Imran Remtulla
0ec944eae9 Merge pull request #472 from ImranR98/dev
Bugfix in getting APK name from URL (affected Sourceforge and potentially others)
2023-04-15 14:43:02 -04:00
Imran Remtulla
ad250c30e4 Increment version 2023-04-15 14:41:38 -04:00
Imran Remtulla
1090f15508 Sourceforge bugfix 2023-04-15 14:34:14 -04:00
Imran Remtulla
666941350e APK name bugfix 2023-04-15 14:28:00 -04:00
Imran Remtulla
eeadbce8b0 Merge pull request #466 from ImranR98/dev
Increment version, update packages
2023-04-13 23:06:22 -04:00
Imran Remtulla
ce8aeff342 Increment version, update packages 2023-04-13 23:06:08 -04:00
Imran Remtulla
0d8362a2ed Merge pull request #465 from Bnyro/amoled-theme
Add an amoled black theme
2023-04-13 22:59:54 -04:00
Bnyro
3b28143a4e Add an amoled black theme 2023-04-13 18:19:24 +02:00
Imran Remtulla
537628f378 Merge pull request #451 from gidano/gidano/Obtainium-HU
Updated hu.json
2023-04-12 15:49:02 -04:00
Imran Remtulla
c92d76df98 Merge pull request #453 from mehdijahann/main
Update fa.json
2023-04-12 15:48:51 -04:00
Imran Remtulla
b6959e1a8b Merge pull request #457 from markus-gitdev/main
Update de.json
2023-04-12 15:48:42 -04:00
Imran Remtulla
1bf648da60 Merge pull request #461 from ImranR98/dev
Fixed HTML relative link handling (#455), Fixed App name override and sort inconsistencies (#450)
2023-04-12 15:48:28 -04:00
Imran Remtulla
6a1275e9e4 Sort no longer case-sensitive (#450) 2023-04-12 15:46:48 -04:00
Imran Remtulla
df242b91ad Increment version, update packages 2023-04-12 15:39:32 -04:00
Imran Remtulla
7ea75325bb App name overrides more consistent (#450) 2023-04-12 15:36:17 -04:00
Imran Remtulla
0704dfe2ee Fixed relative link handling in HTML source 2023-04-12 15:17:08 -04:00
Imran Remtulla
6275cbf114 HTML Source - handle relative URLs in literal .html pages 2023-04-12 14:50:54 -04:00
Markus
36b8ef6782 Update de.json
Translations for:
- groupByCategory
- autoApkFilterByArch
2023-04-11 13:10:03 +02:00
Mehdee
d274b9a428 Update fa.json 2023-04-10 16:54:29 +02:00
gidano
1c2980d1ac Updated hu.json 2023-04-09 08:57:12 +02:00
20 changed files with 129 additions and 78 deletions

View File

@@ -122,6 +122,7 @@
"followSystem": "System folgen", "followSystem": "System folgen",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "App sortieren nach", "appSortBy": "App sortieren nach",
"authorName": "Autor/Name", "authorName": "Autor/Name",
"nameAuthor": "Name/Autor", "nameAuthor": "Name/Autor",
@@ -221,8 +222,8 @@
"importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)", "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
"versionDetection": "Versionserkennung", "versionDetection": "Versionserkennung",
"standardVersionDetection": "Standardversionserkennung", "standardVersionDetection": "Standardversionserkennung",
"groupByCategory": "Group by Category", "groupByCategory": "Nach Kategorie gruppieren",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible", "autoApkFilterByArch": "Nach Möglichkeit versuchen, APKs nach CPU-Architektur zu filtern",
"removeAppQuestion": { "removeAppQuestion": {
"one": "App entfernen?", "one": "App entfernen?",
"other": "App entfernen?" "other": "App entfernen?"

View File

@@ -122,6 +122,7 @@
"followSystem": "Follow System", "followSystem": "Follow System",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "App Sort By", "appSortBy": "App Sort By",
"authorName": "Author/Name", "authorName": "Author/Name",
"nameAuthor": "Name/Author", "nameAuthor": "Name/Author",

View File

@@ -122,6 +122,7 @@
"followSystem": "هماهنگ با سیستم", "followSystem": "هماهنگ با سیستم",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "مرتب سازی برنامه بر اساس", "appSortBy": "مرتب سازی برنامه بر اساس",
"authorName": "سازنده/اسم", "authorName": "سازنده/اسم",
"nameAuthor": "اسم/سازنده", "nameAuthor": "اسم/سازنده",
@@ -207,7 +208,7 @@
"addCategory": "اضافه کردن دسته", "addCategory": "اضافه کردن دسته",
"label": "برچسب", "label": "برچسب",
"language": "زبان", "language": "زبان",
"copiedToClipboard": "Copied to Clipboard", "copiedToClipboard": "در کلیپ بورد کپی شد",
"storagePermissionDenied": "مجوز ذخیره سازی رد شد", "storagePermissionDenied": "مجوز ذخیره سازی رد شد",
"selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.", "selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
"filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید", "filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",
@@ -221,8 +222,8 @@
"importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)", "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
"versionDetection": "تشخیص نسخه", "versionDetection": "تشخیص نسخه",
"standardVersionDetection": "تشخیص نسخه استاندارد", "standardVersionDetection": "تشخیص نسخه استاندارد",
"groupByCategory": "Group by Category", "groupByCategory": "گروه بر اساس دسته",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible", "autoApkFilterByArch": "در صورت امکان سعی کنید APKها را بر اساس معماری CPU فیلتر کنید",
"removeAppQuestion": { "removeAppQuestion": {
"one": "برنامه حذف شود؟", "one": "برنامه حذف شود؟",
"other": "برنامه ها حذف شوند؟" "other": "برنامه ها حذف شوند؟"

View File

@@ -122,6 +122,7 @@
"followSystem": "Suivre le système", "followSystem": "Suivre le système",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "Applications triées par", "appSortBy": "Applications triées par",
"authorName": "Auteur/Nom", "authorName": "Auteur/Nom",
"nameAuthor": "Nom/Auteur", "nameAuthor": "Nom/Auteur",

View File

@@ -122,6 +122,7 @@
"followSystem": "Rendszer szerint", "followSystem": "Rendszer szerint",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "App rendezés...", "appSortBy": "App rendezés...",
"authorName": "Szerző/Név", "authorName": "Szerző/Név",
"nameAuthor": "Név/Szerző", "nameAuthor": "Név/Szerző",
@@ -221,7 +222,7 @@
"versionDetection": "Verzió érzékelés", "versionDetection": "Verzió érzékelés",
"standardVersionDetection": "Alapért. verzió érzékelés", "standardVersionDetection": "Alapért. verzió érzékelés",
"groupByCategory": "Csoportosítás Kategória alapján", "groupByCategory": "Csoportosítás Kategória alapján",
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible", "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-kat",
"removeAppQuestion": { "removeAppQuestion": {
"one": "Eltávolítja az alkalmazást?", "one": "Eltávolítja az alkalmazást?",
"other": "Eltávolítja az alkalmazást?" "other": "Eltávolítja az alkalmazást?"

View File

@@ -122,6 +122,7 @@
"followSystem": "Segui sistema", "followSystem": "Segui sistema",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "App ordinate per", "appSortBy": "App ordinate per",
"authorName": "Autore/Nome", "authorName": "Autore/Nome",
"nameAuthor": "Nome/Autore", "nameAuthor": "Nome/Autore",

View File

@@ -122,6 +122,7 @@
"followSystem": "システムに従う", "followSystem": "システムに従う",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "アプリの並び方", "appSortBy": "アプリの並び方",
"authorName": "作者名/アプリ名", "authorName": "作者名/アプリ名",
"nameAuthor": "アプリ名/作者名", "nameAuthor": "アプリ名/作者名",

View File

@@ -123,6 +123,7 @@
"followSystem": "跟随系统", "followSystem": "跟随系统",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use pure black dark theme",
"appSortBy": "排列方式", "appSortBy": "排列方式",
"authorName": "作者 / 名字", "authorName": "作者 / 名字",
"nameAuthor": "名字 / 作者", "nameAuthor": "名字 / 作者",

View File

@@ -34,14 +34,20 @@ class HTML extends AppSource {
var rel = links.last; var rel = links.last;
var apkName = rel.split('/').last; var apkName = rel.split('/').last;
var version = apkName.substring(0, apkName.length - 4); var version = apkName.substring(0, apkName.length - 4);
List<String> apkUrls = [rel] List<String> apkUrls = [rel].map((e) {
.map((e) => e.toLowerCase().startsWith('http://') || try {
e.toLowerCase().startsWith('https://') Uri.parse(e).origin;
? e return e;
: e.startsWith('/') } catch (err) {
? '${uri.origin}/$e' // is relative
: '${uri.origin}/${uri.path}/$e') }
.toList(); var currPathSegments = uri.path.split('/');
if (e.startsWith('/') || currPathSegments.isEmpty) {
return '${uri.origin}/$e';
} else {
return '${uri.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$e';
}
}).toList();
return APKDetails( return APKDetails(
version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app'))); version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app')));
} else { } else {

View File

@@ -31,7 +31,8 @@ class SourceForge extends AppSource {
getVersion(String url) { getVersion(String url) {
try { try {
var tokens = url.split('/'); var tokens = url.split('/');
return tokens[tokens.length - 3]; var fi = tokens.indexOf('files');
return tokens[tokens[fi + 2] == 'download' ? fi - 1 : fi + 1];
} catch (e) { } catch (e) {
return null; return null;
} }

View File

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
// ignore: implementation_imports // ignore: implementation_imports
import 'package:easy_localization/src/localization.dart'; import 'package:easy_localization/src/localization.dart';
const String currentVersion = '0.11.29'; const String currentVersion = '0.11.32';
const String currentReleaseTag = const String currentReleaseTag =
'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
@@ -263,6 +263,14 @@ class _ObtainiumState extends State<Obtainium> {
darkColorScheme = ColorScheme.fromSeed( darkColorScheme = ColorScheme.fromSeed(
seedColor: defaultThemeColour, brightness: Brightness.dark); seedColor: defaultThemeColour, brightness: Brightness.dark);
} }
// set the background and surface colors to pure black in the amoled theme
if (settingsProvider.useBlackTheme) {
darkColorScheme = darkColorScheme
.copyWith(background: Colors.black, surface: Colors.black)
.harmonized();
}
return MaterialApp( return MaterialApp(
title: 'Obtainium', title: 'Obtainium',
localizationsDelegates: context.localizationDelegates, localizationsDelegates: context.localizationDelegates,

View File

@@ -153,7 +153,7 @@ class _AppPageState extends State<AppPage> {
height: 25, height: 25,
), ),
Text( Text(
app?.app.name ?? tr('app'), app?.name ?? tr('app'),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: Theme.of(context).textTheme.displayLarge, style: Theme.of(context).textTheme.displayLarge,
), ),
@@ -386,7 +386,7 @@ class _AppPageState extends State<AppPage> {
scrollable: true, scrollable: true,
content: getInfoColumn(), content: getInfoColumn(),
title: Text( title: Text(
'${app.app.name} ${tr('byX', args: [ '${app.name} ${tr('byX', args: [
app.app.author app.app.author
])}'), ])}'),
actions: [ actions: [

View File

@@ -94,8 +94,7 @@ class AppsPageState extends State<AppsPage> {
.toList(); .toList();
for (var t in nameTokens) { for (var t in nameTokens) {
var name = app.installedInfo?.name ?? app.app.name; if (!app.name.toLowerCase().contains(t.toLowerCase())) {
if (!name.toLowerCase().contains(t.toLowerCase())) {
return false; return false;
} }
} }
@@ -120,13 +119,13 @@ class AppsPageState extends State<AppsPage> {
}).toList(); }).toList();
listedApps.sort((a, b) { listedApps.sort((a, b) {
var nameA = a.installedInfo?.name ?? a.app.name;
var nameB = b.installedInfo?.name ?? b.app.name;
int result = 0; int result = 0;
if (settingsProvider.sortColumn == SortColumnSettings.authorName) { if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
result = (a.app.author + nameA).compareTo(b.app.author + nameB); result = ((a.app.author + a.name).toLowerCase())
.compareTo((b.app.author + b.name).toLowerCase());
} else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) { } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
result = (nameA + a.app.author).compareTo(nameB + b.app.author); result = ((a.name + a.app.author).toLowerCase())
.compareTo((b.name + b.app.author).toLowerCase());
} else if (settingsProvider.sortColumn == } else if (settingsProvider.sortColumn ==
SortColumnSettings.releaseDate) { SortColumnSettings.releaseDate) {
result = (a.app.releaseDate)?.compareTo( result = (a.app.releaseDate)?.compareTo(
@@ -206,7 +205,7 @@ class AppsPageState extends State<AppsPage> {
var listedCategories = getListedCategories(); var listedCategories = getListedCategories();
listedCategories.sort((a, b) { listedCategories.sort((a, b) {
return a != null && b != null return a != null && b != null
? a.compareTo(b) ? a.toLowerCase().compareTo(b.toLowerCase())
: a == null : a == null
? 1 ? 1
: -1; : -1;
@@ -481,8 +480,7 @@ class AppsPageState extends State<AppsPage> {
leading: getAppIcon(index), leading: getAppIcon(index),
title: Text( title: Text(
maxLines: 1, maxLines: 1,
listedApps[index].installedInfo?.name ?? listedApps[index].name,
listedApps[index].app.name,
style: TextStyle( style: TextStyle(
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
fontWeight: listedApps[index].app.pinned fontWeight: listedApps[index].app.pinned

View File

@@ -224,6 +224,17 @@ class _SettingsPageState extends State<SettingsPage> {
), ),
themeDropdown, themeDropdown,
height16, height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(tr('useBlackTheme')),
Switch(
value: settingsProvider.useBlackTheme,
onChanged: (value) {
settingsProvider.useBlackTheme = value;
})
],
),
colourDropdown, colourDropdown,
height16, height16,
Row( Row(

View File

@@ -36,6 +36,8 @@ class AppInMemory {
AppInMemory(this.app, this.downloadProgress, this.installedInfo); AppInMemory(this.app, this.downloadProgress, this.installedInfo);
AppInMemory deepCopy() => AppInMemory deepCopy() =>
AppInMemory(app.deepCopy(), downloadProgress, installedInfo); AppInMemory(app.deepCopy(), downloadProgress, installedInfo);
String get name => app.overrideName ?? installedInfo?.name ?? app.finalName;
} }
class DownloadedApk { class DownloadedApk {
@@ -163,7 +165,7 @@ class AppsProvider with ChangeNotifier {
Future<DownloadedApk> downloadApp(App app, BuildContext? context) async { Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
NotificationsProvider? notificationsProvider = NotificationsProvider? notificationsProvider =
context?.read<NotificationsProvider>(); context?.read<NotificationsProvider>();
var notifId = DownloadNotification(app.name, 0).id; var notifId = DownloadNotification(app.finalName, 0).id;
if (apps[app.id] != null) { if (apps[app.id] != null) {
apps[app.id]!.downloadProgress = 0; apps[app.id]!.downloadProgress = 0;
notifyListeners(); notifyListeners();
@@ -173,7 +175,7 @@ class AppsProvider with ChangeNotifier {
.getSource(app.url) .getSource(app.url)
.apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value); .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value);
var fileName = '${app.id}-${downloadUrl.hashCode}.apk'; var fileName = '${app.id}-${downloadUrl.hashCode}.apk';
var notif = DownloadNotification(app.name, 100); var notif = DownloadNotification(app.finalName, 100);
notificationsProvider?.cancel(notif.id); notificationsProvider?.cancel(notif.id);
int? prevProg; int? prevProg;
File downloadedFile = File downloadedFile =
@@ -183,7 +185,7 @@ class AppsProvider with ChangeNotifier {
apps[app.id]!.downloadProgress = progress; apps[app.id]!.downloadProgress = progress;
notifyListeners(); notifyListeners();
} }
notif = DownloadNotification(app.name, prog ?? 100); notif = DownloadNotification(app.finalName, prog ?? 100);
if (prog != null && prevProg != prog) { if (prog != null && prevProg != prog) {
notificationsProvider?.notify(notif); notificationsProvider?.notify(notif);
} }
@@ -641,7 +643,7 @@ class AppsProvider with ChangeNotifier {
sp.getSource(newApps[i].url); sp.getSource(newApps[i].url);
apps[newApps[i].id] = AppInMemory(newApps[i], null, info); apps[newApps[i].id] = AppInMemory(newApps[i], null, info);
} catch (e) { } catch (e) {
errors.add([newApps[i].id, newApps[i].name, e.toString()]); errors.add([newApps[i].id, newApps[i].finalName, e.toString()]);
} }
} }
if (errors.isNotEmpty) { if (errors.isNotEmpty) {
@@ -675,9 +677,6 @@ class AppsProvider with ChangeNotifier {
var app = a.deepCopy(); var app = a.deepCopy();
AppInfo? info = await getInstalledInfo(app.id); AppInfo? info = await getInstalledInfo(app.id);
app.name = info?.name ?? app.name; app.name = info?.name ?? app.name;
if (app.additionalSettings['appName']?.toString().isNotEmpty == true) {
app.name = app.additionalSettings['appName'].toString().trim();
}
if (attemptToCorrectInstallStatus) { if (attemptToCorrectInstallStatus) {
app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app; app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app;
} }
@@ -945,7 +944,7 @@ class _APKPickerState extends State<APKPicker> {
scrollable: true, scrollable: true,
title: Text(tr('pickAnAPK')), title: Text(tr('pickAnAPK')),
content: Column(children: [ content: Column(children: [
Text(tr('appHasMoreThanOnePackage', args: [widget.app.name])), Text(tr('appHasMoreThanOnePackage', args: [widget.app.finalName])),
const SizedBox(height: 16), const SizedBox(height: 16),
...widget.app.apkUrls.map( ...widget.app.apkUrls.map(
(u) => RadioListTile<String>( (u) => RadioListTile<String>(

View File

@@ -34,9 +34,9 @@ class UpdateNotification extends ObtainiumNotification {
message = updates.isEmpty message = updates.isEmpty
? tr('noNewUpdates') ? tr('noNewUpdates')
: updates.length == 1 : updates.length == 1
? tr('xHasAnUpdate', args: [updates[0].name]) ? tr('xHasAnUpdate', args: [updates[0].finalName])
: plural('xAndNMoreUpdatesAvailable', updates.length - 1, : plural('xAndNMoreUpdatesAvailable', updates.length - 1,
args: [updates[0].name, (updates.length - 1).toString()]); args: [updates[0].finalName, (updates.length - 1).toString()]);
} }
} }
@@ -46,9 +46,9 @@ class SilentUpdateNotification extends ObtainiumNotification {
tr('appsUpdatedNotifDescription'), Importance.defaultImportance) { tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
message = updates.length == 1 message = updates.length == 1
? tr('xWasUpdatedToY', ? tr('xWasUpdatedToY',
args: [updates[0].name, updates[0].latestVersion]) args: [updates[0].finalName, updates[0].latestVersion])
: plural('xAndNMoreUpdatesInstalled', updates.length - 1, : plural('xAndNMoreUpdatesInstalled', updates.length - 1,
args: [updates[0].name, (updates.length - 1).toString()]); args: [updates[0].finalName, (updates.length - 1).toString()]);
} }
} }

View File

@@ -64,6 +64,15 @@ class SettingsProvider with ChangeNotifier {
notifyListeners(); notifyListeners();
} }
bool get useBlackTheme {
return prefs?.getBool('useBlackTheme') ?? false;
}
set useBlackTheme(bool useBlackTheme) {
prefs?.setBool('useBlackTheme', useBlackTheme);
notifyListeners();
}
int get updateInterval { int get updateInterval {
var min = prefs?.getInt('updateInterval') ?? 360; var min = prefs?.getInt('updateInterval') ?? 360;
if (!updateIntervals.contains(min)) { if (!updateIntervals.contains(min)) {

View File

@@ -80,6 +80,15 @@ class App {
return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned'; return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned';
} }
String? get overrideName =>
additionalSettings['appName']?.toString().trim().isNotEmpty == true
? additionalSettings['appName']
: null;
String get finalName {
return overrideName ?? name;
}
App deepCopy() => App( App deepCopy() => App(
id, id,
url, url,
@@ -257,10 +266,12 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
.reduce((value, element) => [...value, ...element])); .reduce((value, element) => [...value, ...element]));
} }
getApkUrlsFromUrls(List<String> urls) => urls List<MapEntry<String, String>> getApkUrlsFromUrls(List<String> urls) =>
.map((e) => urls.map((e) {
MapEntry(e.split('/').where((el) => el.trim().isNotEmpty).last, e)) var segments = e.split('/').where((el) => el.trim().isNotEmpty);
.toList(); var apkSegs = segments.where((s) => s.toLowerCase().endsWith('.apk'));
return MapEntry(apkSegs.isNotEmpty ? apkSegs.last : segments.last, e);
}).toList();
class AppSource { class AppSource {
String? host; String? host;

View File

@@ -5,18 +5,18 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: android_alarm_manager_plus name: android_alarm_manager_plus
sha256: "8647cc5f9339f3955a2bd9ec40e0f10c3a80049f31f80b3ffdd87e07bb73fce2" sha256: f6d0347734fa2ea716349a5a3e16ffdc1800ca64e5640112896d128c6815c178
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.1" version: "2.1.2"
android_intent_plus: android_intent_plus:
dependency: "direct main" dependency: "direct main"
description: description:
name: android_intent_plus name: android_intent_plus
sha256: "54810cb33945c2c10742cd746ea994822c115e9dbe189919bc63cb436e45a6af" sha256: "6bcdcd20461ac7a0c785f6298cdda96ad275d5bcbc1ecf28829cbe03ec6690be"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.6" version: "3.1.7"
animations: animations:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -117,10 +117,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: device_info_plus name: device_info_plus
sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95" sha256: "435383ca05f212760b0a70426b5a90354fe6bd65992b3a5e27ab6ede74c02f5c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.1.0" version: "8.2.0"
device_info_plus_platform_interface: device_info_plus_platform_interface:
dependency: transitive dependency: transitive
description: description:
@@ -133,10 +133,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: dynamic_color name: dynamic_color
sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b sha256: bbebb1b7ebed819e0ec83d4abdc2a8482d934f6a85289ffc1c6acf7589fa2aad
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.6.2" version: "1.6.3"
easy_localization: easy_localization:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -181,10 +181,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: file_picker name: file_picker
sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013 sha256: dcde5ad1a0cebcf3715ea3f24d0db1888bf77027a26c77d7779e8ef63b8ade62
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.2.6" version: "5.2.9"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@@ -425,10 +425,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path_provider_foundation name: path_provider_foundation
sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7" sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.1" version: "2.2.2"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
@@ -537,18 +537,18 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: share_plus name: share_plus
sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625" sha256: "692261968a494e47323dcc8bc66d8d52e81bc27cb4b808e4e8d7e8079d4cc01a"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.3.1" version: "6.3.2"
share_plus_platform_interface: share_plus_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: share_plus_platform_interface name: share_plus_platform_interface
sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1" sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.2.0" version: "3.2.1"
shared_preferences: shared_preferences:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -561,18 +561,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_android name: shared_preferences_android
sha256: "8304d8a1f7d21a429f91dee552792249362b68a331ac5c3c1caf370f658873f6" sha256: "1bc5d734b109c327b922b0891b41fc51483ccbd53c0d19952b7e230349a5d90b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "2.1.1"
shared_preferences_foundation: shared_preferences_foundation:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_foundation name: shared_preferences_foundation
sha256: cf2a42fb20148502022861f71698db12d937c7459345a1bdaa88fc91a91b3603 sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.0" version: "2.2.1"
shared_preferences_linux: shared_preferences_linux:
dependency: transitive dependency: transitive
description: description:
@@ -710,18 +710,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_android name: url_launcher_android
sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8 sha256: a52628068d282d01a07cd86e6ba99e497aa45ce8c91159015b2416907d78e411
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.0.26" version: "6.0.27"
url_launcher_ios: url_launcher_ios:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_ios name: url_launcher_ios
sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92" sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.1.3" version: "6.1.4"
url_launcher_linux: url_launcher_linux:
dependency: transitive dependency: transitive
description: description:
@@ -734,10 +734,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_macos name: url_launcher_macos
sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a" sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.4" version: "3.0.5"
url_launcher_platform_interface: url_launcher_platform_interface:
dependency: transitive dependency: transitive
description: description:
@@ -790,34 +790,34 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: webview_flutter_android name: webview_flutter_android
sha256: "9e223788e1954087dac30d813dc151f8e12f09f1139f116ce20b5658893f3627" sha256: bdd3ddbeaf341c75620e153d22b6f4f6c4a342fe4439ed3a10db74dd82e65d1c
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.4.4" version: "3.5.1"
webview_flutter_platform_interface: webview_flutter_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: webview_flutter_platform_interface name: webview_flutter_platform_interface
sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b" sha256: "6341f92977609be71391f4d4dcd64bfaa8ac657af1dfb2e231b5c1724e8c6c36"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "2.2.0"
webview_flutter_wkwebview: webview_flutter_wkwebview:
dependency: transitive dependency: transitive
description: description:
name: webview_flutter_wkwebview name: webview_flutter_wkwebview
sha256: d601aba11ad8d4481e17a34a76fa1d30dee92dcbbe2c58b0df3120e9453099c7 sha256: "2ef3f65fd49061c18e4d837a411308f2850417f2d0a7c11aad2c3857bee12c18"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.2.3" version: "3.3.0"
win32: win32:
dependency: transitive dependency: transitive
description: description:
name: win32 name: win32
sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.3" version: "3.1.4"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description:

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 # 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 # 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. # of the product and file versions while build-number is used as the build suffix.
version: 0.11.29+151 # When changing this, update the tag in main() accordingly version: 0.11.32+154 # When changing this, update the tag in main() accordingly
environment: environment:
sdk: '>=2.18.2 <3.0.0' sdk: '>=2.18.2 <3.0.0'