Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/activity/FAQActivity.java

@@ -1,32 +1,37 @@
 package kr.co.zumo.app.lifeplus.activity;
 
 import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.view.fragment.faq.FAQFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.faq.FAQPagerAdapter;
 
 public class FAQActivity extends AppCompatActivity {
 
+  private TabLayout tabLayoutFaq;
+  private ViewPager viewPagerFaq;
+  private FAQPagerAdapter faqPagerAdapter;
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_faq);
-    getSupportFragmentManager().beginTransaction().replace(R.id.faq_container, new FAQFragment()).commit();
-/*
+    //getSupportFragmentManager().beginTransaction().replace(R.id.faq_container, new FAQFragment()).commit();
+
     tabLayoutFaq = findViewById(R.id.faq_tab_layout);
     viewPagerFaq = findViewById(R.id.faq_view_pager);
-
-    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("전체"));
-    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("회원"));
-    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("혜택"));
-    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("기타"));
     tabLayoutFaq.setTabGravity(TabLayout.GRAVITY_FILL);
-*/
+//    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("ALL"));
+//    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("회원"));
+//    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("혜택"));
+//    tabLayoutFaq.addTab(tabLayoutFaq.newTab().setText("기타"));
 
-/*    faqPagerAdapter = new FaqPagerAdapter(getSupportFragmentManager());
 
+    String[] tab = {"전체", "회원", "혜택", "기타"};
+    faqPagerAdapter = new FAQPagerAdapter(getSupportFragmentManager(), tab);
     tabLayoutFaq.setupWithViewPager(viewPagerFaq, true);
-    viewPagerFaq.setAdapter(faqPagerAdapter);*/
+    viewPagerFaq.setAdapter(faqPagerAdapter);
   }
 }

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

@@ -3,7 +3,7 @@ package kr.co.zumo.app.lifeplus.view.fragment.faq;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentStatePagerAdapter;
 
 /**
  * FaqPagerAdapter
@@ -15,15 +15,20 @@ import android.support.v4.app.FragmentPagerAdapter;
  * @history 하세미   [2018-10-01]   [최초 작성]
  * @since 2018-10-01
  */
-public class FAQPagerAdapter extends FragmentPagerAdapter{
+public class FAQPagerAdapter extends FragmentStatePagerAdapter{
 
-  public FAQPagerAdapter(FragmentManager fm) {
+  private String [] tab;
+
+  public FAQPagerAdapter(FragmentManager fm, String [] tab)
+  {
     super(fm);
+    this.tab = tab;
   }
 
   @Override
   public Fragment getItem(int position) {
-    return null;
+    FAQFragment faqFragment = new FAQFragment();
+    return faqFragment;
   }
 
   @Override
@@ -34,15 +39,6 @@ public class FAQPagerAdapter extends FragmentPagerAdapter{
   @Nullable
   @Override
   public CharSequence getPageTitle(int position) {
-    switch (position) {
-      case 0:
-        return "First";
-      case 1:
-        return "Second";
-      case 2:
-        return "Third";
-      default:
-        return "";
-    }
+    return  tab[position];
   }
 }

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

@@ -9,18 +9,16 @@
   android:orientation="vertical"
   tools:context="kr.co.zumo.app.lifeplus.activity.TutorialActivity">
 
-  <!--<android.support.design.widget.TabLayout-->
-  <!--android:id="@+id/faq_tab_layout"-->
-  <!--android:layout_width="match_parent"-->
-  <!--android:layout_height="55dp"-->
-  <!--android:background="@color/darkGrey"-->
-  <!--app:tabGravity="center"-->
-  <!--app:tabIndicatorHeight="0dp"/>-->
+  <android.support.design.widget.TabLayout
+  android:id="@+id/faq_tab_layout"
+  android:layout_width="match_parent"
+  android:layout_height="55dp"
+  app:tabGravity="center"/>
 
-  <!--<android.support.v4.view.ViewPager-->
-  <!--android:id="@+id/faq_view_pager"-->
-  <!--android:layout_width="match_parent"-->
-  <!--android:layout_height="match_parent"/>-->
+  <android.support.v4.view.ViewPager
+  android:id="@+id/faq_view_pager"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"/>
   <LinearLayout
     android:id="@+id/faq_container"
     android:layout_width="match_parent"

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

@@ -21,6 +21,7 @@
       android:layout_height="wrap_content"
       android:layout_marginBottom="3pt"
       android:layout_weight="9"
+      android:background="@null"
       android:button="@null"
       android:drawableLeft="@drawable/custom_check_box"
       android:drawablePadding="8.5dp"
@@ -61,6 +62,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="9"
+      android:background="@null"
       android:button="@null"
       android:drawableLeft="@drawable/custom_check_box"
       android:drawablePadding="8.5dp"
@@ -93,6 +95,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="9"
+      android:background="@null"
       android:button="@null"
       android:drawableLeft="@drawable/custom_check_box"
       android:drawablePadding="8.5dp"
@@ -125,6 +128,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="9"
+      android:background="@null"
       android:button="@null"
       android:drawableLeft="@drawable/custom_check_box"
       android:drawablePadding="8.5dp"
@@ -157,6 +161,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="9"
+      android:background="@null"
       android:button="@null"
       android:drawableLeft="@drawable/custom_check_box"
       android:drawablePadding="8.5dp"
@@ -189,6 +194,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="9"
+      android:background="@null"
       android:button="@null"
       android:drawableLeft="@drawable/custom_check_box"
       android:drawablePadding="8.5dp"
@@ -221,6 +227,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="9"
+      android:background="@null"
       android:button="@null"
       android:drawableLeft="@drawable/custom_check_box"
       android:drawablePadding="8.5dp"

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

@@ -66,6 +66,7 @@
           android:id="@+id/radio_button_local"
           android:layout_width="wrap_content"
           android:layout_height="40dp"
+          android:background="@null"
           android:button="@null"
           android:checked="true"
           android:drawableLeft="@drawable/radio_selector"
@@ -80,6 +81,7 @@
           android:layout_width="wrap_content"
           android:layout_height="40dp"
           android:layout_marginStart="-10dp"
+          android:background="@null"
           android:button="@null"
           android:checked="false"
           android:drawableLeft="@drawable/radio_selector"
@@ -161,6 +163,7 @@
           android:id="@+id/radio_button_male"
           android:layout_width="wrap_content"
           android:layout_height="40dp"
+          android:background="@null"
           android:button="@null"
           android:checked="true"
           android:drawableLeft="@drawable/radio_selector"
@@ -175,6 +178,7 @@
           android:layout_width="wrap_content"
           android:layout_height="40dp"
           android:layout_marginStart="-10dp"
+          android:background="@null"
           android:button="@null"
           android:checked="false"
           android:drawableLeft="@drawable/radio_selector"
@@ -232,6 +236,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="3pt"
+        android:background="@null"
         android:button="@null"
         android:drawableLeft="@drawable/custom_check_box"
         android:drawablePadding="8dp"
@@ -266,6 +271,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="9"
+        android:background="@null"
         android:button="@null"
         android:drawableLeft="@drawable/custom_check_box"
         android:drawablePadding="8.5dp"
@@ -298,6 +304,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="9"
+        android:background="@null"
         android:button="@null"
         android:drawableLeft="@drawable/custom_check_box"
         android:drawablePadding="8.5dp"
@@ -330,6 +337,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="9"
+        android:background="@null"
         android:button="@null"
         android:drawableLeft="@drawable/custom_check_box"
         android:drawablePadding="8.5dp"
@@ -362,6 +370,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="9"
+        android:background="@null"
         android:button="@null"
         android:drawableLeft="@drawable/custom_check_box"
         android:drawablePadding="8.5dp"
@@ -447,6 +456,7 @@
         android:id="@+id/edit_text_phone_number"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_weight="1"
         android:background="@null"
         android:hint="@string/phone_identify_phone_hint"
         android:inputType="number"
@@ -455,7 +465,6 @@
         android:textColor="#000000"
         android:textColorHint="#c5c5c5"
         android:textSize="14sp"
-        android:layout_weight="1"
         />-
 
       <TextView
@@ -515,6 +524,7 @@
         android:id="@+id/edit_text_authorized_number"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
         android:background="@null"
         android:hint="@string/phone_identify_six_characters"
         android:inputType="number"
@@ -522,7 +532,6 @@
         android:maxLength="6"
         android:textColor="#000000"
         android:textColorHint="#c5c5c5"
-        android:layout_weight="1"
         android:textSize="14sp"/>
 
       <LinearLayout
@@ -531,35 +540,36 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         >
-      <ImageView
-        android:layout_width="13dp"
-        android:layout_height="13dp"
-        android:layout_gravity="center"
-        android:layout_marginLeft="8.8dp"
-        android:layout_marginRight="5.3dp"
-        android:src="@drawable/icon_input_clock"
-        />
 
-      <TextView
-        android:id="@+id/text_view_phone_identify_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="12dp"
-        android:lineSpacingExtra="5.5sp"
-        android:textColor="#999999"
-        android:textSize="14sp"
-        tools:text="2:55"
-        />
-
-      <TextView
-        android:id="@+id/button_phone_identify_time_expansion"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:lineSpacingExtra="3.5sp"
-        android:text="@string/phone_identify_time_delay"
-        android:textColor="@color/button_state_color"
-        android:textSize="12sp"/>
+        <ImageView
+          android:layout_width="13dp"
+          android:layout_height="13dp"
+          android:layout_gravity="center"
+          android:layout_marginLeft="8.8dp"
+          android:layout_marginRight="5.3dp"
+          android:src="@drawable/icon_input_clock"
+          />
+
+        <TextView
+          android:id="@+id/text_view_phone_identify_time"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginRight="12dp"
+          android:lineSpacingExtra="5.5sp"
+          android:textColor="#999999"
+          android:textSize="14sp"
+          tools:text="2:55"
+          />
+
+        <TextView
+          android:id="@+id/button_phone_identify_time_expansion"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:gravity="end"
+          android:lineSpacingExtra="3.5sp"
+          android:text="@string/phone_identify_time_delay"
+          android:textColor="@color/button_state_color"
+          android:textSize="12sp"/>
       </LinearLayout>
     </LinearLayout>