Skip to content

Commit 81d243f

Browse files
committed
🐛 (fix) Remove parentkey from retweet
1.:bug: parent key is removed from retweet. 2.:recycle: WidgetView is moved to new dart file. 3.:bug: Long name text overflow on search page fixed.
1 parent 561ecd5 commit 81d243f

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

lib/helper/enum.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ enum AuthStatus {
66
enum TweetType{
77
Tweet,
88
Detail,
9-
Reply
9+
Reply,
10+
ParentTweet
1011
}
1112

1213
enum SortUser{

lib/page/feed/composeTweet/composeTweet.dart

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:flutter_twitter_clone/model/feedModel.dart';
88
import 'package:flutter_twitter_clone/model/user.dart';
99
import 'package:flutter_twitter_clone/page/feed/composeTweet/widget/composeBottomIconWidget.dart';
1010
import 'package:flutter_twitter_clone/page/feed/composeTweet/widget/composeTweetImage.dart';
11+
import 'package:flutter_twitter_clone/page/feed/composeTweet/widget/widgetView.dart';
1112
import 'package:flutter_twitter_clone/state/authState.dart';
1213
import 'package:flutter_twitter_clone/state/feedState.dart';
1314
import 'package:flutter_twitter_clone/widgets/customAppBar.dart';
@@ -107,7 +108,7 @@ class _ComposeTweetReplyPageState extends State<ComposeTweetPage> {
107108
user: commentedUser,
108109
createdAt: DateTime.now().toUtc().toString(),
109110
tags: tags,
110-
parentkey: state.tweetToReplyModel.key,
111+
parentkey: widget.isRetweet ? null : state.tweetToReplyModel.key,
111112
childRetwetkey: widget.isRetweet ? model.key : null,
112113
userId: commentedUser.userId);
113114
if (_image != null) {
@@ -461,13 +462,4 @@ class _ComposeTweet
461462
}
462463
}
463464

464-
abstract class WidgetView<T1, T2> extends StatelessWidget {
465-
const WidgetView(this.state, {Key key}) : super(key: key);
466465

467-
final T2 state;
468-
469-
T1 get widget => (state as State).widget as T1;
470-
471-
@override
472-
Widget build(BuildContext context);
473-
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import 'package:flutter/material.dart';
2+
3+
abstract class WidgetView<T1, T2> extends StatelessWidget {
4+
const WidgetView(this.state, {Key key}) : super(key: key);
5+
6+
final T2 state;
7+
8+
T1 get widget => (state as State).widget as T1;
9+
10+
@override
11+
Widget build(BuildContext context);
12+
}

lib/page/search/SearchPage.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,16 @@ class _SearchPageState extends State<SearchPage> {
3636
},
3737
leading: customImage(context, user.profilePic, height: 40),
3838
title: Row(
39+
crossAxisAlignment: CrossAxisAlignment.start,
3940
children: <Widget>[
40-
UrlText(
41-
text: user.displayName,
42-
style: TextStyle(
43-
color: Colors.black,
44-
fontSize: 16,
45-
fontWeight: FontWeight.w800,
41+
Flexible(
42+
child: UrlText(
43+
text: user.displayName,
44+
style: TextStyle(
45+
color: Colors.black,
46+
fontSize: 16,
47+
fontWeight: FontWeight.w800,
48+
),
4649
),
4750
),
4851
SizedBox(width: 3),

0 commit comments

Comments
 (0)