Merge branch 'presentation/test' into develop

This commit is contained in:
GME 2019-04-09 19:07:04 +02:00
commit fdda6c5e61
2 changed files with 21 additions and 4 deletions

View file

@ -6,6 +6,22 @@
android:layout_height="match_parent"
tools:context="monnethic.mobile.transaction.MakePayementActivity">
<Button
android:id="@+id/buttonSendWithAddress"
android:layout_width="141dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="160dp"
android:text="SEND TO ADDRESS"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.502"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.601" />
<Button
android:id="@+id/buttonScanQr"
android:layout_width="141dp"
@ -20,5 +36,5 @@
app:layout_constraintHorizontal_bias="0.502"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.905" />
app:layout_constraintVertical_bias="0.863" />
</android.support.constraint.ConstraintLayout>

View file

@ -44,10 +44,11 @@
<TextView
android:id="@+id/textViewAdresseDisplay"
android:layout_width="150dp"
android:layout_height="25dp"
android:layout_width="216dp"
android:layout_height="26dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="20dp"
android:layout_marginEnd="96dp"
android:textSize="10sp"
app:layout_constraintBottom_toTopOf="@+id/textViewAmountDisplay"
app:layout_constraintEnd_toEndOf="parent" />