From ac4ae00d06bc97149c83ac3a0bc5e022eccb6290 Mon Sep 17 00:00:00 2001 From: franzap <_@franzap.com> Date: Mon, 11 Nov 2024 23:57:59 -0300 Subject: [PATCH] Install dialog fixes --- lib/screens/app_detail_screen.dart | 5 ++-- lib/widgets/install_alert_dialog.dart | 41 +++++++++++++-------------- lib/widgets/install_button.dart | 7 ----- pubspec.lock | 24 ++++++++-------- 4 files changed, 34 insertions(+), 43 deletions(-) diff --git a/lib/screens/app_detail_screen.dart b/lib/screens/app_detail_screen.dart index cb6ab33..284a9b1 100644 --- a/lib/screens/app_detail_screen.dart +++ b/lib/screens/app_detail_screen.dart @@ -11,7 +11,6 @@ import 'package:zapstore/main.data.dart'; import 'package:zapstore/models/app.dart'; import 'package:zapstore/models/release.dart'; import 'package:zapstore/utils/extensions.dart'; -import 'package:zapstore/widgets/author_container.dart'; import 'package:zapstore/widgets/install_button.dart'; import 'package:zapstore/widgets/release_card.dart'; import 'package:zapstore/widgets/signer_and_developer_row.dart'; @@ -138,7 +137,9 @@ class AppDetailScreen extends HookConsumerWidget { Flexible( child: GestureDetector( onTap: () { - launchUrl(Uri.parse(app.repository!)); + if (app.repository != null) { + launchUrl(Uri.parse(app.repository!)); + } }, child: app.repository != null ? AutoSizeText( diff --git a/lib/widgets/install_alert_dialog.dart b/lib/widgets/install_alert_dialog.dart index 1ac3076..0edb203 100644 --- a/lib/widgets/install_alert_dialog.dart +++ b/lib/widgets/install_alert_dialog.dart @@ -53,32 +53,29 @@ class InstallAlertDialog extends ConsumerWidget { minimal: true, labelText: 'Log in to view your own web of trust', ), - if (app.latestMetadata?.urls.isNotEmpty ?? false) - Padding( - padding: const EdgeInsets.only(top: 16, bottom: 16), - child: RichText( - text: WidgetSpan( - child: Wrap( - crossAxisAlignment: WrapCrossAlignment.center, - children: [ - Text('This app will be downloaded from '), - Text( - Uri.parse(app.latestMetadata!.urls.first).host, - style: TextStyle( - fontWeight: FontWeight.bold, - decoration: TextDecoration.underline, - ), - ), - Text(' and verified.'), - ], - ), - ), - ), - ), ], ), ), actions: [ + if (app.latestMetadata?.urls.isNotEmpty ?? false) + RichText( + text: WidgetSpan( + child: Wrap( + crossAxisAlignment: WrapCrossAlignment.center, + children: [ + Text('This app will be downloaded from '), + Text( + Uri.parse(app.latestMetadata!.urls.first).host, + style: TextStyle( + fontWeight: FontWeight.bold, + decoration: TextDecoration.underline, + ), + ), + Text(' and verified.'), + ], + ), + ), + ), Padding( padding: const EdgeInsets.symmetric(vertical: 10), child: TextButton( diff --git a/lib/widgets/install_button.dart b/lib/widgets/install_button.dart index e5879a0..2fb245e 100644 --- a/lib/widgets/install_button.dart +++ b/lib/widgets/install_button.dart @@ -1,21 +1,14 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:percent_indicator/linear_percent_indicator.dart'; -import 'package:zapstore/main.data.dart'; import 'package:zapstore/models/app.dart'; import 'package:zapstore/models/local_app.dart'; -import 'package:zapstore/models/settings.dart'; -import 'package:zapstore/models/user.dart'; import 'package:zapstore/utils/extensions.dart'; import 'package:zapstore/utils/system_info.dart'; -import 'package:zapstore/widgets/app_drawer.dart'; -import 'package:zapstore/widgets/author_container.dart'; import 'package:zapstore/widgets/install_alert_dialog.dart'; import 'package:zapstore/widgets/spinning_logo.dart'; -import 'package:zapstore/widgets/wot_container.dart'; class InstallButton extends HookConsumerWidget { InstallButton({ diff --git a/pubspec.lock b/pubspec.lock index 137d6ee..245d37f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -638,18 +638,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -694,18 +694,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: @@ -1170,10 +1170,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" timing: dependency: transitive description: @@ -1282,10 +1282,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" watcher: dependency: transitive description: