diff --git a/app/src/main/res/drawable/ic_arrows_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml index c49a7941da..6e7d34d5e6 100644 --- a/app/src/main/res/drawable/ic_arrows_up_down.xml +++ b/app/src/main/res/drawable/ic_arrows_up_down.xml @@ -4,6 +4,6 @@ android:viewportWidth="14" android:viewportHeight="19"> diff --git a/app/src/main/res/layout/fragment_extract.xml b/app/src/main/res/layout/fragment_send.xml similarity index 86% rename from app/src/main/res/layout/fragment_extract.xml rename to app/src/main/res/layout/fragment_send.xml index cce01b7664..f0b7ab503a 100644 --- a/app/src/main/res/layout/fragment_extract.xml +++ b/app/src/main/res/layout/fragment_send.xml @@ -6,20 +6,20 @@ android:orientation="vertical"> @@ -31,7 +31,7 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/layout_extract_address_payid.xml b/app/src/main/res/layout/layout_send_address_payid.xml similarity index 97% rename from app/src/main/res/layout/layout_extract_address_payid.xml rename to app/src/main/res/layout/layout_send_address_payid.xml index e8b24240b2..3f48a6131d 100644 --- a/app/src/main/res/layout/layout_extract_address_payid.xml +++ b/app/src/main/res/layout/layout_send_address_payid.xml @@ -11,7 +11,7 @@ android:id="@+id/tilAddressOrPayId" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/extract_address_or_payid" + android:hint="@string/send_address_or_payid" app:boxBackgroundColor="@android:color/transparent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/layout_extract_currency.xml b/app/src/main/res/layout/layout_send_currency.xml similarity index 97% rename from app/src/main/res/layout/layout_extract_currency.xml rename to app/src/main/res/layout/layout_send_currency.xml index b1afc7a942..a59a0d0ecb 100644 --- a/app/src/main/res/layout/layout_extract_currency.xml +++ b/app/src/main/res/layout/layout_send_currency.xml @@ -49,7 +49,7 @@ android:focusableInTouchMode="true" android:fontFamily="sans-serif-light" android:textAllCaps="true" - android:textColor="@color/colorPrimary" + android:textColor="@color/blue" android:textSize="32sp" app:layout_constraintBottom_toBottomOf="@+id/tilAmount" app:layout_constraintEnd_toStartOf="@+id/flArrowUpDown" @@ -70,7 +70,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingEnd="5dp" - android:text="@string/extract_balance" + android:text="@string/send_balance" android:textColor="@color/darkGray1" /> + android:text="@string/send_network_chip_fee_low" /> + android:text="@string/send_network_chip_fee_normal" /> + android:text="@string/send_network_chip_fee_priority" /> diff --git a/app/src/main/res/layout/layout_extract_total.xml b/app/src/main/res/layout/layout_send_total.xml similarity index 96% rename from app/src/main/res/layout/layout_extract_total.xml rename to app/src/main/res/layout/layout_send_total.xml index d983048902..83ca437a9e 100644 --- a/app/src/main/res/layout/layout_extract_total.xml +++ b/app/src/main/res/layout/layout_send_total.xml @@ -11,7 +11,7 @@ android:id="@+id/tvAmount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/extract_total_amount" + android:text="@string/send_total_amount" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/extract_total_fee" + android:text="@string/send_total_fee" android:textColor="@color/darkGray1" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/extract_total" + android:text="@string/send_total" android:textSize="20sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -138,7 +138,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:text="@string/extract_total_will_be_sent" + android:text="@string/send_total_will_be_sent" android:textColor="@color/lightGray4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTotal" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 434c27428c..5c52903a64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,16 +21,16 @@ Tokens - Address or PayID - Network fee - Low - Normal - Priority - Send - Total - Amount - Fee - will be sent - Balance: + Address or PayID + Network fee + Low + Normal + Priority + Send + Total + Amount + Fee + will be sent + Balance: \ No newline at end of file