Browse Source

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

hyodong.min 6 years ago
parent
commit
8cfe6f82f3

+ 7 - 4
app/src/main/res/layout/dialog_current_page_share.xml

@@ -36,6 +36,7 @@
       android:layout_marginStart="11dp"
       android:layout_marginTop="10dp"
       android:layout_marginEnd="2dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toStartOf="@+id/image_view_facebook"
@@ -43,8 +44,8 @@
       app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_title"
-      app:layout_goneMarginStart="4dp"
-      app:layout_goneMarginEnd="4dp"/>
+      app:layout_goneMarginEnd="4dp"
+      app:layout_goneMarginStart="4dp"/>
 
     <ImageView
       android:id="@+id/image_view_facebook"
@@ -83,14 +84,15 @@
       android:layout_marginTop="10dp"
       android:layout_marginEnd="11dp"
       android:layout_marginBottom="7dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:src="@drawable/circle_c000000"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintStart_toEndOf="@+id/image_view_email"
       app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_title"
-      app:layout_goneMarginStart="4dp"
-      app:layout_goneMarginEnd="4dp"/>
+      app:layout_goneMarginEnd="4dp"
+      app:layout_goneMarginStart="4dp"/>
 
     <ImageView
       android:id="@+id/imageView6"
@@ -138,6 +140,7 @@
       android:layout_height="wrap_content"
       android:layout_marginEnd="22dp"
       android:layout_marginBottom="5dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       app:layout_constraintBottom_toTopOf="@+id/image_view_url"
       app:layout_constraintEnd_toEndOf="parent"

+ 4 - 0
app/src/main/res/layout/setting_custom_menu1.xml

@@ -29,6 +29,7 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu1"
       android:textColor="@color/C000000"
@@ -41,6 +42,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"
@@ -80,6 +82,7 @@
       android:id="@+id/text_view_user_confirm"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:textColor="@color/C666666"
       android:textSize="12sp"
@@ -106,6 +109,7 @@
       android:id="@+id/switch_pin_on_off"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_unlock"
       app:layout_constraintEnd_toStartOf="@+id/guide_end"

+ 5 - 0
app/src/main/res/layout/setting_custom_menu2.xml

@@ -28,6 +28,7 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu2"
       android:textColor="@color/C000000"
@@ -40,6 +41,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"
@@ -68,6 +70,7 @@
       android:id="@+id/text_view_share"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:text="@string/setting_menu2_share"
       android:textColor="@color/C999999"
@@ -79,6 +82,7 @@
       android:id="@+id/text_view_recommend"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:lineSpacingExtra="4sp"
       android:padding="10dp"
       android:textColor="@color/C666666"
@@ -94,6 +98,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="2dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:text="@string/setting_menu2_register"
       android:textColor="@color/C999999"

+ 5 - 0
app/src/main/res/layout/setting_custom_menu3.xml

@@ -29,6 +29,7 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu3"
       android:textColor="@color/C000000"
@@ -41,6 +42,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"
@@ -80,6 +82,7 @@
       android:id="@+id/switch_push_on_off"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_push_setting"
       app:layout_constraintEnd_toStartOf="@+id/guide_end"
@@ -103,6 +106,7 @@
       android:id="@+id/switch_marketing_on_off"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_marketing_setting"
       app:layout_constraintEnd_toStartOf="@+id/guide_end"
@@ -126,6 +130,7 @@
       android:id="@+id/switch_location_on_off"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_location_service_setting"
       app:layout_constraintEnd_toStartOf="@+id/guide_end"

+ 4 - 0
app/src/main/res/layout/setting_custom_menu4.xml

@@ -29,6 +29,7 @@
       android:id="@+id/text_view_setting_menu_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="9dp"
       android:text="@string/setting_menu4"
       android:textColor="@color/C000000"
@@ -41,6 +42,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="9dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="20dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_setting_menu_text"
       app:layout_constraintEnd_toEndOf="parent"
@@ -69,6 +71,7 @@
       android:id="@+id/text_info_policy"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:text="@string/access_terms"
       android:textColor="@color/C999999"
@@ -82,6 +85,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="2dp"
+      android:background="?android:attr/selectableItemBackground"
       android:padding="10dp"
       android:text="@string/operation_guide"
       android:textColor="@color/C999999"