Skip to content

Commit fa81855

Browse files
committed
✨(feat) parent tweet view added on comment detail.
1.✨ Click on comment Tweet it's parent tweet will visible in detail. 2.:bug: (fix)tweet detail dissapear when navigating back from user profile. 3.:art: Hash tags font size and weight fixed. 4.:truck:(move) Unavailable tweet removed from tweet . 5.:truck:(move) Retweet widget moved to new dart file. 6.:sparkles:Add Parent Tweet widget
1 parent 8c3d7dc commit fa81855

File tree

8 files changed

+394
-230
lines changed

8 files changed

+394
-230
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
## [1.0.4] - UPCOMMING
1+
## [1.0.5] - Upcomming
2+
3+
* Now if user click on comment Tweet it's parent tweet will visible in detail.
4+
* Google login button added on signup page.
5+
* Null value alert issue on forgot password fixed
6+
* Time on tweet "yesterday" is replcaed by "1d"
7+
* Hash tags front weight and size issue fixed.
8+
9+
## [1.0.4] - 04 Apr 2020
210

311
* User sort feature added on user search page.
412
* Added pull to refresh on search page.

lib/page/feed/feedPostDetail.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class _FeedPostDetailState extends State<FeedPostDetail> {
4747
);
4848
}
4949

50-
Widget _postBody(FeedModel model) {
50+
Widget _tweetDetail(FeedModel model) {
5151
return Tweet(
5252
model: model,
5353
type: TweetType.Detail,
@@ -106,7 +106,7 @@ class _FeedPostDetailState extends State<FeedPostDetail> {
106106
state.tweetDetailModel == null ||
107107
state.tweetDetailModel.length == 0
108108
? Container()
109-
: _postBody(state.tweetDetailModel?.last),
109+
: _tweetDetail(state.tweetDetailModel?.last),
110110
Container(
111111
height: 6,
112112
width: fullWidth(context),

lib/state/feedState.dart

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ class FeedState extends AppState {
5959
}
6060

6161
/// [Skip if any duplicate tweet already present]
62-
if (_tweetDetailModelList.length == 0 ||
63-
_tweetDetailModelList.length > 0 &&
64-
!_tweetDetailModelList.any((x) => x.key == model.key)) {
62+
if (_tweetDetailModelList.length >= 0) {
6563
_tweetDetailModelList.add(model);
64+
cprint("Detail Tweet added. Total Tweet: ${_tweetDetailModelList.length}");
6665
notifyListeners();
6766
}
6867
}
@@ -73,8 +72,11 @@ class FeedState extends AppState {
7372
/// After removing Tweet from Tweet detail Page stack its commnets tweet is also removed from `_tweetDetailModelList`
7473
void removeLastTweetDetail(String tweetKey) {
7574
if (_tweetDetailModelList != null && _tweetDetailModelList.length > 0) {
76-
_tweetDetailModelList.removeWhere((x) => x.key == tweetKey);
75+
// var index = _tweetDetailModelList.in
76+
FeedModel removeTweet = _tweetDetailModelList.lastWhere((x)=>x.key == tweetKey);
77+
_tweetDetailModelList.remove(removeTweet);
7778
tweetReplyMap.removeWhere((key, value) => key == tweetKey);
79+
cprint("Last Tweet removed from stack. Remaining Tweet: ${_tweetDetailModelList.length}");
7880
}
7981
}
8082

@@ -408,15 +410,15 @@ class FeedState extends AppState {
408410
var model = FeedModel.fromJson(event.snapshot.value);
409411
model.key = event.snapshot.key;
410412
if (_feedlist.any((x) => x.key == model.key)) {
411-
var oldEntry = _feedlist.singleWhere((entry) {
413+
var oldEntry = _feedlist.lastWhere((entry) {
412414
return entry.key == event.snapshot.key;
413415
});
414416
_feedlist[_feedlist.indexOf(oldEntry)] = model;
415417
}
416418

417419
if (_tweetDetailModelList != null && _tweetDetailModelList.length > 0) {
418420
if (_tweetDetailModelList.any((x) => x.key == model.key)) {
419-
var oldEntry = _tweetDetailModelList.singleWhere((entry) {
421+
var oldEntry = _tweetDetailModelList.lastWhere((entry) {
420422
return entry.key == event.snapshot.key;
421423
});
422424
_tweetDetailModelList[_tweetDetailModelList.indexOf(oldEntry)] = model;
@@ -551,13 +553,15 @@ class FeedState extends AppState {
551553
deleteFile(deletedTweet.imagePath, 'tweetImage');
552554
}
553555

554-
/// If a retweet is deleted then retweetCount should be decrease by 1.
556+
/// If a retweet is deleted then retweetCount of original tweet should be decrease by 1.
555557
if (deletedTweet.childRetwetkey != null) {
556558
await fetchTweet(deletedTweet.childRetwetkey).then((retweetModel) {
557559
if (retweetModel == null) {
558560
return;
559561
}
560-
retweetModel.retweetCount -= 1;
562+
if(retweetModel.retweetCount > 0){
563+
retweetModel.retweetCount -= 1;
564+
}
561565
updateTweet(retweetModel);
562566
});
563567
}

0 commit comments

Comments
 (0)