feat: text cover (#75)

* feat: text cover * fix(android): detail background error
miru-project · Sep 23, 2023 · 4aa8901 · 4aa8901
1 parent 1476c58
commit 4aa8901
Show file tree

Hide file tree

Showing 19 changed files with 273 additions and 147 deletions.
diff --git a/lib/models/extension.dart b/lib/models/extension.dart
@@ -75,14 +75,14 @@ class ExtensionListItem {
   ExtensionListItem({
     required this.title,
     required this.url,
-    required this.cover,
+    this.cover,
     this.update,
     this.headers,
   });
 
   final String title;
   final String url;
-  final String cover;
+  final String? cover;
   final String? update;
   late Map<String, String>? headers;
 
@@ -98,14 +98,14 @@ class ExtensionListItem {
 class ExtensionDetail {
   ExtensionDetail({
     required this.title,
-    required this.cover,
+    this.cover,
     this.desc,
     this.episodes,
     this.headers,
   });
 
   final String title;
-  final String cover;
+  final String? cover;
   final String? desc;
   final List<ExtensionEpisodeGroup>? episodes;
   late Map<String, String>? headers;

diff --git a/lib/models/extension.g.dart b/lib/models/extension.g.dart
diff --git a/lib/models/favorite.dart b/lib/models/favorite.dart
@@ -12,6 +12,6 @@ class Favorite {
   @Enumerated(EnumType.name)
   late ExtensionType type;
   late String title;
-  late String cover;
+  String? cover;
   DateTime date = DateTime.now();
 }
diff --git a/lib/models/favorite.g.dart b/lib/models/favorite.g.dart
diff --git a/lib/models/history.dart b/lib/models/history.dart
@@ -10,7 +10,7 @@ class History {
   late String package;
   late String url;
   // 截图，保存封面地址
-  late String cover;
+  String? cover;
   @Enumerated(EnumType.name)
   late ExtensionType type;
   // 不同线路

diff --git a/lib/models/history.g.dart b/lib/models/history.g.dart
diff --git a/lib/pages/detail/controller.dart b/lib/pages/detail/controller.dart
@@ -55,12 +55,12 @@ class DetailPageController extends GetxController {
   TMDBDetail? get tmdbDetail => tmdb.value;
   set tmdbDetail(TMDBDetail? value) => tmdb.value = value;
 
-  String get backgorund {
-    String bg = '';
+  String? get backgorund {
+    String? bg;
     if (tmdbDetail != null && tmdbDetail!.backdrop != null) {
       bg = TmdbApi.getImageUrl(tmdbDetail!.backdrop!) ?? '';
     } else {
-      bg = detail?.cover ?? '';
+      bg = detail?.cover;
     }
     return bg;
   }

diff --git a/lib/pages/detail/view.dart b/lib/pages/detail/view.dart
@@ -17,6 +17,7 @@ import 'package:miru_app/utils/i18n.dart';
 import 'package:miru_app/utils/layout.dart';
 import 'package:miru_app/widgets/cache_network_image.dart';
 import 'package:miru_app/widgets/card_tile.dart';
+import 'package:miru_app/widgets/cover.dart';
 import 'package:miru_app/widgets/platform_widget.dart';
 import 'package:miru_app/widgets/progress.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -232,11 +233,10 @@ class _DetailPageState extends State<DetailPage> {
       return Stack(
         children: [
           Animate(
-            child: CacheNetWorkImage(
-              c.backgorund,
-              width: double.infinity,
-              height: double.infinity,
-              headers: c.detail?.headers,
+            child: Cover(
+              alt: c.detail?.title ?? '',
+              url: c.backgorund,
+              noText: true,
             ),
           ).blur(
             begin: const Offset(10, 10),
@@ -260,24 +260,25 @@ class _DetailPageState extends State<DetailPage> {
                       height: 330,
                       child: Row(
                         children: [
-                          if (constraints.maxWidth > 600) ...[
-                            Hero(
-                              tag: c.heroTag ?? '',
-                              child: Container(
-                                width: 230,
-                                height: double.infinity,
-                                clipBehavior: Clip.antiAlias,
-                                decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(8),
-                                ),
-                                child: CacheNetWorkImage(
-                                  c.detail?.cover ?? '',
-                                  headers: c.detail?.headers,
+                          if (c.detail!.cover != null)
+                            if (constraints.maxWidth > 600) ...[
+                              Hero(
+                                tag: c.heroTag ?? '',
+                                child: Container(
+                                  width: 230,
+                                  height: double.infinity,
+                                  clipBehavior: Clip.antiAlias,
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(8),
+                                  ),
+                                  child: CacheNetWorkImage(
+                                    c.detail?.cover ?? '',
+                                    headers: c.detail?.headers,
+                                  ),
                                 ),
                               ),
-                            ),
-                            const SizedBox(width: 30),
-                          ],
+                              const SizedBox(width: 30),
+                            ],
                           Expanded(
                               child: Column(
                             crossAxisAlignment: CrossAxisAlignment.start,