From 20a83c6618236e269b2540990f6a687b5598c889 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 6 Feb 2024 14:26:12 -0300
Subject: [wallet] bye bye tips!

---
 .../main/res/drawable/ic_baseline_account_tree.xml |  10 -
 .../src/main/res/drawable/ic_baseline_backup.xml   |  10 -
 .../src/main/res/drawable/ic_baseline_vpn_key.xml  |  10 -
 .../main/res/layout/fragment_already_accepted.xml  |  52 -----
 wallet/src/main/res/layout/fragment_prompt_tip.xml | 257 ---------------------
 wallet/src/main/res/navigation/nav_graph.xml       |  25 --
 wallet/src/main/res/values/defaults.xml            |   2 -
 wallet/src/main/res/values/strings.xml             |  10 -
 8 files changed, 376 deletions(-)
 delete mode 100644 wallet/src/main/res/drawable/ic_baseline_account_tree.xml
 delete mode 100644 wallet/src/main/res/drawable/ic_baseline_backup.xml
 delete mode 100644 wallet/src/main/res/drawable/ic_baseline_vpn_key.xml
 delete mode 100644 wallet/src/main/res/layout/fragment_already_accepted.xml
 delete mode 100644 wallet/src/main/res/layout/fragment_prompt_tip.xml

(limited to 'wallet/src/main/res')

diff --git a/wallet/src/main/res/drawable/ic_baseline_account_tree.xml b/wallet/src/main/res/drawable/ic_baseline_account_tree.xml
deleted file mode 100644
index 7067bd3..0000000
--- a/wallet/src/main/res/drawable/ic_baseline_account_tree.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M22,11V3h-7v3H9V3H2v8h7V8h2v10h4v3h7v-8h-7v3h-2V8h2v3z" />
-</vector>
diff --git a/wallet/src/main/res/drawable/ic_baseline_backup.xml b/wallet/src/main/res/drawable/ic_baseline_backup.xml
deleted file mode 100644
index 006b014..0000000
--- a/wallet/src/main/res/drawable/ic_baseline_backup.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z" />
-</vector>
diff --git a/wallet/src/main/res/drawable/ic_baseline_vpn_key.xml b/wallet/src/main/res/drawable/ic_baseline_vpn_key.xml
deleted file mode 100644
index 7b554c9..0000000
--- a/wallet/src/main/res/drawable/ic_baseline_vpn_key.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
-</vector>
diff --git a/wallet/src/main/res/layout/fragment_already_accepted.xml b/wallet/src/main/res/layout/fragment_already_accepted.xml
deleted file mode 100644
index b1a7bb1..0000000
--- a/wallet/src/main/res/layout/fragment_already_accepted.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ This file is part of GNU Taler
-  ~ (C) 2020 Taler Systems S.A.
-  ~
-  ~ GNU Taler is free software; you can redistribute it and/or modify it under the
-  ~ terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 3, or (at your option) any later version.
-  ~
-  ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  ~ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with
-  ~ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="15dp"
-    android:orientation="vertical"
-    tools:context=".tip.AlreadyAcceptedFragment">
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_gravity="center"
-        android:text="@string/tip_already_accepted"
-        android:textAlignment="center"
-        android:textColor="@android:color/holo_green_dark"
-        app:autoSizeTextType="uniform" />
-
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <Button
-        android:id="@+id/backButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/button_back" />
-
-</LinearLayout>
diff --git a/wallet/src/main/res/layout/fragment_prompt_tip.xml b/wallet/src/main/res/layout/fragment_prompt_tip.xml
deleted file mode 100644
index e3b32cd..0000000
--- a/wallet/src/main/res/layout/fragment_prompt_tip.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ This file is part of GNU Taler
-  ~ (C) 2020 Taler Systems S.A.
-  ~
-  ~ GNU Taler is free software; you can redistribute it and/or modify it under the
-  ~ terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 3, or (at your option) any later version.
-  ~
-  ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  ~ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with
-  ~ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".tip.PromptTipFragment">
-
-    <TextView
-        android:id="@+id/introView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:text="@string/tip_total"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/effectiveAmountView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:textColor="@color/green"
-        android:textSize="24sp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/introView"
-        tools:text="9.8 TESTKUDOS"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/chosenAmountLabel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:text="@string/amount_chosen"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/chosenAmountView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/chosenAmountView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:textSize="20sp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/feeLabel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chosenAmountLabel"
-        tools:text="10 TESTKUDOS"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/feeLabel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:text="@string/tip_fees"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/feeView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chosenAmountView"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/feeView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:textColor="?colorError"
-        android:textSize="20sp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/feeLabel"
-        tools:text="-0.2 TESTKUDOS"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/exchangeIntroView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:text="@string/tip_exchange"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/withdrawExchangeUrl"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/feeView"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/withdrawExchangeUrl"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:textSize="24sp"
-        android:visibility="invisible"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/merchantIntroView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/exchangeIntroView"
-        tools:text="demo.taler.net"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/merchantIntroView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:text="@string/tip_merchant_url"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/withdrawMerchantUrl"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/withdrawExchangeUrl"
-        tools:visibility="visible" />
-
-
-    <TextView
-        android:id="@+id/withdrawMerchantUrl"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="8dp"
-        android:gravity="center"
-        android:textSize="24sp"
-        android:visibility="invisible"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/withdrawCard"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.502"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/merchantIntroView"
-        tools:text="merchant.demo.taler.net"
-        tools:visibility="visible" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/withdrawCard"
-        style="@style/BottomCard"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="visible">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dp">
-
-            <Button
-                android:id="@+id/confirmWithdrawButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:backgroundTint="@color/green"
-                android:enabled="false"
-                android:text="@string/tip_button_confirm"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:enabled="true"
-                tools:text="@string/tip_button_confirm" />
-
-            <ProgressBar
-                android:id="@+id/confirmProgressBar"
-                style="?android:attr/progressBarStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="invisible"
-                app:layout_constraintBottom_toBottomOf="@+id/confirmWithdrawButton"
-                app:layout_constraintEnd_toEndOf="@+id/confirmWithdrawButton"
-                app:layout_constraintStart_toStartOf="@+id/confirmWithdrawButton"
-                app:layout_constraintTop_toTopOf="@+id/confirmWithdrawButton"
-                tools:visibility="visible" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index 24def7f..3ea02fc 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -69,21 +69,6 @@
             app:destination="@id/nav_deposit" />
     </fragment>
 
-    <fragment
-        android:id="@+id/promptTip"
-        android:name="net.taler.wallet.tip.PromptTipFragment"
-        android:label="Review Tip"
-        tools:layout="@layout/fragment_prompt_tip">
-        <action
-            android:id="@+id/action_promptTip_to_nav_main"
-            app:destination="@id/nav_main"
-            app:popUpTo="@id/nav_main" />
-        <action
-            android:id="@+id/action_promptTip_to_alreadyAccepted"
-            app:destination="@id/alreadyAccepted"
-            app:popUpTo="@id/nav_main" />
-    </fragment>
-
     <fragment
         android:id="@+id/promptPayment"
         android:name="net.taler.wallet.payment.PromptPaymentFragment"
@@ -289,12 +274,6 @@
         android:name="net.taler.wallet.transactions.TransactionDummyFragment"
         android:label="@string/transactions_detail_title" />
 
-    <fragment
-        android:id="@+id/alreadyAccepted"
-        android:name="net.taler.wallet.tip.AlreadyAcceptedFragment"
-        android:label="@string/tip_already_accepted"
-        tools:layout="@layout/fragment_already_accepted" />
-
     <fragment
         android:id="@+id/promptWithdraw"
         android:name="net.taler.wallet.withdraw.PromptWithdrawFragment"
@@ -369,10 +348,6 @@
         android:id="@+id/action_global_promptPayment"
         app:destination="@id/promptPayment" />
 
-    <action
-        android:id="@+id/action_global_promptTip"
-        app:destination="@id/promptTip" />
-
     <action
         android:id="@+id/action_global_prompt_pull_payment"
         app:destination="@id/promptPullPayment" />
diff --git a/wallet/src/main/res/values/defaults.xml b/wallet/src/main/res/values/defaults.xml
index 0e2a6a1..dffc14e 100644
--- a/wallet/src/main/res/values/defaults.xml
+++ b/wallet/src/main/res/values/defaults.xml
@@ -16,6 +16,4 @@
 
 <resources>
 
-    <bool name="settings_backup_default">true</bool>
-
 </resources>
\ No newline at end of file
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index 436116e..6dac8a8 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -109,7 +109,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
     <string name="transaction_order_total">Total</string>
     <string name="transaction_order">Purchase</string>
     <string name="transaction_order_id">Receipt #%1$s</string>
-    <string name="transaction_tip_from">Reward from %s</string>
     <string name="transaction_refund">Refund</string>
     <string name="transaction_refund_from">Refund from %s</string>
     <string name="transaction_pending">PENDING</string>
@@ -295,15 +294,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
     <string name="refund_error">Error processing refund</string>
     <string name="refund_success">Refund received!</string>
 
-    <string name="tip_title">Reward</string>
-    <string name="tip_already_accepted">This reward was already accepted.</string>
-    <string name="tip_total">Total</string>
-    <string name="tip_fees">Fee</string>
-    <string name="tip_exchange">Exchange</string>
-    <string name="tip_merchant_url">Merchant URL</string>
-    <string name="tip_button_confirm">Accept reward</string>
-    <string name="tip_received">Reward received</string>
-
     <string name="wifi_disabled_error">Turn on Wi-Fi to get free Wi-Fi</string>
     <string name="wifi_connect_error">Could not connect to free Wi-Fi: %s</string>
 
-- 
cgit v1.2.3