[taler-taler-android] branch master updated (84377ba -> d431660)

[gnunet]

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

torsten-grote pushed a change to branch master
in repository taler-android.

    from 84377ba  Transactions background changes when selecting with a long 
press
     new 026c566  Limit purpose to 100 characters
     new a785289  Add comment for RTL translators.
     new d431660  Use constant for max subject length

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../taler/wallet/peer/OutgoingPullIntroComposable.kt    | 16 ++++++++++++++--
 .../taler/wallet/peer/OutgoingPushIntroComposable.kt    | 17 +++++++++++++++--
 .../src/main/java/net/taler/wallet/peer/PeerManager.kt  |  2 ++
 wallet/src/main/res/values/strings.xml                  |  2 ++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt 
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
index 5faea07..9af3f5d 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
@@ -41,6 +41,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -67,11 +68,14 @@ fun OutgoingPullIntroComposable(
         val exchangeItem = exchangeState.value
         OutlinedTextField(
             modifier = Modifier
-                .padding(16.dp)
+                .fillMaxWidth()
+                .padding(top = 16.dp, start = 16.dp, end = 16.dp)
                 .focusRequester(focusRequester),
+            singleLine = true,
             value = subject,
             onValueChange = { input ->
-                subject = input
+                if (input.length <= MAX_LENGTH_SUBJECT)
+                    subject = input
             },
             isError = subject.isBlank(),
             label = {
@@ -86,6 +90,14 @@ fun OutgoingPullIntroComposable(
         LaunchedEffect(Unit) {
             focusRequester.requestFocus()
         }
+        Text(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 5.dp, end = 16.dp),
+            color = if (subject.isBlank()) colorResource(R.color.red) else 
Color.Unspecified,
+            text = stringResource(R.string.char_count, subject.length, 
MAX_LENGTH_SUBJECT),
+            textAlign = TextAlign.End,
+        )
         Text(
             modifier = Modifier.padding(horizontal = 16.dp),
             text = stringResource(id = R.string.amount_chosen),
diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt 
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
index 915d002..a77cfb7 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import net.taler.common.Amount
@@ -70,10 +71,14 @@ fun OutgoingPushIntroComposable(
 
         var subject by rememberSaveable { mutableStateOf("") }
         OutlinedTextField(
-            modifier = Modifier.padding(horizontal = 16.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp),
+            singleLine = true,
             value = subject,
             onValueChange = { input ->
-                subject = input
+                if (input.length <= MAX_LENGTH_SUBJECT)
+                    subject = input
             },
             isError = subject.isBlank(),
             label = {
@@ -85,6 +90,14 @@ fun OutgoingPushIntroComposable(
                 )
             }
         )
+        Text(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 5.dp, end = 16.dp),
+            color = if (subject.isBlank()) colorResource(R.color.red) else 
Color.Unspecified,
+            text = stringResource(R.string.char_count, subject.length, 
MAX_LENGTH_SUBJECT),
+            textAlign = TextAlign.End,
+        )
         Text(
             modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 
16.dp),
             text = stringResource(R.string.send_peer_warning),
diff --git a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt 
b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
index e49f368..270ca04 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
@@ -33,6 +33,8 @@ import net.taler.wallet.exchanges.ExchangeItem
 import org.json.JSONObject
 import java.util.concurrent.TimeUnit.DAYS
 
+const val MAX_LENGTH_SUBJECT = 100
+
 class PeerManager(
     private val api: WalletBackendApi,
     private val scope: CoroutineScope,
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index cb80922..ea5cbdf 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -56,6 +56,8 @@ GNU Taler is immune against many types of fraud, such as 
phishing of credit card
     <string name="menu">Menu</string>
     <string name="or">or</string>
     <string name="currency">Currency</string>
+    <!-- The count should be mirrored in RTL languages -->
+    <string name="char_count">%1$d/%2$d</string>
 
     <string name="offline">Operation requires internet access. Please ensure 
your internet connection works and try again.</string>
     <string name="error_unsupported_uri">Error: This Taler URI is not 
supported.</string>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.