expandable items for session options

lib/network/session_options/session_options_bloc.dart

@@ -14,6 +14,7 @@ You should have received a copy of the Affero GNU General Public License
 along with Medito App. If not, see <https://www.gnu.org/licenses/>.*/
 
 import 'dart:async';
+import 'dart:math';
 
 import 'package:Medito/audioplayer/download_class.dart';
 import 'package:Medito/audioplayer/media_lib.dart';
@@ -26,6 +27,7 @@ import 'package:Medito/utils/duration_ext.dart';
 import 'package:Medito/utils/navigation.dart';
 import 'package:Medito/widgets/player/player_widget.dart';
 import 'package:audio_service/audio_service.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:pedantic/pedantic.dart';
 
 class SessionOptionsBloc {
@@ -46,7 +48,7 @@ class SessionOptionsBloc {
   StreamController<String> backgroundImageController;
   StreamController<String> primaryColourController;
   StreamController<String> secondaryColorController;
-  StreamController<ApiResponse<List<AudioFile>>> contentListController;
+  StreamController<ApiResponse<List<ExpandableItem>>> contentListController;
 
   MediaLibrary mediaLibrary;
 
@@ -82,8 +84,10 @@ class SessionOptionsBloc {
         .reversed
         .toList();
 
+    var expandableItems = _generateExpandableItems(files);
+
     // Show title, desc and image
-    contentListController.sink.add(ApiResponse.completed(files));
+    contentListController.sink.add(ApiResponse.completed(expandableItems));
     titleController.sink.add(options.title);
     descController.sink.add(options.description);
     imageController.sink.add(ApiResponse.completed(options.coverUrl));
@@ -147,6 +151,29 @@ class SessionOptionsBloc {
         attributions: _options.attribution);
   }
 
+  List<ExpandableItem> _generateExpandableItems(List<AudioFile> items) {
+    var voiceSet = <String>{};
+    var expandableList = <ExpandableItem>[];
+
+    // Get unique voices
+    items.forEach((element) {
+      voiceSet.add(element.voice);
+    });
+
+    // Add file data against each voice
+    voiceSet.toList().forEach((voice) {
+      var listForThisVoice =
+          items.where((element) => element.voice == voice).toList();
+      var expandableItem = ExpandableItem(
+          headerValue: voice,
+          expandedValue: listForThisVoice,
+          isExpanded: voice == 'Will');
+      expandableList.add(expandableItem);
+    });
+
+    return expandableList;
+  }
+
   void dispose() {
     titleController?.close();
     imageController?.close();
@@ -157,6 +184,18 @@ class SessionOptionsBloc {
   }
 }
 
+class ExpandableItem {
+  ExpandableItem({
+    @required this.expandedValue,
+    @required this.headerValue,
+    this.isExpanded = false,
+  });
+
+  List<AudioFile> expandedValue;
+  String headerValue;
+  bool isExpanded;
+}
+
 extension MyIterable<E> on Iterable<E> {
   Iterable<E> sortedBy(Comparable Function(E e) key) =>
       toList()..sort((a, b) => key(a).compareTo(key(b)));

lib/widgets/session_options/session_options_screen.dart

@@ -98,53 +98,65 @@ class _SessionOptionsScreenState extends State<SessionOptionsScreen> {
   }
 
   Widget _getContentListWidget() {
-    return StreamBuilder<ApiResponse<List<AudioFile>>>(
-      stream: _bloc.contentListController.stream,
-      initialData: ApiResponse.loading(),
-      builder: (context, itemsSnapshot) {
-        return ListView.builder(
-          physics: NeverScrollableScrollPhysics(),
-          itemCount:
-              itemsSnapshot.data.hasData() ? itemsSnapshot.data.body.length : 0,
-          shrinkWrap: true,
-          padding: EdgeInsets.only(top: 8),
-          itemBuilder: (BuildContext context, int i) {
-            var item = itemsSnapshot.data.body;
+    return StreamBuilder<ApiResponse<List<ExpandableItem>>>(
+        stream: _bloc.contentListController.stream,
+        initialData: ApiResponse.loading(),
+        builder: (context, itemsSnapshot) {
+          if (itemsSnapshot.data.status == Status.LOADING) {
+            return _getLoadingWidget();
+          }
+          return _buildPanel(itemsSnapshot.data.body);
+        });
+  }
 
-            var hideName = false;
-            if (i > 0) {
-              hideName = item[i - 1].voice == item[i].voice;
-            }
-
-            var column = itemsSnapshot.data.hasData()
-                ? Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      !hideName ? _getVoiceText(item[i]) : Container(),
-                      _getListItem(context, item[i]),
-                    ],
-                  )
-                : Container();
-
-            return column;
-          },
-        );
-      },
+  Padding _getLoadingWidget() {
+    return Padding(
+      padding: const EdgeInsets.only(top: 32.0),
+      child: Center(child: CircularProgressIndicator()),
     );
   }
 
-  Widget _getVoiceText(AudioFile item) => Padding(
-        padding: const EdgeInsets.only(left: 16.0, bottom: 16.0, top: 24.0),
-        child: Column(
-          children: [
-            Text(item.voice, style: Theme.of(context).textTheme.headline1),
-          ],
-        ),
+  Widget _buildPanel(List<ExpandableItem> items) {
+    var childList = <Theme>[];
+
+    items.forEach((value) {
+      var tileList = value.expandedValue
+          .map<ListTile>((e) => _getListItem(context, e))
+          .toList();
+
+      childList.add(Theme(
+        data: Theme.of(context)
+            .copyWith(unselectedWidgetColor: MeditoColors.walterWhite),
+        child: ExpansionTile(
+            backgroundColor: MeditoColors.darkMoon,
+            maintainState: true,
+            title: _getVoiceText(value.headerValue),
+            initiallyExpanded: value.isExpanded,
+            children: tileList),
+      ));
+    });
+
+    return Column(
+      children: childList,
+    );
+  }
+
+  Widget _getVoiceText(String voice) => Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(bottom: 16.0, top: 16.0),
+            child: Column(
+              children: [
+                Text(voice, style: Theme.of(context).textTheme.headline1),
+              ],
+            ),
+          ),
+        ],
       );
 
   Widget _getListItem(BuildContext context, AudioFile item) {
     return ListTile(
-      contentPadding: const EdgeInsets.only(left: 32, right: 16),
+      contentPadding: const EdgeInsets.only(left: 32, right: 32),
       title: Text(formatSessionLength(item.length),
           style: Theme.of(context).textTheme.headline4),
       onTap: () => _onBeginTap(item),
@@ -155,7 +167,6 @@ class _SessionOptionsScreenState extends State<SessionOptionsScreen> {
   }
 
   Widget _getTrailing(AudioFile item) {
-    
     if (_bloc.isDownloading(item)) {
       return IconButton(onPressed: () {}, icon: _getLoadingSpinner());
     }