Back to previous version of the send transaction button
This commit is contained in:
parent
3e5e0001e1
commit
2c5661c587
2 changed files with 243 additions and 259 deletions
|
@ -97,8 +97,8 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
|
||||||
Spinner spAsset;
|
Spinner spAsset;
|
||||||
@BindView(R.id.tvAssetError)
|
@BindView(R.id.tvAssetError)
|
||||||
TextView tvAssetError;
|
TextView tvAssetError;
|
||||||
@BindView(R.id.scrollMain)
|
//@BindView(R.id.scrollMain)
|
||||||
ScrollView scrollMain;
|
//ScrollView scrollMain;
|
||||||
@BindView(R.id.etAmount)
|
@BindView(R.id.etAmount)
|
||||||
EditText etAmount;
|
EditText etAmount;
|
||||||
@BindView(R.id.tvAmountError)
|
@BindView(R.id.tvAmountError)
|
||||||
|
@ -167,7 +167,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
|
||||||
/*
|
/*
|
||||||
* Detet scroll changes
|
* Detet scroll changes
|
||||||
* */
|
* */
|
||||||
scrollMain.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() {
|
/*scrollMain.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onScrollChanged() {
|
public void onScrollChanged() {
|
||||||
|
|
||||||
|
@ -206,7 +206,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
|
||||||
viewSend.animate().y(600);
|
viewSend.animate().y(600);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});*/
|
||||||
|
|
||||||
this.cryptoNetAccountId = getArguments().getLong("CRYPTO_NET_ACCOUNT_ID",-1);
|
this.cryptoNetAccountId = getArguments().getLong("CRYPTO_NET_ACCOUNT_ID",-1);
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,10 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<ScrollView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:theme="@style/ActivityDialog">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="20dp"
|
android:background="@color/white">
|
||||||
android:background="@color/white"
|
|
||||||
android:id="@+id/scrollMain">
|
|
||||||
|
|
||||||
<android.support.constraint.ConstraintLayout
|
<android.support.constraint.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -23,10 +14,12 @@
|
||||||
<View
|
<View
|
||||||
android:id="@+id/topView"
|
android:id="@+id/topView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="119dp"
|
|
||||||
android:background="@drawable/send_transaction_top_view"
|
android:background="@drawable/send_transaction_top_view"
|
||||||
|
android:layout_height="120dp"
|
||||||
|
android:layout_marginEnd="0dp"
|
||||||
|
android:layout_marginStart="0dp"
|
||||||
|
android:layout_marginTop="0dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
@ -83,7 +76,6 @@
|
||||||
android:inputType="text"
|
android:inputType="text"
|
||||||
android:textSize="20sp"
|
android:textSize="20sp"
|
||||||
android:hint="@string/to_capital"
|
android:hint="@string/to_capital"
|
||||||
android:maxLength="255"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/gravatar" />
|
app:layout_constraintTop_toBottomOf="@+id/gravatar" />
|
||||||
|
@ -194,7 +186,7 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvMemoError" />
|
app:layout_constraintTop_toBottomOf="@id/tvMemoError" />
|
||||||
|
|
||||||
<me.dm7.barcodescanner.zxing.ZXingScannerView
|
<ImageView
|
||||||
android:id="@+id/ivCamera"
|
android:id="@+id/ivCamera"
|
||||||
android:layout_width="180dp"
|
android:layout_width="180dp"
|
||||||
android:layout_height="180dp"
|
android:layout_height="180dp"
|
||||||
|
@ -218,6 +210,25 @@
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/ivCamera"
|
app:layout_constraintBottom_toBottomOf="@+id/ivCamera"
|
||||||
app:layout_constraintStart_toStartOf="@+id/ivCamera" />
|
app:layout_constraintStart_toStartOf="@+id/ivCamera" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/viewSend"
|
||||||
|
android:layout_width="120dp"
|
||||||
|
android:layout_height="140dp"
|
||||||
|
android:layout_marginEnd="0dp"
|
||||||
|
android:background="@drawable/send_transaction_send_view"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/ivCamera" />
|
||||||
|
|
||||||
|
<android.support.design.widget.FloatingActionButton
|
||||||
|
android:id="@+id/btnSend"
|
||||||
|
android:layout_width="90dp"
|
||||||
|
android:layout_height="90dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
app:backgroundTint="@color/send_strong_orange"
|
||||||
|
app:srcCompat="@drawable/ic_arrow_forward"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/viewSend" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -239,33 +250,6 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
</android.support.constraint.ConstraintLayout>
|
</android.support.constraint.ConstraintLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/viewSend"
|
|
||||||
android:layout_width="120dp"
|
|
||||||
android:layout_height="140dp"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_marginTop="400dp"
|
|
||||||
android:background="@drawable/send_transaction_send_view" />
|
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
|
||||||
android:id="@+id/btnSend"
|
|
||||||
android:layout_width="90dp"
|
|
||||||
android:scaleX="1.7"
|
|
||||||
android:scaleY="1.7"
|
|
||||||
app:fabSize="normal"
|
|
||||||
android:layout_height="90dp"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_marginRight="30dp"
|
|
||||||
android:layout_marginTop="441dp"
|
|
||||||
android:scaleType="center"
|
|
||||||
app:backgroundTint="@color/send_strong_orange"
|
|
||||||
app:srcCompat="@drawable/ic_arrow_forward"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
Loading…
Reference in a new issue