Merge pull request thunder-app#445 from CTalvio/four_fixes

Four little things
justindixson · Jul 22, 2023 · 1a7941c · 1a7941c
2 parents bf1d424 + 35b8824
commit 1a7941c
Show file tree

Hide file tree

Showing 9 changed files with 365 additions and 309 deletions.
diff --git a/lib/community/widgets/community_header.dart b/lib/community/widgets/community_header.dart
@@ -12,12 +12,10 @@ import 'package:thunder/utils/numbers.dart';
 
 class CommunityHeader extends StatelessWidget {
   final FullCommunityView? communityInfo;
-  final bool? isSidebarOpen;
 
   const CommunityHeader({
     super.key,
     this.communityInfo,
-    this.isSidebarOpen,
   });
 
   @override
@@ -91,11 +89,14 @@ class CommunityHeader extends StatelessWidget {
                             ],
                           ),
                         ),
-                        Icon(
-                          isSidebarOpen != null && isSidebarOpen! ? Icons.chevron_right_rounded : Icons.chevron_left_rounded,
-                          size: 50,
-                          shadows: const <Shadow>[Shadow(color: Colors.black, blurRadius: 5.0)],
-                        )
+                        Padding(
+                          padding: const EdgeInsets.all(9.0),
+                          child: Icon(
+                            Icons.info_outline_rounded,
+                            size: 25,
+                            shadows: <Shadow>[Shadow(color: theme.colorScheme.background, blurRadius: 10.0), Shadow(color: theme.colorScheme.background, blurRadius: 20.0)],
+                          ),
+                        ),
                       ],
                     ),
                   ],

diff --git a/lib/community/widgets/community_sidebar.dart b/lib/community/widgets/community_sidebar.dart
@@ -85,9 +85,10 @@ class _CommunitySidebarState extends State<CommunitySidebar> with TickerProvider
                   child: isBlocked == false
                       ? Padding(
                           padding: const EdgeInsets.only(
-                            top: 8.0,
+                            top: 10,
                             left: 12,
                             right: 12,
+                            bottom: 4,
                           ),
                           child: Row(
                             children: [
@@ -133,7 +134,7 @@ class _CommunitySidebarState extends State<CommunitySidebar> with TickerProvider
                                 ),
                               ),
                               const SizedBox(
-                                width: 8,
+                                width: 10,
                                 height: 8,
                               ),
                               Expanded(
@@ -194,10 +195,11 @@ class _CommunitySidebarState extends State<CommunitySidebar> with TickerProvider
                   },
                   child: widget.subscribedType != SubscribedType.subscribed
                       ? Padding(
-                          padding: const EdgeInsets.only(
-                            top: 8.0,
+                          padding: EdgeInsets.only(
+                            top: isBlocked ? 10 : 8,
                             left: 12,
                             right: 12,
+                            bottom: 4,
                           ),
                           child: ElevatedButton(
                             onPressed: isUserLoggedIn

diff --git a/lib/community/widgets/post_card_list.dart b/lib/community/widgets/post_card_list.dart
@@ -227,7 +227,6 @@ class _PostCardListState extends State<PostCardList> with TickerProviderStateMix
                             },
                             child: CommunityHeader(
                               communityInfo: widget.communityInfo,
-                              isSidebarOpen: _displaySidebar,
                             ),
                           )
                         : null,

diff --git a/lib/community/widgets/post_card_view_compact.dart b/lib/community/widgets/post_card_view_compact.dart
@@ -60,42 +60,45 @@ class PostCardViewCompact extends StatelessWidget {
             ),
           if (!showThumbnailPreviewOnRight && (postViewMedia.media.isNotEmpty || showTextPostIndicator)) const SizedBox(width: 8.0),
           Flexible(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  children: [
-                    Text(postViewMedia.postView.post.name,
-                        textScaleFactor: state.titleFontSizeScale.textScaleFactor,
-                        style: theme.textTheme.bodyMedium?.copyWith(
-                          fontWeight: FontWeight.w600,
-                          color: postViewMedia.postView.read ? theme.textTheme.bodyMedium?.color?.withOpacity(0.4) : null,
-                        )),
-                    const SizedBox(height: 4.0),
-                    PostCommunityAndAuthor(
-                      showCommunityIcons: false,
-                      showInstanceName: showInstanceName,
-                      postView: postViewMedia.postView,
-                      textStyleCommunity: textStyleCommunityAndAuthor,
-                      textStyleAuthor: textStyleCommunityAndAuthor,
-                    ),
-                    const SizedBox(height: 8.0),
-                  ],
-                ),
-                PostCardMetaData(
-                  score: postViewMedia.postView.counts.score,
-                  voteType: postViewMedia.postView.myVote ?? VoteType.none,
-                  comments: postViewMedia.postView.counts.comments,
-                  unreadComments: postViewMedia.postView.unreadComments,
-                  hasBeenEdited: postViewMedia.postView.post.updated != null ? true : false,
-                  published: postViewMedia.postView.post.updated != null ? postViewMedia.postView.post.updated! : postViewMedia.postView.post.published,
-                  saved: postViewMedia.postView.saved,
-                  distinguised: postViewMedia.postView.post.featuredCommunity,
-                )
-              ],
+            child: Padding(
+              padding: const EdgeInsets.only(right: 6.0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    children: [
+                      Text(postViewMedia.postView.post.name,
+                          textScaleFactor: state.titleFontSizeScale.textScaleFactor,
+                          style: theme.textTheme.bodyMedium?.copyWith(
+                            fontWeight: FontWeight.w600,
+                            color: postViewMedia.postView.read ? theme.textTheme.bodyMedium?.color?.withOpacity(0.4) : null,
+                          )),
+                      const SizedBox(height: 4.0),
+                      PostCommunityAndAuthor(
+                        showCommunityIcons: false,
+                        showInstanceName: showInstanceName,
+                        postView: postViewMedia.postView,
+                        textStyleCommunity: textStyleCommunityAndAuthor,
+                        textStyleAuthor: textStyleCommunityAndAuthor,
+                      ),
+                      const SizedBox(height: 8.0),
+                    ],
+                  ),
+                  PostCardMetaData(
+                    score: postViewMedia.postView.counts.score,
+                    voteType: postViewMedia.postView.myVote ?? VoteType.none,
+                    comments: postViewMedia.postView.counts.comments,
+                    unreadComments: postViewMedia.postView.unreadComments,
+                    hasBeenEdited: postViewMedia.postView.post.updated != null ? true : false,
+                    published: postViewMedia.postView.post.updated != null ? postViewMedia.postView.post.updated! : postViewMedia.postView.post.published,
+                    saved: postViewMedia.postView.saved,
+                    distinguised: postViewMedia.postView.post.featuredCommunity,
+                  )
+                ],
+              ),
             ),
           ),
           if (showThumbnailPreviewOnRight && (postViewMedia.media.isNotEmpty || showTextPostIndicator))
-Original file line number
+Diff line change
@@ Expand Up @@
                                 },
                                 child: CommunityHeader(
                                   communityInfo: widget.communityInfo,
-                                  isSidebarOpen: _displaySidebar,
                                 ),
                               )
                             : null,
@@ Expand Down @@