json, {bool isCompact = false}) {
- ContentAdvertisement ad = ContentAdvertisement.fromJson(json['content_raw']['data'], isCompact: isCompact);
+ ContentAdvertisement ad = ContentAdvertisement.fromJson(json, isCompact: isCompact);
// We are not using 👇 anywhere + it causes the app to freeze
// ad.contentRegular = ContentRegular(json['content']);
return ad;
diff --git a/lib/model/post/content/Regular.dart b/lib/model/post/content/Regular.dart
index 12df6ff8..48ba6e24 100644
--- a/lib/model/post/content/Regular.dart
+++ b/lib/model/post/content/Regular.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
import 'package:fyx/model/enums/PostTypeEnum.dart';
import 'package:fyx/model/post/Content.dart';
import 'package:fyx/model/post/Image.dart';
@@ -111,8 +113,8 @@ class ContentRegular extends Content {
_body = _body.replaceAll(trailingBr, '');
var xmpTag = RegExp(r'<![CDATA[(.*?)]]>', caseSensitive: false, multiLine: true, dotAll: true);
- _body = _body.replaceAllMapped(xmpTag, (match) => '${match.group(1)}');
- _rawBody = _rawBody.replaceAllMapped(xmpTag, (match) => '${match.group(1)}');
+ _body = _body.replaceAllMapped(xmpTag, (match) => '${HtmlEscape().convert(match.group(1) ?? '')}'); // TODO: Improve performance?
+ _rawBody = _rawBody.replaceAllMapped(xmpTag, (match) => '${HtmlEscape().convert(match.group(1) ?? '')}'); // TODO: Improve performance?
} catch (error) {
Sentry.captureException(error, stackTrace: StackTrace.current);
}
diff --git a/lib/model/post/content/post_content_text.dart b/lib/model/post/content/post_content_text.dart
new file mode 100644
index 00000000..63f781b8
--- /dev/null
+++ b/lib/model/post/content/post_content_text.dart
@@ -0,0 +1,14 @@
+import 'package:fyx/model/enums/PostTypeEnum.dart';
+import 'package:fyx/model/post/Content.dart';
+
+enum ContentFormat { text, html, markdown }
+
+class PostContentText extends Content {
+ late final String data;
+ late final ContentFormat format;
+
+ PostContentText.fromJson(Map json) : super(PostTypeEnum.text, isCompact: false) {
+ this.data = json['data'] ?? '';
+ this.format = ContentFormat.values.firstWhere((value) => value.toString().contains(json['format']));
+ }
+}
diff --git a/lib/model/provider/ThemeModel.dart b/lib/model/provider/ThemeModel.dart
index 4de1a661..4eda1f6a 100644
--- a/lib/model/provider/ThemeModel.dart
+++ b/lib/model/provider/ThemeModel.dart
@@ -1,16 +1,35 @@
import 'package:flutter/cupertino.dart';
+import 'package:fyx/model/enums/SkinEnum.dart';
import 'package:fyx/model/enums/ThemeEnum.dart';
class ThemeModel extends ChangeNotifier {
final ThemeEnum initialTheme;
- ThemeModel(this.initialTheme);
+ final SkinEnum initialSkin;
+ final double initialFontSize;
+ ThemeModel(this.initialTheme, this.initialFontSize, {this.initialSkin = SkinEnum.fyx});
ThemeEnum? _theme;
+ SkinEnum? _skin;
+ double? _fontSize;
ThemeEnum get theme => _theme == null ? this.initialTheme : _theme!;
+ SkinEnum get skin => _skin == null ? this.initialSkin : _skin!;
+
+ double get fontSize => _fontSize == null ? this.initialFontSize : _fontSize!;
+
void setTheme(ThemeEnum val) {
_theme = val;
notifyListeners();
}
+
+ void setFontSize(double val) {
+ _fontSize = val;
+ notifyListeners();
+ }
+
+ void setSkin(SkinEnum skin) {
+ _skin = skin;
+ notifyListeners();
+ }
}
diff --git a/lib/model/reponses/DiscussionHomeResponse.dart b/lib/model/reponses/DiscussionHomeResponse.dart
index 638c55df..4cd3a5b4 100644
--- a/lib/model/reponses/DiscussionHomeResponse.dart
+++ b/lib/model/reponses/DiscussionHomeResponse.dart
@@ -1,24 +1,15 @@
import 'package:fyx/model/Discussion.dart';
+import 'package:fyx/model/DiscussionContent.dart';
import 'package:fyx/model/ResponseContext.dart';
class DiscussionHomeResponse {
- late Discussion _discussion;
- late ResponseContext _context;
- List _home = [];
- List _header = [];
+ late final Discussion discussion;
+ late final ResponseContext context;
+ late final List items;
DiscussionHomeResponse.fromJson(Map json) {
- this._home = List.from(json['home'] ?? []);
- this._header = List.from(json['header'] ?? []);
- this._discussion = Discussion.fromJson(json['discussion']);
- this._context = ResponseContext.fromJson(json['context']);
+ this.discussion = Discussion.fromJson(json['discussion_common']);
+ this.context = ResponseContext.fromJson(json['context']);
+ this.items = (json['items'] as List).map((item) => DiscussionContent.fromJson(item)).toList();
}
-
- ResponseContext get context => _context;
-
- Discussion get discussion => _discussion;
-
- List get header => _header;
-
- List get home => _home;
}
diff --git a/lib/model/reponses/DiscussionResponse.dart b/lib/model/reponses/DiscussionResponse.dart
index 3a194149..9733e936 100644
--- a/lib/model/reponses/DiscussionResponse.dart
+++ b/lib/model/reponses/DiscussionResponse.dart
@@ -1,30 +1,47 @@
import 'package:fyx/model/Discussion.dart';
+import 'package:fyx/model/DiscussionContent.dart';
import 'package:fyx/model/ResponseContext.dart';
+import 'package:fyx/model/enums/DiscussionTypeEnum.dart';
+
+enum DiscussionSpecificDataEnum { header }
class DiscussionResponse {
- late Discussion _discussion;
- List _posts = [];
- late ResponseContext _context;
+ late final Discussion discussion; // TODO: Rename this to DiscussionCommon
+ Map>? discussionSpecificData;
+ late final List posts;
+ ResponseContext? context;
+ bool error = false;
DiscussionResponse.accessDenied() {
- this._discussion = Discussion.fromJson(null);
- this._posts = [];
+ this.discussion = Discussion.fromJson(null);
+ this.posts = [];
}
// TODO: Return something more relevant.
DiscussionResponse.error() {
- DiscussionResponse.accessDenied();
+ this.error = true;
+ this.discussion = Discussion.fromJson(null);
+ this.posts = [];
}
DiscussionResponse.fromJson(Map json) {
- this._discussion = Discussion.fromJson(json['discussion_common']);
- this._posts = json['posts'] ?? [];
- this._context = ResponseContext.fromJson(json['context']);
- }
-
- Discussion get discussion => _discussion;
+ this.discussion = Discussion.fromJson(json['discussion_common']);
+ this.posts = json['posts'] ?? [];
+ this.context = ResponseContext.fromJson(json['context']);
- List get posts => _posts;
-
- ResponseContext get context => _context;
+ switch (this.discussion.type) {
+ case DiscussionTypeEnum.discussion:
+ this.discussionSpecificData = {
+ DiscussionSpecificDataEnum.header:
+ List.from(json['discussion_common']['discussion_specific_data']['header']).map((item) => DiscussionContent.fromJson(item)).toList()
+ };
+ break;
+ case DiscussionTypeEnum.event:
+ // TODO: Handle this case.
+ break;
+ case DiscussionTypeEnum.advertisement:
+ // TODO: Handle this case.
+ break;
+ }
+ }
}
diff --git a/lib/model/reponses/UnifiedSearchResponse.dart b/lib/model/reponses/UnifiedSearchResponse.dart
new file mode 100644
index 00000000..f02a80b3
--- /dev/null
+++ b/lib/model/reponses/UnifiedSearchResponse.dart
@@ -0,0 +1,41 @@
+enum UnifiedSearchType { discussions, events, advertisements }
+
+class UnifiedSearchResponse {
+ late Map> discussion;
+
+ UnifiedSearchResponse(this.discussion);
+
+ UnifiedSearchResponse.fromJson(Map json) {
+ this.discussion = {
+ UnifiedSearchType.discussions: (json['discussion']['discussions'] as List).map((item) => UnifiedDiscussionModel.fromJson(item)).toList(),
+ UnifiedSearchType.events: (json['discussion']['events'] as List).map((item) => UnifiedDiscussionModel.fromJson(item)).toList(),
+ UnifiedSearchType.advertisements: (json['discussion']['advertisements'] as List).map((item) => UnifiedDiscussionModel.fromJson(item)).toList(),
+ };
+ }
+}
+
+class UnifiedDiscussionModel {
+ late int id;
+ late String discussionType;
+ late String discussionName;
+ late String discussionNameHighlighted;
+ late String summary;
+ late String summaryHighlighted;
+
+ UnifiedDiscussionModel(
+ {required this.id,
+ required this.discussionType,
+ required this.discussionName,
+ this.discussionNameHighlighted = '',
+ this.summary = '',
+ this.summaryHighlighted = ''});
+
+ UnifiedDiscussionModel.fromJson(Map json) {
+ this.id = json['id'];
+ this.discussionType = json['discussion_type'];
+ this.discussionName = json['discussion_name'];
+ this.discussionNameHighlighted = json['discussion_name_highlighted'] ?? '';
+ this.summary = json['summary'] ?? '';
+ this.summaryHighlighted = json['summary_highlighted'] ?? '';
+ }
+}
diff --git a/lib/pages/DiscussionPage.dart b/lib/pages/DiscussionPage.dart
index bd068d89..71af0c76 100644
--- a/lib/pages/DiscussionPage.dart
+++ b/lib/pages/DiscussionPage.dart
@@ -2,23 +2,33 @@ import 'package:async/async.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
-import 'package:fyx/components/PullToRefreshList.dart';
-import 'package:fyx/components/post/Advertisement.dart';
-import 'package:fyx/components/post/PostListItem.dart';
-import 'package:fyx/components/post/SyntaxHighlighter.dart';
+import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:fyx/components/discussion_page_scaffold.dart';
+import 'package:fyx/components/post/advertisement.dart';
+import 'package:fyx/components/post/post_list_item.dart';
+import 'package:fyx/components/post/syntax_highlighter.dart';
+import 'package:fyx/components/pull_to_refresh_list.dart';
import 'package:fyx/controllers/AnalyticsProvider.dart';
import 'package:fyx/controllers/ApiController.dart';
import 'package:fyx/controllers/IApiProvider.dart';
import 'package:fyx/model/MainRepository.dart';
import 'package:fyx/model/Post.dart';
+import 'package:fyx/model/Settings.dart';
+import 'package:fyx/model/enums/DiscussionTypeEnum.dart';
import 'package:fyx/model/post/content/Advertisement.dart';
import 'package:fyx/model/reponses/DiscussionResponse.dart';
import 'package:fyx/pages/NewMessagePage.dart';
+import 'package:fyx/pages/discussion_home_page.dart';
+import 'package:fyx/state/batch_actions_provider.dart';
import 'package:fyx/theme/L.dart';
import 'package:fyx/theme/T.dart';
import 'package:fyx/theme/skin/Skin.dart';
import 'package:fyx/theme/skin/SkinColors.dart';
import 'package:hive_flutter/hive_flutter.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:scroll_to_index/scroll_to_index.dart';
+import 'package:tap_canvas/tap_canvas.dart';
class DiscussionPageArguments {
final int discussionId;
@@ -29,17 +39,33 @@ class DiscussionPageArguments {
DiscussionPageArguments(this.discussionId, {this.postId, this.filterByUser, this.search});
}
-class DiscussionPage extends StatefulWidget {
+class DiscussionPage extends ConsumerStatefulWidget {
@override
_DiscussionPageState createState() => _DiscussionPageState();
}
-class _DiscussionPageState extends State {
+class _DiscussionPageState extends ConsumerState {
final AsyncMemoizer _memoizer = AsyncMemoizer();
late SkinColors colors;
int _refreshList = 0;
bool _hasInitData = false;
+ // Did we close the context menu by tapping outside?
+ // Tapping on menu button is outside click. -> This toggle solves the issue of closing and immediate opening
+ // the menu when the menu is open and user clicks on three dots...
+ bool _closedByOutsideTap = false;
+
+ // Display the context menu?
+ bool _popupMenu = false;
+
+ // Is the discussion saved in bookmarks?
+ bool? _bookmark;
+
+ String? _searchTerm;
+
+ // Progress indicator if some posts are being deleted...
+ bool _deleting = false;
+
Future _fetchData(discussionId, postId, user, {String? search}) {
return this._memoizer.runOnce(() {
return Future.delayed(
@@ -79,41 +105,40 @@ class _DiscussionPageState extends State {
isWarning: true, title: snapshot.error.toString(), label: L.GENERAL_CLOSE, onPress: () => Navigator.of(context).pop());
}
if (snapshot.hasData) {
- if (snapshot.data!.discussion.accessDenied) {
+ if (snapshot.data!.error) {
+ return T.feedbackScreen(context,
+ isWarning: true,
+ title: 'Něco se pokazilo.\nChybu, prosím, nahlašte ID LUCIEN.',
+ label: L.GENERAL_CLOSE,
+ onPress: () => Navigator.of(context).pop());
+ } else if (snapshot.data!.discussion.accessDenied) {
return T.feedbackScreen(context,
title: L.ACCESS_DENIED_ERROR, icon: Icons.do_not_disturb_alt, label: L.GENERAL_CLOSE, onPress: () => Navigator.of(context).pop());
}
+ _bookmark ??= (snapshot.data!.discussion.bookmark?.bookmark ?? false);
return this._createDiscussionPage(snapshot.data!, pageArguments);
}
return _pageScaffold(title: L.GENERAL_LOADING, body: T.feedbackScreen(context, isLoading: true));
});
}
- Widget _pageScaffold({required String title, required Widget body}) {
- return CupertinoPageScaffold(
- navigationBar: CupertinoNavigationBar(
- leading: CupertinoNavigationBarBackButton(
- color: colors.primary,
- onPressed: () {
- Navigator.of(context).pop();
+ Widget _pageScaffold({required String title, required Widget body, DiscussionResponse? discussionResponse}) {
+ return DiscussionPageScaffold(
+ title: title,
+ child: body,
+ trailing: Visibility(
+ visible: discussionResponse != null && discussionResponse.discussion.type == DiscussionTypeEnum.discussion,
+ child: GestureDetector(
+ onTap: () {
+ if (_closedByOutsideTap) {
+ setState(() => _closedByOutsideTap = false); // reset _closedByOutsideTap
+ return;
+ }
+ setState(() => _popupMenu = true);
},
+ child: Icon(Icons.more_horiz),
),
- middle: Container(
- alignment: Alignment.center,
- width: MediaQuery.of(context).size.width - 120,
- child: Tooltip(
- message: title,
- child: Text(
- // https://github.com/flutter/flutter/issues/18761
- Characters(title).replaceAll(Characters(''), Characters('\u{200B}')).toString(),
- style: TextStyle(color: colors.text),
- overflow: TextOverflow.ellipsis),
- padding: EdgeInsets.all(8.0), // needed until https://github.com/flutter/flutter/issues/86170 is fixed
- margin: EdgeInsets.all(8.0),
- showDuration: Duration(seconds: 3),
- ))),
- child: body,
- );
+ ));
}
Widget _createDiscussionPage(DiscussionResponse discussionResponse, DiscussionPageArguments pageArguments) {
@@ -121,101 +146,306 @@ class _DiscussionPageState extends State {
// TODO: Not ideal, probably better to use Provider. Or not?
SyntaxHighlighter.languageContext = discussionResponse.discussion.name;
+ final textStyleContext = TextStyle(fontSize: Settings().fontSize);
+
return _pageScaffold(
+ discussionResponse: discussionResponse,
title: discussionResponse.discussion.name,
body: Stack(
children: [
- NotificationListener(
- onNotification: (notification) {
- void rebuild(Element el) {
- el.markNeedsBuild();
- el.visitChildren(rebuild);
- }
-
- // Rebuild the widget tree if Dismissible didn't removed the item due to the server error.
- (context as Element).visitChildren(rebuild);
- return false;
+ PullToRefreshList>(
+ searchLabel: 'Hledej @nick a nebo text...',
+ searchTerm: this._searchTerm,
+ onSearch: (term) {
+ setState(() => this._searchTerm = term);
+ this.refresh();
},
- child: PullToRefreshList(
- rebuild: _refreshList,
- isInfinite: true,
- pinnedWidget: getPinnedWidget(discussionResponse),
- sliverListBuilder: (List data) {
- return ValueListenableBuilder(
- valueListenable: MainRepository().settings.box.listenable(keys: ['blockedPosts', 'blockedUsers']),
- builder: (BuildContext context, value, Widget? child) {
- var filtered = data;
- if (data[0] is PostListItem) {
- filtered = data
- .where((item) => !MainRepository().settings.isPostBlocked((item as PostListItem).post.id))
- .where((item) => !MainRepository().settings.isUserBlocked((item as PostListItem).post.nick))
- .toList();
- }
- return SliverList(
- delegate: SliverChildBuilderDelegate(
- (context, i) => filtered[i],
- childCount: filtered.length,
- ),
- );
- },
- );
- },
- dataProvider: (lastId) async {
- var result;
- if (lastId != null) {
- // If we load next page(s)
- var response = await ApiController().loadDiscussion(pageArguments.discussionId, lastId: lastId, user: pageArguments.filterByUser);
- result = response.posts;
- } else {
- // If we load init data or we refresh data on pull
- if (!this._hasInitData) {
- // If we load init data, use the data from FutureBuilder
- result = discussionResponse.posts;
- this._hasInitData = true;
- } else {
- // If we just pull to refresh, load a fresh data
- var response = await ApiController().loadDiscussion(pageArguments.discussionId, user: pageArguments.filterByUser);
- result = response.posts;
+ onSearchClear: () {
+ setState(() => this._searchTerm = '');
+ this.refresh();
+ },
+ rebuild: _refreshList,
+ isInfinite: true,
+ pinnedWidget: getPinnedWidget(discussionResponse),
+ sliverListBuilder: (List data, {controller}) {
+ return ValueListenableBuilder(
+ valueListenable: MainRepository().settings.box.listenable(keys: ['blockedPosts', 'blockedUsers']),
+ builder: (BuildContext context, value, Widget? child) {
+ var filtered = data;
+ if (data[0] is PostListItem) {
+ filtered = data
+ .where((item) => !MainRepository().settings.isPostBlocked((item as PostListItem).post.id))
+ .where((item) => !MainRepository().settings.isUserBlocked((item as PostListItem).post.nick))
+ .toList();
}
+ final kUnreadIndex = filtered.lastIndexWhere((item) => (item as PostListItem).post.isNew);
+ return SliverList(
+ delegate: SliverChildBuilderDelegate(
+ (context, i) {
+ final postItem = AutoScrollTag(child: filtered[i], key: ValueKey(i), index: i, controller: controller);
+ if (i == kUnreadIndex) {
+ return unseenPill(postItem, kUnreadIndex + 1);
+ }
+ return postItem;
+ },
+ childCount: filtered.length,
+ ),
+ );
+ },
+ );
+ },
+ dataProvider: (lastId) async {
+ var response;
+ var result;
+ if (lastId != null) {
+ // If we load next page(s)
+ response = await ApiController()
+ .loadDiscussion(pageArguments.discussionId, lastId: lastId, user: pageArguments.filterByUser, search: this._searchTerm);
+ } else {
+ // If we load init data or we refresh data on pull
+ if (!this._hasInitData) {
+ // If we load init data, use the data from FutureBuilder
+ response = discussionResponse;
+ this._hasInitData = true;
+ } else {
+ // If we just pull to refresh, load a fresh data
+ response =
+ await ApiController().loadDiscussion(pageArguments.discussionId, user: pageArguments.filterByUser, search: this._searchTerm);
}
- List data = (result as List)
- .map((post) {
- return Post.fromJson(post, pageArguments.discussionId, isCompact: MainRepository().settings.useCompactMode);
- })
- .where((post) => !MainRepository().settings.isPostBlocked(post.id))
- .where((post) => !MainRepository().settings.isUserBlocked(post.nick))
- .map((post) => PostListItem(post, onUpdate: this.refresh, isHighlighted: post.isNew))
- .toList();
-
- int? id;
- try {
- id = Post.fromJson((result as List).last, pageArguments.discussionId, isCompact: MainRepository().settings.useCompactMode).id;
- } catch (error) {}
- return DataProviderResult(data, lastId: id);
- },
- ),
+ }
+
+ result = response.posts;
+ List data = (result as List)
+ .map((post) {
+ return Post.fromJson(post, pageArguments.discussionId, isCompact: MainRepository().settings.useCompactMode);
+ })
+ .where((post) => !MainRepository().settings.isPostBlocked(post.id))
+ .where((post) => !MainRepository().settings.isUserBlocked(post.nick))
+ .map((post) => PostListItem(post, onUpdate: this.refresh, isHighlighted: post.isNew))
+ .toList();
+
+ int? id;
+ try {
+ id = Post.fromJson((result as List).last, pageArguments.discussionId, isCompact: MainRepository().settings.useCompactMode).id;
+ } catch (error) {}
+ return DataProviderResult(data,
+ lastId: id,
+ postId: pageArguments.postId,
+ jumpIndex: response.discussion.lastVisit > 0 ? data.where((listItem) => listItem.post.isNew).length : 0);
+ },
),
Visibility(
visible: discussionResponse.discussion.accessRights.canWrite != false || discussionResponse.discussion.rights.canWrite != false,
child: Positioned(
right: 20,
+ left: 20,
bottom: 20,
child: SafeArea(
- child: FloatingActionButton(
- backgroundColor: colors.primary,
- foregroundColor: colors.background,
- child: Icon(Icons.add),
- onPressed: () => Navigator.of(context).pushNamed('/new-message',
- arguments: NewMessageSettings(
- onClose: this.refresh,
- onSubmit: (String? inputField, String message, List> attachments) async {
- var result = await ApiController().postDiscussionMessage(pageArguments.discussionId, message, attachments: attachments);
- return result.isOk;
- })),
+ child: Row(
+ mainAxisSize: MainAxisSize.max,
+ crossAxisAlignment: CrossAxisAlignment.end,
+ mainAxisAlignment: ref.watch(PostsSelection.provider).isEmpty ? MainAxisAlignment.end : MainAxisAlignment.spaceBetween,
+ children: [
+ if (ref.watch(PostsSelection.provider).isNotEmpty)
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // if (discussionResponse.discussion.accessRights.canRights)
+ // Padding(
+ // padding: const EdgeInsets.only(bottom: 32.0),
+ // child: FloatingActionButton.extended(
+ // backgroundColor: _deleting ? colors.primary.withOpacity(.5) : colors.primary,
+ // foregroundColor: colors.background,
+ // label: Text('RO 7 dní'),
+ // icon: Icon(MdiIcons.messageLock, size: 30),
+ // onPressed: _deleting
+ // ? null
+ // : () async {
+ // setState(() => _deleting = true);
+ // try {
+ // // await Future.wait(ref.read(PostsSelection.provider).map((post) => ApiController().setWriteRights(discussionResponse.discussion.idKlub, post, false).then((_) {
+ // // ref.read(PostsSelection.provider.notifier).remove(post);
+ // // })));
+ // T.success('RO uděleno.');
+ // } catch (error) {
+ // T.warn('Některé příspěvky se nepodařilo smazat.');
+ // } finally {
+ // setState(() => _deleting = false);
+ // }
+ // },
+ // ),
+ // ),
+ FloatingActionButton.extended(
+ backgroundColor: _deleting ? colors.danger.withOpacity(.5) : colors.danger,
+ foregroundColor: colors.background,
+ label: _deleting ? CupertinoActivityIndicator() : Text('${ref.read(PostsSelection.provider).length.toString()}×'),
+ icon: Icon(Icons.delete, size: 30),
+ onPressed: _deleting
+ ? null
+ : () async {
+ setState(() => _deleting = true);
+ try {
+ await Future.wait(ref
+ .read(PostsSelection.provider)
+ .map((post) => ApiController().deleteDiscussionMessage(discussionResponse.discussion.idKlub, post.id).then((_) {
+ ref.read(PostsToDelete.provider.notifier).add(post);
+ ref.read(PostsSelection.provider.notifier).remove(post);
+ })));
+ T.success('Smazáno.');
+ } catch (error) {
+ T.warn('Některé příspěvky se nepodařilo smazat.');
+ } finally {
+ setState(() => _deleting = false);
+ }
+ },
+ )
+ ],
+ ),
+ if (ref.watch(PostsSelection.provider).isNotEmpty)
+ FloatingActionButton(
+ backgroundColor: colors.text,
+ foregroundColor: colors.background,
+ child: Icon(Icons.cancel_rounded),
+ onPressed: () => ref.read(PostsSelection.provider.notifier).reset(),
+ ),
+ if (ref.watch(PostsSelection.provider).isEmpty)
+ FloatingActionButton(
+ backgroundColor: colors.primary,
+ foregroundColor: colors.background,
+ child: Icon(Icons.add),
+ onPressed: () => Navigator.of(context).pushNamed('/new-message',
+ arguments: NewMessageSettings(
+ onClose: this.refresh,
+ onSubmit: (String? inputField, String message, List> attachments) async {
+ var result =
+ await ApiController().postDiscussionMessage(pageArguments.discussionId, message, attachments: attachments);
+ return result.isOk;
+ })),
+ ),
+ ],
),
),
),
),
+ TapOutsideDetectorWidget(
+ onTappedOutside: () {
+ if (_popupMenu) {
+ setState(() {
+ _popupMenu = false;
+ _closedByOutsideTap = true;
+ });
+ return;
+ }
+ setState(() => _closedByOutsideTap = false); // reset _closedByOutsideTap
+ },
+ child: Positioned(
+ top: 10,
+ right: 12,
+ child: AnimatedOpacity(
+ opacity: _popupMenu ? 1 : 0,
+ duration: Duration(milliseconds: 280),
+ curve: Curves.linearToEaseOut,
+ child: AnimatedScale(
+ curve: Curves.linearToEaseOut,
+ scale: _popupMenu ? 1 : 0,
+ alignment: Alignment.topRight,
+ duration: Duration(milliseconds: 280),
+ child: Container(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.all(Radius.circular(20)),
+ boxShadow: [
+ BoxShadow(
+ color: colors.grey.withOpacity(0.4), //New
+ blurRadius: 15.0,
+ offset: Offset(0, 0))
+ ],
+ ),
+ child: Container(
+ padding: const EdgeInsets.all(20),
+ decoration: BoxDecoration(borderRadius: BorderRadius.all(Radius.circular(20)), color: colors.barBackground),
+ child: IntrinsicWidth(
+ child: Column(children: [
+ Visibility(
+ visible: _bookmark != null,
+ child: GestureDetector(
+ onTap: () {
+ ApiController().bookmarkDiscussion(discussionResponse.discussion.idKlub, !_bookmark!);
+ setState(() {
+ _bookmark = !_bookmark!;
+ _popupMenu = false;
+ T.success(_bookmark! ? 'Přidáno do sledovaných.' : 'Odebráno ze sledovaných', duration: 1);
+ });
+ },
+ child: Row(
+ mainAxisSize: MainAxisSize.max,
+ children: [
+ Expanded(child: Text(_bookmark! ? 'Klub sleduješ' : 'Klub nesleduješ', style: textStyleContext)),
+ _bookmark! ? Icon(MdiIcons.pin) : Icon(MdiIcons.pinOutline),
+ ],
+ ),
+ ),
+ ),
+ if (discussionResponse.discussion.hasHeader)
+ Divider(
+ color: colors.grey,
+ height: 26,
+ ),
+ if (discussionResponse.discussion.hasHeader)
+ GestureDetector(
+ onTap: () => Navigator.of(context)
+ .pushNamed('/discussion/header', arguments: new DiscussionHomePageArguments(discussionResponse)),
+ child: Row(
+ children: [
+ Expanded(child: Text('Záhlaví', style: textStyleContext)),
+ Icon(MdiIcons.pageLayoutHeader),
+ ],
+ ),
+ ),
+ if (discussionResponse.discussion.hasHome)
+ Divider(
+ color: colors.grey,
+ height: 26,
+ ),
+ if (discussionResponse.discussion.hasHome)
+ GestureDetector(
+ onTap: () => Navigator.of(context)
+ .pushNamed('/discussion/home', arguments: new DiscussionHomePageArguments(discussionResponse)),
+ child: Row(
+ children: [
+ Expanded(child: Text('Nástěnka', style: textStyleContext)),
+ Icon(MdiIcons.viewDashboardOutline),
+ ],
+ ),
+ ),
+ Divider(
+ color: colors.grey,
+ height: 26,
+ ),
+ GestureDetector(
+ onTap: () {
+ setState(() {
+ this._searchTerm = this._searchTerm == null ? '' : null;
+ this._popupMenu = false;
+ });
+ },
+ child: Row(
+ children: [
+ Text(this._searchTerm == null ? 'Hledat v diskuzi' : 'Zavřít hledání', style: textStyleContext),
+ SizedBox(
+ width: 10,
+ ),
+ Expanded(child: Icon(this._searchTerm == null ? MdiIcons.magnify : MdiIcons.magnifyRemoveOutline)),
+ ],
+ ),
+ ),
+ ]),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ )
],
));
}
@@ -235,4 +465,34 @@ class _DiscussionPageState extends State {
return null;
}
}
+
+ Widget unseenPill(Widget postItem, unseenCount) {
+ return Column(
+ mainAxisSize: MainAxisSize.max,
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ postItem,
+ const Divider(
+ height: 8,
+ thickness: 8,
+ ),
+ Container(
+ color: colors.grey.withOpacity(.1),
+ child: Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Center(
+ child: Container(
+ child: Text(
+ '↑ Nové příspěvky ($unseenCount)',
+ style: TextStyle(color: colors.background, fontSize: FontSize.medium.size),
+ ),
+ decoration: BoxDecoration(color: colors.primary, borderRadius: BorderRadius.all(Radius.circular(12))),
+ padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
+ ),
+ ),
+ ),
+ )
+ ],
+ );
+ }
}
diff --git a/lib/pages/GalleryPage.dart b/lib/pages/GalleryPage.dart
index cb68d505..7c96951b 100644
--- a/lib/pages/GalleryPage.dart
+++ b/lib/pages/GalleryPage.dart
@@ -5,7 +5,8 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:fyx/components/post/PostHeroAttachment.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:fyx/components/post/post_hero_attachment.dart';
import 'package:fyx/controllers/AnalyticsProvider.dart';
import 'package:fyx/exceptions/UnsupportedDownloadFormatException.dart';
import 'package:fyx/theme/Helpers.dart';
@@ -40,7 +41,7 @@ class _GalleryPageState extends State {
@override
void initState() {
super.initState();
- WidgetsBinding.instance?.addPostFrameCallback((_) {
+ WidgetsBinding.instance.addPostFrameCallback((_) {
if (_arguments != null && _arguments!.images.length > 1) {
_arguments!.images.asMap().forEach((key, image) {
if (image.image == _arguments!.imageUrl) {
@@ -74,7 +75,8 @@ class _GalleryPageState extends State {
scrollPhysics: const BouncingScrollPhysics(),
builder: (BuildContext context, int index) {
return PhotoViewGalleryPageOptions(
- imageProvider: CachedNetworkImageProvider(_arguments!.images[index].image), onTapDown: (_, __, ___) => close(context));
+ imageProvider: CachedNetworkImageProvider(
+ _arguments!.images[index].image, cacheManager: CacheManager(Config(_arguments!.images[index].image, stalePeriod: const Duration(days: 7)))), onTapDown: (_, __, ___) => close(context));
},
itemCount: _arguments!.images.length,
loadingBuilder: (context, chunkEvent) => CupertinoActivityIndicator(
diff --git a/lib/pages/HomePage.dart b/lib/pages/HomePage.dart
index ab1791ef..1a16148b 100644
--- a/lib/pages/HomePage.dart
+++ b/lib/pages/HomePage.dart
@@ -1,28 +1,20 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
import 'package:fyx/FyxApp.dart';
-import 'package:fyx/components/Avatar.dart' as ca;
-import 'package:fyx/components/DiscussionListItem.dart';
-import 'package:fyx/components/ListHeader.dart';
-import 'package:fyx/components/NotificationBadge.dart';
-import 'package:fyx/components/PullToRefreshList.dart';
+import 'package:fyx/components/bottom_tab_bar.dart';
+import 'package:fyx/components/notification_badge.dart';
import 'package:fyx/controllers/AnalyticsProvider.dart';
import 'package:fyx/controllers/ApiController.dart';
-import 'package:fyx/model/BookmarkedDiscussion.dart';
import 'package:fyx/model/MainRepository.dart';
import 'package:fyx/model/enums/DefaultView.dart';
+import 'package:fyx/model/enums/RefreshDataEnum.dart';
import 'package:fyx/model/provider/NotificationsModel.dart';
-import 'package:fyx/pages/MailboxPage.dart';
-import 'package:fyx/theme/L.dart';
-import 'package:fyx/theme/T.dart';
+import 'package:fyx/pages/tab_bar/BookmarksTab.dart';
+import 'package:fyx/pages/tab_bar/MailboxTab.dart';
import 'package:fyx/theme/skin/Skin.dart';
-import 'package:fyx/theme/skin/SkinColors.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:provider/provider.dart';
-enum ETabs { history, bookmarks }
-enum ERefreshData { bookmarks, mail, all }
-
class HomePageArguments {
final pageIndex;
@@ -38,39 +30,29 @@ class HomePage extends StatefulWidget {
}
class _HomePageState extends State with RouteAware, WidgetsBindingObserver {
- late PageController _bookmarksController;
-
- ETabs activeTab = ETabs.history;
int _pageIndex = 0;
- Map _refreshData = {'bookmarks': 0, 'mail': 0};
+ Map _refreshData = {RefreshDataEnum.bookmarks: 0, RefreshDataEnum.mail: 0};
bool _filterUnread = false;
- DefaultView _defaultView = DefaultView.history;
- List _toggledCategories = [];
+ bool _showSubmenu = false;
HomePageArguments? _arguments;
@override
void initState() {
super.initState();
- WidgetsBinding.instance?.addObserver(this);
-
- _defaultView = MainRepository().settings.defaultView == DefaultView.latest ? MainRepository().settings.latestView : MainRepository().settings.defaultView;
- _filterUnread = [DefaultView.bookmarksUnread, DefaultView.historyUnread].indexOf(_defaultView) >= 0;
-
- activeTab = [DefaultView.history, DefaultView.historyUnread].indexOf(_defaultView) >= 0 ? ETabs.history : ETabs.bookmarks;
- if (activeTab == ETabs.bookmarks) {
- _bookmarksController = PageController(initialPage: 1);
- } else {
- _bookmarksController = PageController(initialPage: 0);
- }
-
- _bookmarksController.addListener(() {
- // If the CupertinoTabView is sliding and the animation is finished, change the active tab
- if (_bookmarksController.page! % 1 == 0 && activeTab != ETabs.values[_bookmarksController.page!.toInt()]) {
- setState(() {
- activeTab = ETabs.values[_bookmarksController.page!.toInt()];
- });
+ WidgetsBinding.instance.addObserver(this);
+
+ final defaultView =
+ MainRepository().settings.defaultView == DefaultView.latest ? MainRepository().settings.latestView : MainRepository().settings.defaultView;
+ _filterUnread = [DefaultView.bookmarksUnread, DefaultView.historyUnread].indexOf(defaultView) >= 0;
+
+ () async {
+ await Future.delayed(Duration.zero);
+ final Object? _objArguments = ModalRoute.of(context)?.settings.arguments;
+ if (_objArguments != null) {
+ _arguments = _objArguments as HomePageArguments;
+ setState(() => _pageIndex = _arguments?.pageIndex);
}
- });
+ }();
// Request for push notifications
MainRepository().notifications.request();
@@ -87,18 +69,19 @@ class _HomePageState extends State with RouteAware, WidgetsBindingObse
@override
void dispose() {
- _bookmarksController.dispose();
FyxApp.routeObserver.unsubscribe(this);
- WidgetsBinding.instance?.removeObserver(this);
+ WidgetsBinding.instance.removeObserver(this);
super.dispose();
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
+ setState(() => _showSubmenu = false);
+
// If we omit the Route check, there's very rare issue during authorization
// See: https://github.com/lucien144/fyx/issues/57
if (state == AppLifecycleState.resumed && ModalRoute.of(context)!.isCurrent) {
- this.refreshData(_pageIndex == HomePage.PAGE_MAIL ? ERefreshData.mail : ERefreshData.bookmarks);
+ this.refreshData(_pageIndex == HomePage.PAGE_MAIL ? RefreshDataEnum.mail : RefreshDataEnum.bookmarks);
}
}
@@ -110,7 +93,7 @@ class _HomePageState extends State with RouteAware, WidgetsBindingObse
// Called when the current route has been pushed.
void didPopNext() {
- this.refreshData(ERefreshData.bookmarks);
+ this.refreshData(RefreshDataEnum.bookmarks);
}
void didPush() {
@@ -121,271 +104,92 @@ class _HomePageState extends State with RouteAware, WidgetsBindingObse
// Called when the current route has been popped off.
}
+ // Called when a new route has been pushed, and the current route is no longer visible.
void didPushNext() {
- // Called when a new route has been pushed, and the current route is no longer visible.
+ setState(() => _showSubmenu = false);
}
- void refreshData(ERefreshData type) {
+ void refreshData(RefreshDataEnum type) {
setState(() {
switch (type) {
- case ERefreshData.bookmarks:
- _refreshData['bookmarks'] = DateTime.now().millisecondsSinceEpoch;
+ case RefreshDataEnum.bookmarks:
+ _refreshData[RefreshDataEnum.bookmarks] = DateTime.now().millisecondsSinceEpoch;
break;
- case ERefreshData.mail:
- _refreshData['mail'] = DateTime.now().millisecondsSinceEpoch;
+ case RefreshDataEnum.mail:
+ _refreshData[RefreshDataEnum.mail] = DateTime.now().millisecondsSinceEpoch;
break;
default:
- _refreshData['bookmarks'] = DateTime.now().millisecondsSinceEpoch;
- _refreshData['mail'] = DateTime.now().millisecondsSinceEpoch;
+ _refreshData[RefreshDataEnum.bookmarks] = DateTime.now().millisecondsSinceEpoch;
+ _refreshData[RefreshDataEnum.mail] = DateTime.now().millisecondsSinceEpoch;
break;
}
});
}
- Widget actionSheet(BuildContext context) {
- return CupertinoActionSheet(
- title: Text('Přihlášen jako: ${MainRepository().credentials!.nickname}'),
- actions: [
- CupertinoActionSheetAction(
- child: Text(L.SETTINGS),
- onPressed: () {
- Navigator.of(context).pop();
- Navigator.of(context, rootNavigator: true).pushNamed('/settings');
- }),
- CupertinoActionSheetAction(
- child: Text('⚠️ ${L.SETTINGS_BUGREPORT}'),
- onPressed: () {
- T.prefillGithubIssue(appContext: MainRepository(), user: MainRepository().credentials!.nickname);
- AnalyticsProvider().logEvent('reportBug');
- }),
- ],
- cancelButton: CupertinoActionSheetAction(
- isDefaultAction: true,
- child: Text(L.GENERAL_CANCEL),
- onPressed: () {
- Navigator.pop(context);
- },
- ));
- }
-
@override
Widget build(BuildContext context) {
- SkinColors colors = Skin.of(context).theme.colors;
-
if (ApiController().buildContext == null || ApiController().buildContext.hashCode != context.hashCode) {
ApiController().buildContext = context;
}
- final Object? _objArguments = ModalRoute.of(context)?.settings.arguments;
- if (_objArguments != null) {
- _arguments = _objArguments as HomePageArguments;
- _pageIndex = _arguments?.pageIndex;
- }
+ final double bottomPadding = MediaQuery.of(context).padding.bottom;
+ final colors = Skin.of(context).theme.colors;
+ final tabs = [
+ BookmarksTab(filterUnread: _filterUnread, refreshTimestamp: _refreshData[RefreshDataEnum.bookmarks] ?? 0),
+ MailboxTab(refreshTimestamp: _refreshData[RefreshDataEnum.mail] ?? 0),
+ ];
return WillPopScope(
onWillPop: () async => false,
- child: CupertinoTabScaffold(
- tabBar: CupertinoTabBar(
- currentIndex: _pageIndex,
- onTap: (index) {
- if (_pageIndex == index && index == HomePage.PAGE_BOOKMARK) {
- setState(() {
- _filterUnread = !_filterUnread;
- // Reset the category toggle
- _toggledCategories = [];
- this.updateLatestView();
- });
- }
- setState(() => _pageIndex = index);
- this.refreshData(_pageIndex == HomePage.PAGE_MAIL ? ERefreshData.mail : ERefreshData.bookmarks);
- },
- items: [
- BottomNavigationBarItem(
- icon: Icon(_filterUnread ? Icons.bookmarks : Icons.bookmarks_outlined, size: 34),
- ),
- BottomNavigationBarItem(
- icon: Consumer(
- builder: (context, notifications, child) => NotificationBadge(
- widget: Icon(
- Icons.email_outlined,
- size: 42,
- ),
- counter: notifications.newMails,
- isVisible: notifications.newMails > 0),
- ),
- ),
- ],
+ child: Stack(children: [
+ Positioned.fill(
+ // Do not prevent the scroll down if the submenu is up. Only hide the submenu and keep scrolling...
+ child: GestureDetector(
+ child: tabs[_pageIndex],
+ onVerticalDragDown: (_) => _showSubmenu ? setState(() => _showSubmenu = false) : null,
+ ),
+ bottom: 50 + bottomPadding,
),
- tabBuilder: (context, index) {
- switch (index) {
- case HomePage.PAGE_BOOKMARK:
- return CupertinoTabView(builder: (context) {
- return CupertinoPageScaffold(
- navigationBar: CupertinoNavigationBar(
- leading: Consumer(
- builder: (context, notifications, child) => NotificationBadge(
- widget: CupertinoButton(
- padding: EdgeInsets.zero,
- minSize: kMinInteractiveDimensionCupertino - 10,
- child: Icon(
- Icons.notifications_none,
- size: 30,
- ),
- onPressed: () => Navigator.of(context, rootNavigator: true).pushNamed('/notices')),
- isVisible: notifications.newNotices > 0,
- counter: notifications.newNotices)),
- trailing: GestureDetector(
- child: ca.Avatar(
- MainRepository().credentials!.avatar,
- size: 26
- ),
- onTap: () {
- showCupertinoModalPopup(context: context, builder: (BuildContext context) => actionSheet(context));
- },
- ),
- middle: CupertinoSegmentedControl(
- groupValue: activeTab,
- onValueChanged: (value) {
- _bookmarksController.animateToPage(ETabs.values.indexOf(value as ETabs), duration: Duration(milliseconds: 300), curve: Curves.easeInOut);
- },
- children: {
- ETabs.history: Padding(
- child: Text('Historie'),
- padding: EdgeInsets.symmetric(horizontal: 16),
- ),
- ETabs.bookmarks: Padding(
- child: Text('Sledované'),
- padding: EdgeInsets.symmetric(horizontal: 16),
- ),
- },
- )),
- child: PageView(
- controller: _bookmarksController,
- onPageChanged: (int index) => this.updateLatestView(isInverted: true),
- pageSnapping: true,
- children: [
- // -----
- // HISTORY PULL TO REFRESH
- // -----
- PullToRefreshList(
- rebuild: _refreshData['bookmarks'] ?? 0,
- dataProvider: (lastId) async {
- List withReplies = [];
- var result = await ApiController().loadHistory();
- var data = result.discussions
- .map((discussion) => BookmarkedDiscussion.fromJson(discussion))
- .where((discussion) => this._filterUnread ? discussion.unread > 0 : true)
- .map((discussion) => DiscussionListItem(discussion))
- .where((discussionListItem) {
- if (discussionListItem.discussion.replies > 0) {
- withReplies.add(discussionListItem);
- return false;
- }
- return true;
- }).toList();
- data.insertAll(0, withReplies);
- return DataProviderResult(data);
- }),
- // -----
- // BOOKMARKS PULL TO REFRESH
- // -----
- PullToRefreshList(
- rebuild: _refreshData['bookmarks'] ?? 0,
- dataProvider: (lastId) async {
- var categories = [];
- var result = await ApiController().loadBookmarks();
-
- result.bookmarks.forEach((_bookmark) {
- List withReplies = [];
- var discussion = _bookmark.discussions
- .where((discussion) {
- // Filter by tapping on category headers
- // If unread filter is ON
- if (this._filterUnread) {
- if (_toggledCategories.indexOf(_bookmark.categoryId) >= 0) {
- // If unread filter is ON and category toggle is ON, display discussions
- return true;
- } else {
- // If unread filter is ON and category toggle is OFF, display unread discussions only
- return discussion.unread > 0;
- }
- } else {
- if (_toggledCategories.indexOf(_bookmark.categoryId) >= 0) {
- // If unread filter is OFF and category toggle is ON, hide discussions
- return false;
- }
- }
- // If unread filter is OFF and category toggle is OFF, show discussions
- return true;
- })
- .map((discussion) => DiscussionListItem(discussion))
- .where((discussionListItem) {
- if (discussionListItem.discussion.replies > 0) {
- withReplies.add(discussionListItem);
- return false;
- }
- return true;
- })
- .toList();
- discussion.insertAll(0, withReplies);
- categories.add({
- 'header': ListHeader(_bookmark.categoryName, onTap: () {
- if (_toggledCategories.indexOf(_bookmark.categoryId) >= 0) {
- // Hide discussions in the category
- setState(() => _toggledCategories.remove(_bookmark.categoryId));
- } else {
- // Show discussions in the category
- setState(() => _toggledCategories.add(_bookmark.categoryId));
- }
- this.refreshData(ERefreshData.bookmarks);
- }),
- 'items': discussion
- });
- });
- return DataProviderResult(categories);
- }),
- ],
- ),
- );
- });
- case HomePage.PAGE_MAIL:
- return CupertinoTabView(builder: (context) {
- return CupertinoPageScaffold(
- navigationBar: CupertinoNavigationBar(
- trailing: GestureDetector(
- child: ca.Avatar(
- MainRepository().credentials!.avatar,
- size: 26,
- ),
- onTap: () {
- showCupertinoModalPopup(context: context, builder: (BuildContext context) => actionSheet(context));
- },
- ),
- middle: Text('Pošta', style: TextStyle(color: colors.text),)),
- child: MailboxPage(
- refreshData: _refreshData['mail'] ?? 0,
- ));
- });
- default:
- throw Exception('Selected undefined tab');
- }
- },
- ),
+ Positioned.fill(
+ // Prevent the tap if submenu is up!
+ child: GestureDetector(
+ behavior: _showSubmenu ? HitTestBehavior.translucent : HitTestBehavior.deferToChild,
+ onTap: () => _showSubmenu ? setState(() => _showSubmenu = false) : null,
+ child: BottomTabBar(
+ activeSubmenu: _showSubmenu,
+ onTap: (index) {
+ if (index == tabs.length) {
+ setState(() => _showSubmenu = !_showSubmenu);
+ return;
+ }
+
+ if (_pageIndex == index && index == HomePage.PAGE_BOOKMARK) {
+ setState(() => _filterUnread = !_filterUnread);
+ }
+ setState(() {
+ _pageIndex = index;
+ _showSubmenu = false;
+ });
+ this.refreshData(_pageIndex == HomePage.PAGE_MAIL ? RefreshDataEnum.mail : RefreshDataEnum.bookmarks);
+ },
+ items: [
+ Icon(_filterUnread ? Icons.bookmarks : Icons.bookmarks_outlined, size: 34, color: _pageIndex == 0 ? colors.primary : colors.grey),
+ Consumer(
+ builder: (context, notifications, child) => NotificationBadge(
+ widget: Icon(Icons.email_outlined, size: 42, color: _pageIndex == 1 ? colors.primary : colors.grey),
+ counter: notifications.newMails,
+ isVisible: notifications.newMails > 0),
+ ),
+ Center(
+ child: Icon(
+ MdiIcons.menu,
+ size: 34,
+ ))
+ ],
+ ),
+ ),
+ )
+ ]),
);
}
-
- // isInverted
- // Sometimes the activeTab var is changed after the listener where we call updateLatestView() finishes.
- // Therefore, the var activeTab needs to be handled as inverted.
- void updateLatestView({bool isInverted: false}) {
- DefaultView latestView = activeTab == ETabs.history ? DefaultView.history : DefaultView.bookmarks;
- if (isInverted) {
- latestView = activeTab == ETabs.history ? DefaultView.bookmarks : DefaultView.history;
- }
-
- if (_filterUnread) {
- latestView = latestView == DefaultView.bookmarks ? DefaultView.bookmarksUnread : DefaultView.historyUnread;
- }
- MainRepository().settings.latestView = latestView;
- }
}
diff --git a/lib/pages/InfoPage.dart b/lib/pages/InfoPage.dart
index 44ab4bc1..348e3659 100644
--- a/lib/pages/InfoPage.dart
+++ b/lib/pages/InfoPage.dart
@@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:fyx/controllers/AnalyticsProvider.dart';
+import 'package:fyx/controllers/SettingsProvider.dart';
import 'package:fyx/theme/L.dart';
import 'package:fyx/theme/T.dart';
import 'package:fyx/theme/skin/Skin.dart';
@@ -52,7 +53,7 @@ class _InfoPageState extends State {
future: _response,
builder: (BuildContext context, AsyncSnapshot snapshot) {
if (snapshot.hasData) {
- return Markdown(data: snapshot.data!.body, styleSheet: MarkdownStyleSheet.fromCupertinoTheme(CupertinoTheme.of(context)), onTapLink: (String text, String? url, String title) => url != null ? T.openLink(url) : null);
+ return Markdown(data: snapshot.data!.body, styleSheet: MarkdownStyleSheet.fromCupertinoTheme(CupertinoTheme.of(context)), onTapLink: (String text, String? url, String title) => url != null ? T.openLink(url, mode: SettingsProvider().linksMode) : null);
}
if (snapshot.hasError) {
return T.feedbackScreen(
diff --git a/lib/pages/LoginPage.dart b/lib/pages/LoginPage.dart
index 04773e83..5b49f207 100644
--- a/lib/pages/LoginPage.dart
+++ b/lib/pages/LoginPage.dart
@@ -53,12 +53,10 @@ class _LoginPageState extends State {
minWidth: MediaQuery.of(context).size.width,
minHeight: MediaQuery.of(context).size.height,
),
- child: IntrinsicHeight(
- child: Container(
- padding: EdgeInsets.all(16),
- decoration: BoxDecoration(gradient: colors.gradient),
- child: formFactory(),
- ),
+ child: Container(
+ padding: EdgeInsets.all(16),
+ decoration: BoxDecoration(gradient: colors.gradient),
+ child: formFactory(),
))));
}
@@ -73,7 +71,9 @@ class _LoginPageState extends State {
final textfieldDecoration =
BoxDecoration(borderRadius: BorderRadius.circular(4), color: colors.background, border: Border.all(color: colors.background));
- var offset = (MediaQuery.of(context).viewInsets.bottom / 3);
+ var offset = 128 - (MediaQuery.of(context).viewInsets.bottom / 3);
+ offset = offset > 0 ? offset : 20;
+
return Column(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.max,
@@ -91,7 +91,7 @@ class _LoginPageState extends State {
boxShadow: [BoxShadow(color: colors.dark, offset: Offset(0, 0), blurRadius: 16)]),
),
AnimatedPadding(
- padding: EdgeInsets.only(top: 128 - offset),
+ padding: EdgeInsets.only(top: offset),
duration: const Duration(milliseconds: 200),
curve: Curves.easeInOut,
child: Column(
diff --git a/lib/pages/MailboxPage.dart b/lib/pages/MailboxPage.dart
deleted file mode 100644
index a2773b44..00000000
--- a/lib/pages/MailboxPage.dart
+++ /dev/null
@@ -1,114 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:fyx/components/MailListItem.dart';
-import 'package:fyx/components/PullToRefreshList.dart';
-import 'package:fyx/components/post/SyntaxHighlighter.dart';
-import 'package:fyx/controllers/AnalyticsProvider.dart';
-import 'package:fyx/controllers/ApiController.dart';
-import 'package:fyx/controllers/IApiProvider.dart';
-import 'package:fyx/model/Mail.dart';
-import 'package:fyx/model/MainRepository.dart';
-import 'package:fyx/pages/NewMessagePage.dart';
-import 'package:fyx/theme/skin/Skin.dart';
-import 'package:fyx/theme/skin/SkinColors.dart';
-import 'package:hive_flutter/hive_flutter.dart';
-
-class MailboxPage extends StatefulWidget {
- final int refreshData;
-
- MailboxPage({this.refreshData = 0});
-
- @override
- _MailboxPageState createState() => _MailboxPageState();
-}
-
-class _MailboxPageState extends State {
- int _refreshData = 0;
-
- @override
- void initState() {
- _refreshData = widget.refreshData;
- AnalyticsProvider().setScreen('Mailbox', 'MailboxPage');
- super.initState();
- }
-
- refreshData() {
- setState(() => _refreshData = DateTime.now().millisecondsSinceEpoch);
- }
-
- @override
- void didUpdateWidget(MailboxPage oldWidget) {
- if (oldWidget.refreshData != widget.refreshData) {
- this.refreshData();
- }
- super.didUpdateWidget(oldWidget);
- }
-
- @override
- Widget build(BuildContext context) {
- // Reset the language context.
- // TODO: Not ideal. Get rid of the static.
- SyntaxHighlighter.languageContext = '';
- SkinColors colors = Skin.of(context).theme.colors;
-
- return Stack(children: [
- PullToRefreshList(
- rebuild: _refreshData,
- isInfinite: true,
- sliverListBuilder: (List data) {
- return ValueListenableBuilder(
- valueListenable: MainRepository().settings.box.listenable(keys: ['blockedMails', 'blockedUsers']),
- builder: (BuildContext context, value, Widget? child) {
- var filtered = data;
- if (data[0] is MailListItem) {
- filtered = data
- .where((item) => !MainRepository().settings.isMailBlocked((item as MailListItem).mail.id))
- .where((item) => !MainRepository().settings.isUserBlocked((item as MailListItem).mail.participant))
- .toList();
- }
- return SliverList(
- delegate: SliverChildBuilderDelegate(
- (context, i) => filtered[i],
- childCount: filtered.length,
- ),
- );
- },
- );
- },
- dataProvider: (lastId) async {
- var result = await ApiController().loadMail(lastId: lastId);
- var mails = result.mails
- .map((_mail) => Mail.fromJson(_mail, isCompact: MainRepository().settings.useCompactMode))
- .where((mail) => !MainRepository().settings.isMailBlocked(mail.id))
- .where((mail) => !MainRepository().settings.isUserBlocked(mail.participant))
- .map((mail) => MailListItem(mail, onUpdate: this.refreshData,))
- .toList();
- var id = Mail.fromJson(result.mails.last, isCompact: MainRepository().settings.useCompactMode).id;
- return DataProviderResult(mails, lastId: id);
- }),
- Positioned(
- right: 20,
- bottom: 20,
- child: SafeArea(
- child: FloatingActionButton(
- backgroundColor: colors.primary,
- foregroundColor: colors.background,
- child: Icon(Icons.add),
- onPressed: () => Navigator.of(context, rootNavigator: true).pushNamed('/new-message',
- arguments: NewMessageSettings(
- onClose: this.refreshData,
- hasInputField: true,
- onSubmit: (String? inputField, String message, List> attachments) async {
- if (inputField == null) {
- return false;
- }
-
- var response = await ApiController().sendMail(inputField, message, attachments: attachments);
- return response.isOk;
- })),
- ),
- ),
- )
- ]);
- }
-}
diff --git a/lib/pages/NewMessagePage.dart b/lib/pages/NewMessagePage.dart
index c42c6fda..cf5ee254 100644
--- a/lib/pages/NewMessagePage.dart
+++ b/lib/pages/NewMessagePage.dart
@@ -8,6 +8,7 @@ import 'package:flutter/widgets.dart';
import 'package:fyx/controllers/AnalyticsProvider.dart';
import 'package:fyx/controllers/IApiProvider.dart';
import 'package:fyx/model/MainRepository.dart';
+import 'package:fyx/model/Settings.dart';
import 'package:fyx/theme/Helpers.dart';
import 'package:fyx/theme/skin/Skin.dart';
import 'package:fyx/theme/skin/SkinColors.dart';
@@ -141,10 +142,13 @@ class _NewMessagePageState extends State {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- CupertinoButton(padding: EdgeInsets.all(0), child: Text('Zavřít'), onPressed: () => Navigator.of(context).pop()),
+ CupertinoButton(
+ padding: EdgeInsets.all(0),
+ child: Text('Zavřít', style: TextStyle(fontSize: Settings().fontSize)),
+ onPressed: () => Navigator.of(context).pop()),
CupertinoButton(
padding: EdgeInsets.all(0),
- child: _sending ? CupertinoActivityIndicator() : Text('Odeslat'),
+ child: _sending ? CupertinoActivityIndicator() : Text('Odeslat', style: TextStyle(fontSize: Settings().fontSize)),
onPressed: _isSendDisabled()
? null
: () async {
@@ -165,6 +169,7 @@ class _NewMessagePageState extends State {
Visibility(
visible: _settings!.hasInputField == true,
child: CupertinoTextField(
+ decoration: colors.textFieldDecoration,
controller: _recipientController,
inputFormatters: [FilteringTextInputFormatter.allow(RegExp('[a-zA-Z0-9_]'))],
textCapitalization: TextCapitalization.characters,
@@ -177,6 +182,7 @@ class _NewMessagePageState extends State {
height: 8,
),
CupertinoTextField(
+ decoration: colors.textFieldDecoration,
controller: _messageController,
maxLines: 10,
autofocus: _settings!.hasInputField != true || _settings!.inputFieldPlaceholder != null,
diff --git a/lib/pages/NoticesPage.dart b/lib/pages/NoticesPage.dart
index 63f03151..eb5fefe0 100644
--- a/lib/pages/NoticesPage.dart
+++ b/lib/pages/NoticesPage.dart
@@ -1,11 +1,12 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:fyx/components/Avatar.dart' as component;
-import 'package:fyx/components/ContentBoxLayout.dart';
-import 'package:fyx/components/PullToRefreshList.dart';
-import 'package:fyx/components/post/PostThumbs.dart';
+import 'package:fyx/components/avatar.dart' as component;
+import 'package:fyx/components/content_box_layout.dart';
+import 'package:fyx/components/post/post_thumbs.dart';
+import 'package:fyx/components/pull_to_refresh_list.dart';
import 'package:fyx/controllers/AnalyticsProvider.dart';
import 'package:fyx/controllers/ApiController.dart';
+import 'package:fyx/model/Settings.dart';
import 'package:fyx/model/post/PostThumbItem.dart';
import 'package:fyx/model/post/content/Regular.dart';
import 'package:fyx/model/reponses/FeedNoticesResponse.dart';
@@ -32,13 +33,13 @@ class _NoticesPageState extends State with WidgetsBindingObserver {
@override
void initState() {
super.initState();
- WidgetsBinding.instance?.addObserver(this);
+ WidgetsBinding.instance.addObserver(this);
AnalyticsProvider().setScreen('Notices', 'NoticesPage');
}
@override
void dispose() {
- WidgetsBinding.instance?.removeObserver(this);
+ WidgetsBinding.instance.removeObserver(this);
super.dispose();
}
@@ -65,7 +66,7 @@ class _NoticesPageState extends State with WidgetsBindingObserver {
child: PullToRefreshList(
rebuild: _refreshData,
dataProvider: (lastId) async {
- var result = await ApiController().loadFeedNotices();
+ var result = await Future.delayed(const Duration(milliseconds: 300), () => ApiController().loadFeedNotices());
var feed = result.data.map((NoticeItem item) {
var highlight = false;
item.replies.forEach((NoticeReplies reply) => highlight = reply.time > result.lastVisit ? true : highlight);
@@ -77,7 +78,9 @@ class _NoticesPageState extends State with WidgetsBindingObserver {
isHighlighted: highlight,
topRightWidget: Text(
item.wuRating > 0 ? '+${item.wuRating}' : item.wuRating.toString(),
- style: TextStyle(fontSize: 14, color: item.wuRating > 0 ? colors.success : (item.wuRating < 0 ? colors.danger : colors.grey)),
+ style: TextStyle(
+ fontSize: Settings().fontSize * 0.9,
+ color: item.wuRating > 0 ? colors.success : (item.wuRating < 0 ? colors.danger : colors.grey)),
),
topLeftWidget: Expanded(
child: GestureDetector(
@@ -86,7 +89,7 @@ class _NoticesPageState extends State with WidgetsBindingObserver {
item.discussionName,
overflow: TextOverflow.ellipsis,
softWrap: false,
- style: TextStyle(fontWeight: FontWeight.bold),
+ style: TextStyle(fontWeight: FontWeight.bold, fontSize: Settings().fontSize),
),
),
),
diff --git a/lib/pages/SettingsPage.dart b/lib/pages/SettingsPage.dart
deleted file mode 100644
index 96c8c0dc..00000000
--- a/lib/pages/SettingsPage.dart
+++ /dev/null
@@ -1,251 +0,0 @@
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_cupertino_settings/flutter_cupertino_settings.dart';
-import 'package:fyx/FyxApp.dart';
-import 'package:fyx/controllers/AnalyticsProvider.dart';
-import 'package:fyx/controllers/ApiController.dart';
-import 'package:fyx/model/MainRepository.dart';
-import 'package:fyx/model/enums/DefaultView.dart';
-import 'package:fyx/model/enums/ThemeEnum.dart';
-import 'package:fyx/model/provider/ThemeModel.dart';
-import 'package:fyx/pages/InfoPage.dart';
-import 'package:fyx/theme/L.dart';
-import 'package:fyx/theme/T.dart';
-import 'package:fyx/theme/skin/Skin.dart';
-import 'package:fyx/theme/skin/SkinColors.dart';
-import 'package:hive_flutter/hive_flutter.dart';
-import 'package:provider/provider.dart';
-
-class SettingsPage extends StatefulWidget {
- @override
- _SettingsPageState createState() => _SettingsPageState();
-}
-
-class _SettingsPageState extends State {
- bool _compactMode = false;
- bool _underTheHood = false;
- bool _autocorrect = false;
- DefaultView _defaultView = DefaultView.latest;
- ThemeEnum _theme = ThemeEnum.light;
-
- @override
- void initState() {
- super.initState();
- _compactMode = MainRepository().settings.useCompactMode;
- _underTheHood = false;
- _autocorrect = MainRepository().settings.useAutocorrect;
- _defaultView = MainRepository().settings.defaultView;
- _theme = MainRepository().settings.theme;
- AnalyticsProvider().setScreen('Settings', 'SettingsPage');
- }
-
- @override
- Widget build(BuildContext context) {
- SkinColors colors = Skin.of(context).theme.colors;
- CSWidgetStyle postsStyle = CSWidgetStyle(icon: Icon(Icons.view_compact, color: colors.text.withOpacity(0.38)));
- CSWidgetStyle autocorrectStyle = CSWidgetStyle(icon: Icon(Icons.spellcheck, color: colors.text.withOpacity(0.38)));
- CSWidgetStyle bugreportStyle = CSWidgetStyle(icon: Icon(Icons.bug_report, color: colors.text.withOpacity(0.38)));
- CSWidgetStyle aboutStyle = CSWidgetStyle(icon: Icon(Icons.info, color: colors.text.withOpacity(0.38)));
- CSWidgetStyle patronsStyle = CSWidgetStyle(icon: Icon(Icons.volunteer_activism, color: colors.text.withOpacity(0.38)));
- CSWidgetStyle termsStyle = CSWidgetStyle(icon: Icon(Icons.gavel, color: colors.text.withOpacity(0.38)));
-
- var pkg = MainRepository().packageInfo;
- var version = '${pkg.version} (${pkg.buildNumber})';
-
- return CupertinoPageScaffold(
- navigationBar: CupertinoNavigationBar(
- middle: Text(
- L.SETTINGS,
- style: TextStyle(color: colors.text),
- ),
- leading: CupertinoNavigationBarBackButton(
- color: colors.primary,
- onPressed: () {
- Navigator.of(context, rootNavigator: true).pop();
- },
- )),
- child: CupertinoScrollbar(
- child: CupertinoSettings(items: [
- const CSHeader('Příspěvky'),
- CSControl(
- nameWidget: Text(
- 'Autocorrect',
- style: TextStyle(color: colors.text),
- ),
- contentWidget: CupertinoSwitch(
- value: _autocorrect,
- onChanged: (bool value) {
- setState(() => _autocorrect = value);
- MainRepository().settings.useAutocorrect = value;
- }),
- style: autocorrectStyle,
- ),
- CSControl(
- nameWidget: Text(
- 'Kompaktní zobrazení',
- style: TextStyle(color: colors.text),
- ),
- contentWidget: CupertinoSwitch(
- value: _compactMode,
- onChanged: (bool value) {
- setState(() => _compactMode = value);
- MainRepository().settings.useCompactMode = value;
- }),
- style: postsStyle,
- ),
- CSDescription(
- 'Kompaktní zobrazení je zobrazení obrázků po stranách pokud to obsah příspěvku dovoluje (nedojde tak k narušení kontextu).',
- ),
- CSHeader('Úvodní obrazovka'),
- CSSelection(
- items: const >[
- CSSelectionItem(text: 'Poslední stav', value: DefaultView.latest),
- CSSelectionItem(text: 'Historie (vše)', value: DefaultView.history),
- CSSelectionItem(text: 'Historie (nepřečtené)', value: DefaultView.historyUnread),
- CSSelectionItem(text: 'Sledované (vše)', value: DefaultView.bookmarks),
- CSSelectionItem(text: 'Sledované (nepřečtené)', value: DefaultView.bookmarksUnread),
- ],
- onSelected: (index) {
- setState(() => _defaultView = index);
- MainRepository().settings.defaultView = index;
- },
- currentSelection: _defaultView,
- ),
- CSHeader('Barevný režim'),
- CSSelection(
- items: const >[
- CSSelectionItem(text: 'Světlý', value: ThemeEnum.light),
- CSSelectionItem(text: 'Tmavý', value: ThemeEnum.dark),
- CSSelectionItem(text: 'Podle systému', value: ThemeEnum.system),
- ],
- onSelected: (theme) {
- setState(() => _theme = theme);
- MainRepository().settings.theme = theme;
- Provider.of(context, listen: false).setTheme(theme);
- },
- currentSelection: _theme,
- ),
- CSHeader('Paměť'),
- CSControl(
- nameWidget: Text(
- 'Blokovaných uživatelů',
- style: TextStyle(color: colors.text),
- ),
- contentWidget: ValueListenableBuilder(
- valueListenable: MainRepository().settings.box.listenable(keys: ['blockedUsers']),
- builder: (BuildContext context, value, Widget? child) {
- return Text(
- MainRepository().settings.blockedUsers.length.toString(),
- style: TextStyle(color: colors.text),
- );
- }),
- ),
- CSControl(
- nameWidget: Text(
- 'Skrytých příspěvků',
- style: TextStyle(color: colors.text),
- ),
- contentWidget: ValueListenableBuilder(
- valueListenable: MainRepository().settings.box.listenable(keys: ['blockedPosts']),
- builder: (BuildContext context, value, Widget? child) {
- return Text(
- MainRepository().settings.blockedPosts.length.toString(),
- style: TextStyle(color: colors.text),
- );
- }),
- ),
- CSControl(
- nameWidget: Text(
- 'Skrytých mailů',
- style: TextStyle(color: colors.text),
- ),
- contentWidget: ValueListenableBuilder(
- valueListenable: MainRepository().settings.box.listenable(keys: ['blockedMails']),
- builder: (BuildContext context, value, Widget? child) {
- return Text(
- MainRepository().settings.blockedMails.length.toString(),
- style: TextStyle(color: colors.text),
- );
- }),
- ),
- CSButton(CSButtonType.DESTRUCTIVE, 'Reset', () {
- MainRepository().settings.resetBlockedContent();
- T.success(L.SETTINGS_CACHE_RESET, bg: colors.success);
- AnalyticsProvider().logEvent('resetBlockedContent');
- }),
- const CSHeader('Informace'),
- CSButton(
- CSButtonType.DEFAULT,
- L.BACKERS,
- () => Navigator.of(context).pushNamed('/settings/info',
- arguments: InfoPageSettings(L.BACKERS, 'https://raw.githubusercontent.com/lucien144/fyx/develop/BACKERS.md')),
- style: patronsStyle,
- ),
- CSButton(
- CSButtonType.DEFAULT,
- L.ABOUT,
- () => Navigator.of(context).pushNamed('/settings/info',
- arguments: InfoPageSettings(L.ABOUT, 'https://raw.githubusercontent.com/lucien144/fyx/develop/ABOUT.md')),
- style: aboutStyle),
- CSButton(
- CSButtonType.DEFAULT,
- L.SETTINGS_BUGREPORT,
- () {
- T.prefillGithubIssue(appContext: MainRepository(), user: MainRepository().credentials!.nickname);
- AnalyticsProvider().logEvent('reportBug');
- },
- style: bugreportStyle,
- ),
- CSButton(
- CSButtonType.DEFAULT,
- L.TERMS,
- () {
- T.openLink('https://nyx.cz/terms');
- AnalyticsProvider().logEvent('openTerms');
- },
- style: termsStyle,
- ),
- const CSHeader(''),
- CSButton(CSButtonType.DESTRUCTIVE, L.GENERAL_LOGOUT, () {
- ApiController().logout();
- Navigator.of(context, rootNavigator: true).pushNamed('/login');
- AnalyticsProvider().logEvent('logout');
- }),
- Visibility(
- visible: FyxApp.isDev,
- child: CSButton(CSButtonType.DESTRUCTIVE, '${L.GENERAL_LOGOUT} (bez resetu)', () {
- ApiController().logout(removeAuthrorization: false);
- Navigator.of(context, rootNavigator: true).pushNamed('/login');
- })),
- CSDescription('Verze: $version'),
- GestureDetector(child: CSDescription('Nahlídnout pod kapotu.'), onTap: () => setState(() => _underTheHood = !_underTheHood)),
- Visibility(
- visible: _underTheHood,
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- GestureDetector(
- child: CSDescription('API token: ${MainRepository().credentials!.token}'),
- onTap: () => Clipboard.setData(ClipboardData(text: MainRepository().credentials!.token))),
- FutureBuilder(
- future: FirebaseMessaging.instance.getToken(),
- builder: (BuildContext context, AsyncSnapshot snapshot) {
- if (snapshot.hasData && snapshot.data != null) {
- return GestureDetector(
- child: CSDescription('FCM token: ${snapshot.data!.substring(0, 30)}...'),
- onTap: () => Clipboard.setData(ClipboardData(text: snapshot.data)));
- }
- if (snapshot.hasError) {
- return CSDescription('FCM token: error :(');
- }
- return CSDescription('FCM token: načítám...');
- }),
- ],
- ),
- ),
- ]),
- ));
- }
-}
diff --git a/lib/pages/discussion_home_page.dart b/lib/pages/discussion_home_page.dart
new file mode 100644
index 00000000..3de15338
--- /dev/null
+++ b/lib/pages/discussion_home_page.dart
@@ -0,0 +1,61 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:fyx/components/discussion_page_scaffold.dart';
+import 'package:fyx/controllers/ApiController.dart';
+import 'package:fyx/model/reponses/DiscussionHomeResponse.dart';
+import 'package:fyx/model/reponses/DiscussionResponse.dart';
+import 'package:fyx/theme/L.dart';
+import 'package:fyx/theme/T.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+class DiscussionHomePageArguments {
+ final DiscussionResponse discussionResponse;
+
+ DiscussionHomePageArguments(this.discussionResponse);
+}
+
+class DiscussionHomePage extends StatelessWidget {
+ final bool header;
+ DiscussionHomePage({Key? key, this.header = false}) : super(key: key) {
+ if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ DiscussionHomePageArguments? pageArguments = ModalRoute.of(context)?.settings.arguments as DiscussionHomePageArguments?;
+
+ return DiscussionPageScaffold(
+ title: pageArguments?.discussionResponse.discussion.name ?? '',
+ child: FutureBuilder(
+ future: this.header
+ ? ApiController().getDiscussionHeader(pageArguments?.discussionResponse.discussion.idKlub ?? -1)
+ : ApiController().getDiscussionHome(pageArguments?.discussionResponse.discussion.idKlub ?? -1),
+ builder: (BuildContext context, AsyncSnapshot snapshot) {
+ if (snapshot.hasError) {
+ return T.feedbackScreen(context,
+ isWarning: true, title: snapshot.error.toString(), label: L.GENERAL_CLOSE, onPress: () => Navigator.of(context).pop());
+ } else if (snapshot.hasData) {
+ final html = '''
+
+
+
+
+
+
+
+ ${snapshot.data?.items.map((item) => '${item.content ?? ''}
').join('')}
+
+ 
+
+
+
+
+
+
+
+