[taler-merchant-terminal-android] 01/03: Add link to config format docs

[gnunet]

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

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

commit 08295b0bd3c7b8b565b98e7b7fabb0b0f232b94b
Author: Torsten Grote <address@hidden>
AuthorDate: Mon Mar 2 13:32:18 2020 -0300

    Add link to config format docs
---
 app/build.gradle                                               |  1 -
 .../net/taler/merchantpos/config/MerchantConfigFragment.kt     |  2 ++
 app/src/main/res/layout/fragment_merchant_config.xml           | 10 ++++++++++
 app/src/main/res/values/strings.xml                            |  1 +
 build.gradle                                                   |  2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4512af3..e196397 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
diff --git 
a/app/src/main/java/net/taler/merchantpos/config/MerchantConfigFragment.kt 
b/app/src/main/java/net/taler/merchantpos/config/MerchantConfigFragment.kt
index f89962f..2bca677 100644
--- a/app/src/main/java/net/taler/merchantpos/config/MerchantConfigFragment.kt
+++ b/app/src/main/java/net/taler/merchantpos/config/MerchantConfigFragment.kt
@@ -1,6 +1,7 @@
 package net.taler.merchantpos.config
 
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
@@ -60,6 +61,7 @@ class MerchantConfigFragment : Fragment() {
             passwordView.editText!!.text = null
             forgetPasswordButton.visibility = GONE
         }
+        configDocsView.movementMethod = LinkMovementMethod.getInstance()
         updateView(savedInstanceState == null)
     }
 
diff --git a/app/src/main/res/layout/fragment_merchant_config.xml 
b/app/src/main/res/layout/fragment_merchant_config.xml
index 0f0b96f..759073a 100644
--- a/app/src/main/res/layout/fragment_merchant_config.xml
+++ b/app/src/main/res/layout/fragment_merchant_config.xml
@@ -121,6 +121,16 @@
                 app:layout_constraintTop_toTopOf="@+id/okButton"
                 tools:visibility="visible" />
 
+        <TextView
+                android:id="@+id/configDocsView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="16dp"
+                android:text="@string/config_docs"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/okButton" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 149df6e..7ce1ecb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
     <string name="config_forget_password">Forget</string>
     <string name="config_changed">Changed to new merchant using %s</string>
     <string name="config_fetching_label">Fetching Configuration</string>
+    <string name="config_docs">Please refer to <a 
href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats";>the
 documentation</a> for the configuration format.</string>
 
     <string name="payment_intro_nfc">Please scan QR Code or use NFC to 
pay</string>
     <string name="payment_intro">Please scan QR Code to pay</string>
diff --git a/build.gradle b/build.gradle
index e252cd1..d0a284a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 
"androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }

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