Merge pull request #217 from ImranR98/dev

Bugfixes and UI Tweaks (#213, #215, #216)

lib/app_sources/github.dart

@@ -15,6 +15,7 @@ class GitHub extends AppSource {
     additionalSourceSpecificSettingFormItems = [
       GeneratedFormTextField('github-creds',
           label: tr('githubPATLabel'),
+          password: true,
           required: false,
           additionalValidators: [
             (value) {

lib/components/generated_form.dart

@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
-import 'package:obtainium/providers/settings_provider.dart';
 
 abstract class GeneratedFormItem {
   late String key;
@@ -24,6 +23,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
   late bool required;
   late int max;
   late String? hint;
+  late bool password;
 
   GeneratedFormTextField(String key,
       {String label = 'Input',
@@ -32,7 +32,8 @@ class GeneratedFormTextField extends GeneratedFormItem {
       List<String? Function(String? value)> additionalValidators = const [],
       this.required = true,
       this.max = 1,
-      this.hint})
+      this.hint,
+      this.password = false})
       : super(key,
             label: label,
             belowWidgets: belowWidgets,
@@ -129,6 +130,21 @@ class GeneratedForm extends StatefulWidget {
   State<GeneratedForm> createState() => _GeneratedFormState();
 }
 
+// Generates a random light color
+// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+Color generateRandomLightColor() {
+  // Create a random number generator
+  final Random random = Random();
+
+  // Generate random hue, saturation, and value values
+  final double hue = random.nextDouble() * 360;
+  final double saturation = 0.5 + random.nextDouble() * 0.5;
+  final double value = 0.9 + random.nextDouble() * 0.1;
+
+  // Create a HSV color with the random values
+  return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
+}
+
 class _GeneratedFormState extends State<GeneratedForm> {
   final _formKey = GlobalKey<FormState>();
   Map<String, dynamic> values = {};
@@ -153,21 +169,6 @@ class _GeneratedFormState extends State<GeneratedForm> {
     widget.onValueChanges(returnValues, valid, isBuilding);
   }
 
-  // Generates a random light color
-  // Courtesy of ChatGPT 😭 (with a bugfix 🥳)
-  Color generateRandomLightColor() {
-    // Create a random number generator
-    final Random random = Random();
-
-    // Generate random hue, saturation, and value values
-    final double hue = random.nextDouble() * 360;
-    final double saturation = 0.5 + random.nextDouble() * 0.5;
-    final double value = 0.9 + random.nextDouble() * 0.1;
-
-    // Create a HSV color with the random values
-    return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
-  }
-
   @override
   void initState() {
     super.initState();
@@ -188,6 +189,9 @@ class _GeneratedFormState extends State<GeneratedForm> {
         if (formItem is GeneratedFormTextField) {
           final formFieldKey = GlobalKey<FormFieldState>();
           return TextFormField(
+            obscureText: formItem.password,
+            autocorrect: !formItem.password,
+            enableSuggestions: !formItem.password,
             key: formFieldKey,
             initialValue: values[formItem.key],
             autovalidateMode: AutovalidateMode.onUserInteraction,

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

lib/pages/apps.dart

@@ -348,8 +348,9 @@ class AppsPageState extends State<AppsPage> {
         Row(
           children: [
             selectedApps.isEmpty
-                ? IconButton(
+                ? TextButton.icon(
-                    visualDensity: VisualDensity.compact,
+                    style:
+                        const ButtonStyle(visualDensity: VisualDensity.compact),
                     onPressed: () {
                       selectThese(sortedApps.map((e) => e.app).toList());
                     },
@@ -357,7 +358,7 @@ class AppsPageState extends State<AppsPage> {
                       Icons.select_all_outlined,
                       color: Theme.of(context).colorScheme.primary,
                     ),
-                    tooltip: tr('selectAll'))
+                    label: Text(sortedApps.length.toString()))
                 : TextButton.icon(
                     style:
                         const ButtonStyle(visualDensity: VisualDensity.compact),
@@ -375,31 +376,36 @@ class AppsPageState extends State<AppsPage> {
                     label: Text(selectedApps.length.toString())),
             const VerticalDivider(),
             Expanded(
+                child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                selectedApps.isEmpty
+                        IconButton(
-                    ? const SizedBox()
-                    : IconButton(
                           visualDensity: VisualDensity.compact,
-                        onPressed: () {
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () {
                                   showDialog<Map<String, dynamic>?>(
                                       context: context,
                                       builder: (BuildContext ctx) {
                                         return GeneratedFormModal(
-                                  title: tr('removeSelectedAppsQuestion'),
+                                          title:
+                                              tr('removeSelectedAppsQuestion'),
                                           items: const [],
                                           initValid: true,
                                           message: tr(
                                               'xWillBeRemovedButRemainInstalled',
                                               args: [
-                                        plural('apps', selectedApps.length)
+                                                plural(
+                                                    'apps', selectedApps.length)
                                               ]),
                                         );
                                       }).then((values) {
                                     if (values != null) {
-                              appsProvider.removeApps(
+                                      appsProvider.removeApps(selectedApps
-                                  selectedApps.map((e) => e.id).toList());
+                                          .map((e) => e.id)
+                                          .toList());
                                     }
                                   });
                                 },
@@ -416,50 +422,71 @@ class AppsPageState extends State<AppsPage> {
                                 : () {
                                     HapticFeedback.heavyImpact();
                                     List<GeneratedFormItem> formItems = [];
-                            if (existingUpdateIdsAllOrSelected.isNotEmpty) {
+                                    if (existingUpdateIdsAllOrSelected
-                              formItems.add(GeneratedFormSwitch('updates',
+                                        .isNotEmpty) {
+                                      formItems.add(GeneratedFormSwitch(
+                                          'updates',
                                           label: tr('updateX', args: [
-                                    plural('apps',
+                                            plural(
-                                        existingUpdateIdsAllOrSelected.length)
+                                                'apps',
+                                                existingUpdateIdsAllOrSelected
+                                                    .length)
                                           ]),
                                           defaultValue: true));
                                     }
                                     if (newInstallIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormSwitch('installs',
+                                      formItems.add(GeneratedFormSwitch(
+                                          'installs',
                                           label: tr('installX', args: [
-                                    plural('apps',
+                                            plural(
-                                        newInstallIdsAllOrSelected.length)
+                                                'apps',
+                                                newInstallIdsAllOrSelected
+                                                    .length)
                                           ]),
-                                  defaultValue: existingUpdateIdsAllOrSelected
+                                          defaultValue:
+                                              existingUpdateIdsAllOrSelected
                                                   .isNotEmpty));
                                     }
-                            if (trackOnlyUpdateIdsAllOrSelected.isNotEmpty) {
+                                    if (trackOnlyUpdateIdsAllOrSelected
-                              formItems.add(GeneratedFormSwitch('trackonlies',
+                                        .isNotEmpty) {
-                                  label: tr('markXTrackOnlyAsUpdated', args: [
+                                      formItems.add(GeneratedFormSwitch(
-                                    plural('apps',
+                                          'trackonlies',
-                                        trackOnlyUpdateIdsAllOrSelected.length)
+                                          label: tr('markXTrackOnlyAsUpdated',
+                                              args: [
+                                                plural(
+                                                    'apps',
+                                                    trackOnlyUpdateIdsAllOrSelected
+                                                        .length)
                                               ]),
-                                  defaultValue: existingUpdateIdsAllOrSelected
+                                          defaultValue:
+                                              existingUpdateIdsAllOrSelected
                                                       .isNotEmpty ||
-                                      newInstallIdsAllOrSelected.isNotEmpty));
+                                                  newInstallIdsAllOrSelected
+                                                      .isNotEmpty));
                                     }
                                     showDialog<Map<String, dynamic>?>(
                                         context: context,
                                         builder: (BuildContext ctx) {
-                                  var totalApps = existingUpdateIdsAllOrSelected
+                                          var totalApps =
+                                              existingUpdateIdsAllOrSelected.length +
+                                                  newInstallIdsAllOrSelected
                                                       .length +
-                                      newInstallIdsAllOrSelected.length +
+                                                  trackOnlyUpdateIdsAllOrSelected
-                                      trackOnlyUpdateIdsAllOrSelected.length;
+                                                      .length;
                                           return GeneratedFormModal(
-                                    title: tr('changeX',
+                                            title: tr('changeX', args: [
-                                        args: [plural('apps', totalApps)]),
+                                              plural('apps', totalApps)
-                                    items: formItems.map((e) => [e]).toList(),
+                                            ]),
+                                            items: formItems
+                                                .map((e) => [e])
+                                                .toList(),
                                             initValid: true,
                                           );
                                         }).then((values) {
                                       if (values != null) {
                                         if (values.isEmpty) {
-                                  values = getDefaultValuesFromFormItems(
+                                          values =
+                                              getDefaultValuesFromFormItems(
                                                   [formItems]);
                                         }
                                         bool shouldInstallUpdates =
@@ -478,20 +505,22 @@ class AppsPageState extends State<AppsPage> {
                                             .then((_) {
                                           List<String> toInstall = [];
                                           if (shouldInstallUpdates) {
-                                    toInstall
+                                            toInstall.addAll(
-                                        .addAll(existingUpdateIdsAllOrSelected);
+                                                existingUpdateIdsAllOrSelected);
                                           }
                                           if (shouldInstallNew) {
-                                    toInstall
+                                            toInstall.addAll(
-                                        .addAll(newInstallIdsAllOrSelected);
+                                                newInstallIdsAllOrSelected);
                                           }
                                           if (shouldMarkTrackOnlies) {
                                             toInstall.addAll(
                                                 trackOnlyUpdateIdsAllOrSelected);
                                           }
                                           appsProvider
-                                      .downloadAndInstallLatestApps(toInstall,
+                                              .downloadAndInstallLatestApps(
-                                          globalNavigatorKey.currentContext)
+                                                  toInstall,
+                                                  globalNavigatorKey
+                                                      .currentContext)
                                               .catchError((e) {
                                             showError(e, context);
                                           });
@@ -505,16 +534,17 @@ class AppsPageState extends State<AppsPage> {
                             icon: const Icon(
                               Icons.file_download_outlined,
                             )),
-                selectedApps.isEmpty
+                        IconButton(
-                    ? const SizedBox()
-                    : IconButton(
                           visualDensity: VisualDensity.compact,
-                        onPressed: () async {
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () async {
                                   try {
                                     Set<String>? preselected;
                                     var showPrompt = false;
                                     for (var element in selectedApps) {
-                              var currentCats = element.categories.toSet();
+                                      var currentCats =
+                                          element.categories.toSet();
                                       if (preselected == null) {
                                         preselected = currentCats;
                                       } else {
@@ -527,15 +557,16 @@ class AppsPageState extends State<AppsPage> {
                                     }
                                     var cont = true;
                                     if (showPrompt) {
-                              cont = await showDialog<Map<String, dynamic>?>(
+                                      cont = await showDialog<
+                                                  Map<String, dynamic>?>(
                                               context: context,
                                               builder: (BuildContext ctx) {
                                                 return GeneratedFormModal(
                                                   title: tr('categorize'),
                                                   items: const [],
                                                   initValid: true,
-                                          message:
+                                                  message: tr(
-                                              tr('selectedCategorizeWarning'),
+                                                      'selectedCategorizeWarning'),
                                                 );
                                               }) !=
                                           null;
@@ -548,7 +579,8 @@ class AppsPageState extends State<AppsPage> {
                                               title: tr('categorize'),
                                               items: const [],
                                               initValid: true,
-                                      singleNullReturnButton: tr('continue'),
+                                              singleNullReturnButton:
+                                                  tr('continue'),
                                               additionalWidgets: [
                                                 CategoryEditorSelector(
                                                   preselected: !showPrompt
@@ -556,8 +588,8 @@ class AppsPageState extends State<AppsPage> {
                                                       : {},
                                                   showLabelWhenNotEmpty: false,
                                                   onSelected: (categories) {
-                                            appsProvider
+                                                    appsProvider.saveApps(
-                                                .saveApps(selectedApps.map((e) {
+                                                        selectedApps.map((e) {
                                                       e.categories = categories;
                                                       return e;
                                                     }).toList());
@@ -574,30 +606,32 @@ class AppsPageState extends State<AppsPage> {
                           tooltip: tr('categorize'),
                           icon: const Icon(Icons.category_outlined),
                         ),
-                selectedApps.isEmpty
+                        IconButton(
-                    ? const SizedBox()
-                    : IconButton(
                           visualDensity: VisualDensity.compact,
-                        onPressed: () {
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () {
                                   showDialog(
                                       context: context,
                                       builder: (BuildContext ctx) {
                                         return AlertDialog(
                                           scrollable: true,
                                           content: Padding(
-                                    padding: const EdgeInsets.only(top: 6),
+                                            padding:
+                                                const EdgeInsets.only(top: 6),
                                             child: Row(
                                                 mainAxisAlignment:
-                                            MainAxisAlignment.spaceAround,
+                                                    MainAxisAlignment
+                                                        .spaceAround,
                                                 children: [
                                                   IconButton(
-                                              onPressed:
+                                                      onPressed: appsProvider
-                                                  appsProvider
                                                               .areDownloadsRunning()
                                                           ? null
                                                           : () {
                                                               showDialog(
-                                                              context: context,
+                                                                  context:
+                                                                      context,
                                                                   builder:
                                                                       (BuildContext
                                                                           ctx) {
@@ -605,47 +639,39 @@ class AppsPageState extends State<AppsPage> {
                                                                       title: Text(tr(
                                                                           'markXSelectedAppsAsUpdated',
                                                                           args: [
-                                                                        selectedApps
+                                                                            selectedApps.length.toString()
-                                                                            .length
-                                                                            .toString()
                                                                           ])),
-                                                                  content: Text(
+                                                                      content:
+                                                                          Text(
                                                                         tr('onlyWorksWithNonEVDApps'),
                                                                         style: const TextStyle(
                                                                             fontWeight:
-                                                                            FontWeight
+                                                                                FontWeight.bold,
-                                                                                .bold,
+                                                                            fontStyle: FontStyle.italic),
-                                                                        fontStyle:
-                                                                            FontStyle.italic),
                                                                       ),
                                                                       actions: [
                                                                         TextButton(
                                                                             onPressed:
                                                                                 () {
-                                                                          Navigator.of(context)
+                                                                              Navigator.of(context).pop();
-                                                                              .pop();
                                                                             },
-                                                                        child: Text(
+                                                                            child:
-                                                                            tr('no'))),
+                                                                                Text(tr('no'))),
                                                                         TextButton(
                                                                             onPressed:
                                                                                 () {
-                                                                          HapticFeedback
+                                                                              HapticFeedback.selectionClick();
-                                                                              .selectionClick();
+                                                                              appsProvider.saveApps(selectedApps.map((a) {
-                                                                          appsProvider
+                                                                                if (a.installedVersion != null) {
-                                                                              .saveApps(selectedApps.map((a) {
-                                                                            if (a.installedVersion !=
-                                                                                null) {
                                                                                   a.installedVersion = a.latestVersion;
                                                                                 }
                                                                                 return a;
                                                                               }).toList());
 
-                                                                          Navigator.of(context)
+                                                                              Navigator.of(context).pop();
-                                                                              .pop();
                                                                             },
-                                                                        child: Text(
+                                                                            child:
-                                                                            tr('yes')))
+                                                                                Text(tr('yes')))
                                                                       ],
                                                                     );
                                                                   }).whenComplete(() {
@@ -654,21 +680,25 @@ class AppsPageState extends State<AppsPage> {
                                                                     .pop();
                                                               });
                                                             },
-                                              tooltip:
+                                                      tooltip: tr(
-                                                  tr('markSelectedAppsUpdated'),
+                                                          'markSelectedAppsUpdated'),
-                                              icon: const Icon(Icons.done)),
+                                                      icon: const Icon(
+                                                          Icons.done)),
                                                   IconButton(
                                                     onPressed: () {
-                                              var pinStatus = selectedApps
+                                                      var pinStatus =
+                                                          selectedApps
                                                               .where((element) =>
-                                                      element.pinned)
+                                                                  element
+                                                                      .pinned)
                                                               .isEmpty;
                                                       appsProvider.saveApps(
                                                           selectedApps.map((e) {
                                                         e.pinned = pinStatus;
                                                         return e;
                                                       }).toList());
-                                              Navigator.of(context).pop();
+                                                      Navigator.of(context)
+                                                          .pop();
                                                     },
                                                     tooltip: selectedApps
                                                             .where((element) =>
@@ -680,14 +710,16 @@ class AppsPageState extends State<AppsPage> {
                                                             .where((element) =>
                                                                 element.pinned)
                                                             .isEmpty
-                                                ? Icons.bookmark_outline_rounded
+                                                        ? Icons
+                                                            .bookmark_outline_rounded
                                                         : Icons
                                                             .bookmark_remove_outlined),
                                                   ),
                                                   IconButton(
                                                     onPressed: () {
                                                       String urls = '';
-                                              for (var a in selectedApps) {
+                                                      for (var a
+                                                          in selectedApps) {
                                                         urls += '${a.url}\n';
                                                       }
                                                       urls = urls.substring(
@@ -695,16 +727,20 @@ class AppsPageState extends State<AppsPage> {
                                                       Share.share(urls,
                                                           subject: tr(
                                                               'selectedAppURLsFromObtainium'));
-                                              Navigator.of(context).pop();
+                                                      Navigator.of(context)
+                                                          .pop();
                                                     },
-                                            tooltip: tr('shareSelectedAppURLs'),
+                                                    tooltip: tr(
-                                            icon: const Icon(Icons.share),
+                                                        'shareSelectedAppURLs'),
+                                                    icon:
+                                                        const Icon(Icons.share),
                                                   ),
                                                   IconButton(
                                                     onPressed: () {
                                                       showDialog(
                                                           context: context,
-                                                  builder: (BuildContext ctx) {
+                                                          builder: (BuildContext
+                                                              ctx) {
                                                             return GeneratedFormModal(
                                                               title: tr(
                                                                   'resetInstallStatusForSelectedAppsQuestion'),
@@ -722,18 +758,22 @@ class AppsPageState extends State<AppsPage> {
                                                           }).then((values) {
                                                         if (values != null) {
                                                           appsProvider.saveApps(
-                                                      selectedApps.map((e) {
+                                                              selectedApps
-                                                    e.installedVersion = null;
+                                                                  .map((e) {
+                                                            e.installedVersion =
+                                                                null;
                                                             return e;
                                                           }).toList());
                                                         }
                                                       }).whenComplete(() {
-                                                Navigator.of(context).pop();
+                                                        Navigator.of(context)
+                                                            .pop();
                                                       });
                                                     },
-                                            tooltip: tr('resetInstallStatus'),
+                                                    tooltip: tr(
-                                            icon: const Icon(
+                                                        'resetInstallStatus'),
-                                                Icons.restore_page_outlined),
+                                                    icon: const Icon(Icons
+                                                        .restore_page_outlined),
                                                   ),
                                                 ]),
                                           ),
@@ -744,7 +784,7 @@ class AppsPageState extends State<AppsPage> {
                           icon: const Icon(Icons.more_horiz),
                         ),
                       ],
-            )),
+                    ))),
             const VerticalDivider(),
             IconButton(
               visualDensity: VisualDensity.compact,

lib/pages/import_export.dart

@@ -9,6 +9,7 @@ import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:file_picker/file_picker.dart';
@@ -28,6 +29,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
   Widget build(BuildContext context) {
     SourceProvider sourceProvider = SourceProvider();
     var appsProvider = context.read<AppsProvider>();
+    var settingsProvider = context.read<SettingsProvider>();
     var outlineButtonStyle = ButtonStyle(
       shape: MaterialStateProperty.all(
         StadiumBorder(
@@ -100,6 +102,21 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                               appsProvider
                                                   .importApps(data)
                                                   .then((value) {
+                                                var cats =
+                                                    settingsProvider.categories;
+                                                appsProvider.apps
+                                                    .forEach((key, value) {
+                                                  for (var c
+                                                      in value.app.categories) {
+                                                    if (!cats.containsKey(c)) {
+                                                      cats[c] =
+                                                          generateRandomLightColor()
+                                                              .value;
+                                                    }
+                                                  }
+                                                });
+                                                settingsProvider.categories =
+                                                    cats;
                                                 showError(
                                                     tr('importedX', args: [
                                                       plural('apps', value)

pubspec.lock

@@ -56,7 +56,7 @@ packages:
       name: checked_yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   cli_util:
     dependency: transitive
     description:
@@ -286,7 +286,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.2"
+    version: "3.3.0"
   install_plugin_v2:
     dependency: "direct main"
     description:
@@ -559,7 +559,7 @@ packages:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -655,7 +655,7 @@ packages:
       name: timezone
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.0"
+    version: "0.9.1"
   typed_data:
     dependency: transitive
     description:

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.9.13+103 # When changing this, update the tag in main() accordingly
+version: 0.9.14+104 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'