commit 730fbaa702b467669c4b88f6c03fa3e1823abf73 parent 98d693d48ad491b19d89e5d394c2e54a36731728 Author: Torsten Grote <t@grobox.de> Date: Fri, 26 Jun 2020 10:34:08 -0300 [wallet] Move Anastasis UI mockup into its own library module Diffstat:
46 files changed, 882 insertions(+), 615 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml @@ -10,6 +10,7 @@ <option name="modules"> <set> <option value="$PROJECT_DIR$" /> + <option value="$PROJECT_DIR$/anastasis-ui" /> <option value="$PROJECT_DIR$/cashier" /> <option value="$PROJECT_DIR$/merchant-terminal" /> <option value="$PROJECT_DIR$/taler-kotlin-common" /> diff --git a/anastasis-ui/.gitignore b/anastasis-ui/.gitignore @@ -0,0 +1 @@ +/build +\ No newline at end of file diff --git a/anastasis-ui/build.gradle b/anastasis-ui/build.gradle @@ -0,0 +1,70 @@ +/* + * 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/> + */ + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + //noinspection GradleDependency + buildToolsVersion "$build_tools_version" + + defaultConfig { + minSdkVersion 24 + targetSdkVersion 29 + versionCode 1 + versionName "0.1" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + implementation project(":taler-kotlin-common") + + implementation 'com.google.android.material:material:1.2.0-beta01' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + + // Navigation Library + implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" + implementation "androidx.navigation:navigation-ui-ktx:$nav_version" + + // ViewModel and LiveData + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" + + testImplementation 'junit:junit:4.13' + + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/anastasis-ui/consumer-rules.pro b/anastasis-ui/consumer-rules.pro diff --git a/anastasis-ui/proguard-rules.pro b/anastasis-ui/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile +\ No newline at end of file diff --git a/anastasis-ui/src/main/AndroidManifest.xml b/anastasis-ui/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ +<!-- + ~ 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/> + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="org.gnu.anastasis.ui"> + + <application> + <activity + android:name=".MainActivity" + android:theme="@style/AppTheme.NoActionBar" /> + </application> + +</manifest> diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/IntroFragment.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/IntroFragment.kt @@ -0,0 +1,48 @@ +/* + * 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 org.gnu.anastasis.ui + +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_intro.* + +class IntroFragment : Fragment() { + + private val model: MainViewModel by activityViewModels() + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.fragment_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/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainActivity.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainActivity.kt @@ -0,0 +1,46 @@ +/* + * 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 org.gnu.anastasis.ui + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.navigation.NavController +import androidx.navigation.fragment.NavHostFragment +import androidx.navigation.ui.AppBarConfiguration +import androidx.navigation.ui.setupWithNavController +import kotlinx.android.synthetic.main.activity.* + +class MainActivity : AppCompatActivity() { + + private lateinit var nav: NavController + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity) + + val navHostFragment = + supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment + nav = navHostFragment.navController + + setSupportActionBar(toolbar) + val appBarConfiguration = AppBarConfiguration( + emptySet() + ) + toolbar.setupWithNavController(nav, appBarConfiguration) + } + +} diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainViewModel.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainViewModel.kt @@ -0,0 +1,29 @@ +/* + * 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 org.gnu.anastasis.ui + +import android.app.Application +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData + +class MainViewModel(private val app: Application) : AndroidViewModel(app) { + + val securityQuestionChecked = MutableLiveData<Boolean>() + val smsChecked = MutableLiveData<Boolean>() + val videoChecked = MutableLiveData<Boolean>() + +} diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/AuthenticationFragment.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/AuthenticationFragment.kt @@ -0,0 +1,128 @@ +/* + * 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 org.gnu.anastasis.ui.authentication + +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.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_authentication.* +import net.taler.common.Amount +import org.gnu.anastasis.ui.MainViewModel +import org.gnu.anastasis.ui.R + +class AuthenticationFragment : Fragment() { + + private val viewModel: 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_authentication, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + passwordCard.setOnClickListener { + showDialog( + R.id.action_nav_anastasis_authentication_to_securityQuestionFragment, + passwordCard, + "question_card" + ) + } + postidentCard.setOnClickListener { + toggleCard( + postidentCard, + Amount.fromJSONString("KUDOS:3.5") + ) + } + 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" + ) + } + + viewModel.securityQuestionChecked.observe(viewLifecycleOwner, Observer { checked -> + passwordCard.isChecked = checked + updatePrice(checked, Amount.fromJSONString("KUDOS:0.5")) + updateNextButtonState() + }) + viewModel.smsChecked.observe(viewLifecycleOwner, Observer { checked -> + smsCard.isChecked = checked + updatePrice(checked, Amount.fromJSONString("KUDOS:1.0")) + updateNextButtonState() + }) + viewModel.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) { + 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/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/SecurityQuestionFragment.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/SecurityQuestionFragment.kt @@ -0,0 +1,55 @@ +/* + * 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 org.gnu.anastasis.ui.authentication + +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 org.gnu.anastasis.ui.MainViewModel +import org.gnu.anastasis.ui.R + +class SecurityQuestionFragment : Fragment() { + + private val viewModel: MainViewModel by activityViewModels() + + 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 { + viewModel.securityQuestionChecked.value = true + findNavController().popBackStack() + } + } + +} diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/SmsFragment.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/SmsFragment.kt @@ -0,0 +1,55 @@ +/* + * 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 org.gnu.anastasis.ui.authentication + +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 org.gnu.anastasis.ui.MainViewModel +import org.gnu.anastasis.ui.R + +class SmsFragment : Fragment() { + + private val viewModel: MainViewModel by activityViewModels() + + 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 { + viewModel.smsChecked.value = true + findNavController().popBackStack() + } + } + +} diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/VideoFragment.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/VideoFragment.kt @@ -0,0 +1,120 @@ +/* + * 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 org.gnu.anastasis.ui.authentication + +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 org.gnu.anastasis.ui.MainViewModel +import org.gnu.anastasis.ui.R +import java.io.FileDescriptor + +private const val REQUEST_IMAGE_CAPTURE = 1 +private const val REQUEST_IMAGE_OPEN = 2 + +class VideoFragment : Fragment() { + + private val viewModel: MainViewModel by activityViewModels() + + 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 { + viewModel.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 + } + +} diff --git a/anastasis-ui/src/main/java/org/gnu/anastasis/ui/identity/IdentityFragment.kt b/anastasis-ui/src/main/java/org/gnu/anastasis/ui/identity/IdentityFragment.kt @@ -0,0 +1,94 @@ +/* + * 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 org.gnu.anastasis.ui.identity + +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_identity.* +import org.gnu.anastasis.ui.MainViewModel +import org.gnu.anastasis.ui.R +import java.util.* +import java.util.concurrent.TimeUnit.DAYS + +private const val MIN_AGE = 18 + +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_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.datePicker.maxDate = System.currentTimeMillis() - DAYS.toMillis(365) * MIN_AGE + 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()) { + 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) { + countryName = locale.displayCountry + break + } + } + return countryName + } + +} diff --git a/wallet/src/main/res/anim/slide_in_right.xml b/anastasis-ui/src/main/res/anim/slide_in_right.xml diff --git a/wallet/src/main/res/anim/slide_out_left.xml b/anastasis-ui/src/main/res/anim/slide_out_left.xml diff --git a/wallet/src/main/res/drawable/ic_baseline_check.xml b/anastasis-ui/src/main/res/drawable/ic_baseline_check.xml diff --git a/wallet/src/main/res/drawable/ic_baseline_cloud_circle.xml b/anastasis-ui/src/main/res/drawable/ic_baseline_cloud_circle.xml diff --git a/wallet/src/main/res/drawable/ic_baseline_cloud_download.xml b/anastasis-ui/src/main/res/drawable/ic_baseline_cloud_download.xml diff --git a/wallet/src/main/res/drawable/ic_baseline_face.xml b/anastasis-ui/src/main/res/drawable/ic_baseline_face.xml diff --git a/wallet/src/main/res/drawable/ic_baseline_lock.xml b/anastasis-ui/src/main/res/drawable/ic_baseline_lock.xml diff --git a/wallet/src/main/res/drawable/ic_baseline_person.xml b/anastasis-ui/src/main/res/drawable/ic_baseline_person.xml diff --git a/anastasis-ui/src/main/res/layout/activity.xml b/anastasis-ui/src/main/res/layout/activity.xml @@ -0,0 +1,54 @@ +<?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.coordinatorlayout.widget.CoordinatorLayout 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=".MainActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + style="@style/AppTheme.Toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + </com.google.android.material.appbar.AppBarLayout> + + <androidx.fragment.app.FragmentContainerView + android:id="@+id/nav_host_fragment" + android:name="androidx.navigation.fragment.NavHostFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:defaultNavHost="true" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:navGraph="@navigation/anastasis" /> + +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/wallet/src/main/res/layout/fragment_anastasis_authentication.xml b/anastasis-ui/src/main/res/layout/fragment_authentication.xml diff --git a/wallet/src/main/res/layout/fragment_anastasis_identity.xml b/anastasis-ui/src/main/res/layout/fragment_identity.xml diff --git a/wallet/src/main/res/layout/fragment_anastasis_intro.xml b/anastasis-ui/src/main/res/layout/fragment_intro.xml diff --git a/wallet/src/main/res/layout/fragment_security_question.xml b/anastasis-ui/src/main/res/layout/fragment_security_question.xml diff --git a/wallet/src/main/res/layout/fragment_sms.xml b/anastasis-ui/src/main/res/layout/fragment_sms.xml diff --git a/wallet/src/main/res/layout/fragment_video.xml b/anastasis-ui/src/main/res/layout/fragment_video.xml diff --git a/anastasis-ui/src/main/res/navigation/anastasis.xml b/anastasis-ui/src/main/res/navigation/anastasis.xml @@ -0,0 +1,83 @@ +<?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/> + --> + +<navigation 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:id="@+id/nav_graph" + app:startDestination="@id/nav_anastasis_intro"> + + <fragment + android:id="@+id/nav_anastasis_intro" + android:name="org.gnu.anastasis.ui.IntroFragment" + android:label="Secure Cloud Recovery" + tools:layout="@layout/fragment_intro"> + <action + android:id="@+id/action_nav_anastasis_intro_to_nav_anastasis_identity" + app:destination="@id/nav_anastasis_identity" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@android:anim/slide_in_left" + app:popExitAnim="@android:anim/slide_out_right" /> + </fragment> + + <fragment + android:id="@+id/nav_anastasis_identity" + android:name="org.gnu.anastasis.ui.identity.AnastasisIdentityFragment" + android:label="Define your identity" + tools:layout="@layout/fragment_identity"> + <action + android:id="@+id/action_nav_anastasis_intro_to_nav_anastasis_authentication" + app:destination="@id/nav_anastasis_authentication" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@android:anim/slide_in_left" + app:popExitAnim="@android:anim/slide_out_right" /> + </fragment> + + <fragment + android:id="@+id/nav_anastasis_authentication" + android:name="org.gnu.anastasis.ui.authentication.AuthenticationFragment" + android:label="Choose authentication methods" + tools:layout="@layout/fragment_authentication"> + <action + android:id="@+id/action_nav_anastasis_authentication_to_securityQuestionFragment" + app:destination="@id/securityQuestionFragment" /> + <action + android:id="@+id/action_nav_anastasis_authentication_to_smsFragment" + app:destination="@id/smsFragment" /> + <action + android:id="@+id/action_nav_anastasis_authentication_to_videoFragment" + app:destination="@id/videoFragment" /> + </fragment> + + <fragment + android:id="@+id/securityQuestionFragment" + android:name="org.gnu.anastasis.ui.authentication.SecurityQuestionFragment" + android:label="Security question" + tools:layout="@layout/fragment_security_question" /> + <fragment + android:id="@+id/smsFragment" + android:name="org.gnu.anastasis.ui.authentication.SmsFragment" + android:label="SMS" + tools:layout="@layout/fragment_sms" /> + <fragment + android:id="@+id/videoFragment" + android:name="org.gnu.anastasis.ui.authentication.VideoFragment" + android:label="Video identification" + tools:layout="@layout/fragment_video" /> + +</navigation> diff --git a/anastasis-ui/src/main/res/values/themes.xml b/anastasis-ui/src/main/res/values/themes.xml @@ -0,0 +1,32 @@ +<!-- + ~ 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/> + --> + +<resources> + + <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> + </style> + + <style name="AppTheme.NoActionBar"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> + <item name="android:statusBarColor">@android:color/transparent</item> + </style> + + <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.ActionBar" /> + + <style name="AppTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar.Primary" /> + +</resources> diff --git a/build.gradle b/build.gradle @@ -1,6 +1,7 @@ buildscript { ext.kotlin_version = '1.3.72' ext.nav_version = "2.2.2" + ext.lifecycle_version = "2.2.0" // check https://android-rebuilds.beuc.net/ for availability of free build tools ext.build_tools_version = "29.0.2" repositories { diff --git a/settings.gradle b/settings.gradle @@ -1,2 +1,3 @@ include ':cashier', ':merchant-terminal', ':wallet' include ':taler-kotlin-common' +include ':anastasis-ui' diff --git a/wallet/build.gradle b/wallet/build.gradle @@ -66,10 +66,11 @@ android { dependencies { implementation project(":taler-kotlin-common") + implementation project(":anastasis-ui") implementation 'net.taler:akono:0.1' implementation 'androidx.preference:preference:1.1.1' - implementation 'com.google.android.material:material:1.2.0-beta01' + implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // Lists and Selection @@ -81,7 +82,6 @@ dependencies { implementation "androidx.navigation:navigation-ui-ktx:$nav_version" // ViewModel and LiveData - def lifecycle_version = "2.2.0" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" // QR codes diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt b/wallet/src/main/java/net/taler/wallet/MainActivity.kt @@ -216,7 +216,6 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener, ): 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 @@ -37,7 +37,6 @@ import net.taler.wallet.history.DevHistoryManager import net.taler.wallet.payment.PaymentManager import net.taler.wallet.pending.PendingOperationsManager import net.taler.wallet.refund.RefundManager -import net.taler.wallet.settings.AnastasisManager import net.taler.wallet.transactions.TransactionManager import net.taler.wallet.withdraw.WithdrawManager import org.json.JSONObject @@ -103,7 +102,6 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) { val transactionManager: TransactionManager = TransactionManager(walletBackendApi, viewModelScope, mapper) val refundManager = RefundManager(walletBackendApi) - val anastasisManager = AnastasisManager() private val mTransactionsEvent = MutableLiveData<Event<String>>() val transactionsEvent: LiveData<Event<String>> = mTransactionsEvent diff --git a/wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/AnastasisAuthenticationFragment.kt @@ -1,130 +0,0 @@ -/* - * 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.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 -import net.taler.wallet.MainViewModel -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") - - 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 { - showDialog( - R.id.action_nav_anastasis_authentication_to_securityQuestionFragment, - passwordCard, - "question_card" - ) - } - postidentCard.setOnClickListener { - toggleCard( - postidentCard, - Amount.fromJSONString("KUDOS:3.5") - ) - } - 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) { - 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 @@ -1,94 +0,0 @@ -/* - * 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.* -import java.util.concurrent.TimeUnit.DAYS - -private const val MIN_AGE = 18 - -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.datePicker.maxDate = System.currentTimeMillis() - DAYS.toMillis(365) * MIN_AGE - 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()) { - 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) { - 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 @@ -1,51 +0,0 @@ -/* - * 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/AnastasisManager.kt b/wallet/src/main/java/net/taler/wallet/settings/AnastasisManager.kt @@ -1,27 +0,0 @@ -/* - * 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 androidx.lifecycle.MutableLiveData - -class AnastasisManager { - - val securityQuestionChecked = MutableLiveData<Boolean>() - val smsChecked = MutableLiveData<Boolean>() - val videoChecked = MutableLiveData<Boolean>() - -} diff --git a/wallet/src/main/java/net/taler/wallet/settings/BackupSettingsFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/BackupSettingsFragment.kt @@ -16,26 +16,28 @@ package net.taler.wallet.settings +import android.content.Intent import android.os.Bundle import android.view.View -import androidx.fragment.app.activityViewModels +import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import net.taler.wallet.MainViewModel import net.taler.wallet.R - +import org.gnu.anastasis.ui.MainActivity 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) - + val recoveryPref: Preference = findPreference("pref_backup_recovery")!! + recoveryPref.setOnPreferenceClickListener { + val intent = Intent(requireContext(), MainActivity::class.java) + startActivity(intent) + true + } } - } diff --git a/wallet/src/main/java/net/taler/wallet/settings/SecurityQuestionFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/SecurityQuestionFragment.kt @@ -1,56 +0,0 @@ -/* - * 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 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 @@ -1,56 +0,0 @@ -/* - * 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 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 @@ -1,117 +0,0 @@ -/* - * 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.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 - } - -} diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml @@ -66,75 +66,7 @@ <fragment android:id="@+id/nav_settings_backup" android:name="net.taler.wallet.settings.BackupSettingsFragment" - android:label="@string/nav_settings_backup"> - <action - android:id="@+id/action_nav_settings_backup_to_nav_anastasis_intro" - app:destination="@id/nav_anastasis_intro" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@android:anim/slide_in_left" - app:popExitAnim="@android:anim/slide_out_right" /> - </fragment> - - <fragment - android:id="@+id/nav_anastasis_intro" - android:name="net.taler.wallet.settings.AnastasisIntroFragment" - android:label="Secure Cloud Recovery" - tools:layout="@layout/fragment_anastasis_intro"> - <action - android:id="@+id/action_nav_anastasis_intro_to_nav_anastasis_identity" - app:destination="@id/nav_anastasis_identity" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@android:anim/slide_in_left" - app:popExitAnim="@android:anim/slide_out_right" /> - </fragment> - - <fragment - android:id="@+id/nav_anastasis_identity" - android:name="net.taler.wallet.settings.AnastasisIdentityFragment" - android:label="Define your identity" - tools:layout="@layout/fragment_anastasis_identity"> - <action - android:id="@+id/action_nav_anastasis_intro_to_nav_anastasis_authentication" - app:destination="@id/nav_anastasis_authentication" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@android:anim/slide_in_left" - app:popExitAnim="@android:anim/slide_out_right" /> - </fragment> - - <fragment - android:id="@+id/nav_anastasis_authentication" - android:name="net.taler.wallet.settings.AnastasisAuthenticationFragment" - android:label="Choose authentication methods" - tools:layout="@layout/fragment_anastasis_authentication"> - <action - android:id="@+id/action_nav_anastasis_authentication_to_securityQuestionFragment" - app:destination="@id/securityQuestionFragment" /> - <action - android:id="@+id/action_nav_anastasis_authentication_to_smsFragment" - app:destination="@id/smsFragment" /> - <action - android:id="@+id/action_nav_anastasis_authentication_to_videoFragment" - app:destination="@id/videoFragment" /> - </fragment> - - <fragment - android:id="@+id/securityQuestionFragment" - android:name="net.taler.wallet.settings.SecurityQuestionFragment" - android:label="Security question" - tools:layout="@layout/fragment_security_question" /> - <fragment - android:id="@+id/smsFragment" - android:name="net.taler.wallet.settings.SmsFragment" - android:label="SMS" - tools:layout="@layout/fragment_sms" /> - <fragment - android:id="@+id/videoFragment" - android:name="net.taler.wallet.settings.VideoFragment" - android:label="Video identification" - tools:layout="@layout/fragment_video" /> + android:label="@string/nav_settings_backup"/> <fragment android:id="@+id/nav_transactions" diff --git a/wallet/src/main/res/xml/settings_backup.xml b/wallet/src/main/res/xml/settings_backup.xml @@ -14,7 +14,8 @@ ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> --> -<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <SwitchPreferenceCompat app:defaultValue="@bool/settings_backup_default" @@ -48,10 +49,9 @@ <Preference app:dependency="pref_backup_switch" app:icon="@drawable/ic_baseline_cloud_circle" - app:fragment="net.taler.wallet.settings.SettingsFragment" app:key="pref_backup_recovery" app:summary="Not used" - app:title="Secure cloud recovery" /> + app:title="Secure cloud recovery"/> </PreferenceCategory>