From a9b2ec4f35851c26bbe4f62a2e7fa17d9ee79576 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 11 Jun 2020 15:40:29 -0300 Subject: [wallet] UI mockup for backup and anastasis --- .../settings/AnastasisAuthenticationFragment.kt | 91 +++++++++++++++ .../wallet/settings/AnastasisIdentityFragment.kt | 86 ++++++++++++++ .../wallet/settings/AnastasisIntroFragment.kt | 51 +++++++++ .../wallet/settings/BackupSettingsFragment.kt | 41 +++++++ .../net/taler/wallet/settings/SettingsFragment.kt | 125 +++++++++++++++++++++ 5 files changed, 394 insertions(+) create mode 100644 wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt create mode 100644 wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt create mode 100644 wallet/src/main/java/net/taler/wallet/settings/AnastasisIntroFragment.kt create mode 100644 wallet/src/main/java/net/taler/wallet/settings/BackupSettingsFragment.kt create mode 100644 wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt (limited to 'wallet/src/main/java/net/taler/wallet/settings') 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 + */ + +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 + */ + +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 + */ + +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 + */ + +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/settings/SettingsFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt new file mode 100644 index 0000000..31295d6 --- /dev/null +++ b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt @@ -0,0 +1,125 @@ +/* + * 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 + */ + +package net.taler.wallet.settings + +import android.os.Bundle +import android.view.View +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.activityViewModels +import androidx.lifecycle.Observer +import androidx.preference.Preference +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() { + + 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 + private lateinit var prefVersionCore: Preference + private lateinit var prefVersionExchange: Preference + private lateinit var prefVersionMerchant: Preference + private lateinit var prefReset: Preference + private val devPrefs by lazy { + listOf( + prefBackup, + prefWithdrawTest, + prefVersionApp, + prefVersionCore, + prefVersionExchange, + prefVersionMerchant, + prefReset + ) + } + + 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")!! + prefVersionCore = findPreference("pref_version_core")!! + prefVersionExchange = findPreference("pref_version_protocol_exchange")!! + prefVersionMerchant = findPreference("pref_version_protocol_merchant")!! + prefReset = findPreference("pref_reset")!! + } + + 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) { + prefVersionApp.summary = "$VERSION_NAME ($VERSION_CODE)" + prefVersionCore.summary = WALLET_CORE_VERSION + model.exchangeVersion?.let { prefVersionExchange.summary = it } + model.merchantVersion?.let { prefVersionMerchant.summary = it } + } + devPrefs.forEach { it.isVisible = enabled } + }) + prefDevMode.setOnPreferenceChangeListener { _, newValue -> + model.devMode.value = newValue as Boolean + true + } + + withdrawManager.testWithdrawalInProgress.observe(viewLifecycleOwner, Observer { loading -> + prefWithdrawTest.isEnabled = !loading + model.showProgressBar.value = loading + }) + prefWithdrawTest.setOnPreferenceClickListener { + withdrawManager.withdrawTestkudos() + true + } + + prefReset.setOnPreferenceClickListener { + showResetDialog() + true + } + } + + private fun showResetDialog() { + AlertDialog.Builder(requireContext()) + .setMessage("Do you really want to reset the wallet and lose all coins and purchases?") + .setPositiveButton("Reset") { _, _ -> + model.dangerouslyReset() + Snackbar.make(requireView(), "Wallet has been reset", LENGTH_SHORT).show() + } + .setNegativeButton("Cancel") { _, _ -> + Snackbar.make(requireView(), "Reset cancelled", LENGTH_SHORT).show() + } + .show() + } + +} -- cgit v1.2.3