Merge pull request #426 from ImranR98/dev

Increment version

assets/translations/de.json

@@ -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",
@@ -269,4 +270,4 @@
         "one": "{} und 1 weitere Anwendung wurden aktualisiert.",
         "other": "{} und {} weitere Anwendungen wurden aktualisiert."
     }
-}
+}

assets/translations/en.json

@@ -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",
@@ -269,4 +270,4 @@
         "one": "{} and 1 more app were updated.",
         "other": "{} and {} more apps were updated."
     }
-}
+}

assets/translations/fa.json

@@ -207,6 +207,7 @@
     "addCategory": "اضافه کردن دسته",
     "label": "برچسب",
     "language": "زبان",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "مجوز ذخیره سازی رد شد",
     "selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
     "filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",

assets/translations/fr.json

@@ -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",

assets/translations/hu.json

@@ -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",
@@ -219,7 +220,7 @@
     "importFromURLsInFile": "Importálás fájlban található URL-ből (mint pl. OPML)",
     "versionDetection": "Verzió érzékelés",
     "standardVersionDetection": "Alapért. verzió érzékelés",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "Csoportosítás Kategória alapján",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -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",

assets/translations/ja.json

@@ -207,6 +207,7 @@
     "addCategory": "カテゴリを追加",
     "label": "ラベル",
     "language": "言語",
+    "copiedToClipboard": "クリップボードにコピーしました",
     "storagePermissionDenied": "ストレージ権限が拒否されました",
     "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
     "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
@@ -269,4 +270,4 @@
         "one": "{} とさらに {} 個のアプリがアップデートされました",
         "other": "{} とさらに {} 個のアプリがアップデートされました"
     }
-}
+}

assets/translations/zh.json

@@ -208,6 +208,7 @@
     "addCategory": "添加类别",
     "label": "标签",
     "language": "语言",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "存储权限已被拒绝",
     "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
@@ -269,4 +270,4 @@
         "one": "{} 和 {} 更多应用已被安装",
         "other": "{} 和 {} 更多应用已被安装"
     }
-}
+}

lib/app_sources/fdroid.dart

@@ -14,12 +14,14 @@ class FDroid extends AppSource {
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegExB =
-        RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
+        RegExp('^https?://(cloudflare\\.)?$host/+[^/]+/+packages/+[^/]+');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
-      url = 'https://$host/packages/${Uri.parse(url).pathSegments.last}';
+      url =
+          'https://${Uri.parse(url.substring(0, match.end)).host}/packages/${Uri.parse(url).pathSegments.last}';
     }
-    RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
+    RegExp standardUrlRegExA =
+        RegExp('^https?://(cloudflare\\.)?$host/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
@@ -61,9 +63,10 @@ class FDroid extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     String? appId = tryInferringAppId(standardUrl);
+    String host = Uri.parse(standardUrl).host;
     return getAPKUrlsFromFDroidPackagesAPIResponse(
-        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
+        await get(Uri.parse('https://$host/api/v1/packages/$appId')),
-        'https://f-droid.org/repo/$appId',
+        'https://$host/repo/$appId',
         standardUrl);
   }
 }

lib/app_sources/github.dart

@@ -185,9 +185,11 @@ class GitHub extends AppSource {
       Map<String, String> urlsWithDescriptions = {};
       for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
         urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
+          e['html_url'] as String:
-              ? e['description'] as String
+              ((e['archived'] == true ? '[ARCHIVED] ' : '') +
-              : tr('noDescription')
+                  (e['description'] != null
+                      ? e['description'] as String
+                      : tr('noDescription')))
         });
       }
       return urlsWithDescriptions;

lib/main.dart

@@ -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.22';
+const String currentVersion = '0.11.24';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -334,11 +334,10 @@ class _AddAppPageState extends State<AddAppPage> {
           ],
         );
 
-    Widget getSourcesListWidget() => Expanded(
+    Widget getSourcesListWidget() => Column(
-            child: Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
-                mainAxisAlignment: MainAxisAlignment.center,
+            children: [
-                children: [
               const SizedBox(
                 height: 48,
               ),
@@ -365,16 +364,17 @@ class _AddAppPageState extends State<AddAppPage> {
                             fontStyle: FontStyle.italic),
                       )))
                   .toList()
-            ]));
+            ]);
 
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
-        body: CustomScrollView(slivers: <Widget>[
+        body: CustomScrollView(shrinkWrap: true, slivers: <Widget>[
           CustomAppBar(title: tr('addApp')),
-          SliverFillRemaining(
+          SliverToBoxAdapter(
             child: Padding(
                 padding: const EdgeInsets.all(16),
                 child: Column(
+                    mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
                       getUrlInputRow(),

lib/pages/app.dart

@@ -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,
@@ -147,7 +153,7 @@ class _AppPageState extends State<AppPage> {
               height: 25,
             ),
             Text(
-              app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+              app?.app.name ?? tr('app'),
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.displayLarge,
             ),

lib/providers/apps_provider.dart

@@ -670,6 +670,9 @@ class AppsProvider with ChangeNotifier {
     for (var app in apps) {
       AppInfo? info = await getInstalledInfo(app.id);
       app.name = info?.name ?? app.name;
+      if (app.additionalSettings['appName']?.toString().isNotEmpty == true) {
+        app.name = app.additionalSettings['appName'].toString().trim();
+      }
       if (attemptToCorrectInstallStatus) {
         app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app;
       }

lib/providers/source_provider.dart

@@ -278,7 +278,8 @@ class AppSource {
               return regExValidator(value);
             }
           ])
-    ]
+    ],
+    [GeneratedFormTextField('appName', label: tr('appName'), required: false)]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -362,7 +363,7 @@ class SourceProvider {
     url = preStandardizeUrl(url);
     AppSource? source;
     for (var s in sources.where((element) => element.host != null)) {
-      if (url.contains('://${s.host}')) {
+      if (RegExp('://(.+\\.)?${s.host}').hasMatch(url)) {
         source = s;
         break;
       }
@@ -427,8 +428,10 @@ class SourceProvider {
       throw NoAPKError();
     }
     String apkVersion = apk.version.replaceAll('/', '-');
-    var name = currentApp?.name.trim() ??
+    var name = currentApp != null ? currentApp.name.trim() : '';
-        apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
+    name = name.isNotEmpty
+        ? name
+        : apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
     return App(
         currentApp?.id ??
             source.tryInferringAppId(standardUrl,
@@ -436,9 +439,7 @@ class SourceProvider {
             generateTempID(standardUrl, additionalSettings),
         standardUrl,
         apk.names.author[0].toUpperCase() + apk.names.author.substring(1),
-        name.trim().isNotEmpty
+        name,
-            ? name
-            : apk.names.name[0].toUpperCase() + apk.names.name.substring(1),
         currentApp?.installedVersion,
         apkVersion,
         apk.apkUrls,

pubspec.yaml

@@ -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.22+144 # When changing this, update the tag in main() accordingly
+version: 0.11.24+146 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'