Added cross and arrow icons and improved view to match desired design
This commit is contained in:
Severiano Jaramillo
parent
3df50a6836
commit
1ac0a591fc
9 changed files with 60 additions and 9 deletions
|
|
@ -150,7 +150,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
|
|||
|
||||
AlertDialog dialog = builder.create();
|
||||
|
||||
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||
/*dialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||
@Override
|
||||
public void onShow(DialogInterface dialog) {
|
||||
btnSend = ((AlertDialog)dialog).getButton(AlertDialog.BUTTON_POSITIVE);
|
||||
|
|
@ -158,7 +158,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
|
|||
|
||||
btnSend.setEnabled(false);
|
||||
}
|
||||
});
|
||||
});*/
|
||||
|
||||
return dialog;
|
||||
}
|
||||
|
|
|
|||
9
app/src/main/res/drawable/ic_arrow_forward.xml
Normal file
9
app/src/main/res/drawable/ic_arrow_forward.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FFF"
|
||||
android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
|
||||
</vector>
|
||||
9
app/src/main/res/drawable/ic_close.xml
Normal file
9
app/src/main/res/drawable/ic_close.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FFF"
|
||||
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
|
||||
</vector>
|
||||
|
|
@ -4,6 +4,6 @@
|
|||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FFC4C4C4"
|
||||
android:fillColor="#FF727272"
|
||||
android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
|
||||
</vector>
|
||||
|
|
|
|||
7
app/src/main/res/drawable/send_transaction_send_view.xml
Normal file
7
app/src/main/res/drawable/send_transaction_send_view.xml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<corners
|
||||
android:bottomLeftRadius="100dp"
|
||||
android:topLeftRadius="100dp" />
|
||||
<solid android:color="#FFCEC8" />
|
||||
</shape>
|
||||
|
|
@ -4,6 +4,6 @@
|
|||
android:shape="rectangle">
|
||||
<gradient
|
||||
android:angle="0"
|
||||
android:startColor="#FF9269"
|
||||
android:endColor="#FF7063"/>
|
||||
android:startColor="@color/send_light_orange"
|
||||
android:endColor="@color/send_strong_orange"/>
|
||||
</shape>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:text="Send Assets"
|
||||
android:text="@string/title_capital"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
|
|
@ -186,14 +186,36 @@
|
|||
app:layout_constraintTop_toBottomOf="@id/tvScan" />
|
||||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/fabSend"
|
||||
android:layout_width="140dp"
|
||||
android:id="@+id/fabCloseCamera"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
app:fabSize="mini"
|
||||
android:layout_marginBottom="165dp"
|
||||
android:layout_marginStart="165dp"
|
||||
app:backgroundTint="@color/send_strong_orange"
|
||||
android:src="@drawable/ic_close"
|
||||
app:layout_constraintBottom_toBottomOf="@+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:backgroundTint="#FFCEC8"
|
||||
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/fabSend"
|
||||
android:layout_width="90dp"
|
||||
android:layout_height="90dp"
|
||||
android:layout_marginTop="24dp"
|
||||
app:backgroundTint="@color/send_strong_orange"
|
||||
android:src="@drawable/ic_arrow_forward"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/viewSend" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/btnCancel"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -201,6 +223,7 @@
|
|||
android:layout_marginBottom="24dp"
|
||||
android:layout_marginEnd="24dp"
|
||||
android:text="@string/cancel_capital"
|
||||
android:textStyle="bold"
|
||||
android:textSize="18sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
|
|
|||
|
|
@ -39,4 +39,6 @@
|
|||
<color name="color_preloader_end">#ff56a9c7</color>
|
||||
<color name="QRCodeBlackColor">#000000</color>
|
||||
<color name="QRCodeWhiteColor">#ffffff</color>
|
||||
<color name="send_strong_orange">#FF7063</color>
|
||||
<color name="send_light_orange">#FF9269</color>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -454,4 +454,5 @@
|
|||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||
<string name="scan_capital">Scan a QR or NFC signal</string>
|
||||
<string name="cancel_capital">CANCEL</string>
|
||||
<string name="title_capital">Send Assets</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in a new issue