fixed calling deselect() method, changed library package name

ceryle · May 2, 2017 · 0329724 · 0329724
1 parent 744933d
commit 0329724
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 121 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ and:
 
 ```gradle
 dependencies {
-    compile 'com.github.ceryle:RadioRealButton:v2.0.5'
+    compile 'com.github.ceryle:RadioRealButton:v2.0.6'
 }
 ```
 
@@ -135,7 +135,7 @@ how I have used ImageView in RadioRealButton is no different than regular drawab
 ##### In Xml Layout
 
 ```xml
-<co.ceryle.radiorealbutton.library.RadioRealButtonGroup
+<co.ceryle.radiorealbutton.RadioRealButtonGroup
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:rrbg_animateDrawables_enter="overshoot"
@@ -146,7 +146,7 @@ how I have used ImageView in RadioRealButton is no different than regular drawab
     app:rrbg_selectorColor="@color/red_700"
     app:rrbg_selectorSize="6dp">
 
-    <co.ceryle.radiorealbutton.library.RadioRealButton
+    <co.ceryle.radiorealbutton.RadioRealButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:rrb_drawable="@mipmap/ic_launcher"
@@ -158,7 +158,7 @@ how I have used ImageView in RadioRealButton is no different than regular drawab
         app:rrb_text="Button 1"
         app:rrb_textColor="@color/black"/>
 
-    <co.ceryle.radiorealbutton.library.RadioRealButton
+    <co.ceryle.radiorealbutton.RadioRealButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:rrb_drawable="@mipmap/ic_launcher"
@@ -170,7 +170,7 @@ how I have used ImageView in RadioRealButton is no different than regular drawab
         app:rrb_rippleColor="@color/black"
         app:rrb_text="Button 2"
         app:rrb_textColor="@color/black"/>
-</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>
+</co.ceryle.radiorealbutton.RadioRealButtonGroup>
 ```
 
 ##### Listener Example

diff --git a/library/build.gradle b/library/build.gradle
@@ -6,7 +6,6 @@ group = 'com.github.ceryle'
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
-    enforceUniquePackageName = false
 
     defaultConfig {
         minSdkVersion 11

diff --git a/...orealbutton/library/BackgroundHelper.java → ...yle/radiorealbutton/BackgroundHelper.java b/...orealbutton/library/BackgroundHelper.java → ...yle/radiorealbutton/BackgroundHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.graphics.drawable.Drawable;
 import android.os.Build;

diff --git a/...diorealbutton/library/BackgroundView.java → ...eryle/radiorealbutton/BackgroundView.java b/...diorealbutton/library/BackgroundView.java → ...eryle/radiorealbutton/BackgroundView.java
@@ -1,4 +1,4 @@
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.content.Context;
 import android.os.Build;

diff --git a/...orealbutton/library/ConversionHelper.java → ...yle/radiorealbutton/ConversionHelper.java b/...orealbutton/library/ConversionHelper.java → ...yle/radiorealbutton/ConversionHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.content.Context;
 

diff --git a/...iorealbutton/library/RadioRealButton.java → ...ryle/radiorealbutton/RadioRealButton.java b/...iorealbutton/library/RadioRealButton.java → ...ryle/radiorealbutton/RadioRealButton.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -22,17 +22,15 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.support.v7.widget.AppCompatImageView;
+import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import co.ceryle.radiorealbutton.R;
 
 public class RadioRealButton extends LinearLayout {
     public RadioRealButton(Context context) {
@@ -69,22 +67,22 @@ private void init(AttributeSet attrs) {
         setPaddingAttrs();
     }
 
-    private ImageView imageView;
-    private TextView textView;
+    private AppCompatImageView imageView;
+    private AppCompatTextView textView;
 
     private void initViews() {
         setLayoutParams(new LinearLayout.LayoutParams(0, LayoutParams.MATCH_PARENT, 1));
         setOrientation(HORIZONTAL);
         setGravity(Gravity.CENTER);
 
-        imageView = new ImageView(getContext());
+        imageView = new AppCompatImageView(getContext());
         imageView.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT) {{
             gravity = Gravity.CENTER;
         }});
         setDrawableAttrs();
         addView(imageView);
 
-        textView = new TextView(getContext());
+        textView = new AppCompatTextView(getContext());
         textView.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT) {{
             gravity = Gravity.CENTER;
         }});
@@ -210,7 +208,7 @@ private void setDrawableGravity() {
             return;
 
         if (drawableGravity == DrawableGravity.LEFT || drawableGravity == DrawableGravity.TOP) {
-            if (getChildAt(0) instanceof TextView) {
+            if (getChildAt(0) instanceof AppCompatTextView) {
                 removeViewAt(0);
                 addView(textView, 1);
 
@@ -221,7 +219,7 @@ private void setDrawableGravity() {
                 }
             }
         } else {
-            if (getChildAt(0) instanceof ImageView) {
+            if (getChildAt(0) instanceof AppCompatImageView) {
                 removeViewAt(0);
                 addView(imageView, 1);
 
@@ -359,7 +357,7 @@ public boolean isHorizontal() {
     /**
      * TEXT VIEW
      */
-    public TextView getTextView() {
+    public AppCompatTextView getTextView() {
         return textView;
     }
 
@@ -467,7 +465,7 @@ private void updatePadding(View view, boolean hasOtherView) {
 
         if (hasOtherView) {
             int g = drawableGravity.getIntValue();
-            if (view instanceof ImageView) {
+            if (view instanceof AppCompatImageView) {
                 g = g > 1 ? g - 2 : g + 2;
             }
             paddings[g] = drawablePadding / 2;
@@ -516,7 +514,7 @@ public boolean hasPaddingBottom() {
     /**
      * DRAWABLE
      */
-    public ImageView getImageView() {
+    public AppCompatImageView getImageView() {
         return imageView;
     }
 

diff --git a/...lbutton/library/RadioRealButtonGroup.java → ...radiorealbutton/RadioRealButtonGroup.java b/...lbutton/library/RadioRealButtonGroup.java → ...radiorealbutton/RadioRealButtonGroup.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -46,8 +46,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import co.ceryle.radiorealbutton.R;
-
 public class RadioRealButtonGroup extends RoundedCornerLayout {
 
     public RadioRealButtonGroup(Context context) {
@@ -486,8 +484,10 @@ private void makeSelection(int position, boolean isToggledByTouch, boolean hasAn
             if (null != buttonOut)
                 buttonOut.setChecked(false);
         } else {
-            if (lastPosition == position && buttonIn.isChecked())
+            if (lastPosition == position && buttonIn.isChecked()){
                 buttonIn.setChecked(false);
+                position = -1;
+            }
             else
                 buttonIn.setChecked(true);
         }
@@ -592,7 +592,7 @@ private void animateSelectorSliding(int toPosition, String property, boolean has
             initialPosition = 0;
 
             View view = v_selectors.get(initialPosition);
-            view.setTranslationX(-buttons.get(initialPosition).getWidth());
+            view.setTranslationX(-buttons.get(initialPosition).getMeasuredWidth());
             view.setVisibility(VISIBLE);
         }
 
@@ -602,21 +602,19 @@ private void animateSelectorSliding(int toPosition, String property, boolean has
 
         float position = toPosition - initialPosition;
 
-        float value = buttons.get(initialPosition).getWidth() * position + dividerSize * position;
+        float value = buttons.get(initialPosition).getMeasuredWidth() * position + dividerSize * position;
         ObjectAnimator animator = createAnimator(v_selectors.get(initialPosition), property, value, false, hasAnimation);
         animator.start();
     }
 
     public void deselect() {
-        if(!buttons.get(lastPosition).isChecked())
+        if (lastPosition == -1 || !buttons.get(lastPosition).isChecked())
             return;
 
         if (animationType == ANIM_TRANSLATE_X) {
             deselect(lastPosition, true);
         } else {
-            if (lastPosition != -1) {
-                setPosition(lastPosition);
-            }
+            setPosition(lastPosition);
         }
     }
 

diff --git a/...radiorealbutton/library/RippleHelper.java → .../ceryle/radiorealbutton/RippleHelper.java b/...radiorealbutton/library/RippleHelper.java → .../ceryle/radiorealbutton/RippleHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.annotation.TargetApi;
 import android.content.Context;

diff --git a/.../radiorealbutton/library/RoundHelper.java → ...o/ceryle/radiorealbutton/RoundHelper.java b/.../radiorealbutton/library/RoundHelper.java → ...o/ceryle/radiorealbutton/RoundHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.graphics.drawable.GradientDrawable;
 import android.view.View;

diff --git a/...albutton/library/RoundedCornerLayout.java → .../radiorealbutton/RoundedCornerLayout.java b/...albutton/library/RoundedCornerLayout.java → .../radiorealbutton/RoundedCornerLayout.java
@@ -9,7 +9,7 @@
  *
  * I extended this by adding border.
  */
-package co.ceryle.radiorealbutton.library;
+package co.ceryle.radiorealbutton;
 
 import android.annotation.TargetApi;
 import android.content.Context;

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -3,10 +3,9 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
-    enforceUniquePackageName = false
 
     defaultConfig {
-        applicationId "co.ceryle.radiorealbutton"
+        applicationId "co.ceryle.radiorealbutton.sample"
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.ceryle.radiorealbutton"
+<manifest package="co.ceryle.radiorealbutton.sample"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application

diff --git a/.../ceryle/radiorealbutton/MainActivity.java → .../radiorealbutton/sample/MainActivity.java b/.../ceryle/radiorealbutton/MainActivity.java → .../radiorealbutton/sample/MainActivity.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package co.ceryle.radiorealbutton;
+package co.ceryle.radiorealbutton.sample;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
-import co.ceryle.radiorealbutton.library.RadioRealButton;
-import co.ceryle.radiorealbutton.library.RadioRealButtonGroup;
+import co.ceryle.radiorealbutton.RadioRealButton;
+import co.ceryle.radiorealbutton.RadioRealButtonGroup;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -40,9 +40,9 @@ protected void onCreate(Bundle savedInstanceState) {
         button.setTransformationMethod(null);
         updateText(group1.getPosition());
 
-        group1.setOnClickedButtonListener(new RadioRealButtonGroup.OnClickedButtonListener() {
+        group1.setOnPositionChangedListener(new RadioRealButtonGroup.OnPositionChangedListener() {
             @Override
-            public void onClickedButton(RadioRealButton button, int position) {
+            public void onPositionChanged(RadioRealButton button, int position) {
                 updateText(position);
             }
         });
@@ -61,16 +61,14 @@ public void onClick(View v) {
                 int position = group1.getPosition();
                 position = ++position % group1.getNumberOfButtons();
                 group1.setPosition(position);
-
-                updateText(position);
             }
         });
 
         RadioRealButtonGroup group2 = (RadioRealButtonGroup) findViewById(R.id.radioRealButtonGroup_2);
         group2.setOnPositionChangedListener(new RadioRealButtonGroup.OnPositionChangedListener() {
             @Override
             public void onPositionChanged(RadioRealButton button, int position) {
-                Toast.makeText(MainActivity.this, "Id: " + position, Toast.LENGTH_SHORT).show();
+                Toast.makeText(MainActivity.this, "Position: " + position, Toast.LENGTH_SHORT).show();
             }
         });
     }