Fix extends

S64 · Aug 30, 2017 · 7fb6a4f · 7fb6a4f
1 parent 7cc6e16
commit 7fb6a4f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/...in/java/jp/s64/android/radiobuttonextended/core/widget/CompoundFrameLayoutRadioGroup.java b/...in/java/jp/s64/android/radiobuttonextended/core/widget/CompoundFrameLayoutRadioGroup.java
@@ -213,7 +213,9 @@ public interface OnCheckedChangeListener {
     }
 
     private class CheckedStateTracker implements CompoundFrameLayout.OnCheckedChangeListener {
-        public void onCheckedChanged(CompoundFrameLayout buttonView, boolean isChecked) {
+
+        @Override
+        public void onCheckedChanged(NonClickableCompoundFrameLayout buttonView, boolean isChecked) {
             if (mProtectFromCheckedChange) {
                 return;
             }
@@ -227,6 +229,7 @@ public void onCheckedChanged(CompoundFrameLayout buttonView, boolean isChecked)
             int id = buttonView.getId();
             setCheckedId(isChecked ? id : View.NO_ID);
         }
+
     }
 
     private class PassThroughHierarchyChangeListener implements

diff --git a/.../java/jp/s64/android/radiobuttonextended/core/widget/NonClickableCompoundFrameLayout.java b/.../java/jp/s64/android/radiobuttonextended/core/widget/NonClickableCompoundFrameLayout.java
@@ -77,8 +77,8 @@ protected boolean init(@NonNull Context context, @Nullable AttributeSet attrs, @
         );
 
         try {
-            setChecked(a.getBoolean(R.styleable.CompoundFrameLayout_checked, false));
-            setClickable(a.getBoolean(R.styleable.CompoundFrameLayout_clickable, true));
+            setChecked(a.getBoolean(R.styleable.NonClickableCompoundFrameLayout_checked, false));
+            setClickable(a.getBoolean(R.styleable.NonClickableCompoundFrameLayout_clickable, true));
         } finally {
             a.recycle();
         }

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
@@ -7,8 +7,7 @@
     </declare-styleable>
 
     <declare-styleable name="CompoundFrameLayout">
-        <attr name="checked" format="boolean" />
-        <attr name="clickable" format="boolean" />
+        <!-- default -->
     </declare-styleable>
 
     <declare-styleable name="CompoundFrameLayoutRadioGroup">

diff --git a/...ple/src/main/java/jp/s64/android/radiobuttonextended/example/second/SecondViewHolder.java b/...ple/src/main/java/jp/s64/android/radiobuttonextended/example/second/SecondViewHolder.java
@@ -25,6 +25,7 @@
 import java.util.UUID;
 
 import jp.s64.android.radiobuttonextended.core.widget.CompoundFrameLayout;
+import jp.s64.android.radiobuttonextended.core.widget.NonClickableCompoundFrameLayout;
 import jp.s64.android.radiobuttonextended.core.widget.RadioFrameLayout;
 import jp.s64.android.radiobuttonextended.example.R;
 import jp.s64.android.radiobuttonextended.recycler.adapter.IOnCheckedChangeListener;
@@ -68,7 +69,7 @@ public void setCheckedChangeListener(final IOnCheckedChangeListener<SecondViewHo
         mRadioLayout.setOnCheckedChangeListener(new CompoundFrameLayout.OnCheckedChangeListener() {
 
             @Override
-            public void onCheckedChanged(CompoundFrameLayout compoundFrameLayout, boolean checked) {
+            public void onCheckedChanged(NonClickableCompoundFrameLayout compoundFrameLayout, boolean checked) {
                 listener.onCheckedChange(SecondViewHolder.this, compoundFrameLayout, checked);
             }