From 405326aca6833d1d20677b08b2d36543f59c17d4 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Fri, 4 Mar 2022 16:42:08 +0330 Subject: [PATCH] D1APP-104 hashtags (beta) (needs backend bug fix) --- lib/services/network/request_helper.dart | 2 +- lib/views/home/hashtag/hashtag.dart | 11 +++++++++-- lib/views/home/hashtag/hashtag_state.dart | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/services/network/request_helper.dart b/lib/services/network/request_helper.dart index 1eb9a6f..886bd47 100644 --- a/lib/services/network/request_helper.dart +++ b/lib/services/network/request_helper.dart @@ -34,7 +34,7 @@ class RequestHelper { _urlConcatGenerator([ MapEntry('limit', limit?.toString() ?? '3'), MapEntry('type', type), - MapEntry('id', itemId.toString()), + MapEntry('id', itemId?.toString()), MapEntry('tags', _urlListConcatGenerator(ids)) ]); diff --git a/lib/views/home/hashtag/hashtag.dart b/lib/views/home/hashtag/hashtag.dart index eb95e99..2e94ce0 100644 --- a/lib/views/home/hashtag/hashtag.dart +++ b/lib/views/home/hashtag/hashtag.dart @@ -28,12 +28,19 @@ class _HashtagState extends State { @override Widget build(BuildContext context) { return DidvanScaffold( - appBarData: AppBarData(title: widget.tag.label, hasBack: true), + appBarData: AppBarData(title: '#' + widget.tag.label, hasBack: true), slivers: [ Consumer( builder: (context, state, child) => SliverStateHandler( + itemPadding: const EdgeInsets.only(bottom: 8), state: state, + placeholder: RadarOverview.placeholder, builder: (context, state, index) { + index++; + if (index % 15 == 0 && index / 15 >= state.page) { + state.getTagItems(page: index ~/ 15 + 1); + } + index--; final item = state.items[index]; final type = item.type; if (type == 'radar') { @@ -51,7 +58,7 @@ class _HashtagState extends State { return Container(); }, childCount: state.items.length, - onRetry: () {}, + onRetry: () => state.getTagItems(page: 1), ), ) ], diff --git a/lib/views/home/hashtag/hashtag_state.dart b/lib/views/home/hashtag/hashtag_state.dart index 3dcb2f3..a94cdbe 100644 --- a/lib/views/home/hashtag/hashtag_state.dart +++ b/lib/views/home/hashtag/hashtag_state.dart @@ -17,6 +17,8 @@ class HashtagState extends CoreProvier { } final service = RequestService(RequestHelper.tag( ids: [id], + itemId: 1, + type: 'radar', limit: 15, page: page, ));