From 98d693d48ad491b19d89e5d394c2e54a36731728 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 22 Jun 2020 14:58:18 -0300 Subject: [wallet] Improve Anastasis UI mockup --- .../settings/AnastasisAuthenticationFragment.kt | 47 ++++++++- .../wallet/settings/AnastasisIdentityFragment.kt | 14 ++- .../net/taler/wallet/settings/AnastasisManager.kt | 27 +++++ .../wallet/settings/SecurityQuestionFragment.kt | 56 ++++++++++ .../java/net/taler/wallet/settings/SmsFragment.kt | 56 ++++++++++ .../net/taler/wallet/settings/VideoFragment.kt | 117 +++++++++++++++++++++ 6 files changed, 310 insertions(+), 7 deletions(-) create mode 100644 wallet/src/main/java/net/taler/wallet/settings/AnastasisManager.kt create mode 100644 wallet/src/main/java/net/taler/wallet/settings/SecurityQuestionFragment.kt create mode 100644 wallet/src/main/java/net/taler/wallet/settings/SmsFragment.kt create mode 100644 wallet/src/main/java/net/taler/wallet/settings/VideoFragment.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 index 96b0928..4421d46 100644 --- a/wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt @@ -23,8 +23,12 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import android.widget.Toast.LENGTH_SHORT +import androidx.annotation.IdRes import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels +import androidx.lifecycle.Observer +import androidx.navigation.fragment.FragmentNavigatorExtras +import androidx.navigation.fragment.findNavController import com.google.android.material.card.MaterialCardView import kotlinx.android.synthetic.main.fragment_anastasis_authentication.* import net.taler.common.Amount @@ -35,6 +39,7 @@ import net.taler.wallet.R class AnastasisAuthenticationFragment : Fragment() { private val model: MainViewModel by activityViewModels() + private val anastasisManager by lazy { model.anastasisManager } private var price: Amount = Amount.zero("KUDOS") @@ -48,9 +53,10 @@ class AnastasisAuthenticationFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) passwordCard.setOnClickListener { - toggleCard( + showDialog( + R.id.action_nav_anastasis_authentication_to_securityQuestionFragment, passwordCard, - Amount.fromJSONString("KUDOS:0.5") + "question_card" ) } postidentCard.setOnClickListener { @@ -59,8 +65,41 @@ class AnastasisAuthenticationFragment : Fragment() { Amount.fromJSONString("KUDOS:3.5") ) } - smsCard.setOnClickListener { toggleCard(smsCard, Amount.fromJSONString("KUDOS:1.0")) } - videoCard.setOnClickListener { toggleCard(videoCard, Amount.fromJSONString("KUDOS:2.25")) } + smsCard.setOnClickListener { + showDialog( + R.id.action_nav_anastasis_authentication_to_smsFragment, + smsCard, + "sms_card" + ) + } + videoCard.setOnClickListener { + showDialog( + R.id.action_nav_anastasis_authentication_to_videoFragment, + videoCard, + "video_card" + ) + } + + anastasisManager.securityQuestionChecked.observe(viewLifecycleOwner, Observer { checked -> + passwordCard.isChecked = checked + updatePrice(checked, Amount.fromJSONString("KUDOS:0.5")) + updateNextButtonState() + }) + anastasisManager.smsChecked.observe(viewLifecycleOwner, Observer { checked -> + smsCard.isChecked = checked + updatePrice(checked, Amount.fromJSONString("KUDOS:1.0")) + updateNextButtonState() + }) + anastasisManager.videoChecked.observe(viewLifecycleOwner, Observer { checked -> + videoCard.isChecked = checked + updatePrice(checked, Amount.fromJSONString("KUDOS:2.25")) + updateNextButtonState() + }) + } + + private fun showDialog(@IdRes resId: Int, view: View, transitionName: String) { + val extras = FragmentNavigatorExtras(view to transitionName) + findNavController().navigate(resId, null, null, extras) } private fun toggleCard(card: MaterialCardView, price: Amount) { diff --git a/wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt index 562bcd0..6b84223 100644 --- a/wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/settings/AnastasisIdentityFragment.kt @@ -32,6 +32,9 @@ import kotlinx.android.synthetic.main.fragment_anastasis_identity.* import net.taler.wallet.MainViewModel import net.taler.wallet.R import java.util.* +import java.util.concurrent.TimeUnit.DAYS + +private const val MIN_AGE = 18 class AnastasisIdentityFragment : Fragment() { @@ -53,6 +56,7 @@ class AnastasisIdentityFragment : Fragment() { } birthDateInput.editText?.setOnClickListener { val picker = DatePickerDialog(requireContext()) + picker.datePicker.maxDate = System.currentTimeMillis() - DAYS.toMillis(365) * MIN_AGE picker.setOnDateSetListener { _, year, month, dayOfMonth -> val calender = Calendar.getInstance().apply { set(year, month, dayOfMonth) @@ -70,9 +74,13 @@ class AnastasisIdentityFragment : Fragment() { 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" + val countryIso = if (tm.networkCountryIso.isNullOrEmpty()) { + if (tm.simCountryIso.isNullOrEmpty()) { + if (Locale.getDefault().country.isNullOrEmpty()) "unknown" + else Locale.getDefault().country + } else tm.simCountryIso + } else tm.networkCountryIso + var countryName = countryIso for (locale in Locale.getAvailableLocales()) { @SuppressLint("DefaultLocale") if (locale.country.toLowerCase() == countryIso) { diff --git a/wallet/src/main/java/net/taler/wallet/settings/AnastasisManager.kt b/wallet/src/main/java/net/taler/wallet/settings/AnastasisManager.kt new file mode 100644 index 0000000..09c6a39 --- /dev/null +++ b/wallet/src/main/java/net/taler/wallet/settings/AnastasisManager.kt @@ -0,0 +1,27 @@ +/* + * 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 androidx.lifecycle.MutableLiveData + +class AnastasisManager { + + val securityQuestionChecked = MutableLiveData() + val smsChecked = MutableLiveData() + val videoChecked = MutableLiveData() + +} diff --git a/wallet/src/main/java/net/taler/wallet/settings/SecurityQuestionFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/SecurityQuestionFragment.kt new file mode 100644 index 0000000..0ca63b4 --- /dev/null +++ b/wallet/src/main/java/net/taler/wallet/settings/SecurityQuestionFragment.kt @@ -0,0 +1,56 @@ +/* + * 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 com.google.android.material.transition.MaterialContainerTransform +import com.google.android.material.transition.MaterialContainerTransform.FADE_MODE_CROSS +import kotlinx.android.synthetic.main.fragment_security_question.* +import net.taler.wallet.MainViewModel +import net.taler.wallet.R + +class SecurityQuestionFragment : Fragment() { + + private val model: MainViewModel by activityViewModels() + private val anastasisManager by lazy { model.anastasisManager } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + sharedElementEnterTransition = MaterialContainerTransform().apply { + fadeMode = FADE_MODE_CROSS + } + return inflater.inflate(R.layout.fragment_security_question, container, false).apply { + transitionName = "question_card" + } + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + saveQuestionButton.setOnClickListener { + anastasisManager.securityQuestionChecked.value = true + findNavController().popBackStack() + } + } + +} diff --git a/wallet/src/main/java/net/taler/wallet/settings/SmsFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/SmsFragment.kt new file mode 100644 index 0000000..6a617ac --- /dev/null +++ b/wallet/src/main/java/net/taler/wallet/settings/SmsFragment.kt @@ -0,0 +1,56 @@ +/* + * 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 com.google.android.material.transition.MaterialContainerTransform +import com.google.android.material.transition.MaterialContainerTransform.FADE_MODE_CROSS +import kotlinx.android.synthetic.main.fragment_sms.* +import net.taler.wallet.MainViewModel +import net.taler.wallet.R + +class SmsFragment : Fragment() { + + private val model: MainViewModel by activityViewModels() + private val anastasisManager by lazy { model.anastasisManager } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + sharedElementEnterTransition = MaterialContainerTransform().apply { + fadeMode = FADE_MODE_CROSS + } + return inflater.inflate(R.layout.fragment_sms, container, false).apply { + transitionName = "sms_card" + } + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + saveSmsButton.setOnClickListener { + anastasisManager.smsChecked.value = true + findNavController().popBackStack() + } + } + +} diff --git a/wallet/src/main/java/net/taler/wallet/settings/VideoFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/VideoFragment.kt new file mode 100644 index 0000000..8a6477d --- /dev/null +++ b/wallet/src/main/java/net/taler/wallet/settings/VideoFragment.kt @@ -0,0 +1,117 @@ +/* + * 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.app.Activity.RESULT_OK +import android.content.Intent +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.net.Uri +import android.os.Bundle +import android.os.ParcelFileDescriptor +import android.provider.MediaStore +import android.view.LayoutInflater +import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.fragment.app.activityViewModels +import androidx.navigation.fragment.findNavController +import androidx.transition.TransitionManager.beginDelayedTransition +import com.google.android.material.transition.MaterialContainerTransform +import com.google.android.material.transition.MaterialContainerTransform.FADE_MODE_CROSS +import kotlinx.android.synthetic.main.fragment_video.* +import net.taler.wallet.MainViewModel +import net.taler.wallet.R +import java.io.FileDescriptor + +private const val REQUEST_IMAGE_CAPTURE = 1 +private const val REQUEST_IMAGE_OPEN = 2 + +class VideoFragment : Fragment() { + + private val model: MainViewModel by activityViewModels() + private val anastasisManager by lazy { model.anastasisManager } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + sharedElementEnterTransition = MaterialContainerTransform().apply { + fadeMode = FADE_MODE_CROSS + } + return inflater.inflate(R.layout.fragment_video, container, false).apply { + transitionName = "video_card" + } + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + takePhotoButton.setOnClickListener { + val pm = requireContext().packageManager + Intent(MediaStore.ACTION_IMAGE_CAPTURE).also { takePictureIntent -> + takePictureIntent.resolveActivity(pm)?.also { + startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE) + } + } + } + choosePhotoButton.setOnClickListener { + val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply { + addCategory(Intent.CATEGORY_OPENABLE) + type = "image/*" + } + startActivityForResult(intent, REQUEST_IMAGE_OPEN) + } + + saveVideoButton.setOnClickListener { + anastasisManager.videoChecked.value = true + findNavController().popBackStack() + } + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (requestCode == REQUEST_IMAGE_CAPTURE && resultCode == RESULT_OK) { + val imageBitmap = data!!.extras!!.get("data") as Bitmap + showImage(imageBitmap) + } else if (requestCode == REQUEST_IMAGE_OPEN && resultCode == RESULT_OK) { + data?.data?.also { uri -> + val imageBitmap = getBitmapFromUri(uri) + showImage(imageBitmap) + } + } + } + + private fun showImage(bitmap: Bitmap) { + photoView.setImageBitmap(bitmap) + beginDelayedTransition(view as ViewGroup) + photoView.visibility = VISIBLE + takePhotoButton.visibility = GONE + choosePhotoButton.visibility = GONE + saveVideoButton.isEnabled = true + } + + private fun getBitmapFromUri(uri: Uri): Bitmap { + val contentResolver = requireContext().contentResolver + val parcelFileDescriptor: ParcelFileDescriptor = + contentResolver.openFileDescriptor(uri, "r")!! + val fileDescriptor: FileDescriptor = parcelFileDescriptor.fileDescriptor + val image: Bitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor) + parcelFileDescriptor.close() + return image + } + +} -- cgit v1.2.3