Browse Source

Merge pull request #52 from jrgonzalezg/master

A couple things were missing on the pull request for accepting CharSeque...
Aidan Follestad 10 years ago
parent
commit
e0fe5320c1

+ 4 - 4
README.md

@@ -161,7 +161,7 @@ new MaterialDialog.Builder(this)
         .items(new String[]{"Twitter", "Google+", "Instagram", "Facebook"})
         .itemsCallback(new MaterialDialog.ListCallback() {
             @Override
-            public void onSelection(MaterialDialog dialog, View view, int which, String text) {
+            public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
             }
         })
         .build()
@@ -195,7 +195,7 @@ new MaterialDialog.Builder(this)
         .items(new String[]{"Twitter", "Google+", "Instagram", "Facebook"})
         .itemsCallbackSingleChoice(-1, new MaterialDialog.ListCallback() {
             @Override
-            public void onSelection(MaterialDialog dialog, View view, int which, String text) {
+            public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
             }
         })
         .positiveText("Choose")
@@ -227,7 +227,7 @@ new MaterialDialog.Builder(this)
         .items(new String[]{"Twitter", "Google+", "Instagram", "Facebook"})
         .itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMulti() {
             @Override
-            public void onSelection(MaterialDialog dialog, Integer[] which, String[] text) {
+            public void onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
             }
         })
         .positiveText("Choose")
@@ -355,4 +355,4 @@ MaterialDialog dialog new MaterialDialog.Builder(this)
         .typeface(titleAndActions, contentAndListItems)
         .build()
         .show();
-```
+```

+ 4 - 4
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -449,7 +449,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             @SuppressLint("WrongViewCast")
             RadioButton rb = (RadioButton) itemView.findViewById(R.id.control);
             if (rb.isChecked()) {
-                listCallbackSingle.onSelection(this, v, i - 1, ((TextView) itemView.findViewById(R.id.title)).getText().toString());
+                listCallbackSingle.onSelection(this, v, i - 1, ((TextView) itemView.findViewById(R.id.title)).getText());
                 break;
             }
         }
@@ -457,7 +457,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
 
     private void sendMultichoiceCallback() {
         List<Integer> selectedIndices = new ArrayList<>();
-        List<String> selectedTitles = new ArrayList<>();
+        List<CharSequence> selectedTitles = new ArrayList<>();
         LinearLayout list = (LinearLayout) view.findViewById(R.id.customViewFrame);
         for (int i = 1; i < list.getChildCount(); i++) {
             View itemView = list.getChildAt(i);
@@ -465,7 +465,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             CheckBox rb = (CheckBox) itemView.findViewById(R.id.control);
             if (rb.isChecked()) {
                 selectedIndices.add(i - 1);
-                selectedTitles.add(((TextView) itemView.findViewById(R.id.title)).getText().toString());
+                selectedTitles.add(((TextView) itemView.findViewById(R.id.title)).getText());
             }
         }
         listCallbackMulti.onSelection(this,
@@ -968,7 +968,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
 
 
     public static interface ListCallback {
-        void onSelection(MaterialDialog dialog, View itemView, int which, String text);
+        void onSelection(MaterialDialog dialog, View itemView, int which, CharSequence text);
     }
 
     public static interface ListCallbackMulti {

+ 4 - 4
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -223,7 +223,7 @@ public class MainActivity extends ActionBarActivity {
                 .items(R.array.socialNetworks)
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
-                    public void onSelection(MaterialDialog dialog, View view, int which, String text) {
+                    public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getApplicationContext(), which + ": " + text, Toast.LENGTH_SHORT).show();
                     }
                 })
@@ -237,7 +237,7 @@ public class MainActivity extends ActionBarActivity {
                 .items(R.array.states)
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
-                    public void onSelection(MaterialDialog dialog, View view, int which, String text) {
+                    public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getApplicationContext(), which + ": " + text, Toast.LENGTH_SHORT).show();
                     }
                 })
@@ -251,7 +251,7 @@ public class MainActivity extends ActionBarActivity {
                 .items(R.array.socialNetworks)
                 .itemsCallbackSingleChoice(2, new MaterialDialog.ListCallback() {
                     @Override
-                    public void onSelection(MaterialDialog dialog, View view, int which, String text) {
+                    public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getApplicationContext(), which + ": " + text, Toast.LENGTH_SHORT).show();
                     }
                 })
@@ -288,7 +288,7 @@ public class MainActivity extends ActionBarActivity {
                 .items(R.array.socialNetworks)
                 .itemsCallback(new MaterialDialog.ListCallback() {
                     @Override
-                    public void onSelection(MaterialDialog dialog, View view, int which, String text) {
+                    public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
                         Toast.makeText(getApplicationContext(), which + ": " + text, Toast.LENGTH_SHORT).show();
                     }
                 })