[공통][New] OnOffSwitch 적용

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/faq/FAQWriteFragment.java

@@ -6,7 +6,6 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.Switch;
 
 import kr.co.zumo.app.R;
@@ -14,7 +13,6 @@ import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
-import kr.co.zumo.app.lifeplus.view.fragment.setting.SwitchTrackTextDrawable;
 import kr.co.zumo.app.lifeplus.view.presenter.FAQWritePresenter;
 
 /**
@@ -46,18 +44,8 @@ public class FAQWriteFragment extends FragmentBase<FAQWritePresenter> implements
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     switchPushOnOff = findViewById(R.id.switch_push_on_off);
-    switchPushOnOff.setTrackDrawable(new SwitchTrackTextDrawable(getActivity(), R.string.on, R.string.off, false));
+    switchPushOnOff.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-    switchPushOnOff.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-        if (isChecked) {
-          switchPushOnOff.setTrackDrawable(new SwitchTrackTextDrawable(getActivity(), R.string.on, R.string.off, true));
-        }
-        else {
-          switchPushOnOff.setTrackDrawable(new SwitchTrackTextDrawable(getActivity(), R.string.on, R.string.off, false));
-        }
-      }
     });
 
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/setting/PushAndLocationSettingViewHolder.java

@@ -2,7 +2,6 @@ package kr.co.zumo.app.lifeplus.view.fragment.setting;
 
 import android.content.Context;
 import android.view.View;
-import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.Switch;
@@ -38,44 +37,17 @@ public class PushAndLocationSettingViewHolder extends SettingViewHolder {
     switchPushOnOff = itemView.findViewById(R.id.switch_push_on_off);
     switchMarketingOnOff = itemView.findViewById(R.id.switch_marketing_on_off);
     switchLocationOnOff = itemView.findViewById(R.id.switch_location_on_off);
-    switchPushOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, false));
-    switchPushOnOff.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-        if (isChecked) {
-          switchPushOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, true));
-        }
-        else {
-          switchPushOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, false));
-        }
-      }
+
+    switchPushOnOff.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
     });
 
-    switchMarketingOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, false));
-    switchMarketingOnOff.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-        if (isChecked) {
-          switchMarketingOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, true));
-        }
-        else {
-          switchMarketingOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, false));
-        }
-      }
+    switchMarketingOnOff.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
     });
 
+    switchLocationOnOff.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-    switchLocationOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, false));
-    switchLocationOnOff.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-        if (isChecked) {
-          switchLocationOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, true));
-        }
-        else {
-          switchLocationOnOff.setTrackDrawable(new SwitchTrackTextDrawable(context, R.string.on, R.string.off, false));
-        }
-      }
     });
   }
 

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

@@ -277,7 +277,7 @@
         android:textSize="12sp"
         />
 
-      <Switch
+      <kr.co.zumo.app.lifeplus.view.custom.OnOffSwitch
         android:id="@+id/switch_push_on_off"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -285,9 +285,6 @@
         android:layout_marginTop="19dp"
         android:layout_marginEnd="25dp"
         android:layout_marginBottom="22dp"
-        android:background="@drawable/switch_track_selector"
-        android:switchMinWidth="46dp"
-        android:thumb="@drawable/switch_thumb_selector"
         />
 
     </RelativeLayout>

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

@@ -88,16 +88,13 @@
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <Switch
+      <kr.co.zumo.app.lifeplus.view.custom.OnOffSwitch
         android:id="@+id/switch_push_on_off"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="25dp"
         android:layout_marginBottom="22dp"
-        android:switchMinWidth="46dp"
-        android:thumb="@drawable/switch_thumb_selector"
-        android:background="@drawable/switch_track_selector"
         />
 
       <TextView
@@ -117,7 +114,7 @@
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <Switch
+      <kr.co.zumo.app.lifeplus.view.custom.OnOffSwitch
         android:id="@+id/switch_marketing_on_off"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -125,9 +122,6 @@
         android:layout_marginTop="40dp"
         android:layout_marginEnd="25dp"
         android:layout_marginBottom="22dp"
-        android:switchMinWidth="46dp"
-        android:thumb="@drawable/switch_thumb_selector"
-        android:background="@drawable/switch_track_selector"
         />
       <TextView
         android:layout_width="wrap_content"
@@ -144,7 +138,7 @@
         android:textColor="@color/C999999"
         android:textSize="12sp"/>
 
-      <Switch
+      <kr.co.zumo.app.lifeplus.view.custom.OnOffSwitch
         android:id="@+id/switch_location_on_off"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -152,9 +146,6 @@
         android:layout_marginTop="86dp"
         android:layout_marginEnd="26dp"
         android:layout_marginBottom="28dp"
-        android:switchMinWidth="46dp"
-        android:thumb="@drawable/switch_thumb_selector"
-        android:background="@drawable/switch_track_selector"
         />
     </RelativeLayout>
   </FrameLayout>