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

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

@@ -19,26 +19,25 @@
       android:id="@+id/text_view_title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="32dp"
-      android:layout_marginTop="32dp"
+      android:layout_marginTop="35dp"
       android:lineSpacingExtra="7sp"
       android:text="@string/notification"
       android:textColor="@color/C000000"
       android:textSize="18sp"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      />
+      app:layout_constraintStart_toStartOf="@+id/text_view_dialog_message"
+      app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
       android:id="@+id/text_view_dialog_message"
       android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
+      android:layout_height="45dp"
       android:layout_marginTop="20dp"
       android:lineSpacingExtra="6sp"
       android:text="@string/app_review_message"
       android:textColor="@color/C000000"
       android:textSize="14sp"
-      app:layout_constraintStart_toStartOf="@+id/text_view_title"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/text_view_title"
       />
 
@@ -63,10 +62,10 @@
       android:layout_marginBottom="22dp"
       android:gravity="center_horizontal"
       android:lineSpacingExtra="6sp"
+      android:padding="10dp"
       android:text="@string/next_time"
       android:textColor="@color/C999999"
       android:textSize="14sp"
-      android:padding="10dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
 
@@ -80,8 +79,8 @@
       android:layout_marginBottom="22dp"
       android:gravity="center_horizontal"
       android:lineSpacingExtra="6sp"
-      android:text="@string/app_review_write"
       android:padding="10dp"
+      android:text="@string/app_review_write"
       android:textColor="@color/C000000"
       android:textSize="14sp"
       app:layout_constraintBottom_toBottomOf="parent"