agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved SendTransactionLayout to adjust to different screen sizes and fixed text color

Browse source
This commit is contained in:
Severiano Jaramillo 2018-01-25 15:49:43 -06:00
parent ff971ee492
commit bf45cae2a1
3 changed files with 218 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout/receive_transaction.xml
View file

@ -69,8 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:inputType="textMultiLine" android:inputType="numberDecimal"
android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
android:hint="@string/amount" android:hint="@string/amount"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

34
app/src/main/res/layout/send_transaction.xml
View file

@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <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_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="24dp">
<View <View
android:id="@+id/topView" android:id="@+id/topView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -66,8 +71,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:gravity="top" android:gravity="top"
android:inputType="textMultiLine" android:inputType="text"
android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
android:hint="@string/to_capital" android:hint="@string/to_capital"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -82,7 +86,8 @@
app:srcCompat="@drawable/ic_people" app:srcCompat="@drawable/ic_people"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
app:layout_constraintEnd_toEndOf="@id/etTo" app:layout_constraintEnd_toEndOf="@id/etTo"
app:layout_constraintBottom_toBottomOf="@id/etTo"/> app:layout_constraintBottom_toBottomOf="@id/etTo"
android:contentDescription="@string/people_icon" />
<TextView <TextView
android:id="@+id/tvToError" android:id="@+id/tvToError"
@ -99,8 +104,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:inputType="textMultiLine" android:inputType="numberDecimal"
android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
android:hint="@string/amount" android:hint="@string/amount"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -130,12 +134,12 @@
<View <View
android:id="@+id/viewSpinner" android:id="@+id/viewSpinner"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="3dp" android:layout_height="1dp"
android:layout_marginTop="5dp" android:layout_marginBottom="7dp"
android:background="@color/gray" android:background="@color/darkGray"
app:layout_constraintEnd_toEndOf="@+id/spAsset" app:layout_constraintEnd_toEndOf="@+id/spAsset"
app:layout_constraintStart_toStartOf="@+id/spAsset" app:layout_constraintStart_toStartOf="@+id/spAsset"
app:layout_constraintTop_toBottomOf="@id/spAsset" /> app:layout_constraintBottom_toBottomOf="@id/etAmount" />
<TextView <TextView
android:id="@+id/tvAssetError" android:id="@+id/tvAssetError"
@ -154,7 +158,6 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:textColor="@color/white"
android:hint="@string/memo_capital" android:hint="@string/memo_capital"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -189,9 +192,9 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:src="#666" android:src="#666"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvScan" /> app:layout_constraintTop_toBottomOf="@id/tvScan"
android:contentDescription="@string/camera_feed_to_scan_qr" />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/fabCloseCamera" android:id="@+id/fabCloseCamera"
@ -228,7 +231,6 @@
android:id="@+id/btnCancel" android:id="@+id/btnCancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:text="@string/cancel_capital" android:text="@string/cancel_capital"
android:textStyle="bold" android:textStyle="bold"
@ -236,4 +238,6 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</ScrollView>

2
app/src/main/res/values/strings.xml
View file

@ -499,4 +499,6 @@
<string name="new_user">New user?</string> <string name="new_user">New user?</string>
<string name="existing_user">Existing user?</string> <string name="existing_user">Existing user?</string>
<string name="connection_status">Connection status</string> <string name="connection_status">Connection status</string>
<string name="people_icon">People icon</string>
<string name="camera_feed_to_scan_qr">Camera feed to scan QR</string>
</resources> </resources>