Simpler parameters name, add some parameters to S2ModalConfig, and S2Modal nows is public class

Author: davigmacode

lib/src/choices.dart

@@ -41,7 +41,7 @@ class S2Choices<T> extends StatelessWidget {
             config: config,
             builder: builder,
           )
-      : builder.choiceEmptyBuilder?.call(context, query)
+      : builder.choiceEmpty?.call(context, query)
         ?? const S2ChoicesEmpty();
   }
 

lib/src/choices_grouped.dart

@@ -44,7 +44,7 @@ class S2ChoicesGrouped<T> extends StatelessWidget {
                 count: groupItems.length,
                 style: config.headerStyle,
               );
-              final Widget groupHeader = builder.choiceHeaderBuilder?.call(context, group, query)
+              final Widget groupHeader = builder.choiceHeader?.call(context, group, query)
                 ?? SmartSelectChoicesGroupedHeader(
                     group: group,
                     query: query,
@@ -55,7 +55,7 @@ class S2ChoicesGrouped<T> extends StatelessWidget {
                 items: groupItems,
                 itemBuilder: itemBuilder,
               );
-              return builder.choiceGroupBuilder?.call(context, groupHeader, groupChoices)
+              return builder.choiceGroup?.call(context, groupHeader, groupChoices)
                 ?? Column(
                   mainAxisSize: MainAxisSize.min,
                   children: <Widget>[

lib/src/choices_list.dart

@@ -92,7 +92,7 @@ class S2ChoicesList<T> extends StatelessWidget {
       padding: style.wrapperPadding ?? const EdgeInsets.symmetric(vertical: 10.0),
       itemCount: items.length,
       itemBuilder: (context, i) => itemBuilder(items[i]),
-      separatorBuilder: builder.choiceDividerBuilder ?? _dividerBuilderDefault,
+      separatorBuilder: builder.choiceDivider ?? _dividerBuilderDefault,
     );
   }
 

lib/src/choices_resolver.dart

@@ -20,7 +20,7 @@ class S2ChoiceResolver<T> {
   });
 
   S2ChoiceBuilder<T> get choiceBuilder {
-    return builder.choiceBuilder ?? defaultChoiceBuilder;
+    return builder.choice ?? defaultChoiceBuilder;
   }
 
   S2ChoiceBuilder<T> get defaultChoiceBuilder {
@@ -141,8 +141,8 @@ class S2ChoiceResolver<T> {
   // build title widget
   Widget getTitle(BuildContext context, S2Choice<T> choice, String searchText) {
     return choice.title != null
-    ? builder.choiceTitleBuilder != null
-      ? builder.choiceTitleBuilder(context, choice, searchText)
+    ? builder.choiceTitle != null
+      ? builder.choiceTitle(context, choice, searchText)
       : S2Text(
           text: choice.title,
           style: style.titleStyle,
@@ -155,8 +155,8 @@ class S2ChoiceResolver<T> {
   // build subtitle widget
   Widget getSubtitle(BuildContext context, S2Choice<T> choice, String searchText) {
     return choice.subtitle != null
-      ? builder.choiceSubtitleBuilder != null
-        ? builder.choiceSubtitleBuilder(context, choice, searchText)
+      ? builder.choiceSubtitle != null
+        ? builder.choiceSubtitle(context, choice, searchText)
         : S2Text(
             text: choice.subtitle,
             style: style.subtitleStyle,
@@ -168,6 +168,6 @@ class S2ChoiceResolver<T> {
 
   // build secondary/avatar widget
   Widget getSecondary(BuildContext context, S2Choice<T> choice, String searchText) {
-    return builder.choiceSecondaryBuilder?.call(context, choice, searchText);
+    return builder.choiceSecondary?.call(context, choice, searchText);
   }
 }