aboutsummaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler
diff options
context:
space:
mode:
Diffstat (limited to 'wallet/src/main/java/net/taler')
-rw-r--r--wallet/src/main/java/net/taler/wallet/MainActivity.kt17
-rw-r--r--wallet/src/main/java/net/taler/wallet/MainViewModel.kt10
-rw-r--r--wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt91
-rw-r--r--wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt86
-rw-r--r--wallet/src/main/java/net/taler/wallet/settings/AnastasisIntroFragment.kt51
-rw-r--r--wallet/src/main/java/net/taler/wallet/settings/BackupSettingsFragment.kt41
-rw-r--r--wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt (renamed from wallet/src/main/java/net/taler/wallet/SettingsFragment.kt)13
7 files changed, 307 insertions, 2 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
index f626e4f..c687a0e 100644
--- a/wallet/src/main/java/net/taler/wallet/MainActivity.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
@@ -37,6 +37,9 @@ import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.setupWithNavController
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceFragmentCompat.OnPreferenceStartFragmentCallback
import com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener
import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG
import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT
@@ -54,7 +57,8 @@ import net.taler.wallet.HostCardEmulatorService.Companion.TRIGGER_PAYMENT_ACTION
import net.taler.wallet.refund.RefundStatus
import java.util.Locale.ROOT
-class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener {
+class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener,
+ OnPreferenceStartFragmentCallback {
private val model: MainViewModel by viewModels()
@@ -206,4 +210,15 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener {
}
}
+ override fun onPreferenceStartFragment(
+ caller: PreferenceFragmentCompat,
+ pref: Preference
+ ): Boolean {
+ when (pref.key) {
+ "pref_backup" -> nav.navigate(R.id.action_nav_settings_to_nav_settings_backup)
+ "pref_backup_recovery" -> nav.navigate(R.id.action_nav_settings_backup_to_nav_anastasis_intro)
+ }
+ return true
+ }
+
}
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
index 75cab67..c69c31c 100644
--- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
@@ -40,6 +40,9 @@ import net.taler.wallet.refund.RefundManager
import net.taler.wallet.transactions.TransactionManager
import net.taler.wallet.withdraw.WithdrawManager
import org.json.JSONObject
+import java.util.concurrent.TimeUnit.DAYS
+import java.util.concurrent.TimeUnit.MINUTES
+import kotlin.random.Random
const val TAG = "taler-wallet"
@@ -103,6 +106,13 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) {
private val mTransactionsEvent = MutableLiveData<Event<String>>()
val transactionsEvent: LiveData<Event<String>> = mTransactionsEvent
+ private val mLastBackup = MutableLiveData(
+ // fake backup time until we actually do backup
+ System.currentTimeMillis() -
+ Random.nextLong(MINUTES.toMillis(5), DAYS.toMillis(2))
+ )
+ val lastBackup: LiveData<Long> = mLastBackup
+
override fun onCleared() {
walletBackendApi.destroy()
super.onCleared()
diff --git a/wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt
new file mode 100644
index 0000000..96b0928
--- /dev/null
+++ b/wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt
@@ -0,0 +1,91 @@
+/*
+ * 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/>
+ */
+
+package net.taler.wallet.settings
+
+import android.os.Bundle
+import android.view.Gravity.CENTER
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import android.widget.Toast.LENGTH_SHORT
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import com.google.android.material.card.MaterialCardView
+import kotlinx.android.synthetic.main.fragment_anastasis_authentication.*
+import net.taler.common.Amount
+import net.taler.wallet.MainViewModel
+import net.taler.wallet.R
+
+
+class AnastasisAuthenticationFragment : Fragment() {
+
+ private val model: MainViewModel by activityViewModels()
+
+ private var price: Amount = Amount.zero("KUDOS")
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_anastasis_authentication, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ passwordCard.setOnClickListener {
+ toggleCard(
+ passwordCard,
+ Amount.fromJSONString("KUDOS:0.5")
+ )
+ }
+ postidentCard.setOnClickListener {
+ toggleCard(
+ postidentCard,
+ Amount.fromJSONString("KUDOS:3.5")
+ )
+ }
+ smsCard.setOnClickListener { toggleCard(smsCard, Amount.fromJSONString("KUDOS:1.0")) }
+ videoCard.setOnClickListener { toggleCard(videoCard, Amount.fromJSONString("KUDOS:2.25")) }
+ }
+
+ private fun toggleCard(card: MaterialCardView, price: Amount) {
+ card.isChecked = !card.isChecked
+ val text = "Imagine you entered information here"
+ if (card.isChecked) Toast.makeText(requireContext(), text, LENGTH_SHORT).apply {
+ setGravity(CENTER, 0, 0)
+ }.show()
+ updatePrice(card.isChecked, price)
+ updateNextButtonState()
+ }
+
+ private fun updatePrice(add: Boolean, amount: Amount) {
+ if (add) price += amount
+ else price -= amount
+ recoveryCostView.text = "Recovery cost: $price"
+ }
+
+ private fun updateNextButtonState() {
+ var numChecked = 0
+ numChecked += if (passwordCard.isChecked) 1 else 0
+ numChecked += if (postidentCard.isChecked) 1 else 0
+ numChecked += if (smsCard.isChecked) 1 else 0
+ numChecked += if (videoCard.isChecked) 1 else 0
+ nextAuthButton.isEnabled = numChecked >= 2
+ }
+
+}
diff --git a/wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt
new file mode 100644
index 0000000..562bcd0
--- /dev/null
+++ b/wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt
@@ -0,0 +1,86 @@
+/*
+ * 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/>
+ */
+
+package net.taler.wallet.settings
+
+import android.annotation.SuppressLint
+import android.app.DatePickerDialog
+import android.os.Bundle
+import android.telephony.TelephonyManager
+import android.text.format.DateFormat.getDateFormat
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.fragment_anastasis_identity.*
+import net.taler.wallet.MainViewModel
+import net.taler.wallet.R
+import java.util.*
+
+class AnastasisIdentityFragment : Fragment() {
+
+ private val model: MainViewModel by activityViewModels()
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_anastasis_identity, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ countryView.text = getCountryName()
+ changeCountryView.setOnClickListener {
+ Snackbar.make(view, "Not implemented", Snackbar.LENGTH_SHORT).show()
+ }
+ birthDateInput.editText?.setOnClickListener {
+ val picker = DatePickerDialog(requireContext())
+ picker.setOnDateSetListener { _, year, month, dayOfMonth ->
+ val calender = Calendar.getInstance().apply {
+ set(year, month, dayOfMonth)
+ }
+ val date = Date(calender.timeInMillis)
+ val dateStr = getDateFormat(requireContext()).format(date)
+ birthDateInput.editText?.setText(dateStr)
+ }
+ picker.show()
+ }
+ createIdentifierButton.setOnClickListener {
+ findNavController().navigate(R.id.action_nav_anastasis_intro_to_nav_anastasis_authentication)
+ }
+ }
+
+ private fun getCountryName(): String {
+ val tm = requireContext().getSystemService(TelephonyManager::class.java)!!
+ val countryIso = if (tm.networkCountryIso.isNullOrEmpty())
+ tm.simCountryIso else tm.networkCountryIso
+ var countryName = "Unknown"
+ for (locale in Locale.getAvailableLocales()) {
+ @SuppressLint("DefaultLocale")
+ if (locale.country.toLowerCase() == countryIso) {
+ countryName = locale.displayCountry
+ break
+ }
+ }
+ return countryName
+ }
+
+}
diff --git a/wallet/src/main/java/net/taler/wallet/settings/AnastasisIntroFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/AnastasisIntroFragment.kt
new file mode 100644
index 0000000..463f5b8
--- /dev/null
+++ b/wallet/src/main/java/net/taler/wallet/settings/AnastasisIntroFragment.kt
@@ -0,0 +1,51 @@
+/*
+ * 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/>
+ */
+
+package net.taler.wallet.settings
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
+import kotlinx.android.synthetic.main.fragment_anastasis_intro.*
+import net.taler.wallet.MainViewModel
+import net.taler.wallet.R
+
+
+class AnastasisIntroFragment : Fragment() {
+
+ private val model: MainViewModel by activityViewModels()
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_anastasis_intro, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ button.setOnClickListener {
+ findNavController().navigate(R.id.action_nav_anastasis_intro_to_nav_anastasis_identity)
+ }
+ }
+
+
+}
diff --git a/wallet/src/main/java/net/taler/wallet/settings/BackupSettingsFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/BackupSettingsFragment.kt
new file mode 100644
index 0000000..f820661
--- /dev/null
+++ b/wallet/src/main/java/net/taler/wallet/settings/BackupSettingsFragment.kt
@@ -0,0 +1,41 @@
+/*
+ * 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/>
+ */
+
+package net.taler.wallet.settings
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.activityViewModels
+import androidx.preference.PreferenceFragmentCompat
+import net.taler.wallet.MainViewModel
+import net.taler.wallet.R
+
+
+class BackupSettingsFragment : PreferenceFragmentCompat() {
+
+ private val model: MainViewModel by activityViewModels()
+
+ override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+ setPreferencesFromResource(R.xml.settings_backup, rootKey)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ }
+
+
+}
diff --git a/wallet/src/main/java/net/taler/wallet/SettingsFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
index 97deaa5..31295d6 100644
--- a/wallet/src/main/java/net/taler/wallet/SettingsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.wallet
+package net.taler.wallet.settings
import android.os.Bundle
import android.view.View
@@ -26,9 +26,12 @@ import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreferenceCompat
import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT
import com.google.android.material.snackbar.Snackbar
+import net.taler.common.toRelativeTime
import net.taler.wallet.BuildConfig.VERSION_CODE
import net.taler.wallet.BuildConfig.VERSION_NAME
import net.taler.wallet.BuildConfig.WALLET_CORE_VERSION
+import net.taler.wallet.MainViewModel
+import net.taler.wallet.R
class SettingsFragment : PreferenceFragmentCompat() {
@@ -36,6 +39,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
private val model: MainViewModel by activityViewModels()
private val withdrawManager by lazy { model.withdrawManager }
+ private lateinit var prefBackup: Preference
private lateinit var prefDevMode: SwitchPreferenceCompat
private lateinit var prefWithdrawTest: Preference
private lateinit var prefVersionApp: Preference
@@ -45,6 +49,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
private lateinit var prefReset: Preference
private val devPrefs by lazy {
listOf(
+ prefBackup,
prefWithdrawTest,
prefVersionApp,
prefVersionCore,
@@ -56,6 +61,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.settings_main, rootKey)
+ prefBackup = findPreference("pref_backup")!!
prefDevMode = findPreference("pref_dev_mode")!!
prefWithdrawTest = findPreference("pref_testkudos")!!
prefVersionApp = findPreference("pref_version_app")!!
@@ -68,6 +74,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ model.lastBackup.observe(viewLifecycleOwner, Observer {
+ val time = it.toRelativeTime(requireContext())
+ prefBackup.summary = getString(R.string.backup_last, time)
+ })
+
model.devMode.observe(viewLifecycleOwner, Observer { enabled ->
prefDevMode.isChecked = enabled
if (enabled) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 20:41:04 +0000