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

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ActivityChanger.java

@@ -74,11 +74,11 @@ public class ActivityChanger extends ScreenChanger {
   @Override
   public void changeToBack(int id) {
     startActivity(id);
-    activity.overridePendingTransition(R.anim.pop_enter, R.anim.pop_exit);
+    activity.overridePendingTransition(R.anim.back_enter, R.anim.back_exit);
     finishAfterTransition();
 
 //    activity.finish();
-//    activity.overridePendingTransition(R.anim.pop_enter, R.anim.pop_exit);
+//    activity.overridePendingTransition(R.anim.back_enter, R.anim.back_exit);
   }
 
   private void startActivity(int id) {

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/FragmentChanger.java

@@ -73,7 +73,7 @@ public class FragmentChanger extends ScreenChanger{
   public void changeToNext(@ScreenID.FragmentID int id) {
 
     FragmentTransaction fragmentTransaction = activity.getSupportFragmentManager().beginTransaction();
-    fragmentTransaction.setCustomAnimations(R.anim.enter, R.anim.exit, R.anim.pop_enter, R.anim.pop_exit);
+    fragmentTransaction.setCustomAnimations(R.anim.enter, R.anim.exit);
 
     changeFragment(id, fragmentTransaction);
 
@@ -87,7 +87,7 @@ public class FragmentChanger extends ScreenChanger{
   public void changeToBack(@ScreenID.FragmentID int id) {
 
     FragmentTransaction fragmentTransaction = activity.getSupportFragmentManager().beginTransaction();
-    fragmentTransaction.setCustomAnimations(R.anim.pop_enter, R.anim.pop_exit, R.anim.enter, R.anim.exit);
+    fragmentTransaction.setCustomAnimations(R.anim.back_enter, R.anim.back_exit);
 
     changeFragment(id, fragmentTransaction);
 

app/src/main/res/anim/pop_enter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set>
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
-             android:duration="300"
+             android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="-100%"
              android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="0"/>

app/src/main/res/anim/pop_exit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set>
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
-             android:duration="300"
+             android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="0"
              android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="100%"/>

app/src/main/res/anim/enter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set>
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
-             android:duration="@android:integer/config_shortAnimTime"
+             android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="100%"
              android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="0"/>

app/src/main/res/anim/exit.xml

@@ -3,6 +3,6 @@
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
              android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="0"
-             android:interpolator="@android:anim/accelerate_interpolator"
+             android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="-100%"/>
 </set>

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

@@ -4,6 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="@color/CFFFFFF"
   android:orientation="vertical"
   >
 
@@ -25,7 +26,6 @@
       tools:text="@string/sign_up_hello_from_on_boarding"
       />
 
-
     <TextView
       android:id="@+id/text_description"
       android:layout_width="match_parent"

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

@@ -4,6 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="@color/CFFFFFF"
   android:orientation="vertical"
   >
 
@@ -19,18 +20,17 @@
       android:layout_height="wrap_content"
       android:lineSpacingExtra="8sp"
       android:text="@string/sign_up_hello_text"
-      android:textColor="#000000"
+      android:textColor="@color/C000000"
       android:textSize="21sp"
       />
 
-
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="17dp"
       android:lineSpacingExtra="5sp"
       android:text="@string/sign_up_need_id"
-      android:textColor="#999999"
+      android:textColor="@color/C999999"
       android:textSize="14sp"
       />
 

app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/NetworkWatcher.java

@@ -35,7 +35,7 @@ public class NetworkWatcher {
    * 네트워크 장치 연결과 인터넷 연결이 됐는지 감시한다.
    * - 변경이 있을 때 발행한다.
    *
-   * @param context
+   * @param networkStatus
    * @return rx Observable with Boolean
    */
   public static Single<Boolean> check(NetworkStatus networkStatus) {

app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -49,16 +49,58 @@ public class LifeplusAPIService implements LifeplusAPI {
   public Single<PolicyResultBean> getPolicyList(RequestBean bean) {
     return Single.fromCallable(() -> {
       String result = "{\n" +
-        "  \"sp_rtn\":0,\n" +
-        "  \"data\":[\n" +
-        "    {\"type_cd\":1,\"version\":1,\"mandatory\":true,\"title\":\"정책 1\",\"link_url\":\"http://m.naver.com\"},\n" +
-        "    {\"type_cd\":2,\"version\":1,\"mandatory\":true,\"title\":\"정책 2\",\"link_url\":\"http://m.naver.com\"},\n" +
-        "    {\"type_cd\":2,\"version\":1,\"mandatory\":false,\"title\":\"정책 2\",\"link_url\":\"http://m.naver.com\"},\n" +
-        "    {\"type_cd\":2,\"version\":1,\"mandatory\":false,\"title\":\"정책 2\",\"link_url\":\"http://m.naver.com\"},\n" +
-        "    {\"type_cd\":2,\"version\":1,\"mandatory\":false,\"title\":\"정책 2\",\"link_url\":\"http://m.naver.com\"},\n" +
-        "    {\"type_cd\":3,\"version\":1,\"mandatory\":false,\"title\":\"정책 3\",\"link_url\":\"http://m.naver.com\"}\n" +
-        "  ]\n" +
-        "}";
+        "      \"data\": [\n" +
+        "        {\n" +
+        "          \"isChecked\": false,\n" +
+        "          \"mandatory\": true,\n" +
+        "          \"title\": \"Lifeplus 서비스 이용약관 동의\",\n" +
+        "          \"link_url\": \"http://m.naver.com\",\n" +
+        "          \"type_cd\": 1,\n" +
+        "          \"version\": 1\n" +
+        "        },\n" +
+        "        {\n" +
+        "          \"isChecked\": false,\n" +
+        "          \"mandatory\": true,\n" +
+        "          \"title\": \"개인정보 수집 및 활용 동의\",\n" +
+        "          \"link_url\": \"http://m.naver.com\",\n" +
+        "          \"type_cd\": 2,\n" +
+        "          \"version\": 1\n" +
+        "        },\n" +
+        "        {\n" +
+        "          \"isChecked\": false,\n" +
+        "          \"mandatory\": false,\n" +
+        "          \"title\": \"개인정보 수집 및 활용 동의\",\n" +
+        "          \"link_url\": \"http://m.naver.com\",\n" +
+        "          \"type_cd\": 3,\n" +
+        "          \"version\": 1\n" +
+        "        },\n" +
+        "        {\n" +
+        "          \"isChecked\": false,\n" +
+        "          \"mandatory\": false,\n" +
+        "          \"title\": \"제휴사 서비스 이용을 위한 개인정보 수집 및 활용 동의\",\n" +
+        "          \"link_url\": \"http://m.naver.com\",\n" +
+        "          \"type_cd\": 4,\n" +
+        "          \"version\": 1\n" +
+        "        },\n" +
+        "        {\n" +
+        "          \"isChecked\": false,\n" +
+        "          \"mandatory\": false,\n" +
+        "          \"title\": \"위치기반 서비스 이용 동의\",\n" +
+        "          \"link_url\": \"http://m.naver.com\",\n" +
+        "          \"type_cd\": 5,\n" +
+        "          \"version\": 1\n" +
+        "        },\n" +
+        "        {\n" +
+        "          \"isChecked\": false,\n" +
+        "          \"mandatory\": false,\n" +
+        "          \"title\": \"마케팅 정보 수집 동의\",\n" +
+        "          \"link_url\": \"http://m.naver.com\",\n" +
+        "          \"type_cd\": 6,\n" +
+        "          \"version\": 1\n" +
+        "        }\n" +
+        "      ],\n" +
+        "      \"sp_rtn\": 0\n" +
+        "    }\n";
 
       return new Gson().fromJson(result, PolicyResultBean.class);
     });