Merge pull request Yalantis#40 from Yalantis/feature/clickable_text

Feature/clickable text

README.md

@@ -15,7 +15,7 @@ Check this [project on Behance] (https://www.behance.net/gallery/20411445/Mobile
 *For a working implementation, have a look at the ```app``` module*
 
 #### 	1. Clone repository and add sources into your project or use Gradle: 
-``` compile 'com.yalantis:contextmenu:1.0.6' ```  
+``` compile 'com.yalantis:contextmenu:1.0.7' ```
 #### 	2. Create list of `MenuObject`, which consists of icon or icon and description.
 You can use any `resource, bitmap, drawable, color` as image:  
 ```
@@ -144,6 +144,11 @@ To stay `Context Menu` below Status Bar set `fitSystemWindows` to true and `clip
 
 # Changelog
 
+### Version: 1.0.7
+
+  * Text in menu now also clickable
+  * Support libs and gradle updated
+
 ### Version: 1.0.6
 
   * com.android.tools.build:gradle:1.5.0

app/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
-
+//apply from: '../mavenpush.gradle'
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "com.yalantis.contextmenu.sample"
@@ -19,5 +19,5 @@ android {
 }
 
 dependencies {
-    compile project(':lib')
+    compile 'com.yalantis:contextmenu:1.0.7'
 }

app/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=ContextMenu
+POM_ARTIFACT_ID=contextmenu
+POM_PACKAGING=aar

app/src/main/java/com/yalantis/contextmenu/sample/MainActivity.java

@@ -26,7 +26,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class MainActivity extends AppCompatActivity implements OnMenuItemClickListener, OnMenuItemLongClickListener{
+public class MainActivity extends AppCompatActivity implements OnMenuItemClickListener, OnMenuItemLongClickListener {
 
     private FragmentManager fragmentManager;
     private ContextMenuDialogFragment mMenuDialogFragment;
@@ -104,9 +104,11 @@ private void initToolbar() {
         Toolbar mToolbar = (Toolbar) findViewById(R.id.toolbar);
         TextView mToolBarTextView = (TextView) findViewById(R.id.text_view_toolbar_title);
         setSupportActionBar(mToolbar);
-        getSupportActionBar().setHomeButtonEnabled(true);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setHomeButtonEnabled(true);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+        }
         mToolbar.setNavigationIcon(R.drawable.btn_back);
         mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
@@ -154,7 +156,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public void onBackPressed() {
         if (mMenuDialogFragment != null && mMenuDialogFragment.isAdded()) {
             mMenuDialogFragment.dismiss();
-        } else{
+        } else {
             finish();
         }
     }

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 

gradle.properties

@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.0.6
-VERSION_CODE=7
+VERSION_NAME=1.0.7
+VERSION_CODE=8
 GROUP=com.yalantis
 
 POM_DESCRIPTION=Android Library to display awesome context menu

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon May 23 17:09:44 EEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

lib/build.gradle

@@ -3,7 +3,7 @@ apply from: '../mavenpush.gradle'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 11
@@ -20,6 +20,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.nineoldandroids:library:2.4.0'
 }

lib/src/main/java/com/yalantis/contextmenu/lib/ContextMenuDialogFragment.java

@@ -156,15 +156,15 @@ public void setItemClickListener(OnMenuItemClickListener itemClickListener) {
     @Override
     public void onClick(View v) {
         if (mItemClickListener != null) {
-            mItemClickListener.onMenuItemClick(v, mWrapperButtons.indexOfChild(v));
+            mItemClickListener.onMenuItemClick(v, ((ViewGroup) v.getParent()).indexOfChild(v));
         }
         close();
     }
 
     @Override
     public void onLongClick(View v) {
         if (mItemLongClickListener != null) {
-            mItemLongClickListener.onMenuItemLongClick(v, mWrapperButtons.indexOfChild(v));
+            mItemLongClickListener.onMenuItemLongClick(v, ((ViewGroup) v.getParent()).indexOfChild(v));
         }
         close();
     }

lib/src/main/java/com/yalantis/contextmenu/lib/MenuAdapter.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import com.nineoldandroids.animation.Animator;
@@ -69,7 +70,8 @@ public int getItemCount() {
     private void setViews() {
         for (int i = 0; i < mMenuObjects.size(); i++) {
             MenuObject menuObject = mMenuObjects.get(i);
-            mTextWrapper.addView(Utils.getItemTextView(mContext, menuObject, mMenuItemSize));
+            mTextWrapper.addView(Utils.getItemTextView(mContext, menuObject, mMenuItemSize,
+                    clickItem, longClickItem));
             mMenuWrapper.addView(Utils.getImageWrapper(mContext, menuObject, mMenuItemSize,
                     clickItem, longClickItem, i != mMenuObjects.size() - 1));
         }
@@ -198,7 +200,7 @@ public boolean onLongClick(View v) {
     private void viewClicked(View v) {
         if (mIsMenuOpen && !mIsAnimationRun) {
             mClickedView = v;
-            int childIndex = mMenuWrapper.indexOfChild(v);
+            int childIndex = ((ViewGroup) v.getParent()).indexOfChild(v);
             if (childIndex == -1) {
                 return;
             }

lib/src/main/java/com/yalantis/contextmenu/lib/MenuObject.java

@@ -5,6 +5,8 @@
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.ColorRes;
+import android.support.annotation.StyleRes;
 import android.widget.ImageView;
 
 public class MenuObject implements Parcelable {
@@ -82,7 +84,7 @@ public int getTextColor() {
      * Use {@link #setMenuTextAppearanceStyle(int)} to set all text style params at one place
      */
     @Deprecated
-    public void setTextColor(int mTextColor) {
+    public void setTextColor(@ColorRes int mTextColor) {
         this.mTextColor = mTextColor;
     }
 
@@ -130,6 +132,7 @@ public void setDrawable(Drawable mDrawable) {
         mBitmap = null;
     }
 
+    @StyleRes
     public int getMenuTextAppearanceStyle() {
         return mMenuTextAppearenseStyle;
     }
@@ -138,15 +141,16 @@ public int getMenuTextAppearanceStyle() {
      * Set style resource id, it will be used for setting text appearance of menu item title.
      * For better effect your style should extend TextView.DefaultStyle
      */
-    public void setMenuTextAppearanceStyle(int mMenuTextAppearanceStyle) {
+    public void setMenuTextAppearanceStyle(@StyleRes int mMenuTextAppearanceStyle) {
         this.mMenuTextAppearenseStyle = mMenuTextAppearanceStyle;
     }
 
+    @ColorRes
     public int getDividerColor() {
         return mDividerColor;
     }
 
-    public void setDividerColor(int mDividerColor) {
+    public void setDividerColor(@ColorRes int mDividerColor) {
         this.mDividerColor = mDividerColor;
     }
 

lib/src/main/java/com/yalantis/contextmenu/lib/Utils.java

@@ -5,6 +5,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,22 +25,33 @@ public static int getDefaultActionBarSize(Context context) {
         return actionBarSize;
     }
 
-    public static TextView getItemTextView(Context context, MenuObject menuItem, int menuItemSize) {
+    public static TextView getItemTextView(Context context, MenuObject menuItem, int menuItemSize,
+                                           View.OnClickListener onCLick, View.OnLongClickListener onLongClick) {
         TextView itemTextView = new TextView(context);
         RelativeLayout.LayoutParams textLayoutParams = new RelativeLayout.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT, menuItemSize);
         itemTextView.setLayoutParams(textLayoutParams);
-//        itemTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources().getDimension(R.dimen.menu_text_size));
+        itemTextView.setOnClickListener(onCLick);
+        itemTextView.setOnLongClickListener(onLongClick);
         itemTextView.setText(menuItem.getTitle());
         itemTextView.setPadding(0, 0, (int) context.getResources().getDimension(R.dimen.text_right_padding), 0);
         itemTextView.setGravity(Gravity.CENTER_VERTICAL);
         int textColor = menuItem.getTextColor() == 0 ?
-                context.getResources().getColor(android.R.color.white) :
+                android.R.color.white :
                 menuItem.getTextColor();
-        itemTextView.setTextColor(textColor);
-        itemTextView.setTextAppearance(context, menuItem.getMenuTextAppearanceStyle() > 0
+
+        itemTextView.setTextColor(ContextCompat.getColor(context, textColor));
+
+        int styleResId = menuItem.getMenuTextAppearanceStyle() > 0
                 ? menuItem.getMenuTextAppearanceStyle()
-                : R.style.TextView_DefaultStyle);
+                : R.style.TextView_DefaultStyle;
+
+        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M) {
+            itemTextView.setTextAppearance(context, styleResId);
+        } else {
+            itemTextView.setTextAppearance(styleResId);
+        }
+
         return itemTextView;
     }
 
@@ -78,9 +90,9 @@ public static View getDivider(Context context, MenuObject menuItem) {
         dividerView.setLayoutParams(viewLayoutParams);
         dividerView.setClickable(true);
         int dividerColor = menuItem.getDividerColor() == Integer.MAX_VALUE ?
-                context.getResources().getColor(R.color.divider_color) :
+                R.color.divider_color :
                 menuItem.getDividerColor();
-        dividerView.setBackgroundColor(dividerColor);
+        dividerView.setBackgroundColor(ContextCompat.getColor(context, dividerColor));
         return dividerView;
     }
 

lib/src/main/res/layout/fragment_menu.xml

@@ -7,23 +7,26 @@
     <RelativeLayout
         android:id="@+id/root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:id="@+id/wrapper_buttons"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_alignParentRight="true" />
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"/>
 
         <LinearLayout
             android:id="@+id/wrapper_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_toLeftOf="@+id/wrapper_buttons"
+            android:layout_toStartOf="@+id/wrapper_buttons"
             android:layout_marginRight="@dimen/text_wrapper_right_margin"
-            android:gravity="right" />
+            android:layout_marginEnd="@dimen/text_wrapper_right_margin"
+            android:gravity="end" />
 
     </RelativeLayout>
 </ScrollView>