diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java index 43e2ef7..070d39b 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java @@ -7,6 +7,7 @@ import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.design.widget.FloatingActionButton; import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; @@ -15,6 +16,7 @@ import android.text.Editable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.animation.LinearInterpolator; import android.widget.Button; import android.widget.EditText; import android.widget.Spinner; @@ -64,8 +66,8 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat EditText etMemo; @BindView(R.id.tvMemoError) TextView tvMemoError; - //@BindView(R.id.btnSend) - Button btnSend; + @BindView(R.id.btnSend) + FloatingActionButton btnSend; @BindView(R.id.btnCancel) TextView btnCancel; diff --git a/app/src/main/res/drawable/receive_transaction_top_view.xml b/app/src/main/res/drawable/receive_transaction_top_view.xml new file mode 100644 index 0000000..32bc4d2 --- /dev/null +++ b/app/src/main/res/drawable/receive_transaction_top_view.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/receive_transaction.xml b/app/src/main/res/layout/receive_transaction.xml index 1ead746..ed2916e 100644 --- a/app/src/main/res/layout/receive_transaction.xml +++ b/app/src/main/res/layout/receive_transaction.xml @@ -1,33 +1,155 @@ - + android:layout_height="wrap_content" + android:minWidth="350dp"> + + + + + + + + + + + android:layout_width="150dp" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:layout_marginStart="24dp" + android:inputType="textMultiLine" + android:textColor="@color/white" + android:textSize="20sp" + android:hint="@string/amount" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/gravatar" /> + + android:layout_width="0dp" + android:layout_height="wrap_content" + android:textColor="@color/red" + app:layout_constraintEnd_toEndOf="@+id/etAmount" + app:layout_constraintStart_toStartOf="@+id/etAmount" + app:layout_constraintTop_toBottomOf="@+id/etAmount" /> + + android:textColor="@color/white" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/etAmount" /> + + + + android:layout_width="0dp" + android:layout_height="wrap_content" + android:textColor="@color/red" + app:layout_constraintBottom_toBottomOf="@+id/tvAmountError" + app:layout_constraintEnd_toEndOf="@+id/spAsset" + app:layout_constraintStart_toStartOf="@+id/spAsset" /> + + + - \ No newline at end of file + android:layout_marginBottom="24dp" + android:layout_marginStart="24dp" + android:layout_marginTop="24dp" + android:text="@string/share_this_qr" + android:textSize="18sp" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ivQrCode" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/send_transaction.xml b/app/src/main/res/layout/send_transaction.xml index 6c68456..558906e 100644 --- a/app/src/main/res/layout/send_transaction.xml +++ b/app/src/main/res/layout/send_transaction.xml @@ -217,7 +217,7 @@ app:layout_constraintTop_toTopOf="@id/ivCamera" /> #ffffff #FF7063 #FF9269 + #52CE84 + #4EBB7F diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6cf9e9c..523017f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -455,4 +455,7 @@ Scan a QR or NFC signal CANCEL Send Assets + Receive Assets + Share this QR + CLOSE