File tree Expand file tree Collapse file tree 4 files changed +25
-17
lines changed Expand file tree Collapse file tree 4 files changed +25
-17
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,8 @@ enum AuthStatus {
6
6
enum TweetType {
7
7
Tweet ,
8
8
Detail ,
9
- Reply
9
+ Reply ,
10
+ ParentTweet
10
11
}
11
12
12
13
enum SortUser {
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ import 'package:flutter_twitter_clone/model/feedModel.dart';
8
8
import 'package:flutter_twitter_clone/model/user.dart' ;
9
9
import 'package:flutter_twitter_clone/page/feed/composeTweet/widget/composeBottomIconWidget.dart' ;
10
10
import 'package:flutter_twitter_clone/page/feed/composeTweet/widget/composeTweetImage.dart' ;
11
+ import 'package:flutter_twitter_clone/page/feed/composeTweet/widget/widgetView.dart' ;
11
12
import 'package:flutter_twitter_clone/state/authState.dart' ;
12
13
import 'package:flutter_twitter_clone/state/feedState.dart' ;
13
14
import 'package:flutter_twitter_clone/widgets/customAppBar.dart' ;
@@ -107,7 +108,7 @@ class _ComposeTweetReplyPageState extends State<ComposeTweetPage> {
107
108
user: commentedUser,
108
109
createdAt: DateTime .now ().toUtc ().toString (),
109
110
tags: tags,
110
- parentkey: state.tweetToReplyModel.key,
111
+ parentkey: widget.isRetweet ? null : state.tweetToReplyModel.key,
111
112
childRetwetkey: widget.isRetweet ? model.key : null ,
112
113
userId: commentedUser.userId);
113
114
if (_image != null ) {
@@ -461,13 +462,4 @@ class _ComposeTweet
461
462
}
462
463
}
463
464
464
- abstract class WidgetView <T1 , T2 > extends StatelessWidget {
465
- const WidgetView (this .state, {Key key}) : super (key: key);
466
465
467
- final T2 state;
468
-
469
- T1 get widget => (state as State ).widget as T1 ;
470
-
471
- @override
472
- Widget build (BuildContext context);
473
- }
Original file line number Diff line number Diff line change
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
+ }
Original file line number Diff line number Diff line change @@ -36,13 +36,16 @@ class _SearchPageState extends State<SearchPage> {
36
36
},
37
37
leading: customImage (context, user.profilePic, height: 40 ),
38
38
title: Row (
39
+ crossAxisAlignment: CrossAxisAlignment .start,
39
40
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
+ ),
46
49
),
47
50
),
48
51
SizedBox (width: 3 ),
You can’t perform that action at this time.
0 commit comments