library ui is done completely

raysummee · Jul 6, 2020 · 4879d17 · 4879d17
1 parent dfaea56
commit 4879d17
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 23 deletions.
diff --git a/lib/logic/models/modelGroupPlaylistData.dart b/lib/logic/models/modelGroupPlaylistData.dart
@@ -0,0 +1,7 @@
+import 'package:Raylex/logic/models/modelPlaylistData.dart';
+
+class ModelGroupPlaylistData{
+  List<ModelPlaylistData> list;
+  String groupTitle;
+  ModelGroupPlaylistData(this.groupTitle, this.list);
+}
diff --git a/lib/ux/components/lists/horizontalListRoundedImage.dart b/lib/ux/components/lists/horizontalListRoundedImage.dart
@@ -5,16 +5,8 @@ import 'package:Raylex/ux/components/cards/roundedImageCard.dart';
 import 'package:flutter/material.dart';
 
 class HorizontalListRoundedImage extends StatelessWidget {
-  static Future<dynamic> _future() async{
-    return null;
-  }
-  final List<ModelPlaylistData> list= [
-    ModelPlaylistData("Raylex Select", "lib/assets/images/raylexselect.jpg", _future),
-    ModelPlaylistData("Top 200", "lib/assets/images/top200.jpg", _future),
-    ModelPlaylistData("Top 100", "lib/assets/images/top100s.jpg", _future),
-    ModelPlaylistData("Top 50", "lib/assets/images/top50s.jpg", _future),
-    ModelPlaylistData("Top 10", "lib/assets/images/top10s.jpg", _future),
-  ];
+  final List<ModelPlaylistData> list;
+  HorizontalListRoundedImage(this.list);
   @override
   Widget build(BuildContext context) {
     return Container(

diff --git a/lib/ux/pages/libraryPages.dart b/lib/ux/pages/libraryPages.dart
@@ -1,3 +1,5 @@
+import 'package:Raylex/logic/models/modelGroupPlaylistData.dart';
+import 'package:Raylex/logic/models/modelPlaylistData.dart';
 import 'package:Raylex/logic/models/playerStateNotify.dart';
 import 'package:Raylex/logic/models/songInfo.dart';
 import 'package:Raylex/logic/songQuery.dart';
@@ -13,7 +15,27 @@ import 'package:provider/provider.dart';
 
 
 class LibraryPages extends StatelessWidget {
-
+  static Future<dynamic> _future() async{
+    return null;
+  }
+  static final List<ModelPlaylistData> list= [
+    ModelPlaylistData("Raylex Select", "lib/assets/images/raylexselect.jpg", _future),
+    ModelPlaylistData("Top 200", "lib/assets/images/top200.jpg", _future),
+    ModelPlaylistData("Top 100", "lib/assets/images/top100s.jpg", _future),
+    ModelPlaylistData("Top 50", "lib/assets/images/top50s.jpg", _future),
+    ModelPlaylistData("Top 10", "lib/assets/images/top10s.jpg", _future),
+  ];
+  static final List<ModelPlaylistData> list1= [
+    ModelPlaylistData("Top 200", "lib/assets/images/superdupersongs.jpg", _future),
+    ModelPlaylistData("Top 100", "lib/assets/images/top100s.jpg", _future),
+    ModelPlaylistData("Top 50", "lib/assets/images/top50s.jpg", _future),
+    ModelPlaylistData("Top 10", "lib/assets/images/top10s.jpg", _future),
+  ];
+  final List<ModelGroupPlaylistData> groupList = [
+    ModelGroupPlaylistData("Raylex Exclusive", list),
+    ModelGroupPlaylistData("Dance", list1),
+
+  ];
   @override
   Widget build(BuildContext context) {
     return NestedScrollView(
@@ -29,7 +51,7 @@ class LibraryPages extends StatelessWidget {
         ];
       }, 
       body:ListView(
-        padding: EdgeInsets.fromLTRB(0, 10, 0, 50),
+        padding: EdgeInsets.fromLTRB(0, 10, 0, 70),
         children: <Widget>[
           ListTile(
             dense: true,
@@ -87,18 +109,36 @@ class LibraryPages extends StatelessWidget {
               )
             ),
           ),
-          Container(
-            padding: EdgeInsets.fromLTRB(16, 5, 10, 5),
-            child: Text(
-              "Raylex Exclusive".toUpperCase(),
-              style: TextStyle(
-                color: Colors.red,
-                fontWeight: FontWeight.bold,
-                fontSize: 18
-              )
+
+          //HorizontalListRoundedImage(),
+          Expanded(
+            child: ListView.builder(
+              shrinkWrap: true,
+              primary: false,
+              padding: EdgeInsets.fromLTRB(0, 0, 0, 0),
+              physics: const NeverScrollableScrollPhysics(),
+              itemCount: groupList.length,
+              itemBuilder: (context, index){
+                return Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    Container(
+                      padding: EdgeInsets.fromLTRB(16, 5, 10, 0),
+                      child: Text(
+                        groupList.elementAt(index).groupTitle.toUpperCase(),
+                        style: TextStyle(
+                          color: Colors.red,
+                          fontWeight: FontWeight.bold,
+                          fontSize: 18
+                        )
+                      ),
+                    ),
+                    HorizontalListRoundedImage(groupList.elementAt(index).list),
+                  ],
+                );
+              }
             ),
-          ),
-          HorizontalListRoundedImage()
+          )
         ],
       ) 
     );