[카테고리메인][Bug] 필터 검색시 커스텀 라디오 버튼 수정

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/CustomSquareRadio.java

@@ -6,7 +6,6 @@ import android.support.annotation.StringRes;
 import android.support.constraint.ConstraintLayout;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.view.ViewGroup;
 import android.widget.CheckBox;
 
 import kr.co.zumo.app.R;
@@ -44,13 +43,9 @@ public class CustomSquareRadio extends ConstraintLayout  {
 
   public void init(Context context){
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    inflater.inflate(R.layout.squre_radio_button, this);
+    inflater.inflate(R.layout.square_radio_button, this);
 
     checkBox = findViewById(R.id.check_box);
-    if(checkBox.getParent() !=null){
-      ((ViewGroup) checkBox.getParent()).removeView(checkBox);
-    }
-    addView(checkBox);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/main/banner/MainBannerViewItemDotIndicator.java

@@ -6,7 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.View;
+import android.util.Log;
 
 /**
  * MainBannerViewItemDotIndicator
@@ -33,7 +33,7 @@ public class MainBannerViewItemDotIndicator extends RecyclerView.ItemDecoration
   /**
    * Indicator stroke width.
    */
-  private final float mIndicatorStrokeWidth = DP * 4;
+  private final float mIndicatorStrokeWidth = DP * 2;
 
   /**
    * Indicator width.
@@ -56,7 +56,7 @@ public class MainBannerViewItemDotIndicator extends RecyclerView.ItemDecoration
     //this.context = context;
     mPaint.setStrokeCap(Paint.Cap.ROUND);
     mPaint.setStrokeWidth(mIndicatorStrokeWidth);
-    mPaint.setStyle(Paint.Style.STROKE);
+    mPaint.setStyle(Paint.Style.FILL);
     mPaint.setAntiAlias(true);
   }
 
@@ -66,13 +66,11 @@ public class MainBannerViewItemDotIndicator extends RecyclerView.ItemDecoration
 
     int itemCount = parent.getAdapter().getItemCount();
 
-    // center horizontally, calculate width and subtract half from center
     float totalLength = mIndicatorItemLength * itemCount;
     float paddingBetweenItems = Math.max(0, itemCount - 1) * mIndicatorItemPadding;
     float indicatorTotalWidth = totalLength + paddingBetweenItems;
     float indicatorStartX = (parent.getWidth() - indicatorTotalWidth) / 2F;
 
-    // center vertically in the allotted space
     float indicatorPosY = parent.getHeight() - mIndicatorHeight / 2F;
 
     drawInactiveIndicators(c, indicatorStartX, indicatorPosY, itemCount);
@@ -81,19 +79,11 @@ public class MainBannerViewItemDotIndicator extends RecyclerView.ItemDecoration
     // find active page (which should be highlighted)
     LinearLayoutManager layoutManager = (LinearLayoutManager) parent.getLayoutManager();
     int activePosition = layoutManager.findFirstVisibleItemPosition();
+    Log.e("APP#  MainBannerViewItemDotIndicator | onDrawOver", "|" + activePosition);
     if (activePosition == RecyclerView.NO_POSITION) {
       return;
     }
 
-    // find offset of active page (if the user is scrolling)
-    final View activeChild = layoutManager.findViewByPosition(activePosition);
-    int left = activeChild.getLeft();
-    int width = activeChild.getWidth();
-
-    // on swipe the active item will be positioned from [-width, 0]
-    // interpolate offset for smooth animation
-    //float progress = mInterpolator.getInterpolation(left * -1 / (float) width);
-
     drawHighlights(c, indicatorStartX, indicatorPosY, activePosition, itemCount);
   }
 

app/src/main/res/layout/dialog_first_category_main_filter.xml

@@ -49,7 +49,7 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.CustomSquareRadio
     android:id="@+id/first"
-    android:layout_width="66dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
     app:layout_constraintStart_toStartOf="@+id/text_view_filter_first_case"
@@ -73,7 +73,7 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.CustomSquareRadio
     android:id="@+id/second"
-    android:layout_width="66dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
     app:layout_constraintStart_toStartOf="@+id/text_view_filter_second_case"
@@ -96,7 +96,7 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.CustomSquareRadio
     android:id="@+id/third"
-    android:layout_width="66dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
     app:layout_constraintStart_toStartOf="@+id/text_view_filter_third_case"
@@ -119,7 +119,7 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.CustomSquareRadio
     android:id="@+id/fourth"
-    android:layout_width="152dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
     app:layout_constraintStart_toStartOf="@+id/text_view_filter_fourth_case"
@@ -142,7 +142,7 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.CustomSquareRadio
     android:id="@+id/fifth"
-    android:layout_width="66dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
     app:layout_constraintStart_toStartOf="@+id/text_view_filter_fifth_case"

app/src/main/res/layout/squre_radio_button.xml

@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<merge
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
+  android:layout_width="wrap_content"
   android:layout_height="30dp">
 
 
   <CheckBox
     android:id="@+id/check_box"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="30dp"
     android:background="@drawable/custom_rectangle_radio_selector"
     android:button="@null"
     android:lineSpacingExtra="4sp"
-    android:text="아이와"
+    android:text="dkdldkdkdkdkdk"
     android:textAlignment="center"
     android:textColor="@drawable/my_faq_radio_text_selector"
     android:textSize="12sp"
+    android:paddingTop="7dp"
+    android:paddingBottom="7dp"
+    android:paddingStart="17dp"
+    android:paddingEnd="17dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
@@ -25,4 +29,4 @@
     />
 
 
-</android.support.constraint.ConstraintLayout>
+</merge>