chore: Fix up analyze issues from merge

ubuntu · Aug 16, 2024 · cf75cd9 · cf75cd9
1 parent e405564
commit cf75cd9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/packages/app_center/lib/deb/local_deb_page.dart b/packages/app_center/lib/deb/local_deb_page.dart
@@ -46,15 +46,15 @@ class _LocalDebPage extends StatelessWidget {
     return AppPage(
       appInfos: [
         (
-          label: l10n.snapPageSizeLabel,
+          label: Text(l10n.snapPageSizeLabel),
           value: Text(context.formatByteSize(debData.details.size))
         ),
         (
-          label: l10n.snapPageLicenseLabel,
+          label: Text(l10n.snapPageLicenseLabel),
           value: Text(debData.details.license)
         ),
         (
-          label: l10n.snapPageLinksLabel,
+          label: Text(l10n.snapPageLinksLabel),
           value: Html(
             data: '<a href="${debData.details.url}">${debData.details.url}</a>',
             style: {'body': Style(margin: Margins.zero)},

diff --git a/packages/app_center/lib/snapd/snap_page.dart b/packages/app_center/lib/snapd/snap_page.dart
@@ -1,7 +1,17 @@
-import 'dart:async';
-
 import 'package:app_center/constants.dart';
-import 'package:app_center/src/widgets/placeholders.dart';
+import 'package:app_center/error/error.dart';
+import 'package:app_center/extensions/string_extensions.dart';
+import 'package:app_center/l10n.dart';
+import 'package:app_center/layout.dart';
+import 'package:app_center/manage/local_snap_providers.dart';
+import 'package:app_center/ratings/ratings.dart';
+import 'package:app_center/snapd/snap_action.dart';
+import 'package:app_center/snapd/snap_report.dart';
+import 'package:app_center/snapd/snapd.dart';
+import 'package:app_center/snapd/snapd_cache.dart';
+import 'package:app_center/store/store_app.dart';
+import 'package:app_center/widgets/shimmer_placeholder.dart';
+import 'package:app_center/widgets/widgets.dart';
 import 'package:app_center_ratings_client/app_center_ratings_client.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
@@ -256,10 +266,11 @@ class _SnapInfoBar extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final l10n = AppLocalizations.of(context);
     final ratingsModel = ref.watch(ratingsModelProvider(snap.name));
+    final isLightTheme = Theme.of(context).brightness == Brightness.light;
 
     final ratings = ratingsModel.whenOrNull(
       data: (ratingsData) => (
-        label: l10n.snapRatingsVotes(ratingsData.rating?.totalVotes ?? 0),
+        label: Text(l10n.snapRatingsVotes(ratingsData.rating?.totalVotes ?? 0)),
         value: Text(
           ratingsData.rating?.ratingsBand.localize(l10n) ?? '',
           style: TextStyle(
@@ -269,17 +280,17 @@ class _SnapInfoBar extends ConsumerWidget {
       ),
       loading: () => (
         label: Shimmer.fromColors(
-          baseColor: light ? kShimmerBaseLight : kShimmerBaseDark,
+          baseColor: isLightTheme ? kShimmerBaseLight : kShimmerBaseDark,
           highlightColor:
-              light ? kShimmerHighLightLight : kShimmerHighLightDark,
+              isLightTheme ? kShimmerHighLightLight : kShimmerHighLightDark,
           child: ShimmerPlaceholder(
             child: Text(l10n.snapRatingsVotes(0)),
           ),
         ),
         value: Shimmer.fromColors(
-          baseColor: light ? kShimmerBaseLight : kShimmerBaseDark,
+          baseColor: isLightTheme ? kShimmerBaseLight : kShimmerBaseDark,
           highlightColor:
-              light ? kShimmerHighLightLight : kShimmerHighLightDark,
+              isLightTheme ? kShimmerHighLightLight : kShimmerHighLightDark,
           child: ShimmerPlaceholder(
             child: Text(
               RatingsBand.insufficientVotes.localize(l10n),

diff --git a/.../app_center/lib/widgets/placeholders.dart → ...nter/lib/widgets/shimmer_placeholder.dart b/.../app_center/lib/widgets/placeholders.dart → ...nter/lib/widgets/shimmer_placeholder.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 
 class ShimmerPlaceholder extends StatelessWidget {
-  final Widget child;
-
   const ShimmerPlaceholder({
-    Key? key,
     required this.child,
-  }) : super(key: key);
+    super.key,
+  });
+
+  final Widget child;
 
   @override
   Widget build(BuildContext context) {