diff options
| author | Torsten Grote <t@grobox.de> | 2020-08-04 09:46:38 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-08-04 09:46:38 -0300 |
| commit | 35f7ed512ed7445362d6caee1bf60441f4ce979e (patch) | |
| tree | 08fb02c802ff36065dd85fb9dcb95a0adabc03c3 /merchant-terminal/src/main/res | |
| parent | d3a035c59c508b7b0ef3c06a1b0f1f3c0a077bb8 (diff) | |
| download | taler-android-35f7ed512ed7445362d6caee1bf60441f4ce979e.tar.gz taler-android-35f7ed512ed7445362d6caee1bf60441f4ce979e.tar.bz2 taler-android-35f7ed512ed7445362d6caee1bf60441f4ce979e.zip | |
[pos] Implement new refund API (untested since there is no wallet support)
Also do a bit of code cleanup and minor refactorings
This also removes the volley HTTP library which is not needed anymore
Diffstat (limited to 'merchant-terminal/src/main/res')
3 files changed, 6 insertions, 6 deletions
diff --git a/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml b/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml index b19f14c..0061a1c 100644 --- a/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml +++ b/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml @@ -24,7 +24,7 @@ <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" - tools:context=".config.MerchantConfigFragment"> + tools:context=".config.ConfigFragment"> <com.google.android.material.textfield.TextInputLayout android:id="@+id/configUrlView" diff --git a/merchant-terminal/src/main/res/layout/fragment_refund.xml b/merchant-terminal/src/main/res/layout/fragment_refund.xml index 944da55..a13cd5a 100644 --- a/merchant-terminal/src/main/res/layout/fragment_refund.xml +++ b/merchant-terminal/src/main/res/layout/fragment_refund.xml @@ -19,7 +19,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".history.RefundFragment"> + tools:context=".refund.RefundFragment"> <com.google.android.material.textfield.TextInputLayout android:id="@+id/amountView" diff --git a/merchant-terminal/src/main/res/navigation/nav_graph.xml b/merchant-terminal/src/main/res/navigation/nav_graph.xml index 606f2de..2c9ef2c 100644 --- a/merchant-terminal/src/main/res/navigation/nav_graph.xml +++ b/merchant-terminal/src/main/res/navigation/nav_graph.xml @@ -54,7 +54,7 @@ <fragment android:id="@+id/nav_history" - android:name="net.taler.merchantpos.history.MerchantHistoryFragment" + android:name="net.taler.merchantpos.history.HistoryFragment" android:label="@string/history_label" tools:layout="@layout/fragment_merchant_history"> <action @@ -64,7 +64,7 @@ <fragment android:id="@+id/refundFragment" - android:name="net.taler.merchantpos.history.RefundFragment" + android:name="net.taler.merchantpos.refund.RefundFragment" android:label="@string/history_refund" tools:layout="@layout/fragment_refund"> <action @@ -75,13 +75,13 @@ <fragment android:id="@+id/refundUriFragment" - android:name="net.taler.merchantpos.history.RefundUriFragment" + android:name="net.taler.merchantpos.refund.RefundUriFragment" android:label="@string/history_refund" tools:layout="@layout/fragment_refund_uri" /> <fragment android:id="@+id/nav_settings" - android:name="net.taler.merchantpos.config.MerchantConfigFragment" + android:name="net.taler.merchantpos.config.ConfigFragment" android:label="@string/config_label" tools:layout="@layout/fragment_merchant_config"> <action |