PackageKit improvements (#50)

Author: Feichtmeier

Diff for: lib/package_installer/package_installer_model.dart

@@ -12,7 +12,9 @@ class PackageInstallerModel extends SafeChangeNotifier {
         _size = 0,
         _summary = '',
         _url = '',
-        _installedPackageIds = {};
+        _installedPackageIds = {} {
+    _client.connect();
+  }
 
   final PackageKitClient _client;
   final String path;

Diff for: lib/store_app/my_apps/my_packages_model.dart

@@ -6,7 +6,9 @@ import 'package:safe_change_notifier/safe_change_notifier.dart';
 class MyPackagesModel extends SafeChangeNotifier {
   final PackageKitClient _client;
 
-  MyPackagesModel(this._client) : _packageIds = {};
+  MyPackagesModel(this._client) : _packageIds = {} {
+    _client.connect();
+  }
 
   final Set<PackageKitPackageId> _packageIds;
   List<PackageKitPackageId> get packages => _packageIds.toList();

Diff for: lib/store_app/my_apps/package_dialog.dart

@@ -71,7 +71,7 @@ class _PackageDialogState extends State<PackageDialog> {
             onPressed: model.processing ? null : model.remove,
             child: Text(context.l10n.remove),
           ),
-        if (!model.updateAvailable)
+        if (!model.updateAvailable && !model.packageIsInstalled)
           ElevatedButton(
             onPressed: model.processing ? null : model.install,
             child: Text(context.l10n.install),

Diff for: lib/store_app/my_apps/package_model.dart

@@ -11,7 +11,9 @@ class PackageModel extends SafeChangeNotifier {
         _size = 0,
         _summary = '',
         _url = '',
-        _installedPackageIds = [];
+        _installedPackageIds = [] {
+    _client.connect();
+  }
 
   final PackageKitClient _client;
 

Diff for: lib/store_app/my_apps/system_updates_model.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:packagekit/packagekit.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
@@ -9,10 +10,19 @@ class SystemUpdatesModel extends SafeChangeNotifier {
   final List<PackageKitPackageId> updates = [];
   String errorString = '';
   bool updating = false;
+  String _manualRepoName = '';
+  set manualRepoName(String value) {
+    if (value == _manualRepoName) return;
+    _manualRepoName = value;
+    notifyListeners();
+  }
 
-  SystemUpdatesModel(this._client);
+  SystemUpdatesModel(this._client) {
+    _client.connect();
+  }
 
   Future<void> getUpdates() async {
+    updates.clear();
     errorString = '';
     final transaction = await _client.createTransaction();
     final completer = Completer();
@@ -92,7 +102,19 @@ class SystemUpdatesModel extends SafeChangeNotifier {
   }
 
   // Not implemented in packagekit.dart
-  Future<void> addRepo(String id) async {}
-  // Not implemented in packagekit.dart
+  Future<void> addRepo() async {
+    if (_manualRepoName.isEmpty) return;
+    Process.start(
+      'pkexec',
+      [
+        'apt-add-repository',
+        _manualRepoName,
+      ],
+      mode: ProcessStartMode.detached,
+    );
+    loadRepoList();
+  }
+
+  // Not implemented in packagekit.dart and too hard for apt-add-repository
   Future<void> removeRepo(String id) async {}
 }

Diff for: lib/store_app/my_apps/system_updates_page.dart

@@ -71,6 +71,16 @@ class _SystemUpdatesPageState extends State<SystemUpdatesPage> {
               const SizedBox(
                 width: 10,
               ),
+              SizedBox(
+                width: 40,
+                child: YaruRoundIconButton(
+                  onTap: () => model.getUpdates(),
+                  child: const Icon(YaruIcons.refresh),
+                ),
+              ),
+              const SizedBox(
+                width: 10,
+              ),
               if (model.updates.isNotEmpty)
                 ElevatedButton(
                   onPressed: model.updating ? null : () => model.updateAll(),
@@ -89,16 +99,6 @@ class _SystemUpdatesPageState extends State<SystemUpdatesPage> {
                         context.l10n.noUpdates,
                         style: Theme.of(context).textTheme.headline4,
                       ),
-                      const SizedBox(
-                        width: 10,
-                      ),
-                      SizedBox(
-                        width: 40,
-                        child: YaruRoundIconButton(
-                          onTap: () => model.getUpdates(),
-                          child: const Icon(YaruIcons.refresh),
-                        ),
-                      ),
                     ],
                   ),
                 )
@@ -110,6 +110,7 @@ class _SystemUpdatesPageState extends State<SystemUpdatesPage> {
                   itemBuilder: (context, index) {
                     return AppBanner(
                       name: model.updates[index].name,
+                      summary: model.updates[index].version,
                       icon: const Icon(
                         YaruIcons.package_deb,
                         size: 50,
@@ -137,7 +138,14 @@ class _RepoDialog extends StatefulWidget {
 }
 
 class _RepoDialogState extends State<_RepoDialog> {
-  final controller = TextEditingController();
+  late TextEditingController controller;
+
+  @override
+  void initState() {
+    controller = TextEditingController();
+    super.initState();
+  }
+
   @override
   void dispose() {
     controller.dispose();
@@ -154,9 +162,7 @@ class _RepoDialogState extends State<_RepoDialog> {
         titleWidget: Row(
           children: [
             YaruRoundIconButton(
-              onTap: controller.text.isNotEmpty
-                  ? () => model.addRepo(controller.text)
-                  : null,
+              onTap: controller.text.isEmpty ? null : () => model.addRepo(),
               child: const Icon(YaruIcons.plus),
             ),
             const SizedBox(
@@ -165,6 +171,7 @@ class _RepoDialogState extends State<_RepoDialog> {
             SizedBox(
               width: 300,
               child: TextField(
+                onChanged: (value) => model.manualRepoName = value,
                 controller: controller,
                 decoration: InputDecoration(
                   hintText: context.l10n.enterRepoName,
@@ -182,13 +189,8 @@ class _RepoDialogState extends State<_RepoDialog> {
               value: e.enabled,
               onChanged: (v) => model.toggleRepo(id: e.repoId, value: v!),
               title: ListTile(
-                leading: YaruRoundIconButton(
-                  child: const Icon(YaruIcons.trash),
-                  onTap: () => model.removeRepo(e.repoId),
-                ),
                 title: Text(e.repoId),
                 subtitle: Text(e.description),
-                isThreeLine: true,
               ),
             ),
           )

Diff for: linux/my_application.cc

@@ -54,7 +54,7 @@ static void my_application_activate(GApplication* application) {
   gtk_window_set_geometry_hints(window, nullptr, &geometry_min, GDK_HINT_MIN_SIZE);
 
 
-  gtk_window_set_default_size(window, 800, 730);
+  gtk_window_set_default_size(window, 800, 870);
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
   fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);