Merge pull request Notsfsssf#23 from Notsfsssf/master

Sync with upstream
itzXian · Jul 7, 2020 · 835584e · 835584e
2 parents 5d95573 + 7aeaec5
commit 835584e
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 5 deletions.
diff --git a/lib/page/hello/setting/setting_quality_page.dart b/lib/page/hello/setting/setting_quality_page.dart
@@ -253,12 +253,12 @@ class _SettingQualityPageState extends State<SettingQualityPage>
                                     onPressed: () {
                                       Navigator.of(context).pop('OK');
                                     },
-                                    child: Text('ok')),
+                                    child: Text(I18n.of(context).OK)),
                                 FlatButton(
                                     onPressed: () {
-                                      Navigator.of(context).pop('OK');
+                                      Navigator.of(context).pop();
                                     },
-                                    child: Text('cancel'))
+                                    child: Text(I18n.of(context).Cancel))
                               ],
                             );
                           });

diff --git a/lib/page/novel/component/novel_card.dart b/lib/page/novel/component/novel_card.dart
@@ -1,6 +1,28 @@
+/*
+ * Copyright (C) 2020. by perol_notsf, All rights reserved
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 import 'package:flutter/material.dart';
+import 'package:pixez/component/pixiv_image.dart';
+import 'package:pixez/models/novel_recom_response.dart';
 
 class NovelCard extends StatefulWidget {
+  final int id;
+  final Novel novel;
+
+  const NovelCard({Key key, this.id, this.novel}) : super(key: key);
   @override
   _NovelCardState createState() => _NovelCardState();
 }
@@ -9,7 +31,25 @@ class _NovelCardState extends State<NovelCard> {
   @override
   Widget build(BuildContext context) {
     return Container(
-
+      child: Row(
+        children: <Widget>[
+          Column(
+            mainAxisSize: MainAxisSize.max,
+            children: <Widget>[
+              PixivImage(widget.novel.imageUrls.squareMedium),
+              Text(widget.novel.totalView.toString())
+            ],
+          ),
+          Column(
+            mainAxisSize: MainAxisSize.max,
+            children: <Widget>[
+              Text(widget.novel.title),
+              Text('by ${widget.novel.user.name}'),
+              Text(widget.novel.caption)
+            ],
+          )
+        ],
+      ),
     );
   }
-}
+}