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

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

@@ -48,7 +48,7 @@ public class SplashActivity extends AppCompatActivity {
     // 앱이 실행 중인지 판단한다.
     if (SuperModel.getInstance().isInitialized()) {
       Log.e("APP#  SplashActivity | onCreate", "|" + " restart from call...........");
-      jumpActivity(context, ScreenStarter.START_FROM_MAIN);
+      linkActivity(context, ScreenStarter.START_FROM_MAIN);
     }
     else {
       Log.e("APP#  SplashActivity | onCreate", "|" + " first ...........................");
@@ -69,6 +69,13 @@ public class SplashActivity extends AppCompatActivity {
     }
   }
 
+  private void linkActivity(Context context1, int fragmentFlag) {
+    Intent intent = new Intent(context1, MainActivity.class);
+    intent.putExtra(ScreenStarter.FLAG_FRAGMENT, fragmentFlag);
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    context1.startActivity(intent);
+  }
+
   private void jumpActivity(Context context1, int fragmentFlag) {
     Intent intent = new Intent(context1, MainActivity.class);
     intent.putExtra(ScreenStarter.FLAG_FRAGMENT, fragmentFlag);

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CurrentPageShareDialog.java

@@ -3,10 +3,13 @@ package kr.co.zumo.app.lifeplus.view.dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.widget.TextView;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -23,6 +26,9 @@ import kr.co.zumo.app.lifeplus.view.Event;
  */
 public class CurrentPageShareDialog extends DialogBase {
 
+  private int titleResource;
+  private int lastButtonNameResource;
+
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -33,6 +39,11 @@ public class CurrentPageShareDialog extends DialogBase {
   public void onActivityCreated(Bundle savedInstanceState) {
     super.onActivityCreated(savedInstanceState);
 
+    Log.e("APP#  CurrentPageShareDialog | onActivityCreated", "|" + "onActivityCreated");
+    ((TextView) getView().findViewById(R.id.text_view_dialog_title)).setText(titleResource);
+    ((TextView) getView().findViewById(R.id.text_view_last_button_name)).setText(lastButtonNameResource);
+
+
     Window window = getDialog().getWindow();
     window.setBackgroundDrawableResource(R.color.C99000000);
 
@@ -43,7 +54,7 @@ public class CurrentPageShareDialog extends DialogBase {
     });
 
     getView().findViewById(R.id.image_view_kakao).setOnClickListener(view -> {
-      if(null != getCustomListener()){
+      if (null != getCustomListener()) {
         getCustomListener().onDialogResult(CurrentPageShareDialog.this, new Event.Builder(Event.KAKAO_TALK).build());
       }
     });
@@ -51,5 +62,10 @@ public class CurrentPageShareDialog extends DialogBase {
 
   }
 
+  public void setDialogType(@StringRes int titleResource, @StringRes int lastButtonNameResource) {
+    this.titleResource = titleResource;
+    this.lastButtonNameResource = lastButtonNameResource;
+  }
+
 }
 

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

@@ -214,8 +214,11 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
                     dialog.dispose();
                   }
                 })
-                .attribute((IAttribute<CurrentPageShareDialog>) dialog -> {})
+                .attribute((IAttribute<CurrentPageShareDialog>) dialog -> {
+                  dialog.setDialogType(R.string.code_share, R.string.code_copy);
+                })
                 .show();
+
             }
 
           }

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle" >
+  <corners android:radius="4dp"/>
+  <solid
+    android:color="@color/CFFFFFF"/>
+</shape>

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

@@ -7,74 +7,78 @@
   android:layout_height="match_parent">
 
   <android.support.constraint.ConstraintLayout
-    android:background="@color/CFFFFFF"
     android:id="@+id/constraintLayout"
     android:layout_width="273dp"
     android:layout_height="163dp"
+    android:background="@drawable/rectangle_cffffff"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 
     <TextView
-      android:id="@+id/text_view"
+      android:id="@+id/text_view_dialog_title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="36dp"
+      android:layout_marginTop="32dp"
       android:lineSpacingExtra="7sp"
+      tools:text="현재 페이지 공유"
       android:textColor="#000000"
       android:textSize="17.5sp"
       app:layout_constraintStart_toStartOf="@+id/image_view_kakao"
-      app:layout_constraintTop_toTopOf="parent"
-      android:text="현재 페이지 공유"/>
+      app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
       android:id="@+id/image_view_kakao"
       android:layout_width="35dp"
       android:layout_height="35dp"
+      android:layout_marginStart="32dp"
       android:layout_marginTop="20dp"
+      android:layout_marginEnd="22dp"
       android:src="@drawable/circle_c000000"
-      app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintEnd_toStartOf="@+id/image_view_facebook"
       app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/text_view"/>
+      app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_title"/>
 
     <ImageView
       android:id="@+id/image_view_facebook"
       android:layout_width="35dp"
       android:layout_height="35dp"
-      android:layout_marginStart="33dp"
       android:layout_marginTop="20dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toStartOf="@+id/image_view_email"
       app:layout_constraintHorizontal_bias="0.5"
+      android:layout_marginEnd="21dp"
+      app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintStart_toEndOf="@+id/image_view_kakao"
-      app:layout_constraintTop_toBottomOf="@+id/text_view"/>
+      app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_title"/>
 
     <ImageView
       android:id="@+id/image_view_email"
       android:layout_width="35dp"
       android:layout_height="35dp"
-      android:layout_marginStart="32dp"
+      android:layout_marginEnd="21dp"
       android:layout_marginTop="20dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toStartOf="@+id/image_view_url"
       app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintStart_toEndOf="@+id/image_view_facebook"
-      app:layout_constraintTop_toBottomOf="@+id/text_view"/>
+      app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_title"/>
 
     <ImageView
       android:id="@+id/image_view_url"
       android:layout_width="35dp"
-      android:layout_height="35dp"
-      android:layout_marginStart="32dp"
+      android:layout_height="33dp"
       android:layout_marginTop="20dp"
+      android:layout_marginEnd="34dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintHorizontal_bias="0.5"
+      app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintStart_toEndOf="@+id/image_view_email"
-      app:layout_constraintTop_toBottomOf="@+id/text_view"/>
+      app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_title"/>
 
     <ImageView
       android:layout_width="wrap_content"
@@ -118,11 +122,9 @@
       android:id="@+id/image_view_cancel"
       android:layout_width="18dp"
       android:layout_height="18dp"
-      android:layout_marginTop="40dp"
+      app:layout_constraintBottom_toBottomOf="@+id/text_view_dialog_title"
       app:layout_constraintEnd_toEndOf="@+id/image_view_url"
-      app:layout_constraintHorizontal_bias="1.0"
-      app:layout_constraintStart_toEndOf="@+id/text_view"
-      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintTop_toTopOf="@+id/text_view_dialog_title"
       app:srcCompat="@drawable/icon_header_close"/>
 
     <TextView
@@ -135,6 +137,7 @@
       android:text="@string/kakaotalk"
       android:textColor="@color/C888888"
       android:textSize="11sp"
+      android:textStyle="bold"
       app:layout_constraintEnd_toEndOf="@+id/image_view_kakao"
       app:layout_constraintStart_toStartOf="@+id/image_view_kakao"
       app:layout_constraintTop_toBottomOf="@+id/image_view_kakao"/>
@@ -149,6 +152,7 @@
       android:lineSpacingExtra="4sp"
       android:text="@string/facebook"
       android:textColor="@color/C888888"
+      android:textStyle="bold"
       android:textSize="11sp"
       app:layout_constraintEnd_toEndOf="@+id/image_view_facebook"
       app:layout_constraintHorizontal_bias="0.777"
@@ -164,6 +168,7 @@
       android:gravity="center_horizontal"
       android:lineSpacingExtra="4sp"
       android:text="@string/email_korean"
+      android:textStyle="bold"
       android:textColor="@color/C888888"
       android:textSize="11sp"
       app:layout_constraintEnd_toEndOf="@+id/image_view_email"
@@ -172,13 +177,15 @@
       app:layout_constraintTop_toBottomOf="@+id/image_view_email"/>
 
     <TextView
+      android:id="@+id/text_view_last_button_name"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="7dp"
       android:layout_marginEnd="8dp"
       android:gravity="center_horizontal"
       android:lineSpacingExtra="4sp"
-      android:text="@string/url"
+      tools:text="@string/url"
+      android:textStyle="bold"
       android:textColor="@color/C888888"
       android:textSize="11sp"
       app:layout_constraintEnd_toEndOf="@+id/image_view_url"

app/src/main/res/values/strings.xml

@@ -229,6 +229,9 @@
   <string name="tutorial_bottom_next_for_zumo_user">회원전환하고 혜택받기</string>
   <string name="action_settings">Settings</string>
 
+  <string name="code_share">추천인코드 공유</string>
+  <string name="code_copy">코드복사</string>
+
   <string name="setting_menu1">기본 설정</string>
   <string name="setting_menu1_user_confirm"><u>회원확인</u></string>
   <string name="setting_menu1_user_confirm_please">회원확인을 진행해주세요.</string>