feat: 搜索分页

miru-project · Aug 12, 2023 · 72b3a39 · 72b3a39
1 parent 9872a3e
commit 72b3a39
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 138 deletions.
diff --git a/assets/i18n/en.json b/assets/i18n/en.json
@@ -7,6 +7,7 @@
     "settings": "Settings",
     "no-extension": "No installed extensions",
     "no-result": "No relevant results",
+    "no-more-data": "No more data",
     "cancel": "Cancel",
     "confirm": "Confirm",
     "close": "Close",

diff --git a/assets/i18n/zh.json b/assets/i18n/zh.json
@@ -12,6 +12,7 @@
     "settings": "设置",
     "no-extension": "未安装任何扩展",
     "no-result": "未找到相关结果",
+    "no-more-data": "没有更多数据了",
     "cancel": "取消",
     "confirm": "确定",
     "close": "关闭",

diff --git a/lib/pages/detail/controller.dart b/lib/pages/detail/controller.dart
@@ -108,7 +108,6 @@ class DetailPageController extends GetxController {
         );
         showPlatformSnackbar(
           context: cuurentContext,
-          title: '',
           content: content,
           severity: fluent.InfoBarSeverity.error,
         );
@@ -186,7 +185,6 @@ class DetailPageController extends GetxController {
     } catch (e) {
       showPlatformSnackbar(
         context: cuurentContext,
-        title: '',
         content: e.toString().split('\n')[0],
         severity: fluent.InfoBarSeverity.error,
       );
@@ -205,7 +203,6 @@ class DetailPageController extends GetxController {
     if (runtime.value == null) {
       showPlatformSnackbar(
         context: cuurentContext,
-        title: '',
         content: FlutterI18n.translate(
           cuurentContext,
           'common.extension-missing',

diff --git a/lib/pages/detail/view.dart b/lib/pages/detail/view.dart
@@ -272,9 +272,13 @@ class _DetailPageState extends State<DetailPage> {
                     Obx(
                       () {
                         if (c.tmdbDetail == null ||
-                            c.tmdbDetail!.images.isEmpty) {
+                            c.tmdbDetail!.backdrop == null) {
                           return const SizedBox();
                         }
+                        final images = [
+                          c.tmdbDetail!.backdrop!,
+                          ...c.tmdbDetail!.images
+                        ];
                         return fluent.Padding(
                           padding: const EdgeInsets.only(bottom: 16),
                           child: CardTile(
@@ -284,7 +288,7 @@ class _DetailPageState extends State<DetailPage> {
                               child: ListView.builder(
                                 scrollDirection: Axis.horizontal,
                                 itemBuilder: (context, index) {
-                                  final image = c.tmdbDetail!.images[index];
+                                  final image = images[index];
                                   final url = TmdbApi.getImageUrl(image);
                                   if (url == null) {
                                     return const SizedBox();
@@ -301,7 +305,7 @@ class _DetailPageState extends State<DetailPage> {
                                     ),
                                   );
                                 },
-                                itemCount: c.tmdbDetail!.images.length,
+                                itemCount: images.length,
                               ),
                             ),
                           ),

diff --git a/lib/pages/detail/widgets/detail_overview.dart b/lib/pages/detail/widgets/detail_overview.dart
@@ -22,9 +22,10 @@ class DetailOverView extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Obx(() {
-              if (c.tmdbDetail == null || c.tmdbDetail!.images.isEmpty) {
+              if (c.tmdbDetail == null || c.tmdbDetail!.backdrop == null) {
                 return const SizedBox();
               }
+              final images = [c.tmdbDetail!.backdrop!, ...c.tmdbDetail!.images];
               return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -41,7 +42,7 @@ class DetailOverView extends StatelessWidget {
                     child: ListView.builder(
                       scrollDirection: Axis.horizontal,
                       itemBuilder: (context, index) {
-                        final image = c.tmdbDetail!.images[index];
+                        final image = images[index];
                         final url = TmdbApi.getImageUrl(image);
                         if (url == null) {
                           return const SizedBox();
@@ -58,7 +59,7 @@ class DetailOverView extends StatelessWidget {
                           ),
                         );
                       },
-                      itemCount: c.tmdbDetail!.images.length,
+                      itemCount: images.length,
                     ),
                   ),
                   const SizedBox(height: 20),
@@ -68,6 +69,9 @@ class DetailOverView extends StatelessWidget {
             Obx(
               () => SelectableText(
                 c.tmdbDetail?.overview ?? c.detail?.desc ?? '',
+                style: const TextStyle(
+                  height: 2,
+                ),
               ),
             ),
             const SizedBox(height: 20),