From d0a9ee7fae30e27ec2e134b35e94563aaad3d485 Mon Sep 17 00:00:00 2001
From: Deven Joshi <deven9852@gmail.com>
Date: Wed, 23 Dec 2020 16:53:04 +0530
Subject: [PATCH] fix: Corrected shimmer

---
 lib/src/channel_list_view.dart | 125 +++++++++++++++++++++------------
 1 file changed, 80 insertions(+), 45 deletions(-)

diff --git a/lib/src/channel_list_view.dart b/lib/src/channel_list_view.dart
index d5278f5e..66ec09f7 100644
--- a/lib/src/channel_list_view.dart
+++ b/lib/src/channel_list_view.dart
@@ -312,11 +312,13 @@ class _ChannelListViewState extends State<ChannelListView>
       children: List.generate(
         25,
         (i) {
-          if (i % 2 != 0) {
-            if (widget.separatorBuilder != null) {
-              return widget.separatorBuilder(context, i);
+          if (widget.crossAxisCount == 1) {
+            if (i % 2 != 0) {
+              if (widget.separatorBuilder != null) {
+                return widget.separatorBuilder(context, i);
+              }
+              return _separatorBuilder(context, i);
             }
-            return _separatorBuilder(context, i);
           }
           return _buildLoadingItem();
         },
@@ -325,63 +327,96 @@ class _ChannelListViewState extends State<ChannelListView>
   }
 
   Shimmer _buildLoadingItem() {
-    return Shimmer.fromColors(
-      baseColor: Color(0xffE5E5E5),
-      highlightColor: Color(0xffffffff),
-      child: ListTile(
-        leading: Container(
-          decoration: BoxDecoration(
-            color: Colors.white,
-            shape: BoxShape.circle,
-          ),
-          constraints: BoxConstraints.tightFor(
-            height: 40,
-            width: 40,
-          ),
+    if (widget.crossAxisCount > 1) {
+      return Shimmer.fromColors(
+        baseColor: Color(0xffE5E5E5),
+        highlightColor: Color(0xffffffff),
+        child: Column(
+          children: [
+            SizedBox(
+              height: 4.0,
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                for (int i = 0; i < widget.crossAxisCount; i++)
+                  Container(
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      shape: BoxShape.circle,
+                    ),
+                    constraints: BoxConstraints.tightFor(
+                      height: 70,
+                      width: 70,
+                    ),
+                  ),
+              ],
+            ),
+            SizedBox(
+              height: 16.0,
+            ),
+          ],
         ),
-        title: Align(
-          alignment: Alignment.centerLeft,
-          child: Container(
+      );
+    } else {
+      return Shimmer.fromColors(
+        baseColor: Color(0xffE5E5E5),
+        highlightColor: Color(0xffffffff),
+        child: ListTile(
+          leading: Container(
             decoration: BoxDecoration(
               color: Colors.white,
-              borderRadius: BorderRadius.circular(11),
+              shape: BoxShape.circle,
             ),
             constraints: BoxConstraints.tightFor(
-              height: 16,
-              width: 82,
+              height: 40,
+              width: 40,
             ),
           ),
-        ),
-        subtitle: Row(
-          children: [
-            Align(
-              alignment: Alignment.centerLeft,
-              child: Container(
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(11),
-                ),
-                constraints: BoxConstraints.tightFor(
-                  height: 16,
-                  width: 238,
-                ),
-              ),
-            ),
-            Container(
-              margin: const EdgeInsets.only(left: 16),
+          title: Align(
+            alignment: Alignment.centerLeft,
+            child: Container(
               decoration: BoxDecoration(
                 color: Colors.white,
                 borderRadius: BorderRadius.circular(11),
               ),
               constraints: BoxConstraints.tightFor(
                 height: 16,
-                width: 42,
+                width: 82,
               ),
             ),
-          ],
+          ),
+          subtitle: Row(
+            children: [
+              Align(
+                alignment: Alignment.centerLeft,
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(11),
+                  ),
+                  constraints: BoxConstraints.tightFor(
+                    height: 16,
+                    width: 238,
+                  ),
+                ),
+              ),
+              Container(
+                margin: const EdgeInsets.only(left: 16),
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.circular(11),
+                ),
+                constraints: BoxConstraints.tightFor(
+                  height: 16,
+                  width: 42,
+                ),
+              ),
+            ],
+          ),
         ),
-      ),
-    );
+      );
+    }
   }
 
   Widget _buildErrorWidget(