add setting parameter: show preview text

Author: avdosev

lib/habr/json_parsing.dart

@@ -69,7 +69,11 @@ PostPreviews parsePostPreviewsFromJson(Map<String, dynamic> data) {
           id: id,
           corporative: article['isCorporative'],
           title: _prepareHtmlString(article['titleHtml']),
-          tags: article['hubs']
+          hubs: article['hubs']
+              .map<String>((flow) => flow['title'] as String)
+              .toList(),
+          htmlPreview: "<div>${article['leadData']['textHtml']}</div>",
+          flows: article['flows']
               .map<String>((flow) => flow['title'] as String)
               .toList(),
           publishDate: DateTime.parse(article['timePublished']),

lib/hive/post_preview.dart

@@ -11,14 +11,14 @@ class PostPreviewAdapter extends TypeAdapter<PostPreview> {
   PostPreview read(BinaryReader reader) {
     final id = reader.read();
     final title = reader.read();
-    final tags = reader.readList().cast<String>();
+    final hubs = reader.readList().cast<String>();
     final corporative = reader.read();
     final publishDate = reader.read();
     final author = reader.read();
     return PostPreview(
       id: id,
       title: title,
-      tags: tags,
+      hubs: hubs,
       corporative: corporative,
       publishDate: publishDate,
       author: author,
@@ -30,7 +30,7 @@ class PostPreviewAdapter extends TypeAdapter<PostPreview> {
   void write(BinaryWriter writer, PostPreview obj) {
     writer.write(obj.id);
     writer.write(obj.title);
-    writer.writeList(obj.tags);
+    writer.writeList(obj.hubs);
     writer.write(obj.corporative);
     writer.write(obj.publishDate);
     writer.write(obj.author);

lib/models/post_preview.dart

@@ -4,7 +4,9 @@ import 'statistics.dart';
 class PostPreview {
   final String id;
   final String title;
-  final List<String> tags;
+  final List<String> hubs;
+  final List<String> flows;
+  final String htmlPreview;
   final DateTime publishDate;
   final Author author;
   final Statistics statistics;
@@ -13,7 +15,9 @@ class PostPreview {
   const PostPreview(
       {this.id,
       this.title,
-      this.tags,
+      this.hubs,
+      this.flows,
+      this.htmlPreview,
       this.publishDate,
       this.author,
       this.statistics,
@@ -25,5 +29,4 @@ class PostPreviews {
   final List<PostPreview> previews;
 
   const PostPreviews({this.previews, this.maxCountPages});
-
 }

lib/pages/article/article.dart

@@ -170,7 +170,7 @@ class _ArticlePageState extends State<ArticlePage> {
       final preview = PostPreview(
         id: articleId,
         title: post.title,
-        tags: [],
+        hubs: [],
         publishDate: post.publishDate,
         statistics: Models.Statistics.zero(),
         author: post.author,

lib/pages/settings.dart

@@ -102,6 +102,11 @@ class Settings extends StatelessWidget {
                 leading: const Icon(Icons.palette),
                 title: Text(AppLocalizations.of(context).customization),
               ),
+              SwitchListTile(
+                title: Text('Использовать расширенный вид ленты'),
+                value: settings.showPreviewText,
+                onChanged: (val) => settings.showPreviewText = val,
+              ),
               ListTile(
                 // leading: const Icon(Icons.font_download_outlined),
                 title: Text(localizations.fontSize),

lib/stores/app_settings.dart

@@ -62,6 +62,9 @@ class AppSettings extends ChangeNotifier {
       .put('ToTimeThemeSwitch', val)
       .whenComplete(() => changeThemeByTime());
 
+  bool get showPreviewText => data.get('ShowPreviewText', defaultValue: false);
+  set showPreviewText(bool val) => data.put('ShowPreviewText', val);
+
   static bool needSetLightTheme(
       TimeOfDay current, TimeOfDay from, TimeOfDay to) {
     final timeLower = (TimeOfDay d1, TimeOfDay d2) =>

lib/stores/habr_storage.dart

@@ -114,7 +114,7 @@ class HabrStorage {
 
         return PostPreview(
           id: post.id,
-          tags: [],
+          hubs: [],
           title: post.title,
           publishDate: post.publishDate,
           statistics: Statistics.zero(),

lib/widgets/article_preview.dart

@@ -1,19 +1,29 @@
 import 'package:flutter/material.dart';
+import 'package:habr_app/stores/app_settings.dart';
 import 'package:habr_app/utils/date_to_text.dart';
 import 'package:habr_app/models/post_preview.dart';
+import 'package:habr_app/widgets/html_view.dart';
+import 'package:provider/provider.dart';
 
 import 'small_author_preview.dart';
 import 'statistics_icons.dart';
 
 class ArticlePreview extends StatelessWidget {
   final PostPreview postPreview;
+  final bool showHtml;
   final Function(String articleId) onPressed;
 
-  ArticlePreview({Key key, @required this.postPreview, this.onPressed})
-      : super(key: key);
+  ArticlePreview({
+    Key key,
+    @required this.postPreview,
+    this.showHtml,
+    this.onPressed,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    final needShowHtml =
+        showHtml ?? context.watch<AppSettings>().showPreviewText;
     final upIconTextStyle = const TextStyle(fontSize: 15);
     final statisticIconTextStyle = const TextStyle(fontSize: 15);
     return InkWell(
@@ -45,13 +55,20 @@ class ArticlePreview extends StatelessWidget {
               const SizedBox(
                 height: 10,
               ),
+              if (needShowHtml && postPreview.htmlPreview != null) ...[
+                HtmlView.unparsed(postPreview.htmlPreview),
+                const SizedBox(
+                  height: 20,
+                ),
+              ],
               Text(
-                  postPreview.tags
-                      .where((String el) => !el.startsWith('Блог компании'))
-                      .join(', '),
-                  style: const TextStyle(fontSize: 15),
-                  overflow: TextOverflow.ellipsis,
-                  textAlign: TextAlign.left),
+                postPreview.flows
+                    .where((String el) => !el.startsWith('Блог компании'))
+                    .join(', '),
+                style: const TextStyle(fontSize: 15),
+                overflow: TextOverflow.ellipsis,
+                textAlign: TextAlign.left,
+              ),
               const SizedBox(
                 height: 5,
               ),