Merge branch 'Subscription_For-you'

# Conflicts: # lib/status.dart # lib/tweet/conversation.dart
jonjomckay · Aug 29, 2023 · a135515 · a135515
2 parents d6e71aa + 06d4908
commit a135515
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/lib/profile/_tweets.dart b/lib/profile/_tweets.dart
@@ -103,8 +103,8 @@ class _ProfileTweetsState extends State<ProfileTweets> with AutomaticKeepAliveCl
           addAutomaticKeepAlives: false,
           builderDelegate: PagedChildBuilderDelegate(
             itemBuilder: (context, chain, index) {
-              return TweetConversation(
-                  id: chain.id, tweets: chain.tweets, username: widget.user.screenName!, isPinned: chain.isPinned);
+              return TweetConversation(id: chain.id, tweets: chain.tweets,
+                  username: widget.user.screenName!, isPinned: chain.isPinned);
             },
             firstPageErrorIndicatorBuilder: (context) => FullPageErrorWidget(
               error: _pagingController.error[0],

diff --git a/lib/status.dart b/lib/status.dart
@@ -14,9 +14,9 @@ import 'package:scroll_to_index/scroll_to_index.dart';
 class StatusScreenArguments {
   final String id;
   final String? username;
-  final bool tweetOpened;
+  final tweetOpened;
 
-  StatusScreenArguments({required this.id, required this.username, this.tweetOpened = false});
+  StatusScreenArguments({required this.id, required this.username, this.tweetOpened});
 
   @override
   String toString() {
@@ -31,7 +31,7 @@ class StatusScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     final args = ModalRoute.of(context)!.settings.arguments as StatusScreenArguments;
 
-    return _StatusScreen(username: args.username, id: args.id, tweetOpened: args.tweetOpened);
+    return _StatusScreen(username: args.username, id: args.id, tweetOpened : args.tweetOpened);
   }
 }
 
@@ -123,7 +123,8 @@ class _StatusScreenState extends State<_StatusScreen> {
                 controller: _scrollController,
                 index: index,
                 highlightColor: Colors.white.withOpacity(1),
-                child: TweetConversation(id: chain.id, tweets: chain.tweets, username: null, isPinned: chain.isPinned, tweetOpened: widget.tweetOpened),
+                child: TweetConversation(id: chain.id, tweets: chain.tweets,
+                    username: null, isPinned: chain.isPinned, tweetOpened : widget.tweetOpened),
               );
             },
             firstPageErrorIndicatorBuilder: (context) => FullPageErrorWidget(

diff --git a/lib/tweet/conversation.dart b/lib/tweet/conversation.dart
@@ -10,8 +10,8 @@ class TweetConversation extends StatefulWidget {
   final List<TweetWithCard> tweets;
   final tweetOpened;
 
-  const TweetConversation(
-      {Key? key, required this.id, required this.username, required this.isPinned, required this.tweets, this.tweetOpened=false})
+  const TweetConversation({Key? key, required this.id, required this.username,
+    required this.isPinned, required this.tweets, this.tweetOpened=false})
       : super(key: key);
 
   @override
@@ -22,9 +22,8 @@ class _TweetConversationState extends State<TweetConversation> {
   @override
   Widget build(BuildContext context) {
     if (widget.tweets.length == 1) {
-      return TweetTile(
-          clickable: true, tweet: widget.tweets.first, currentUsername: widget.username,
-          isPinned: widget.isPinned,tweetOpened: widget.tweetOpened);
+      return TweetTile(clickable: true, tweet: widget.tweets.first, currentUsername: widget.username,
+          isPinned: widget.isPinned, tweetOpened : widget.tweetOpened);
     }
 
     var tiles = [];
@@ -37,8 +36,7 @@ class _TweetConversationState extends State<TweetConversation> {
           tweet: tweets[i],
           currentUsername: widget.username,
           isPinned: widget.isPinned,
-          isThread: i == 0,
-          tweetOpened: widget.tweetOpened));
+          isThread: i == 0));
     }
 
     return Container(