Merge branch 'google:master' into master

.github/workflows/build.yml

@@ -49,6 +49,7 @@ jobs:
     permissions:
       actions: read
       contents: read
+      packages: write
 
     strategy:
       fail-fast: false
@@ -75,9 +76,21 @@ jobs:
       - name: Check with Gradle
         run: ./gradlew check --scan --full-stacktrace
 
+      - name: Publish Maven packages to GitHub Packages
+        if: ${{ github.event_name == 'push' }}
+        run: ./gradlew publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPOSITORY_URL: 'https://maven.pkg.github.com/google/android-fhir'
+          # Use SNAPSHOT Prefix to follow Maven convention
+          ARTIFACT_VERSION_SUFFIX: SNAPSHOT
+
       - name: Release artifacts to local repo
         run: ./gradlew publishReleasePublicationToCIRepository --scan
-      - name: Upload maven repo
+        env:
+          ARTIFACT_VERSION_SUFFIX: build_${{ github.run_id }}
+
+      - name: Upload artifact maven-repository.zip
         uses: actions/upload-artifact@v4
         with:
           name: maven-repository
@@ -118,7 +131,7 @@ jobs:
 
       - name: Setup GitHub Pages
         if: ${{ github.event_name == 'push' }}
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Upload site/ directory as GitHub Pages artifact
         if: ${{ github.event_name == 'push' }}

buildSrc/build.gradle.kts

@@ -19,5 +19,5 @@ dependencies {
   implementation("com.spotify.ruler:ruler-gradle-plugin:1.4.0")
 
   implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.10.0")
-  implementation("com.squareup:kotlinpoet:1.15.3")
+  implementation("com.squareup:kotlinpoet:1.17.0")
 }

buildSrc/src/main/kotlin/Releases.kt

@@ -119,20 +119,33 @@ fun Project.publishArtifact(artifact: LibraryArtifact) {
             licenses {
               license {
                 name.set("The Apache License, Version 2.0")
-                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
               }
             }
           }
           repositories {
             maven {
               name = "CI"
-              url = uri("file://${rootProject.buildDir}/ci-repo")
+              url =
+                if (System.getenv("REPOSITORY_URL") != null) {
+                  // REPOSITORY_URL is defined in .github/workflows/build.yml
+                  uri(System.getenv("REPOSITORY_URL"))
+                } else {
+                  uri("file://${rootProject.buildDir}/ci-repo")
+                }
               version =
                 if (project.providers.environmentVariable("GITHUB_ACTIONS").isPresent) {
-                  "${artifact.version}-build_${System.getenv("GITHUB_RUN_ID")}"
+                  // ARTIFACT_VERSION_SUFFIX is defined in .github/workflows/build.yml
+                  "${artifact.version}-${System.getenv("ARTIFACT_VERSION_SUFFIX")}"
                 } else {
                   artifact.version
                 }
+              if (System.getenv("GITHUB_TOKEN") != null) {
+                credentials {
+                  username = System.getenv("GITHUB_ACTOR")
+                  password = System.getenv("GITHUB_TOKEN")
+                }
+              }
             }
           }
         }

catalog/build.gradle.kts

@@ -22,8 +22,8 @@ android {
 
   buildTypes {
     release {
-      isMinifyEnabled = false
-      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
+      isMinifyEnabled = true
+      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
     }
   }
   compileOptions {

catalog/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

catalog/src/main/java/com/google/android/fhir/catalog/ModalBottomSheetFragment.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
+import android.widget.CheckBox
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
-import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
@@ -40,25 +39,16 @@ class ModalBottomSheetFragment : BottomSheetDialogFragment() {
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-    val showHideErrorButton = view.findViewById<Button>(R.id.errorToggleButton)
-    showHideErrorButton.text =
-      requireContext()
-        .getString(
-          if (args.errorState) {
-            R.string.hide_error_state
-          } else {
-            R.string.show_error_state
-          },
-        )
-    showHideErrorButton.setOnClickListener {
+
+    val showHideErrorCheckBox = view.findViewById<CheckBox>(R.id.errorToggleCheckBox)
+    showHideErrorCheckBox.isChecked = args.errorState
+    showHideErrorCheckBox.setOnCheckedChangeListener { _, isChecked ->
       setFragmentResult(
         REQUEST_ERROR_KEY,
         bundleOf(
-          BUNDLE_ERROR_KEY to
-            (showHideErrorButton.text == requireContext().getString(R.string.show_error_state)),
+          BUNDLE_ERROR_KEY to isChecked,
         ),
       )
-      NavHostFragment.findNavController(this).navigateUp()
     }
     (activity as? MainActivity)?.showOpenQuestionnaireMenu(false)
   }

catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml

@@ -7,7 +7,6 @@
     android:layout_height="match_parent"
     tools:context=".ModalBottomSheetFragment"
 >
-
   <TextView
         android:id="@+id/optionsTextView"
         android:layout_width="wrap_content"
@@ -19,13 +18,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
     />
-
-  <Button
-        style="@style/Widget.App.MaterialComponents.Button"
-        android:id="@+id/errorToggleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="60dp"
+  <CheckBox
+        android:id="@+id/errorToggleCheckBox"
+        style="@style/Questionnaire.CheckBoxStyle"
+        android:layout_width="280dp"
+        android:layout_height="68dp"
+        android:layout_marginTop="24dp"
         android:layout_marginBottom="116dp"
         android:text="@string/show_error_state"
         android:textAllCaps="false"
@@ -34,5 +32,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/optionsTextView"
     />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

catalog/src/main/res/values/strings.xml

@@ -74,7 +74,6 @@
     >Below is the JSON code</string>
     <string name="submit">Submit</string>
     <string name="show_error_state">Show error state</string>
-    <string name="hide_error_state">Hide error state</string>
     <string name="options">Options</string>
     <string name="error">Error</string>
     <string name="widgets">Widgets</string>

datacapture/build.gradle.kts

@@ -21,6 +21,7 @@ android {
     testInstrumentationRunner = Dependencies.androidJunitRunner
     // Need to specify this to prevent junit runner from going deep into our dependencies
     testInstrumentationRunnerArguments["package"] = "com.google.android.fhir.datacapture"
+    consumerProguardFile("proguard-rules.pro")
   }
 
   buildFeatures { viewBinding = true }

datacapture/proguard-rules.pro

@@ -0,0 +1,11 @@
+## HAPI Strucutres need to be kept beause
+	# 1. Reflection is used in resource extraction as the FHIR Path expression is then translated to field names to locate data elements in FHIR resources.
+	# 2. In HAPI Strucures, ClassLoader is used to load classes from different packages that are hardcoded.
+-keep class ca.uhn.fhir.** { *; }
+-keep class org.hl7.fhir.**  { *; }
+# Used by hapi's XmlUtil which is internally used by hapi's FHIRPathEngine.
+-keep class com.ctc.wstx.stax.**  { *; }
+# Used by HapiWorkerContext (fhirpath engine in QuestionnaireViewModel)
+-keep class com.github.benmanes.caffeine.cache.**  { *; }
+## hapi libs ends
+-ignorewarnings

datacapture/sampledata/component_repeated_group.json

@@ -0,0 +1,24 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "type": "group",
+      "text": "Repeated Group",
+      "repeats": true,
+      "item": [
+        {
+          "linkId": "1-1",
+          "text": "Sample date question",
+          "type": "date",
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/entryFormat",
+              "valueString": "yyyy-mm-dd"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

datacapture/sampledata/repeated_group_response.json

@@ -0,0 +1,20 @@
+{
+  "resourceType": "QuestionnaireResponse",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Repeated Group",
+      "item": [
+        {
+          "linkId": "1-1",
+          "text": "Sample date question",
+          "answer": [
+            {
+              "valueDate": "2024-06-03"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt

@@ -65,7 +65,7 @@ class PhoneNumberViewHolderFactoryInstrumentedTest {
   }
 
   @Test
-  fun createViewHolder_shouldReturn_phoneNumberViewHolder() {
+  fun createViewHolder_phoneNumberViewHolderFactory_returnsViewHolder() {
     val viewHolderFromAdapter =
       questionnaireEditAdapter.createViewHolder(
         parent,
@@ -74,8 +74,13 @@ class PhoneNumberViewHolderFactoryInstrumentedTest {
             subtype = QuestionnaireViewHolderType.PHONE_NUMBER.value,
           )
           .viewType,
+      ) as QuestionnaireEditAdapter.ViewHolder.QuestionHolder
+    assertThat(
+        viewHolderFromAdapter.holder.itemView
+          .findViewById<TextInputEditText>(R.id.text_input_edit_text)
+          .visibility,
       )
-    assertThat(viewHolderFromAdapter).isInstanceOf(viewHolder::class.java)
+      .isEqualTo(View.VISIBLE)
   }
 
   @Test