From 5c8720dc9129786064d16eccab8fd94ebda12fbd Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sun, 11 Oct 2015 00:15:39 +0900 Subject: CustomListAdapter: vararg をやめて addItems* メソッドを追加した MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/adapter/OrderedCustomListAdapterTest.java | 7 ++++--- .../smileessence/activity/EditCommandActivity.java | 6 +++--- .../smileessence/activity/EditTabActivity.java | 6 +++--- .../activity/EditTemplateActivity.java | 7 +++---- .../view/adapter/OrderedCustomListAdapter.java | 8 +++++++- .../view/adapter/UnorderedCustomListAdapter.java | 24 ++++++++++++++-------- .../view/dialog/ChooseTemplateDialogFragment.java | 5 +---- .../view/dialog/HashtagDialogFragment.java | 4 +--- .../view/dialog/MessageMenuDialogFragment.java | 4 +--- .../view/dialog/PostMenuDialogFragment.java | 4 +--- .../view/dialog/QuoteDialogFragment.java | 4 +--- .../view/dialog/SelectImageDialogFragment.java | 4 +--- .../dialog/SelectSearchQueryDialogFragment.java | 4 +--- .../view/dialog/SelectUserListDialogFragment.java | 4 +--- .../view/dialog/StatusMenuDialogFragment.java | 4 +--- .../view/dialog/UserMenuDialogFragment.java | 4 +--- 16 files changed, 46 insertions(+), 53 deletions(-) (limited to 'app') diff --git a/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapterTest.java b/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapterTest.java index 2bb156b3..0bdf46cd 100644 --- a/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapterTest.java +++ b/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/OrderedCustomListAdapterTest.java @@ -25,12 +25,13 @@ package net.lacolaco.smileessence.view.adapter; import android.test.ActivityInstrumentationTestCase2; - import net.lacolaco.smileessence.activity.MainActivity; import net.lacolaco.smileessence.entity.Account; import net.lacolaco.smileessence.util.TwitterMock; import net.lacolaco.smileessence.viewmodel.StatusViewModel; +import java.util.Arrays; + public class OrderedCustomListAdapterTest extends ActivityInstrumentationTestCase2 { TwitterMock mock; @@ -64,7 +65,7 @@ public class OrderedCustomListAdapterTest extends ActivityInstrumentationTestCas public void testAddItems() throws Exception { StatusViewModel viewModel1 = new StatusViewModel(mock.getReplyMock()); StatusViewModel viewModel2 = new StatusViewModel(mock.getReplyMock()); - adapter.addItem(viewModel1, viewModel2); + adapter.addItems(Arrays.asList(viewModel1, viewModel2)); adapter.notifyDataSetChanged(); assertEquals(2, adapter.getCount()); } @@ -72,7 +73,7 @@ public class OrderedCustomListAdapterTest extends ActivityInstrumentationTestCas public void testRemoveItem() throws Exception { StatusViewModel viewModel1 = new StatusViewModel(mock.getReplyMock()); StatusViewModel viewModel2 = new StatusViewModel(mock.getReplyMock()); - adapter.addItem(viewModel1, viewModel2); + adapter.addItems(Arrays.asList(viewModel1, viewModel2)); adapter.notifyDataSetChanged(); assertEquals(2, adapter.getCount()); adapter.removeItem(viewModel1); diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java index 6d47656e..c9b14cd5 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java @@ -52,7 +52,7 @@ public class EditCommandActivity extends Activity { // --------------------- GETTER / SETTER METHODS --------------------- - private CheckBoxModel[] getCheckBoxItems() { + private List getCheckBoxItems() { editedCommands = new ArrayList<>(); List checkBoxModels = new ArrayList<>(); List commands = Command.getAllCommands(this); @@ -72,7 +72,7 @@ public class EditCommandActivity extends Activity { CheckBoxModel checkBoxModel = new CheckBoxModel(text, CommandSetting.isVisible(command.getKey())); checkBoxModels.add(checkBoxModel); } - return checkBoxModels.toArray(new CheckBoxModel[checkBoxModels.size()]); + return checkBoxModels; } private ListView getListView() { @@ -139,7 +139,7 @@ public class EditCommandActivity extends Activity { ListView listView = getListView(); adapter = new UnorderedCustomListAdapter<>(this); listView.setAdapter(adapter); - adapter.addItemToTop(getCheckBoxItems()); + adapter.addItemsToTop(getCheckBoxItems()); adapter.update(); } diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java index ac2200b6..d1a60fe6 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java @@ -49,7 +49,7 @@ public class EditTabActivity extends Activity { // --------------------- GETTER / SETTER METHODS --------------------- - private EditableCheckBoxModel[] getCheckBoxItems() { + private List getCheckBoxItems() { List models = new ArrayList<>(); EditableCheckBoxModel post = new EditableCheckBoxModel(0, getString(R.string.page_name_post)); @@ -77,7 +77,7 @@ public class EditTabActivity extends Activity { list.setChecked(getVisibility(R.string.key_page_list_visibility)) .setInputText(String.valueOf(getPosition(R.string.key_page_list_position, 6))); models.add(list); - return models.toArray(new EditableCheckBoxModel[models.size()]); + return models; } private ListView getListView() { @@ -134,7 +134,7 @@ public class EditTabActivity extends Activity { ListView listView = getListView(); adapter = new OrderedCustomListAdapter<>(this, Collections.reverseOrder()); listView.setAdapter(adapter); - adapter.addItem(getCheckBoxItems()); + adapter.addItems(getCheckBoxItems()); adapter.update(); } diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java index c322c845..33c29792 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java @@ -56,9 +56,8 @@ public class EditTemplateActivity extends Activity implements AdapterView.OnItem return (ListView) findViewById(R.id.listview_edit_list); } - private Template[] getTemplates() { - List