diff options
Diffstat (limited to 'wallet/src/main/res/layout')
-rw-r--r-- | wallet/src/main/res/layout/fragment_event_paid.xml | 30 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_event_withdraw.xml | 12 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_transactions.xml (renamed from wallet/src/main/res/layout/fragment_show_history.xml) | 8 | ||||
-rw-r--r-- | wallet/src/main/res/layout/transaction_in.xml (renamed from wallet/src/main/res/layout/history_receive.xml) | 6 | ||||
-rw-r--r-- | wallet/src/main/res/layout/transaction_out.xml (renamed from wallet/src/main/res/layout/history_payment.xml) | 4 | ||||
-rw-r--r-- | wallet/src/main/res/layout/transaction_row.xml (renamed from wallet/src/main/res/layout/history_row.xml) | 4 |
6 files changed, 32 insertions, 32 deletions
diff --git a/wallet/src/main/res/layout/fragment_event_paid.xml b/wallet/src/main/res/layout/fragment_event_paid.xml index 4485744..3f17464 100644 --- a/wallet/src/main/res/layout/fragment_event_paid.xml +++ b/wallet/src/main/res/layout/fragment_event_paid.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - tools:context=".history.HistoryEventFragment"> + tools:context=".transactions.TransactionDetailFragment"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" @@ -28,7 +28,7 @@ <TextView android:id="@+id/timeView" - style="@style/HistoryEventLabel.Time" + style="@style/TransactionLabel.Time" app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesLabel" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -38,8 +38,8 @@ <TextView android:id="@+id/amountPaidWithFeesLabel" - style="@style/HistoryEventLabel" - android:text="@string/history_event_payment_sent_paid" + style="@style/TransactionLabel" + android:text="@string/transaction_paid" app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -47,7 +47,7 @@ <TextView android:id="@+id/amountPaidWithFeesView" - style="@style/HistoryEventContent" + style="@style/TransactionContent" android:textColor="@color/red" app:layout_constraintBottom_toTopOf="@+id/orderAmountLabel" app:layout_constraintEnd_toEndOf="parent" @@ -57,8 +57,8 @@ <TextView android:id="@+id/orderAmountLabel" - style="@style/HistoryEventLabel" - android:text="@string/history_event_payment_sent_amount" + style="@style/TransactionLabel" + android:text="@string/transaction_order_total" app:layout_constraintBottom_toTopOf="@+id/orderAmountView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -66,7 +66,7 @@ <TextView android:id="@+id/orderAmountView" - style="@style/HistoryEventContent" + style="@style/TransactionContent" app:layout_constraintBottom_toTopOf="@+id/feeLabel" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -75,7 +75,7 @@ <TextView android:id="@+id/feeLabel" - style="@style/HistoryEventLabel" + style="@style/TransactionLabel" android:text="@string/withdraw_fees" app:layout_constraintBottom_toTopOf="@+id/feeView" app:layout_constraintEnd_toEndOf="parent" @@ -84,7 +84,7 @@ <TextView android:id="@+id/feeView" - style="@style/HistoryEventContent" + style="@style/TransactionContent" android:textColor="@color/red" app:layout_constraintBottom_toTopOf="@+id/orderSummaryLabel" app:layout_constraintEnd_toEndOf="parent" @@ -94,8 +94,8 @@ <TextView android:id="@+id/orderSummaryLabel" - style="@style/HistoryEventLabel" - android:text="@string/history_event_payment_sent_order" + style="@style/TransactionLabel" + android:text="@string/transaction_order" app:layout_constraintBottom_toTopOf="@+id/orderSummaryView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -103,7 +103,7 @@ <TextView android:id="@+id/orderSummaryView" - style="@style/HistoryEventContent" + style="@style/TransactionContent" app:layout_constraintBottom_toTopOf="@+id/orderIdView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -112,8 +112,8 @@ <TextView android:id="@+id/orderIdView" - style="@style/HistoryEventLabel" - android:text="@string/history_event_payment_sent_order_id" + style="@style/TransactionLabel" + android:text="@string/transaction_order_id" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/wallet/src/main/res/layout/fragment_event_withdraw.xml b/wallet/src/main/res/layout/fragment_event_withdraw.xml index 9c5d818..5d30fcf 100644 --- a/wallet/src/main/res/layout/fragment_event_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_event_withdraw.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - tools:context=".history.HistoryEventFragment"> + tools:context=".transactions.TransactionDetailFragment"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" @@ -28,7 +28,7 @@ <TextView android:id="@+id/timeView" - style="@style/HistoryEventLabel.Time" + style="@style/TransactionLabel.Time" app:layout_constraintBottom_toTopOf="@+id/effectiveAmountLabel" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -38,7 +38,7 @@ <TextView android:id="@+id/effectiveAmountLabel" - style="@style/HistoryEventLabel" + style="@style/TransactionLabel" app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -64,7 +64,7 @@ <TextView android:id="@+id/chosenAmountLabel" - style="@style/HistoryEventLabel" + style="@style/TransactionLabel" app:layout_constraintBottom_toTopOf="@+id/chosenAmountView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -89,7 +89,7 @@ <TextView android:id="@+id/feeLabel" - style="@style/HistoryEventLabel" + style="@style/TransactionLabel" android:text="@string/withdraw_fees" app:layout_constraintBottom_toTopOf="@+id/feeView" app:layout_constraintEnd_toEndOf="parent" @@ -115,7 +115,7 @@ <TextView android:id="@+id/exchangeLabel" - style="@style/HistoryEventLabel" + style="@style/TransactionLabel" android:text="@string/withdraw_exchange" app:layout_constraintBottom_toTopOf="@+id/exchangeView" app:layout_constraintEnd_toEndOf="parent" diff --git a/wallet/src/main/res/layout/fragment_show_history.xml b/wallet/src/main/res/layout/fragment_transactions.xml index 97194d8..a2aebcd 100644 --- a/wallet/src/main/res/layout/fragment_show_history.xml +++ b/wallet/src/main/res/layout/fragment_transactions.xml @@ -20,22 +20,22 @@ android:layout_height="match_parent"> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/historyList" + android:id="@+id/list" android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" /> <TextView - android:id="@+id/historyEmptyState" + android:id="@+id/emptyState" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:text="@string/history_empty" + android:text="@string/transactions_empty" android:visibility="invisible" tools:visibility="visible" /> <ProgressBar - android:id="@+id/historyProgressBar" + android:id="@+id/progressBar" style="?android:progressBarStyleLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/wallet/src/main/res/layout/history_receive.xml b/wallet/src/main/res/layout/transaction_in.xml index 5f386a2..f116240 100644 --- a/wallet/src/main/res/layout/history_receive.xml +++ b/wallet/src/main/res/layout/transaction_in.xml @@ -32,18 +32,18 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/history_withdrawn" + app:srcCompat="@drawable/transaction_withdrawal" app:tint="?android:colorControlNormal" tools:ignore="ContentDescription" /> <TextView android:id="@+id/title" - style="@style/HistoryTitle" + style="@style/TransactionTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" - android:text="@string/history_event_withdrawn" + android:text="@string/transaction_withdrawal" app:layout_constraintEnd_toStartOf="@+id/amountWithdrawn" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="parent" /> diff --git a/wallet/src/main/res/layout/history_payment.xml b/wallet/src/main/res/layout/transaction_out.xml index 33cb676..49f76b7 100644 --- a/wallet/src/main/res/layout/history_payment.xml +++ b/wallet/src/main/res/layout/transaction_out.xml @@ -38,7 +38,7 @@ <TextView android:id="@+id/title" - style="@style/HistoryTitle" + style="@style/TransactionTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -46,7 +46,7 @@ app:layout_constraintEnd_toStartOf="@+id/amountPaidWithFees" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="parent" - tools:text="@string/history_event_payment_sent" /> + tools:text="@string/transaction_payment" /> <TextView android:id="@+id/summary" diff --git a/wallet/src/main/res/layout/history_row.xml b/wallet/src/main/res/layout/transaction_row.xml index 5eac44b..ac6bdb7 100644 --- a/wallet/src/main/res/layout/history_row.xml +++ b/wallet/src/main/res/layout/transaction_row.xml @@ -38,7 +38,7 @@ <TextView android:id="@+id/title" - style="@style/HistoryTitle" + style="@style/TransactionTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -46,7 +46,7 @@ app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" - tools:text="My History Event" /> + tools:text="My Transaction" /> <TextView android:id="@+id/info" |