From c9b0193b3bfff9ae5d155fe81eec9b50df1d8dc0 Mon Sep 17 00:00:00 2001 From: Kaushik Meesala Date: Mon, 9 Dec 2024 14:10:32 -0800 Subject: [PATCH 1/3] add missing quantities --- toolkit/featureforms/src/main/res/values/strings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/toolkit/featureforms/src/main/res/values/strings.xml b/toolkit/featureforms/src/main/res/values/strings.xml index 43fdfd259..cde1a60b8 100644 --- a/toolkit/featureforms/src/main/res/values/strings.xml +++ b/toolkit/featureforms/src/main/res/values/strings.xml @@ -18,17 +18,29 @@ + Enter %1$d character Enter %1$d character + Enter %1$d characters + Enter %1$d characters + Enter %1$d characters Enter %1$d characters + Value must be %1$d character Value must be %1$d character + Value must be %1$d characters + Value must be %1$d characters + Value must be %1$d characters Value must be %1$d characters Enter %1$d to %2$d characters Value must be %1$d to %2$d characters + Maximum %1$d character Maximum %1$d character + Maximum %1$d characters + Maximum %1$d characters + Maximum %1$d characters Maximum %1$d characters Maximum %1$d characters From 25fe5d83db28d7c7747c74aa7f75bda7918808ca Mon Sep 17 00:00:00 2001 From: Kaushik Meesala Date: Mon, 9 Dec 2024 14:24:17 -0800 Subject: [PATCH 2/3] add contextual comments --- toolkit/featureforms/src/main/res/values/strings.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/toolkit/featureforms/src/main/res/values/strings.xml b/toolkit/featureforms/src/main/res/values/strings.xml index cde1a60b8..85d04ae3c 100644 --- a/toolkit/featureforms/src/main/res/values/strings.xml +++ b/toolkit/featureforms/src/main/res/values/strings.xml @@ -17,6 +17,8 @@ --> + Enter %1$d character Enter %1$d character @@ -25,6 +27,8 @@ Enter %1$d characters Enter %1$d characters + Value must be %1$d character Value must be %1$d character @@ -33,8 +37,8 @@ Value must be %1$d characters Value must be %1$d characters - Enter %1$d to %2$d characters - Value must be %1$d to %2$d characters + Maximum %1$d character Maximum %1$d character @@ -43,6 +47,8 @@ Maximum %1$d characters Maximum %1$d characters + Enter %1$d to %2$d characters + Value must be %1$d to %2$d characters Maximum %1$d characters No value Enter Value From be4ef443ade185b67ed5bda444d1c96cfb053b5f Mon Sep 17 00:00:00 2001 From: Kaushik Meesala Date: Mon, 9 Dec 2024 15:36:59 -0800 Subject: [PATCH 3/3] add lint baseline --- gradle/libs.versions.toml | 2 +- toolkit/featureforms/build.gradle.kts | 2 + toolkit/featureforms/lint-baseline.xml | 1147 +++++++++++++++++ .../src/main/res/values/strings.xml | 5 + 4 files changed, 1155 insertions(+), 1 deletion(-) create mode 100644 toolkit/featureforms/lint-baseline.xml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 15b113bb8..b05f831b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ androidGradlePlugin = "8.3.2" androidXBrowser = "1.8.0" coilBOM = "2.5.0" composeBOM = "2024.10.00" -androidxCamera = "1.4.0-rc02" +androidxCamera = "1.4.0" androidxComposeCompiler = "1.5.12" androidxCore = "1.13.0" androidxEspresso = "3.5.1" diff --git a/toolkit/featureforms/build.gradle.kts b/toolkit/featureforms/build.gradle.kts index cbff7922b..8e7f1e94f 100644 --- a/toolkit/featureforms/build.gradle.kts +++ b/toolkit/featureforms/build.gradle.kts @@ -79,6 +79,7 @@ android { } lint { targetSdk = libs.versions.compileSdk.get().toInt() + baseline = file("lint-baseline.xml") } } @@ -90,6 +91,7 @@ apiValidation { val composableSingletons = listOf( "com.arcgismaps.toolkit.featureforms.internal.components.base.ComposableSingletons\$BaseTextFieldKt", "com.arcgismaps.toolkit.featureforms.internal.components.codedvalue.ComposableSingletons\$ComboBoxFieldKt", + "com.arcgismaps.toolkit.featureforms.internal.components.codedvalue.ComposableSingletons\$ComboBoxDialogKt", "com.arcgismaps.toolkit.featureforms.internal.components.codedvalue.ComposableSingletons\$RadioButtonFieldKt", "com.arcgismaps.toolkit.featureforms.internal.components.datetime.ComposableSingletons\$DateTimeFieldKt", "com.arcgismaps.toolkit.featureforms.internal.components.datetime.picker.ComposableSingletons\$DateTimePickerKt", diff --git a/toolkit/featureforms/lint-baseline.xml b/toolkit/featureforms/lint-baseline.xml new file mode 100644 index 000000000..7bb41f4be --- /dev/null +++ b/toolkit/featureforms/lint-baseline.xml @@ -0,0 +1,1147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toolkit/featureforms/src/main/res/values/strings.xml b/toolkit/featureforms/src/main/res/values/strings.xml index 85d04ae3c..5483a384b 100644 --- a/toolkit/featureforms/src/main/res/values/strings.xml +++ b/toolkit/featureforms/src/main/res/values/strings.xml @@ -47,8 +47,11 @@ Maximum %1$d characters Maximum %1$d characters + Enter %1$d to %2$d characters + Value must be %1$d to %2$d characters + Maximum %1$d characters No value Enter Value @@ -111,12 +114,14 @@ AM Hour + %1$d hours Select hour %1$d o\'clock for hour Minute Select minutes + %1$d minutes for minutes Select AM or PM