Merge remote-tracking branch 'origin/master'

drstranges · drstranges · commit f0a7c0e24ee9 · 2017-07-25T02:50:13.000+03:00
# Conflicts:
#	actionhandler/build.gradle
#	actionhandler/src/main/java/com/drextended/actionhandler/action/CompositeAction.java
diff --git a/actionhandler/src/main/java/com/drextended/actionhandler/action/CompositeAction.java b/actionhandler/src/main/java/com/drextended/actionhandler/action/CompositeAction.java
@@ -35,6 +35,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -47,6 +48,7 @@
 
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -76,7 +78,10 @@ public class CompositeAction<M> extends BaseAction<M> implements OnActionFiredLi
 
     // Flag for settings how a single action item should be fired.
     // True for show a menu, false for fire action directly.
-    private boolean mDisplayDialogForSingleAction = true;
+    protected boolean mDisplayDialogForSingleAction = true;
+
+    // True for show non accepted actions in menu as disabled, false to hide them.
+    protected boolean mShowNonAcceptedActions = false;
 
     /**
      * Specific type of action which can contain a few other actions, show them as menu items,
@@ -89,7 +94,24 @@ public class CompositeAction<M> extends BaseAction<M> implements OnActionFiredLi
      *                                     if there is only single action in a menu.
      */
     public CompositeAction(@StringRes int titleResId, boolean displayDialogForSingleAction, ActionItem... actions) {
-        this(new SimpleTitleProvider<M>(titleResId), displayDialogForSingleAction, actions);
+        this(new SimpleTitleProvider<M>(titleResId), displayDialogForSingleAction, false, actions);
+    }
+
+    /**
+     * Specific type of action which can contain a few other actions, show them as menu items,
+     * and fire an action, if corresponding item clicked.
+     *
+     * @param titleResId                   resource id for corresponding menu item's title
+     * @param actions                      action item, which contains menu item titles and actions,
+     *                                     which will be fired if corresponding menu item selected
+     * @param displayDialogForSingleAction True for show a menu, false for fire action directly
+     *                                     if there is only single action in a menu.
+     * @param showNonAcceptedActions       true for show non accepted actions in menu as disabled,
+     *                                     false to hide them
+     */
+    public CompositeAction(@StringRes int titleResId, boolean displayDialogForSingleAction,
+                           boolean showNonAcceptedActions, ActionItem... actions) {
+        this(new SimpleTitleProvider<M>(titleResId), displayDialogForSingleAction, showNonAcceptedActions, actions);
     }
 
     /**
@@ -101,7 +123,7 @@ public CompositeAction(@StringRes int titleResId, boolean displayDialogForSingle
      *                   which will be fired if corresponding menu item selected
      */
     public CompositeAction(@StringRes int titleResId, ActionItem... actions) {
-        this(new SimpleTitleProvider<M>(titleResId), actions);
+        this(new SimpleTitleProvider<M>(titleResId), true, false, actions);
     }
 
     /**
@@ -113,7 +135,7 @@ public CompositeAction(@StringRes int titleResId, ActionItem... actions) {
      *                      which will be fired if corresponding menu item selected
      */
     public CompositeAction(TitleProvider<M> titleProvider, ActionItem... actions) {
-        this(titleProvider, true, actions);
+        this(titleProvider, true, false, actions);
     }
 
     /**
@@ -127,10 +149,28 @@ public CompositeAction(TitleProvider<M> titleProvider, ActionItem... actions) {
      *                                     if there is only single action in a menu.
      */
     public CompositeAction(TitleProvider<M> titleProvider, boolean displayDialogForSingleAction, ActionItem... actions) {
+        this(titleProvider, displayDialogForSingleAction, false, actions);
+    }
+
+    /**
+     * Specific type of action which can contain a few other actions, show them as menu items,
+     * and fire an action, if corresponding item clicked.
+     *
+     * @param titleProvider                provider for corresponding menu item's title
+     * @param actions                      action item, which contains menu item titles and actions,
+     *                                     which will be fired if corresponding menu item selected
+     * @param displayDialogForSingleAction True for show a menu, false for fire action directly
+     *                                     if there is only single action in a menu.
+     * @param showNonAcceptedActions       true for show non accepted actions in menu as disabled,
+     *                                     false to hide them
+     */
+    public CompositeAction(TitleProvider<M> titleProvider, boolean displayDialogForSingleAction,
+                           boolean showNonAcceptedActions, ActionItem... actions) {
         if (actions == null) throw new InvalidParameterException("Provide at least one action");
         mActions = actions;
         mTitleProvider = titleProvider;
         mDisplayDialogForSingleAction = displayDialogForSingleAction;
+        mShowNonAcceptedActions = showNonAcceptedActions;
 
         for (ActionItem item : mActions) {
             if (item.action instanceof BaseAction) {
@@ -154,6 +194,22 @@ public void setShowAsPopupMenuEnabled(boolean showAsPopupMenuEnabled) {
         mShowAsPopupMenuEnabled = showAsPopupMenuEnabled;
     }
 
+    /**
+     * Flag for settings how a single action item should be fired.
+     * @param displayDialogForSingleAction true for show a menu, false for fire action directly.
+     */
+    public void setDisplayDialogForSingleAction(boolean displayDialogForSingleAction) {
+        mDisplayDialogForSingleAction = displayDialogForSingleAction;
+    }
+
+    /**
+     * Flag for settings how non accepted action item should be showed in the menu.
+     * @param showNonAcceptedActions true for show non accepted actions in menu as disabled, false to hide them.
+     */
+    public void setShowNonAcceptedActions(boolean showNonAcceptedActions) {
+        mShowNonAcceptedActions = showNonAcceptedActions;
+    }
+
     /**
      * Check if there is at least one action which can handle given model
      *
@@ -236,10 +292,23 @@ private void showMenu(final Context context, final View view, String actionType,
             String title = mTitleProvider.getTitle(context, model);
             AlertDialog.Builder builder = buildAlertDialog(context, view, actionType, model, title, menuItems);
             final AlertDialog dialog = builder.create();
+            if (mShowNonAcceptedActions) {
+                final AdapterView.OnItemClickListener clickListener = dialog.getListView().getOnItemClickListener();
+                if (clickListener != null) {
+                    dialog.getListView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                        @Override
+                        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                            if (menuItems.get(position).action.isModelAccepted(model)) {
+                                clickListener.onItemClick(parent, view, position, id);
+                            }
+                        }
+                    });
+                }
+            }
             if (title == null) {
                 dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
             }
-            builder.show();
+            dialog.show();
         }
     }
 
@@ -251,6 +320,7 @@ private void showMenu(final Context context, final View view, String actionType,
      */
     @NonNull
     protected List<ActionItem> prepareMenuListItems(M model) {
+        if (mShowNonAcceptedActions) return Arrays.asList(mActions);
         int count = mActions.length;
         final List<ActionItem> menuItems = new ArrayList<>(count);
         for (int index = 0; index < count; index++) {
@@ -281,14 +351,21 @@ protected PopupMenu buildPopupMenu(final Context context, final View view, final
             final ActionItem item = menuItems.get(index);
             //noinspection unchecked
             menu.add(0, index, 0, item.titleProvider.getTitle(context, model));
+            if (mShowNonAcceptedActions) {
+                menu.getItem(index).setEnabled(item.action.isModelAccepted(model));
+            }
         }
         final AtomicBoolean activated = new AtomicBoolean(false);
         popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
                 activated.set(true);
                 final ActionItem actionItem = menuItems.get(item.getItemId());
-                fireActionItem(context, view, actionItem.actionType, model, actionItem);
+                if (item.isEnabled()) {
+                    fireActionItem(context, view, actionItem.actionType, model, actionItem);
+                } else {
+                    notifyOnActionDismiss("The model is not accepted for selected action", view, actionType, model);
+                }
                 return true;
             }
         });
@@ -318,11 +395,15 @@ protected AlertDialog.Builder buildAlertDialog(final Context context, final View
         final AlertDialog.Builder builder = new AlertDialog.Builder(context)
                 .setTitle(title);
 
-        builder.setAdapter(new MenuItemsAdapter(getMenuItemLayoutResId(), menuItems, model), new DialogInterface.OnClickListener() {
+        builder.setAdapter(new MenuItemsAdapter(getMenuItemLayoutResId(), menuItems, model, mShowNonAcceptedActions), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 final ActionItem actionItem = menuItems.get(which);
-                fireActionItem(context, view, actionItem.actionType, model, actionItem);
+                if (actionItem.action.isModelAccepted(model)) {
+                    fireActionItem(context, view, actionItem.actionType, model, actionItem);
+                } else {
+                    notifyOnActionDismiss("Model is not acceptable for this action", view, actionType, model);
+                }
             }
         }).setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
@@ -538,12 +619,14 @@ private static class MenuItemsAdapter extends BaseAdapter {
         private final int mItemLayoutResId;
         private final List<ActionItem> mItems;
         private final Object mModel;
+        private final boolean mShowNonAcceptedActions;
         private final boolean mHasIcons;
 
-        public MenuItemsAdapter(@LayoutRes int itemLayoutResId, List<ActionItem> menuItems, Object model) {
+        public MenuItemsAdapter(@LayoutRes int itemLayoutResId, List<ActionItem> menuItems, Object model, boolean showNonAcceptedActions) {
             mItemLayoutResId = itemLayoutResId;
             mItems = menuItems;
             mModel = model;
+            mShowNonAcceptedActions = showNonAcceptedActions;
             mHasIcons = checkHasIcons(mItems);
         }
 
@@ -557,20 +640,38 @@ private boolean checkHasIcons(List<ActionItem> items) {
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             Context context = parent.getContext();
+            ViewHolder viewHolder;
             if (convertView == null) {
                 convertView = LayoutInflater.from(context).inflate(mItemLayoutResId, parent, false);
+                viewHolder = new ViewHolder(convertView);
+                convertView.setTag(R.id.viewHolder, viewHolder);
+            } else {
+                viewHolder = (ViewHolder) convertView.getTag(R.id.viewHolder);
             }
 
             ActionItem item = mItems.get(position);
+
+            boolean modelAccepted = true;
+            if (mShowNonAcceptedActions) {
+                modelAccepted = item.action.isModelAccepted(mModel);
+                viewHolder.itemView.setEnabled(modelAccepted);
+            }
             //noinspection unchecked
             final String label = item.titleProvider.getTitle(context, mModel);
-            ((TextView) convertView.findViewById(android.R.id.text1)).setText(label);
-            ImageView imageView = (ImageView) convertView.findViewById(android.R.id.icon);
+            viewHolder.textView.setText(label);
+
             if (item.iconProvider != null) {
                 //noinspection unchecked
                 Drawable icon = item.iconProvider.getIconDrawable(context, mModel);
-                imageView.setVisibility(icon != null ? View.VISIBLE : View.GONE);
-                imageView.setImageDrawable(icon);
+                if (icon != null) {
+                    imageView.setVisibility(View.VISIBLE);
+                    imageView.setImageDrawable(icon);
+                    if (mShowNonAcceptedActions) {
+                        viewHolder.imageView.setAlpha(modelAccepted ? 1.0f : 0.3f);
+                    }
+                } else {
+                    imageView.setVisibility(mHasIcons ? View.INVISIBLE : View.GONE);
+                }
             } else {
                 imageView.setVisibility(mHasIcons ? View.INVISIBLE : View.GONE);
             }
@@ -597,5 +698,17 @@ public boolean hasStableIds() {
         public long getItemId(int position) {
             return position;
         }
+
+        private static class ViewHolder {
+            final View itemView;
+            final TextView textView;
+            final ImageView imageView;
+
+            public ViewHolder(View itemView) {
+                this.itemView = itemView;
+                this.textView = (TextView) itemView.findViewById(android.R.id.text1);
+                this.imageView = (ImageView) itemView.findViewById(android.R.id.icon);
+            }
+        }
     }
 }
diff --git a/actionhandler/src/main/res/layout/item_menu_composit_action.xml b/actionhandler/src/main/res/layout/item_menu_composit_action.xml
@@ -27,6 +27,7 @@
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="24dp"
+        android:duplicateParentState="true"
         tools:src="@android:drawable/ic_menu_edit"/>
 
     <TextView
@@ -36,6 +37,7 @@
         android:layout_marginLeft="24dp"
         android:ellipsize="marquee"
         android:gravity="center_vertical"
+        android:duplicateParentState="true"
         android:minHeight="?attr/listPreferredItemHeightSmall"
         android:paddingRight="?attr/listPreferredItemPaddingRight"
         android:textAppearance="?attr/textAppearanceListItemSmall"
diff --git a/actionhandler/src/main/res/values/ids.xml b/actionhandler/src/main/res/values/ids.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  Copyright Roman Donchenko. All Rights Reserved.
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  -->
+
+<resources>
+    <item name="viewHolder" type="id"/>
+</resources>
diff --git a/samples/databinding/src/main/java/com/drextended/databinding/viewmodel/MainActivityViewModel.java b/samples/databinding/src/main/java/com/drextended/databinding/viewmodel/MainActivityViewModel.java
@@ -65,33 +65,41 @@ private void refreshModel() {
     }
 
     private ActionHandler buildActionHandler() {
+
+        CompositeAction<String> menuAction = new CompositeAction<>(new CompositeAction.TitleProvider<String>() {
+            @Override
+            public String getTitle(Context context, String model) {
+                return "Title (" + model + ")";
+            }
+        }, true, true,
+                new ActionItem<>(ActionType.OPEN_NEW_SCREEN, new OpenSecondActivity(), R.drawable.ic_touch_app_black_24dp, 0,
+                        new CompositeAction.TitleProvider<String>() {
+                            @Override
+                            public String getTitle(Context context, String model) {
+                                // There you can return any title for menu item using some fields from model
+                                return context.getString(R.string.fire_intent_action);
+                            }
+                        }),
+                new ActionItem(ActionType.FIRE_ACTION, new ShowToastAction(), R.drawable.ic_announcement_black_24dp, R.color.greenLight, R.string.fire_simple_action),
+                new ActionItem(ActionType.FIRE_DIALOG_ACTION, DialogAction.wrap(getString(R.string.action_dialog_message), new ShowToastAction()), R.drawable.ic_announcement_black_24dp, R.color.amber, R.string.fire_dialog_action),
+                new ActionItem(ActionType.FIRE_REQUEST_ACTION, new SampleRequestAction() {
+                    @Override
+                    public boolean isModelAccepted(Object model) {
+                        return super.isModelAccepted(model) && mClickCount % 3 == 0;
+                    }
+                }, R.drawable.ic_cloud_upload_black_24dp, R.color.red, R.string.fire_request_action),
+                new ActionItem(ActionType.FIRE_RX_REQUEST_ACTION, new SampleRxRequestAction(), 0, 0, R.string.fire_rx_request_action)
+        );
+        menuAction.setShowAsPopupMenuEnabled(false);
+
         return new ActionHandler.Builder()
                 .addAction(null, new SimpleAnimationAction()) // Applied for any actionType
                 .addAction(null, new TrackAction()) // Applied for any actionType
                 .addAction(ActionType.OPEN_NEW_SCREEN, new OpenSecondActivity())
                 .addAction(ActionType.FIRE_ACTION, new ShowToastAction())
                 .addAction(ActionType.FIRE_DIALOG_ACTION, DialogAction.wrap(getString(R.string.action_dialog_message), new ShowToastAction()))
                 .addAction(ActionType.FIRE_REQUEST_ACTION, new SampleRequestAction())
-                .addAction(ActionType.FIRE_COMPOSITE_ACTION,
-                        new CompositeAction<>(new CompositeAction.TitleProvider<String>() {
-                            @Override
-                            public String getTitle(Context context, String model) {
-                                return "Title (" + model + ")";
-                            }
-                        },
-                                new ActionItem<>(ActionType.OPEN_NEW_SCREEN, new OpenSecondActivity(), R.drawable.ic_touch_app_black_24dp, 0,
-                                        new CompositeAction.TitleProvider<String>() {
-                                    @Override
-                                    public String getTitle(Context context, String model) {
-                                        // There you can return any title for menu item using some fields from model
-                                        return context.getString(R.string.fire_intent_action);
-                                    }
-                                }),
-                                new ActionItem(ActionType.FIRE_ACTION, new ShowToastAction(), R.drawable.ic_announcement_black_24dp, R.color.greenLight, R.string.fire_simple_action),
-                                new ActionItem(ActionType.FIRE_DIALOG_ACTION, DialogAction.wrap(getString(R.string.action_dialog_message), new ShowToastAction()), R.drawable.ic_announcement_black_24dp, R.color.amber, R.string.fire_dialog_action),
-                                new ActionItem(ActionType.FIRE_REQUEST_ACTION, new SampleRequestAction(), R.drawable.ic_cloud_upload_black_24dp, R.color.red, R.string.fire_request_action),
-                                new ActionItem(ActionType.FIRE_RX_REQUEST_ACTION, new SampleRxRequestAction(), 0, 0, R.string.fire_rx_request_action)
-                        ))
+                .addAction(ActionType.FIRE_COMPOSITE_ACTION, menuAction)
                 .addActionInterceptor(this)
                 .addActionFiredListener(this)
                 .addActionErrorListener(this)
