From 730fbaa702b467669c4b88f6c03fa3e1823abf73 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 26 Jun 2020 10:34:08 -0300 Subject: [wallet] Move Anastasis UI mockup into its own library module --- .../java/org/gnu/anastasis/ui/IntroFragment.kt | 48 ++++++++ .../main/java/org/gnu/anastasis/ui/MainActivity.kt | 46 ++++++++ .../java/org/gnu/anastasis/ui/MainViewModel.kt | 29 +++++ .../ui/authentication/AuthenticationFragment.kt | 128 +++++++++++++++++++++ .../ui/authentication/SecurityQuestionFragment.kt | 55 +++++++++ .../gnu/anastasis/ui/authentication/SmsFragment.kt | 55 +++++++++ .../anastasis/ui/authentication/VideoFragment.kt | 120 +++++++++++++++++++ .../gnu/anastasis/ui/identity/IdentityFragment.kt | 94 +++++++++++++++ 8 files changed, 575 insertions(+) create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/IntroFragment.kt create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainActivity.kt create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/MainViewModel.kt create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/AuthenticationFragment.kt create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/SecurityQuestionFragment.kt create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/SmsFragment.kt create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/authentication/VideoFragment.kt create mode 100644 anastasis-ui/src/main/java/org/gnu/anastasis/ui/identity/IdentityFragment.kt (limited to 'anastasis-ui/src/main/java/org/gnu') 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 new file mode 100644 index 0000000..c4b8e73 --- /dev/null +++ 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 + */ + +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 new file mode 100644 index 0000000..3ca3224 --- /dev/null +++ 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 + */ + +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 new file mode 100644 index 0000000..7bcfc19 --- /dev/null +++ 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 + */ + +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() + val smsChecked = MutableLiveData() + val videoChecked = MutableLiveData() + +} 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 new file mode 100644 index 0000000..607917d --- /dev/null +++ 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 + */ + +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 new file mode 100644 index 0000000..7353174 --- /dev/null +++ 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 + */ + +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 new file mode 100644 index 0000000..2ceb422 --- /dev/null +++ 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 + */ + +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 new file mode 100644 index 0000000..6cd80ce --- /dev/null +++ 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 + */ + +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 new file mode 100644 index 0000000..d391c5d --- /dev/null +++ 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 + */ + +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 + } + +} -- cgit v1.2.3