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

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
+  <size android:width="35dp"
+        android:height="35dp"/>
 <solid
   android:color="@color/C000000"/>
 </shape>

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

@@ -20,21 +20,23 @@
       android:id="@+id/text_view_dialog_title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_marginStart="32dp"
       android:layout_marginTop="32dp"
       android:lineSpacingExtra="7sp"
-      tools:text="현재 페이지 공유"
-      android:textColor="#000000"
+      android:textColor="@color/C000000"
       android:textSize="17.5sp"
-      app:layout_constraintStart_toStartOf="@+id/image_view_kakao"
-      app:layout_constraintTop_toTopOf="parent"/>
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:text="현재 페이지 공유"/>
 
     <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:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="11dp"
+      android:layout_marginTop="10dp"
+      android:layout_marginEnd="2dp"
+      android:padding="10dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toStartOf="@+id/image_view_facebook"
       app:layout_constraintHorizontal_bias="0.5"
@@ -44,23 +46,25 @@
 
     <ImageView
       android:id="@+id/image_view_facebook"
-      android:layout_width="35dp"
-      android:layout_height="35dp"
-      android:layout_marginTop="20dp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="10dp"
+      android:layout_marginEnd="2dp"
+      android:padding="10dp"
       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_dialog_title"/>
 
     <ImageView
       android:id="@+id/image_view_email"
-      android:layout_width="35dp"
-      android:layout_height="35dp"
-      android:layout_marginEnd="21dp"
-      android:layout_marginTop="20dp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="10dp"
+      android:layout_marginEnd="2dp"
+      android:padding="10dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toStartOf="@+id/image_view_url"
       app:layout_constraintHorizontal_bias="0.5"
@@ -70,10 +74,13 @@
 
     <ImageView
       android:id="@+id/image_view_url"
-      android:layout_width="35dp"
-      android:layout_height="33dp"
-      android:layout_marginTop="20dp"
-      android:layout_marginEnd="34dp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="10dp"
+      android:layout_marginEnd="11dp"
+      android:layout_marginBottom="7dp"
+
+      android:padding="10dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_chainStyle="packed"
@@ -81,6 +88,7 @@
       app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_title"/>
 
     <ImageView
+      android:id="@+id/imageView6"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       app:layout_constraintBottom_toBottomOf="@+id/image_view_kakao"
@@ -90,6 +98,7 @@
       app:srcCompat="@drawable/icon_share_kakaotalk_wh"/>
 
     <ImageView
+      android:id="@+id/imageView2"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       app:layout_constraintBottom_toBottomOf="@+id/image_view_facebook"
@@ -120,77 +129,70 @@
 
     <ImageView
       android:id="@+id/image_view_cancel"
-      android:layout_width="18dp"
-      android:layout_height="18dp"
-      app:layout_constraintBottom_toBottomOf="@+id/text_view_dialog_title"
-      app:layout_constraintEnd_toEndOf="@+id/image_view_url"
-      app:layout_constraintTop_toTopOf="@+id/text_view_dialog_title"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="22dp"
+      android:layout_marginBottom="5dp"
+      android:padding="10dp"
+      app:layout_constraintBottom_toTopOf="@+id/image_view_url"
+      app:layout_constraintEnd_toEndOf="parent"
       app:srcCompat="@drawable/icon_header_close"/>
 
     <TextView
       android:id="@+id/textView"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="8dp"
       android:gravity="center_horizontal"
       android:lineSpacingExtra="4sp"
       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_constraintEnd_toEndOf="@+id/imageView6"
+      app:layout_constraintStart_toStartOf="@+id/imageView6"
       app:layout_constraintTop_toBottomOf="@+id/image_view_kakao"/>
 
     <TextView
       android:id="@+id/textView2"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="21dp"
-      android:layout_marginTop="8dp"
       android:gravity="center_horizontal"
       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"
-      app:layout_constraintStart_toStartOf="@+id/image_view_facebook"
+      android:textStyle="bold"
+      app:layout_constraintEnd_toEndOf="@+id/imageView2"
+      app:layout_constraintStart_toStartOf="@+id/imageView2"
       app:layout_constraintTop_toBottomOf="@+id/image_view_facebook"/>
 
     <TextView
       android:id="@+id/textView3"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="24dp"
-      android:layout_marginTop="8dp"
       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"
-      app:layout_constraintHorizontal_bias="1.0"
-      app:layout_constraintStart_toStartOf="@+id/image_view_email"
+      android:textStyle="bold"
+      app:layout_constraintEnd_toEndOf="@+id/imageView3"
+      app:layout_constraintStart_toStartOf="@+id/imageView3"
       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"
-      tools:text="@string/url"
-      android:textStyle="bold"
       android:textColor="@color/C888888"
       android:textSize="11sp"
-      app:layout_constraintEnd_toEndOf="@+id/image_view_url"
+      android:textStyle="bold"
+      app:layout_constraintEnd_toEndOf="@+id/imageView4"
       app:layout_constraintStart_toStartOf="@+id/imageView4"
-      app:layout_constraintTop_toBottomOf="@+id/image_view_url"/>
+      app:layout_constraintTop_toBottomOf="@+id/image_view_url"
+      tools:text="@string/url"/>
   </android.support.constraint.ConstraintLayout>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -10,8 +10,8 @@
   <string name="lifeplus_font_sans_serif" translatable="false">sans-serif</string>
 
   <!--kakaotalk 링크 공유-->
-  <string name="kakao_app_key">95448ff031e92087b5dbc44d56cff7bb</string>
-  <string name="kakao_scheme">kakao95448ff031e92087b5dbc44d56cff7bb</string>
+  <string name="kakao_app_key">57a0356496fdb154f5f68d4bc297f404</string>
+  <string name="kakao_scheme">kakao57a0356496fdb154f5f68d4bc297f404</string>
   <string name="kakaolink_host">kakaolink</string>
 
   <!--페이스북-->