Merge Feature branches/forms into v.next

gradle.properties

@@ -54,4 +54,4 @@ ignoreBuildNumber=false
 # these versions define the dependency of the ArcGIS Maps SDK for Kotlin dependency
 # and are generally not overridden at the command line unless a special build is requested.
 sdkVersionNumber=200.5.0
-sdkBuildNumber=4273
+sdkBuildNumber=4297

microapps/FeatureFormsApp/README.md

@@ -10,12 +10,9 @@ for editing Feature attributes.
 The application provides a web map gallery and a map viewer which invokes the form when Features are tapped.
 Authentication is optional but limited to specific public web maps.
 
+To login to your ArcGIS Online account, click the `Sign in with ArcGIS Online` button in the app. This will open the OAuth page in a new browser window where you can enter the account credentials. 
+Once you have signed in, you can access the web maps that are shared with your account.
 
-To authenticate using OAuth, provide the Client ID value in `local.properties`. If an OAuth client id
-is not provided, the app will prompt a username and password dialog.
-
-```
-clientId=YOUR_CLIENT_ID
-```
+If you'd rather use an ArcGIS Enterprise account, click the `Sign in with ArcGIS Enterprise` button in the app. This will open a dialog prompting for an Enterprise URL followed by another dialog to enter your credentials.
 
 For more information on the `FeatureForm` component and how it works, see it's [Readme](../../toolkit/featureforms/README.md).

microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/login/LoginViewModel.kt

@@ -57,6 +57,7 @@ class LoginViewModel @Inject constructor(
     val loginState = _loginState.asStateFlow()
 
     private val oAuthRedirectUri = "featureformsapp://auth"
+    private val clientId = "iFmvhJGQEKGK1Ahf"
 
     /**
      * Save this url to the search history.
@@ -76,10 +77,10 @@ class LoginViewModel @Inject constructor(
         _loginState.value = LoginState.Loading
         viewModelScope.launch(Dispatchers.IO) {
             authenticatorState.oAuthUserConfiguration =
-                if (useOAuth && BuildConfig.clientId.isNotBlank())
+                if (useOAuth)
                     OAuthUserConfiguration(
                         portalUrl = url,
-                        clientId = BuildConfig.clientId,
+                        clientId = clientId,
                         redirectUrl = oAuthRedirectUri,
                     )
                 else null

microapps/FeatureFormsApp/app/src/main/java/com/arcgismaps/toolkit/featureformsapp/screens/map/MapViewModel.kt

@@ -185,22 +185,28 @@ class MapViewModel @Inject constructor(
         )
         // if there are no errors then update the feature
         return if (errors.isEmpty()) {
-            val feature = featureForm.feature
             val serviceFeatureTable =
-                feature.featureTable as? ServiceFeatureTable ?: return Result.failure(
+                featureForm.feature.featureTable as? ServiceFeatureTable ?: return Result.failure(
                     IllegalStateException("cannot save feature edit without a ServiceFeatureTable")
                 )
-            val result = featureForm.finishEditing().map {
+            var result = Result.success(Unit)
+            featureForm.finishEditing().onSuccess {
                 serviceFeatureTable.serviceGeodatabase?.let { database ->
-                    return@let if (database.serviceInfo?.canUseServiceGeodatabaseApplyEdits == true) {
-                        database.applyEdits()
+                    if (database.serviceInfo?.canUseServiceGeodatabaseApplyEdits == true) {
+                        database.applyEdits().onFailure {
+                            result = Result.failure(it)
+                        }
                     } else {
-                        serviceFeatureTable.applyEdits()
+                        serviceFeatureTable.applyEdits().onFailure {
+                            result = Result.failure(it)
+                        }
                     }
                 }
-                feature.refresh()
+                featureForm.feature.refresh()
                 // unselect the feature after the edits have been saved
-                (feature.featureTable?.layer as FeatureLayer).clearSelection()
+                (featureForm.feature.featureTable?.layer as FeatureLayer).clearSelection()
+            }.onFailure {
+                result = Result.failure(it)
             }
             // set the state to not editing since the feature was updated successfully
             _uiState.value = UIState.NotEditing

toolkit/featureforms/api/featureforms.api

@@ -16,6 +16,44 @@ public final class com/arcgismaps/toolkit/featureforms/ValidationErrorVisibility
 	public static final field INSTANCE Lcom/arcgismaps/toolkit/featureforms/ValidationErrorVisibility$Visible;
 }
 
+public final class com/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors {
+	public static final field $stable I
+	public final fun component1-0d7_KjU ()J
+	public final fun component2-0d7_KjU ()J
+	public final fun component3-0d7_KjU ()J
+	public final fun component4-0d7_KjU ()J
+	public final fun component5-0d7_KjU ()J
+	public final fun component6-0d7_KjU ()J
+	public final fun component7-0d7_KjU ()J
+	public final fun copy-4JmcsL4 (JJJJJJJ)Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;
+	public static synthetic fun copy-4JmcsL4$default (Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;JJJJJJJILjava/lang/Object;)Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getContainerColor-0d7_KjU ()J
+	public final fun getLabelColor-0d7_KjU ()J
+	public final fun getOutlineColor-0d7_KjU ()J
+	public final fun getScrollBarColor-0d7_KjU ()J
+	public final fun getSupportingTextColor-0d7_KjU ()J
+	public final fun getTileBorderColor-0d7_KjU ()J
+	public final fun getTileTextColor-0d7_KjU ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/arcgismaps/toolkit/featureforms/theme/AttachmentsElementTypography {
+	public static final field $stable I
+	public final fun component1 ()Landroidx/compose/ui/text/TextStyle;
+	public final fun component2 ()Landroidx/compose/ui/text/TextStyle;
+	public final fun component3 ()Landroidx/compose/ui/text/TextStyle;
+	public final fun copy (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;)Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementTypography;
+	public static synthetic fun copy$default (Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementTypography;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementTypography;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getLabelStyle ()Landroidx/compose/ui/text/TextStyle;
+	public final fun getSupportingTextStyle ()Landroidx/compose/ui/text/TextStyle;
+	public final fun getTileTextStyle ()Landroidx/compose/ui/text/TextStyle;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class com/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors {
 	public static final field $stable I
 	public final fun component1-0d7_KjU ()J
@@ -112,9 +150,11 @@ public final class com/arcgismaps/toolkit/featureforms/theme/FeatureFormColorSch
 	public final fun component2 ()Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;
 	public final fun component3 ()Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;
 	public final fun component4 ()Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;
-	public final fun copy (Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;
-	public static synthetic fun copy$default (Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;
+	public final fun component5 ()Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;
+	public final fun copy (Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;
+	public static synthetic fun copy$default (Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;ILjava/lang/Object;)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAttachmentsElementColors ()Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;
 	public final fun getEditableTextFieldColors ()Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;
 	public final fun getGroupElementColors ()Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;
 	public final fun getRadioButtonFieldColors ()Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;
@@ -126,7 +166,9 @@ public final class com/arcgismaps/toolkit/featureforms/theme/FeatureFormColorSch
 public final class com/arcgismaps/toolkit/featureforms/theme/FeatureFormDefaults {
 	public static final field $stable I
 	public static final field INSTANCE Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormDefaults;
-	public final fun colorScheme (Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;
+	public final fun attachmentsElementColors-69fazGs (JJJJJJJLandroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;
+	public final fun attachmentsElementTypography (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementTypography;
+	public final fun colorScheme (Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldColors;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementColors;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormColorScheme;
 	public final fun editableTextFieldColors-s9joTbY (JJJJJJJJLandroidx/compose/foundation/text/selection/TextSelectionColors;JJJJJJJJJJJJJJJJJJJJJJJJLandroidx/compose/runtime/Composer;IIIIII)Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldColors;
 	public final fun editableTextFieldTypography (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldTypography;
 	public final fun groupElementColors-zjMxDiM (JJJJJLandroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementColors;
@@ -135,11 +177,12 @@ public final class com/arcgismaps/toolkit/featureforms/theme/FeatureFormDefaults
 	public final fun radioButtonFieldTypography (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldTypography;
 	public final fun readOnlyFieldColors-ro_MJ88 (JJJJLandroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldColors;
 	public final fun readOnlyFieldTypography (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldTypography;
-	public final fun typography (Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldTypography;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldTypography;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementTypography;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldTypography;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormTypography;
+	public final fun typography (Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldTypography;Lcom/arcgismaps/toolkit/featureforms/theme/ReadOnlyFieldTypography;Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementTypography;Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldTypography;Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementTypography;Landroidx/compose/runtime/Composer;II)Lcom/arcgismaps/toolkit/featureforms/theme/FeatureFormTypography;
 }
 
 public final class com/arcgismaps/toolkit/featureforms/theme/FeatureFormTypography {
 	public static final field $stable I
+	public final fun getAttachmentsElementTypography ()Lcom/arcgismaps/toolkit/featureforms/theme/AttachmentsElementTypography;
 	public final fun getEditableTextFieldTypography ()Lcom/arcgismaps/toolkit/featureforms/theme/EditableTextFieldTypography;
 	public final fun getGroupElementTypography ()Lcom/arcgismaps/toolkit/featureforms/theme/GroupElementTypography;
 	public final fun getRadioButtonFieldTypography ()Lcom/arcgismaps/toolkit/featureforms/theme/RadioButtonFieldTypography;

toolkit/featureforms/src/androidTest/java/com/arcgismaps/toolkit/featureforms/ThemingTests.kt

@@ -18,11 +18,15 @@ package com.arcgismaps.toolkit.featureforms
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performImeAction
+import androidx.compose.ui.test.performScrollToNode
 import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.test.printToLog
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import com.arcgismaps.toolkit.featureforms.theme.FeatureFormColorScheme
@@ -266,4 +270,62 @@ class ThemingTests : FeatureFormTestRunner(
         supportingText.assertIsDisplayed()
         supportingText.assertTextColor(Color.Green)
     }
+
+    /**
+     * Given a FeatureForm with a custom color scheme and typography for attachments elements
+     * When the FeatureForm is displayed
+     * Then the custom color scheme and typography are applied to the attachments form elements
+     */
+    @Test
+    fun testAttachmentsElementTheming() {
+        var colorScheme: FeatureFormColorScheme
+        var typography: FeatureFormTypography
+        composeTestRule.setContent {
+            colorScheme = FeatureFormDefaults.colorScheme(
+                attachmentsElementColors = FeatureFormDefaults.attachmentsElementColors(
+                    labelColor = Color.Red,
+                    tileTextColor = Color.Green
+                )
+            )
+            typography = FeatureFormDefaults.typography(
+                attachmentsElementTypography = FeatureFormDefaults.attachmentsElementTypography(
+                    labelStyle = TextStyle(
+                        fontWeight = FontWeight.ExtraBold
+                    ),
+                    tileTextStyle = TextStyle(
+                        fontWeight = FontWeight.ExtraBold,
+                    ),
+                )
+            )
+            FeatureForm(
+                featureForm = featureForm,
+                colorScheme = colorScheme,
+                typography = typography
+            )
+        }
+        val attachmentsElement = featureForm.defaultAttachmentsElement
+        assertThat(attachmentsElement).isNotNull()
+        // find the scrollable container
+        val lazyColumn = composeTestRule.onNodeWithContentDescription("lazy column")
+        lazyColumn.performScrollToNode(hasText(attachmentsElement!!.label))
+        // scroll until the attachments element is visible
+        val attachmentsField = composeTestRule.onNodeWithText(attachmentsElement.label)
+        attachmentsField.printToLog("label")
+        attachmentsField.assertIsDisplayed()
+        attachmentsField.assertTextStyle(
+            TextStyle(
+                fontWeight = FontWeight.ExtraBold,
+                color = Color.Red
+            )
+        )
+        // get the first attachment tile
+        val tile = attachmentsField.onChildWithText(attachmentsElement.attachments.first().name)
+        tile.assertIsDisplayed()
+        tile.assertTextStyle(
+            TextStyle(
+                fontWeight = FontWeight.ExtraBold,
+                color = Color.Green
+            )
+        )
+    }
 }