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

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

@@ -40,8 +40,11 @@
       android:id="@+id/image_view_setting_menu_accordion"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="31dp"
-      android:layout_marginBottom="31dp"
+      android:layout_marginTop="11dp"
+      android:layout_marginBottom="11dp"
+      android:paddingLeft="20dp"
+      android:paddingTop="20dp"
+      android:paddingBottom="20dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"

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

@@ -41,9 +41,11 @@
       android:id="@+id/image_view_setting_menu_accordion"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="31dp"
-      android:layout_marginEnd="0dp"
-      android:layout_marginBottom="31dp"
+      android:layout_marginTop="11dp"
+      android:layout_marginBottom="11dp"
+      android:paddingLeft="20dp"
+      android:paddingTop="20dp"
+      android:paddingBottom="20dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"

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

@@ -36,8 +36,11 @@
       android:id="@+id/image_view_setting_menu_accordion"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="31dp"
-      android:layout_marginBottom="31dp"
+      android:layout_marginTop="11dp"
+      android:layout_marginBottom="11dp"
+      android:paddingTop="20dp"
+      android:paddingBottom="20dp"
+      android:paddingLeft="20dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"

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

@@ -40,8 +40,11 @@
       android:id="@+id/image_view_setting_menu_accordion"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="31dp"
-      android:layout_marginBottom="31dp"
+      android:layout_marginTop="11dp"
+      android:layout_marginBottom="11dp"
+      android:paddingLeft="20dp"
+      android:paddingTop="20dp"
+      android:paddingBottom="20dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"