1 files changed, 69 insertions, 150 deletions

diff --git a/src/com/android/tv/ui/sidepanel/EditChannelsFragment.java b/src/com/android/tv/ui/sidepanel/EditChannelsFragment.java
index 48d21fd3..2497630b 100644
--- a/src/com/android/tv/ui/sidepanel/EditChannelsFragment.java
+++ b/src/com/android/tv/ui/sidepanel/EditChannelsFragment.java
@@ -19,191 +19,110 @@ package com.android.tv.ui.sidepanel;
 import android.content.ContentValues;
 import android.media.tv.TvContract;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.internal.util.Preconditions;
 import com.android.tv.R;
-import com.android.tv.TvActivity;
 import com.android.tv.data.Channel;
-import com.android.tv.input.TvInput;
-
-public class EditChannelsFragment extends BaseSideFragment {
-    private static final int ACTION_SHOW_ALL = 0;
-    private static final int ACTION_HIDE_ALL = 1;
-
-    private TvInput mSelectedInput;
-
-    private TvActivity mTvActivity;
-    private Item[] mItems;
-    private String[] mActions;
-    private Channel[] mChannels;
-    private int mBrowsableChannelCount;
-
-    private static final class Item {
-        private static final int TYPE_ACTION = 0;
-        private static final int TYPE_CHANNEL = 1;
-        private static final int TYPE_DIVIDER = 2;
-
-        private Item(int type, int action, Channel channel) {
-            mType = type;
-            mAction = action;
-            Preconditions.checkState(!(type == TYPE_CHANNEL && channel == null));
-            mChannel = channel;
-        }
 
-        private int mType;
-        private int mAction;
-        private Channel mChannel;
-    }
+import java.util.ArrayList;
+import java.util.List;
+
+public class EditChannelsFragment extends SideFragment {
+    Channel[] mChannels;
 
     public EditChannelsFragment(Channel[] channels) {
         mChannels = channels;
-        mBrowsableChannelCount = 0;
-        for (Channel channel : channels) {
-            if (channel.isBrowsable()) {
-                ++mBrowsableChannelCount;
-            }
-        }
     }
 
     @Override
-    public void onDetach() {
-        super.onDetach();
-        mTvActivity.onSideFragmentCanceled(getInitiator());
-        mTvActivity.hideOverlays(false, false, true);
+    protected String getTitle() {
+        String displayName = getTvActivity().getSelectedTvInput().getDisplayName();
+        return String.format(getString(R.string.edit_channels_title), displayName);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        mTvActivity = (TvActivity) getActivity();
-        mSelectedInput = mTvActivity.getSelectedTvInput();
-
-        mActions = getActivity().getResources().getStringArray(R.array.edit_channels_actions);
-        mItems = new Item[mActions.length + mChannels.length + 1];
-        int index = 0;
-        for (; index < mActions.length; ++index) {
-            mItems[index] = new Item(Item.TYPE_ACTION, index ,null);
-        }
-        mItems[index++] = new Item(Item.TYPE_DIVIDER, 0, null);
+    protected List<Item> getItemList() {
+        ArrayList<Item> items = new ArrayList<>();
+        items.add(new ActionItem(getString(R.string.edit_channels_show_all)) {
+            @Override
+            protected void onSelected() {
+                super.onSelected();
+                updateAllChannels(true);
+            }
+        });
+        items.add(new ActionItem(getString(R.string.edit_channels_hide_all)) {
+            @Override
+            protected void onSelected() {
+                super.onSelected();
+                updateAllChannels(false);
+            }
+        });
+        items.add(new DividerItem());
         for (Channel channel : mChannels) {
-            mItems[index++] = new Item(Item.TYPE_CHANNEL, 0, channel);
+            final Channel currentChannel = channel;
+            items.add(new CheckBoxItem(getChannelName(channel)) {
+                @Override
+                protected void bind(View view) {
+                    super.bind(view);
+                    setChecked(currentChannel.isBrowsable());
+                }
+
+                @Override
+                protected void onSelected() {
+                    super.onSelected();
+
+                    Uri uri = TvContract.buildChannelUri(currentChannel.getId());
+                    ContentValues values = new ContentValues();
+                    values.put(TvContract.Channels.COLUMN_BROWSABLE, getChecked() ? 1 : 0);
+                    getActivity().getContentResolver().update(uri, values, null, null);
+
+                    currentChannel.setBrowsable(getChecked());
+                    if (!getChecked()) {
+                        maybeDisplayAllUnchecked();
+                    }
+                }
+            });
         }
-        String displayName = mSelectedInput.getDisplayName();
-        String title = String.format(getString(R.string.edit_channels_title), displayName);
-        initialize(title, mItems, R.layout.option_fragment, R.layout.edit_channels_item,
-                R.color.option_item_background, R.color.option_item_focused_background,
-                R.dimen.edit_channels_item_height);
+        return items;
+    }
 
-        if (mBrowsableChannelCount <= 0) {
+    private void maybeDisplayAllUnchecked() {
+        if (!hasBrowsableChannel()) {
             Toast.makeText(getActivity(), R.string.all_the_channels_are_unchecked,
                     Toast.LENGTH_SHORT).show();
         }
-
-        return super.onCreateView(inflater, container, savedInstanceState);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        // TODO: the current channel should be initially focused.
-        setSelectedPosition(0);
-    }
-
-    @Override
-    public void onBindView(View v, int position, Object tag, boolean prevSelected) {
-        super.onBindView(v, position, tag, prevSelected);
-
-        CheckBox checkBox = (CheckBox) v.findViewById(R.id.check_box);
-        TextView textView = (TextView) v.findViewById(R.id.channel_text_view);
-        View itemContainer = v.findViewById(R.id.item_container);
-        View divider = v.findViewById(R.id.divider);
-
-        Item item = (Item) tag;
-        if (item.mType == Item.TYPE_ACTION) {
-            checkBox.setVisibility(View.GONE);
-            textView.setText(mActions[item.mAction]);
-        } else if (item.mType == Item.TYPE_CHANNEL) {
-            checkBox.setVisibility(View.VISIBLE);
-            checkBox.setChecked(item.mChannel.isBrowsable());
-
-            String channelNumber = item.mChannel.getDisplayNumber();
-            String channelName = item.mChannel.getDisplayName();
-            String channelString;
-            if (TextUtils.isEmpty(channelName)) {
-                channelString = channelNumber;
-            } else {
-                channelString = String.format(getString(R.string.channel_item),
-                        channelNumber, channelName);
-            }
-            textView.setText(channelString);
-        }
-        divider.setVisibility(item.mType == Item.TYPE_DIVIDER ? View.VISIBLE : View.GONE);
-        itemContainer.setVisibility(item.mType != Item.TYPE_DIVIDER ? View.VISIBLE : View.GONE);
-        v.setFocusable(item.mType != Item.TYPE_DIVIDER);
-    }
-
-    @Override
-    public void onItemSelected(View v, int position, Object tag) {
-        Item item = (Item) tag;
-        if (item.mType == Item.TYPE_ACTION) {
-            if (item.mAction == ACTION_SHOW_ALL) {
-                updateAllChannels(true);
-            } else if (item.mAction == ACTION_HIDE_ALL) {
-                updateAllChannels(false);
-            }
-        } else if (item.mType == Item.TYPE_CHANNEL) {
-            CheckBox checkBox = (CheckBox) v.findViewById(R.id.check_box);
-            boolean checked = checkBox.isChecked();
-
-            Channel channel = item.mChannel;
-            Uri uri = TvContract.buildChannelUri(channel.getId());
-            ContentValues values = new ContentValues();
-            values.put(TvContract.Channels.COLUMN_BROWSABLE, checked ? 0 : 1);
-            getActivity().getContentResolver().update(uri, values, null, null);
-            channel.setBrowsable(!checked);
-
-            checkBox.setChecked(!checked);
-            mBrowsableChannelCount += checked ? -1 : 1;
-            if (mBrowsableChannelCount <= 0) {
-                Toast.makeText(getActivity(), R.string.all_the_channels_are_unchecked,
-                        Toast.LENGTH_SHORT).show();
-            }
-        }
-
-        super.onItemSelected(v, position, tag);
     }
 
     private void updateAllChannels(boolean browsable) {
-        Uri uri = mSelectedInput.buildChannelsUri(null);
+        Uri uri = getTvActivity().getSelectedTvInput().buildChannelsUri(null);
         ContentValues values = new ContentValues();
         values.put(TvContract.Channels.COLUMN_BROWSABLE, browsable ? 1 : 0);
-
         getActivity().getContentResolver().update(uri, values, null, null);
 
         for (Channel channel : mChannels) {
             channel.setBrowsable(browsable);
         }
         notifyDataSetChanged();
+        maybeDisplayAllUnchecked();
+    }
 
-        if (browsable) {
-            mBrowsableChannelCount = mChannels.length;
-        } else  {
-            mBrowsableChannelCount = 0;
-            Toast.makeText(getActivity(), R.string.all_the_channels_are_unchecked,
-                    Toast.LENGTH_SHORT).show();
+    private boolean hasBrowsableChannel() {
+        for (Channel channel : mChannels) {
+            if (channel.isBrowsable()) {
+                return true;
+            }
         }
+        return false;
     }
 
-    @Override
-    public void onItemFocusChanged(View v, boolean focusGained, int position, Object tag) {
-        super.onItemFocusChanged(v, focusGained, position, tag);
+    private String getChannelName(Channel channel) {
+        String channelName = channel.getDisplayName();
+        String channelNumber = channel.getDisplayNumber();
+        if (TextUtils.isEmpty(channelName)) {
+            return channelNumber;
+        }
+        return String.format(getString(R.string.channel_item), channelNumber, channelName);
     }
-}
+}
\ No newline at end of file