Merge branch 'dev' into qa_1.1
This commit is contained in:
@@ -82,10 +82,10 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_30"
|
||||
android:fontFamily="sans-serif-condensed-medium"
|
||||
android:gravity="center_vertical"
|
||||
android:textColor="#FFF"
|
||||
android:textSize="@dimen/dp_80"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
|
||||
app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
|
||||
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
|
||||
|
||||
@@ -21,9 +21,10 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivIconPIcon"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:src="@drawable/icon_parting_icon"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tvAddress"
|
||||
app:layout_constraintStart_toEndOf="@+id/ivIconP"
|
||||
@@ -34,6 +35,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_30"
|
||||
android:layout_marginBottom="@dimen/dp_20"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_34"
|
||||
android:textStyle="bold"
|
||||
@@ -48,10 +50,10 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_30"
|
||||
android:fontFamily="sans-serif-condensed-medium"
|
||||
android:gravity="center_vertical"
|
||||
android:textColor="#FFF"
|
||||
android:textSize="@dimen/dp_80"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
|
||||
app:layout_constraintEnd_toStartOf="@+id/ivToNav"
|
||||
app:layout_constraintTop_toTopOf="@+id/ivToNav"
|
||||
|
||||
Reference in New Issue
Block a user