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

Center text vertically below QR code and fix Please Pay string.

Browse source
This commit is contained in:
Severiano Jaramillo 2018-12-20 18:06:11 -06:00
parent 4beec4e66a
commit e3bea9f475
3 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/layout/activity_main.xml
View file

@ -13,6 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark" /> android:theme="@style/ThemeOverlay.AppCompat.Dark" />
<fragment <fragment

52
app/src/main/res/layout/fragment_receive_transaction.xml
View file

@ -57,7 +57,7 @@
android:background="@color/darkGray" android:background="@color/darkGray"
app:layout_constraintTop_toBottomOf="@+id/spAsset" app:layout_constraintTop_toBottomOf="@+id/spAsset"
app:layout_constraintEnd_toEndOf="@+id/spAsset" app:layout_constraintEnd_toEndOf="@+id/spAsset"
app:layout_constraintStart_toStartOf="@+id/spAsset" /> app:layout_constraintStart_toStartOf="@+id/spAsset"/>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilAsset" android:id="@+id/tilAsset"
@ -89,31 +89,41 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="@dimen/spacing_different_topic" android:layout_marginTop="@dimen/spacing_different_topic"
android:layout_marginBottom="@dimen/spacing_different_topic" android:layout_marginBottom="@dimen/spacing_different_topic"
android:background="@drawable/camera_view_background"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toBottomOf="@id/tilAsset" app:layout_constraintTop_toBottomOf="@+id/tilAsset"
app:layout_constraintBottom_toTopOf="@id/tvPleasePay" app:layout_constraintBottom_toTopOf="@+id/llText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"/>
<TextView <LinearLayout
android:id="@+id/tvPleasePay" android:id="@+id/llText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1" android:orientation="vertical"
tools:text="Please Pay: 12.25316 BTS" app:layout_constraintBottom_toBottomOf="parent"
android:textAppearance="@style/TextAppearance.Bitsy.Body1" app:layout_constraintTop_toBottomOf="@+id/ivQR">
android:textAlignment="center"
app:layout_constraintBottom_toTopOf="@id/tvTo"/>
<TextView <TextView
android:id="@+id/tvTo" android:id="@+id/tvPleasePay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1" android:maxLines="1"
tools:text="To: seventest-3" tools:text="Please Pay: 12.25316 BTS"
android:textAppearance="@style/TextAppearance.Bitsy.Body1" android:textAppearance="@style/TextAppearance.Bitsy.Body1"
android:textAlignment="center" android:textAlignment="center"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toTopOf="@id/tvTo"/>
<TextView
android:id="@+id/tvTo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
tools:text="To: seventest-3"
android:textAppearance="@style/TextAppearance.Bitsy.Body1"
android:textAlignment="center"
app:layout_constraintBottom_toBottomOf="parent"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -54,7 +54,7 @@
<string name="text__memo">Memo</string> <string name="text__memo">Memo</string>
<string name="text__scan_qr">Scan QR</string> <string name="text__scan_qr">Scan QR</string>
<string name="text__asset">Asset</string> <string name="text__asset">Asset</string>
<string name="template__please_pay">Please pay: %1$s %2$s</string> <string name="template__please_pay">Please Pay: %1$s %2$s</string>
<string name="template__to">To: %1$s</string> <string name="template__to">To: %1$s</string>
<!-- Settings --> <!-- Settings -->