summaryrefslogtreecommitdiff
path: root/wallet/src/main/res
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-04-15 11:26:51 -0300
committerTorsten Grote <t@grobox.de>2020-04-15 11:26:51 -0300
commitea3250845fb266a2ecd5ebeba561bc99101bf3de (patch)
treed726f2216efa9b3008741b0037db325725d0d90b /wallet/src/main/res
parent8e4f85d467c8e8109026a7195757ce9448ad7b19 (diff)
downloadtaler-android-ea3250845fb266a2ecd5ebeba561bc99101bf3de.tar.gz
taler-android-ea3250845fb266a2ecd5ebeba561bc99101bf3de.tar.bz2
taler-android-ea3250845fb266a2ecd5ebeba561bc99101bf3de.zip
[wallet] rename history to transactions
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r--wallet/src/main/res/drawable/transaction_payment_aborted.xml (renamed from wallet/src/main/res/drawable/history_payment_aborted.xml)0
-rw-r--r--wallet/src/main/res/drawable/transaction_refresh.xml (renamed from wallet/src/main/res/drawable/history_refresh.xml)0
-rw-r--r--wallet/src/main/res/drawable/transaction_refund.xml (renamed from wallet/src/main/res/drawable/history_refund.xml)0
-rw-r--r--wallet/src/main/res/drawable/transaction_tip_accepted.xml (renamed from wallet/src/main/res/drawable/history_tip_accepted.xml)0
-rw-r--r--wallet/src/main/res/drawable/transaction_tip_declined.xml (renamed from wallet/src/main/res/drawable/history_tip_declined.xml)0
-rw-r--r--wallet/src/main/res/drawable/transaction_withdrawal.xml (renamed from wallet/src/main/res/drawable/history_withdrawn.xml)0
-rw-r--r--wallet/src/main/res/layout/fragment_event_paid.xml30
-rw-r--r--wallet/src/main/res/layout/fragment_event_withdraw.xml12
-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
-rw-r--r--wallet/src/main/res/menu/fragment_main.xml (renamed from wallet/src/main/res/menu/balance.xml)0
-rw-r--r--wallet/src/main/res/menu/transactions.xml (renamed from wallet/src/main/res/menu/history.xml)11
-rw-r--r--wallet/src/main/res/menu/transactions_detail.xml (renamed from wallet/src/main/res/menu/history_event.xml)2
-rw-r--r--wallet/src/main/res/navigation/nav_graph.xml21
-rw-r--r--wallet/src/main/res/values/strings.xml74
-rw-r--r--wallet/src/main/res/values/styles.xml8
-rw-r--r--wallet/src/main/res/xml/settings_main.xml2
19 files changed, 81 insertions, 101 deletions
diff --git a/wallet/src/main/res/drawable/history_payment_aborted.xml b/wallet/src/main/res/drawable/transaction_payment_aborted.xml
index 8d47c26..8d47c26 100644
--- a/wallet/src/main/res/drawable/history_payment_aborted.xml
+++ b/wallet/src/main/res/drawable/transaction_payment_aborted.xml
diff --git a/wallet/src/main/res/drawable/history_refresh.xml b/wallet/src/main/res/drawable/transaction_refresh.xml
index 219b891..219b891 100644
--- a/wallet/src/main/res/drawable/history_refresh.xml
+++ b/wallet/src/main/res/drawable/transaction_refresh.xml
diff --git a/wallet/src/main/res/drawable/history_refund.xml b/wallet/src/main/res/drawable/transaction_refund.xml
index 6c3d0a7..6c3d0a7 100644
--- a/wallet/src/main/res/drawable/history_refund.xml
+++ b/wallet/src/main/res/drawable/transaction_refund.xml
diff --git a/wallet/src/main/res/drawable/history_tip_accepted.xml b/wallet/src/main/res/drawable/transaction_tip_accepted.xml
index b945b53..b945b53 100644
--- a/wallet/src/main/res/drawable/history_tip_accepted.xml
+++ b/wallet/src/main/res/drawable/transaction_tip_accepted.xml
diff --git a/wallet/src/main/res/drawable/history_tip_declined.xml b/wallet/src/main/res/drawable/transaction_tip_declined.xml
index 4bd1633..4bd1633 100644
--- a/wallet/src/main/res/drawable/history_tip_declined.xml
+++ b/wallet/src/main/res/drawable/transaction_tip_declined.xml
diff --git a/wallet/src/main/res/drawable/history_withdrawn.xml b/wallet/src/main/res/drawable/transaction_withdrawal.xml
index 4fd64f5..4fd64f5 100644
--- a/wallet/src/main/res/drawable/history_withdrawn.xml
+++ b/wallet/src/main/res/drawable/transaction_withdrawal.xml
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"
diff --git a/wallet/src/main/res/menu/balance.xml b/wallet/src/main/res/menu/fragment_main.xml
index d4568d4..d4568d4 100644
--- a/wallet/src/main/res/menu/balance.xml
+++ b/wallet/src/main/res/menu/fragment_main.xml
diff --git a/wallet/src/main/res/menu/history.xml b/wallet/src/main/res/menu/transactions.xml
index bd50f5d..d4568d4 100644
--- a/wallet/src/main/res/menu/history.xml
+++ b/wallet/src/main/res/menu/transactions.xml
@@ -16,15 +16,4 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
- <item
- android:id="@+id/show_all_history"
- android:checkable="true"
- android:checked="false"
- android:title="@string/history_show_all"
- app:showAsAction="never" />
- <item
- android:id="@+id/reload_history"
- android:orderInCategory="100"
- android:title="@string/history_reload"
- app:showAsAction="never" />
</menu>
diff --git a/wallet/src/main/res/menu/history_event.xml b/wallet/src/main/res/menu/transactions_detail.xml
index 45a1e0e..388e3c4 100644
--- a/wallet/src/main/res/menu/history_event.xml
+++ b/wallet/src/main/res/menu/transactions_detail.xml
@@ -18,6 +18,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/show_json"
- android:title="@string/history_detail_json"
+ android:title="@string/transactions_detail_json"
app:showAsAction="never" />
</menu>
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index d4257b9..f8927a6 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -55,23 +55,22 @@
<fragment
android:id="@+id/settings"
android:name="net.taler.wallet.SettingsFragment"
- android:label="Settings"
- tools:layout="@layout/fragment_settings" />
+ android:label="Settings" />
<fragment
- android:id="@+id/walletHistory"
- android:name="net.taler.wallet.history.HistoryFragment"
- android:label="@string/history_title"
- tools:layout="@layout/fragment_show_history">
+ android:id="@+id/nav_transactions"
+ android:name="net.taler.wallet.transactions.TransactionsFragment"
+ android:label="@string/transactions_title"
+ tools:layout="@layout/fragment_transactions">
<action
- android:id="@+id/action_walletHistory_to_historyEventFragment"
- app:destination="@id/historyEventFragment" />
+ android:id="@+id/action_nav_transactions_to_nav_transaction_detail"
+ app:destination="@id/nav_transactions_detail" />
</fragment>
<fragment
- android:id="@+id/historyEventFragment"
- android:name="net.taler.wallet.history.HistoryEventFragment"
- android:label="@string/history_detail_title"
+ android:id="@+id/nav_transactions_detail"
+ android:name="net.taler.wallet.transactions.TransactionDetailFragment"
+ android:label="@string/transactions_detail_title"
tools:layout="@layout/fragment_event_withdraw" />
<fragment
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index 8eec297..d2840de 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -30,55 +30,50 @@
<string name="button_continue">Continue</string>
<string name="button_scan_qr_code">Scan Taler QR Code</string>
- <string name="menu_history">History</string>
<string name="menu_settings">Settings</string>
- <string name="menu_balance_reload">Reload balances</string>
- <string name="menu_developer_mode">Developer Mode</string>
<string name="menu_retry_pending_operations">Retry Pending Operations</string>
<string name="servicedesc">my service</string>
<string name="aiddescription">my aid</string>
<string name="balances_title">Balances</string>
- <string name="amount_positive">+%s</string>
- <string name="amount_negative">-%s</string>
+ <string name="amount_positive">+ %s</string>
+ <string name="amount_negative">- %s</string>
<string name="amount_chosen">Chosen Amount</string>
<string name="balances_inbound_label">inbound</string>
<string name="balances_empty_state">There is no digital cash in your wallet.\n\nYou can get test money from the demo bank:\n\nhttps://bank.demo.taler.net</string>
- <string name="history_title">History</string>
- <string name="history_show_all">Show All</string>
- <string name="history_reload">Reload History</string>
- <string name="history_empty">The wallet history is empty</string>
- <string name="history_error">Could not load history</string>
- <string name="history_detail_title">Transaction</string>
- <string name="history_detail_json">Show JSON</string>
+ <string name="transactions_title">Transactions</string>
+ <string name="transactions_empty">You don\'t have any transactions</string>
+ <string name="transactions_error">Could not load transactions</string>
+ <string name="transactions_detail_title">Transaction</string>
+ <string name="transactions_detail_json">Show JSON</string>
- <!-- HistoryEvents -->
+ <!-- Transactions -->
<string name="history_event_exchange_added">Exchange Added</string>
<string name="history_event_exchange_updated">Exchange Updated</string>
- <string name="history_event_reserve_balance_updated">Reserve Balance Updated</string>
- <string name="history_event_payment_sent">Payment</string>
- <string name="history_event_payment_sent_paid">Paid</string>
- <string name="history_event_payment_sent_amount">Order Total</string>
- <string name="history_event_payment_sent_order">Order</string>
- <string name="history_event_payment_sent_order_id">Order Reference: %1$s</string>
- <string name="history_event_payment_aborted">Payment Aborted</string>
- <string name="history_event_withdrawn">Withdraw</string>
- <string name="history_event_order_accepted">Purchase Confirmed</string>
- <string name="history_event_order_refused">Purchase Cancelled</string>
- <string name="history_event_tip_accepted">Tip Accepted</string>
- <string name="history_event_tip_declined">Tip Declined</string>
- <string name="history_event_order_redirected">Purchase Redirected</string>
- <string name="history_event_refund">Refund</string>
- <string name="history_event_refreshed">Obtained change</string>
- <string name="history_event_refresh_reason_manual">because of manual request</string>
- <string name="history_event_refresh_reason_pay">for payment</string>
- <string name="history_event_refresh_reason_refund">for refund</string>
- <string name="history_event_refresh_reason_abort_pay">to abort payment</string>
- <string name="history_event_refresh_reason_recoup">to recoup funds</string>
- <string name="history_event_refresh_reason_backup_restored">because of restoring from backup</string>
- <string name="history_event_unknown">Unknown Event</string>
+ <string name="transaction_reserve_balance_updated">Reserve Balance Updated</string>
+ <string name="transaction_payment">Payment</string>
+ <string name="transaction_paid">Paid</string>
+ <string name="transaction_order_total">Order Total</string>
+ <string name="transaction_order">Order</string>
+ <string name="transaction_order_id">Order Reference: %1$s</string>
+ <string name="transaction_payment_aborted">Payment Aborted</string>
+ <string name="transaction_withdrawal">Withdraw</string>
+ <string name="transaction_order_accepted">Purchase Confirmed</string>
+ <string name="transaction_order_refused">Purchase Cancelled</string>
+ <string name="transaction_tip_accepted">Tip Accepted</string>
+ <string name="transaction_tip_declined">Tip Declined</string>
+ <string name="transaction_order_redirected">Purchase Redirected</string>
+ <string name="transaction_refund">Refund</string>
+ <string name="transaction_refresh">Obtained change</string>
+ <string name="transaction_refresh_reason_manual">because of manual request</string>
+ <string name="transaction_refresh_reason_pay">for payment</string>
+ <string name="transaction_refresh_reason_refund">for refund</string>
+ <string name="transaction_refresh_reason_abort_pay">to abort payment</string>
+ <string name="transaction_refresh_reason_recoup">to recoup funds</string>
+ <string name="transaction_refresh_reason_backup_restored">because of restoring from backup</string>
+ <string name="transaction_unknown">Unknown Transaction</string>
<string name="payment_fee">+%s payment fee</string>
<string name="payment_button_confirm">Confirm Payment</string>
@@ -118,21 +113,18 @@
<string name="exchange_fee_wire_fee_timespan">Timespan: %1$s - %2$s</string>
<string name="exchange_fee_wire_fee_wire_fee">Wire Fee: %s</string>
<string name="exchange_fee_wire_fee_closing_fee">Closing Fee: %s</string>
+ <string name="exchange_tos_accept">Accept Terms of Service</string>
<string name="pending_operations_title">Pending Operations</string>
<string name="pending_operations_refuse">Refuse Proposal</string>
<string name="pending_operations_no_action">(no action)</string>
- <string name="settings_version">Version Information</string>
- <string name="exchange_tos_accept">Accept Terms of Service</string>
- <string name="settings_backups">Backups</string>
- <string name="settings_export_to_file">Export wallet to file</string>
- <string name="settings_import_from_file">Import from file</string>
+ <string name="settings_dev_mode">Developer Mode</string>
+ <string name="settings_dev_mode_summary">Shows more information intended for debugging</string>
<string name="settings_withdraw_testkudos">Withdraw TESTKUDOS</string>
<string name="settings_withdraw_testkudos_summary">Get money for testing</string>
<string name="settings_reset">Reset Wallet (dangerous!)</string>
<string name="settings_reset_summary">Throws away your money</string>
- <string name="settings_dev_mode_summary">Shows more information intended for debugging</string>
<string name="refund_error">Error processing refund</string>
<string name="refund_success">Refund received</string>
diff --git a/wallet/src/main/res/values/styles.xml b/wallet/src/main/res/values/styles.xml
index 9ebcae5..c8a2c3b 100644
--- a/wallet/src/main/res/values/styles.xml
+++ b/wallet/src/main/res/values/styles.xml
@@ -33,12 +33,12 @@
<style name="AppTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar.Primary" />
- <style name="HistoryTitle">
+ <style name="TransactionTitle">
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
- <style name="HistoryEventLabel">
+ <style name="TransactionLabel">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginStart">16dp</item>
@@ -47,12 +47,12 @@
<item name="android:gravity">center</item>
</style>
- <style name="HistoryEventLabel.Time">
+ <style name="TransactionLabel.Time">
<item name="android:layout_marginBottom">16dp</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
</style>
- <style name="HistoryEventContent">
+ <style name="TransactionContent">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginStart">16dp</item>
diff --git a/wallet/src/main/res/xml/settings_main.xml b/wallet/src/main/res/xml/settings_main.xml
index 90f5f6c..d200bb5 100644
--- a/wallet/src/main/res/xml/settings_main.xml
+++ b/wallet/src/main/res/xml/settings_main.xml
@@ -21,7 +21,7 @@
app:icon="@drawable/ic_developer_mode"
app:key="pref_dev_mode"
app:summary="@string/settings_dev_mode_summary"
- app:title="@string/menu_developer_mode" />
+ app:title="@string/settings_dev_mode" />
<Preference
app:icon="@drawable/ic_cash_usd_outline"