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

app/build.gradle

@@ -37,7 +37,7 @@ android {
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
         versionCode 149
-        versionName "4.0.0.124"
+        versionName "4.0.0.125"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -155,6 +155,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-dynamic-links:16.1.8'
     implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.google.firebase:firebase-config:16.4.1'
+    
     /*********************************
      * External lib
      *********************************/
@@ -173,10 +174,22 @@ dependencies {
     implementation 'com.facebook.android:facebook-share:4.38.1'
     implementation 'com.githang:status-bar-compat:0.7'
     implementation 'com.wefika:flowlayout:0.4.1'
-    implementation 'com.robinhood.ticker:ticker:2.0.1'
     implementation 'me.everything:overscroll-decor-android:1.0.4'
+    //    implementation 'com.robinhood.ticker:ticker:2.0.1'
     //    implementation 'com.squareup.picasso:picasso:2.71828'
     //    implementation 'jp.wasabeef:picasso-transformations:2.2.1'
+
+    // ZUMO
+    implementation 'com.google.android.gms:play-services-auth:16.0.0'
+    implementation 'com.kakao.sdk:usermgmt:1.14.0'
+    implementation 'com.kakao.sdk:kakaotalk:1.14.0'
+    // Naver login sdk
+    implementation files('libs/3rdparty_login_library_android_4.1.4.jar')
+    implementation files('libs/buzzad-android-sdk-advertiser-1.0.1.jar')
+    implementation files('libs/cashslide-sdk20170320.jar')
+    implementation files('libs/libNswitchSDK_v1.1.2.jar')
+    implementation files('libs/tnkad-sdk.jar')
+
     /*********************************
      * UNIT TEST
      *********************************/
@@ -198,14 +211,4 @@ dependencies {
     testImplementation 'org.powermock:powermock-core:1.7.4'
     testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
     testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
-    // ZUMO
-    implementation 'com.google.android.gms:play-services-auth:16.0.0'
-    implementation 'com.kakao.sdk:usermgmt:1.14.0'
-    implementation 'com.kakao.sdk:kakaotalk:1.14.0'
-    // Naver login sdk
-    implementation files('libs/3rdparty_login_library_android_4.1.4.jar')
-    implementation files('libs/buzzad-android-sdk-advertiser-1.0.1.jar')
-    implementation files('libs/cashslide-sdk20170320.jar')
-    implementation files('libs/libNswitchSDK_v1.1.2.jar')
-    implementation files('libs/tnkad-sdk.jar')
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainDebugFragment.java

@@ -62,6 +62,7 @@ public class MainDebugFragment extends FragmentBase<MainPresenter> implements IM
   private ViewParent layoutCoordinator;
   private View layoutNewbie;
   private ActionBarScroller actionBarScroller;
+  private TextView buttonAddSpecialCode;
 
   private RecyclerView.OnScrollListener scrollListener = new RecyclerView.OnScrollListener() {
     @Override
@@ -109,6 +110,12 @@ public class MainDebugFragment extends FragmentBase<MainPresenter> implements IM
     contentsRecyclerView = findViewById(R.id.recycler_view_main);
     contentsRecyclerView.addOnScrollListener(scrollListener);
 
+    buttonAddSpecialCode = findViewById(R.id.button_add_special_code);
+
+    buttonAddSpecialCode.setOnClickListener(v -> {
+      presenter.onEvent(new Event.Builder(Event.SPECIAL_CODE_CLICK).build());
+    });
+
     indicator.setAlpha(0f);
     ObjectAnimator indicatorAnimator = ObjectAnimator.ofFloat(indicator, "alpha", 1f);
     indicatorAnimator.setStartDelay(600);
@@ -336,17 +343,13 @@ public class MainDebugFragment extends FragmentBase<MainPresenter> implements IM
     }
   }
 
-  private TextView buttonAddSpecialCode;
-
   @Override
   public void setNewbieLayoutVisible(boolean visible) {
-    layoutNewbie.setVisibility(visible ? View.VISIBLE : View.GONE);
-    if (visible && null == buttonAddSpecialCode) {
-      buttonAddSpecialCode = findViewById(R.id.button_add_special_code);
-
-      buttonAddSpecialCode.setOnClickListener(v -> {
-        presenter.onEvent(new Event.Builder(Event.SPECIAL_CODE_CLICK).build());
-      });
+    if (visible) {
+      layoutNewbie.setVisibility(View.VISIBLE);
+    }
+    else {
+      layoutNewbie.animate().withLayer().setStartDelay(200).setDuration(400).translationY(layoutNewbie.getHeight()).start();
     }
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainPresenter.java

@@ -19,7 +19,6 @@ import kr.co.zumo.app.lifeplus.bean.SignUpCompletedBean;
 import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.LinkBean;
-import kr.co.zumo.app.lifeplus.bean.api.LoginBean;
 import kr.co.zumo.app.lifeplus.bean.api.MainContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.MainContentsCategoryBean;
 import kr.co.zumo.app.lifeplus.bean.api.PromotionPopupBean;
@@ -69,12 +68,6 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
     doubleCheckerWeather = new DoubleChecker(this::renderWeather);
 
     model.setContext(view.getActivity());
-
-    LoginBean loginBean = model.getDeliveryPackaging(LoginBean.class);
-    if (null != loginBean) {
-      Log.i("APP# MainPresenter | MemberBlockPresenter", "|" + ": " + loginBean.toJson());
-      model.clearDeliveryPackaging();
-    }
   }
 
   private void renderWeather() {

app/src/main/java/kr/co/zumo/app/lifeplus/zumo/model/SignUpModel.java

@@ -7,13 +7,15 @@ import android.util.Log;
 
 import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.SignUpCompletedBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.helper.MemberInfoHelper;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
+import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.helper.MemberInfoHelper;
 import kr.co.zumo.app.lifeplus.zumo.BaseModel;
 import kr.co.zumo.app.lifeplus.zumo.bean.UserInfoDeliveryBean;
 import kr.co.zumo.app.lifeplus.zumo.bean.api.DmcyUserCnclRequestBean;
@@ -156,6 +158,10 @@ public class SignUpModel extends BaseModel {
                 if (!StringUtil.isEmpty(userNo)) {
                     SuperModel.getInstance().setUserNo(userNo);
                     SuperModel.getInstance().setUserEmail(requestBean.getEmail());
+
+                    // 처음 메인 진입 시 스페셜 코드 스낵바 표시
+                    ActivityDeliveryHelper.getInstance().setPackaging(new SignUpCompletedBean());
+
                     getMemberInfoByUserNo();
                 } else {
                     onResult(new Event.Builder(Event.ERROR).integer(Event.SET_MEMBER_LOGIN).string(resultBean.getReturnMessage()).build());
@@ -203,6 +209,10 @@ public class SignUpModel extends BaseModel {
 
                 SuperModel.getInstance().setUserNo(userNo);
                 SuperModel.getInstance().setUserEmail(requestBean.getEmail());
+
+                // 처음 메인 진입 시 스페셜 코드 스낵바 표시
+                ActivityDeliveryHelper.getInstance().setPackaging(new SignUpCompletedBean());
+
                 getMemberInfoByUserNo();
             }
 

app/src/main/res/drawable/permission_dot.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#999999" />
+            <size
+                android:width="2dp"
+                android:height="2dp" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
@@ -21,18 +20,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:lineSpacingExtra="6sp"
+                android:text="접근권한 설정안내"
                 android:textColor="#000000"
-                android:textSize="15sp"
-                android:text="접근권한 설정안내" />
+                android:textSize="15sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3.8dp"
                 android:lineSpacingExtra="3.8sp"
+                android:text="ZUMO에서는 다음 권한들을 사용하오니 확인해주시기 바랍니다."
                 android:textColor="#999999"
-                android:textSize="10.5sp"
-                android:text="ZUMO에서는 다음 권한들을 사용하오 확인해주시기 바랍니다." />
+                android:textSize="10.5sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -43,18 +42,20 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/permission_dot"
+                    android:drawablePadding="4.8dp"
                     android:lineSpacingExtra="5.5sp"
+                    android:text="필수 접근권한"
                     android:textColor="#666666"
-                    android:textSize="11.3sp"
-                    android:text="필수 접근권한" />
+                    android:textSize="11.3sp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:lineSpacingExtra="5.5sp"
+                    android:text=" 없음"
                     android:textColor="#000000"
-                    android:textSize="11.3sp"
-                    android:text=" 없음" />
+                    android:textSize="11.3sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -66,112 +67,148 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/permission_dot"
+                    android:drawablePadding="4.8dp"
                     android:lineSpacingExtra="5.5sp"
+                    android:text="선택적 접근권한"
                     android:textColor="#666666"
-                    android:textSize="11.3sp"
-                    android:text="선택적 접근권한" />
+                    android:textSize="11.3sp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:lineSpacingExtra="5.5sp"
+                    android:text=" 2건"
                     android:textColor="#000000"
-                    android:textSize="11.3sp"
-                    android:text=" 2건" />
+                    android:textSize="11.3sp" />
             </LinearLayout>
 
 
             <LinearLayout
-                android:layout_marginLeft="17dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_picture" />
+                android:background="#f8f8f8"
+                android:orientation="vertical"
+                android:paddingTop="17.2dp"
+                android:paddingBottom="17.2dp">
 
                 <LinearLayout
-                    android:layout_marginLeft="18.5dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_marginLeft="18dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
-                    <TextView
+                    <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:lineSpacingExtra="4.8sp"
-                        android:textColor="#000000"
-                        android:textSize="12sp"
-                        android:text="사진" />
+                        android:src="@drawable/ic_picture" />
 
-                    <TextView
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:lineSpacingExtra="6.3sp"
-                        android:textColor="#666666"
-                        android:textSize="10.5sp"
-                        android:text="이벤트 참여 시 사진 첨부" />
+                        android:layout_marginLeft="18.5dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:lineSpacingExtra="4.8sp"
+                            android:text="사진"
+                            android:textColor="#000000"
+                            android:textSize="12sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:lineSpacingExtra="6.3sp"
+                            android:text="이벤트 참여 시 사진 첨부"
+                            android:textColor="#666666"
+                            android:textSize="10.5sp" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_marginLeft="17dp"
-                android:gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="17.2dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_location" />
 
                 <LinearLayout
-                    android:layout_marginLeft="18.5dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginTop="17.2dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
-                    <TextView
+                    <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:lineSpacingExtra="4.8sp"
-                        android:textColor="#000000"
-                        android:textSize="12sp"
-                        android:text="위치정보" />
+                        android:src="@drawable/ic_location" />
 
-                    <TextView
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:lineSpacingExtra="6.3sp"
-                        android:textColor="#666666"
-                        android:textSize="10.5sp"
-                        android:text="날씨 정보 제공을 위한 위치 확인" />
+                        android:layout_marginLeft="18.5dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:lineSpacingExtra="4.8sp"
+                            android:text="위치정보"
+                            android:textColor="#000000"
+                            android:textSize="12sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:lineSpacingExtra="6.3sp"
+                            android:text="날씨 정보 제공을 위한 위치 확인"
+                            android:textColor="#666666"
+                            android:textSize="10.5sp" />
+                    </LinearLayout>
                 </LinearLayout>
+
             </LinearLayout>
 
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32.2dp"
+                android:layout_marginTop="15dp"
                 android:lineSpacingExtra="4sp"
+                android:text="선택 접근 권한은 해당 기능을 사용할 때 허용이 필요하며, 비 허용시에도 해당 기능 외 서비스 이용이 가능합니다."
                 android:textColor="#999999"
-                android:textSize="10.5sp"
-                android:text="선택 접근 권한은 해당 기능을 사용할 때 허용이 필요하며, 비 허용시에도 해당 기능 외 서비스 이용이 가능합니다." />
+                android:textSize="10.5sp" />
 
-            <TextView
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:lineSpacingExtra="6.8sp"
-                android:textColor="#000000"
-                android:textSize="10.5sp"
-                android:text="휴대폰 설정 > ZUMO에서 접근 권한 변경" />
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:lineSpacingExtra="6.8sp"
+                    android:text="휴대폰 설정"
+                    android:textColor="#000000"
+                    android:textSize="10.5sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="3.5dp"
+                    android:layout_marginRight="3.5dp"
+                    android:src="@drawable/icon_arrow" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:lineSpacingExtra="6.8sp"
+                    android:text="ZUMO에서 접근 권한 변경"
+                    android:textColor="#000000"
+                    android:textSize="10.5sp" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -183,9 +220,9 @@
             android:background="#000000"
             android:gravity="center"
             android:lineSpacingExtra="6.3sp"
+            android:text="확인"
             android:textColor="#ffffff"
-            android:textSize="14.3sp"
-            android:text="확인" />
+            android:textSize="14.3sp" />
     </LinearLayout>
 
 </android.support.constraint.ConstraintLayout>