gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-cashier-terminal-android] 02/02: Show link to register a test acc


From: gnunet
Subject: [taler-cashier-terminal-android] 02/02: Show link to register a test account
Date: Mon, 02 Mar 2020 15:51:04 +0100

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a commit to branch master
in repository cashier-terminal-android.

commit e2ed3f607f8b651238a0801e4bdd399f38bc2513
Author: Torsten Grote <address@hidden>
AuthorDate: Mon Mar 2 11:50:45 2020 -0300

    Show link to register a test account
---
 app/src/main/java/net/taler/cashier/ConfigFragment.kt | 10 +++++++++-
 app/src/main/res/layout/fragment_config.xml           | 14 ++++++++++++--
 app/src/main/res/values/strings.xml                   |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/taler/cashier/ConfigFragment.kt 
b/app/src/main/java/net/taler/cashier/ConfigFragment.kt
index dd7c273..b9a97e5 100644
--- a/app/src/main/java/net/taler/cashier/ConfigFragment.kt
+++ b/app/src/main/java/net/taler/cashier/ConfigFragment.kt
@@ -17,6 +17,7 @@
 package net.taler.cashier
 
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.INVISIBLE
@@ -24,6 +25,8 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import androidx.core.content.ContextCompat.getSystemService
+import androidx.core.text.HtmlCompat
+import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
@@ -33,6 +36,7 @@ import 
com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import kotlinx.android.synthetic.main.fragment_config.*
 
 private const val URL_BANK_TEST = "https://bank.test.taler.net";
+private const val URL_BANK_TEST_REGISTER = "$URL_BANK_TEST/accounts/register"
 
 class ConfigFragment : Fragment() {
 
@@ -48,7 +52,7 @@ class ConfigFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         if (savedInstanceState == null) {
-            if (viewModel.config.bankUrl.isBlank() && BuildConfig.DEBUG) {
+            if (viewModel.config.bankUrl.isBlank()) {
                 urlView.editText!!.setText(URL_BANK_TEST)
             } else {
                 urlView.editText!!.setText(viewModel.config.bankUrl)
@@ -79,6 +83,10 @@ class ConfigFragment : Fragment() {
                 inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
             }
         }
+        demoView.text = HtmlCompat.fromHtml(
+            getString(R.string.config_demo_hint, URL_BANK_TEST_REGISTER), 
FROM_HTML_MODE_LEGACY
+        )
+        demoView.movementMethod = LinkMovementMethod.getInstance()
     }
 
     override fun onStart() {
diff --git a/app/src/main/res/layout/fragment_config.xml 
b/app/src/main/res/layout/fragment_config.xml
index 2bf17e2..47ec6f9 100644
--- a/app/src/main/res/layout/fragment_config.xml
+++ b/app/src/main/res/layout/fragment_config.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ This file is part of GNU Taler
   ~ (C) 2020 Taler Systems S.A.
   ~
@@ -28,6 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/default_margin"
         android:hint="@string/config_bank_url"
+        app:endIconMode="clear_text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -99,4 +99,14 @@
         app:layout_constraintTop_toTopOf="@+id/saveButton"
         tools:visibility="visible" />
 
+    <TextView
+        android:id="@+id/demoView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/default_margin"
+        android:text="@string/config_demo_hint"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/saveButton" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 7efa2ad..5df5bfa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="config_username_error">Please enter your username</string>
     <string name="config_error">Error retrieving configuration</string>
     <string name="config_error_auth">Invalid username or password</string>
+    <string name="config_demo_hint">For testing, you can <![CDATA[<a 
href="%s">create a test account at the demo bank</a>]]>.</string>
 
     <string name="balance_current_label">Current balance</string>
     <string name="balance_error">ERROR</string>

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]