Merge pull request getodk#5769 from seadowg/to-review

Add custom attribute to flag strings to review

.circleci/config.yml

@@ -91,7 +91,7 @@ jobs:
 
       - run:
           name: Run code quality checks
-          command: ./gradlew pmd ktlintCheck checkstyle lintDebug -PlintStrings
+          command: ./gradlew pmd ktlintCheck checkstyle lintDebug
 
   test_modules:
     <<: *android_config

collect_app/build.gradle

@@ -207,10 +207,6 @@ android {
         htmlReport true
         lintConfig file("$rootDir/config/lint.xml")
         xmlReport true
-
-        if (!project.hasProperty("lintStrings")) {
-            disable += ["HardcodedText"]
-        }
     }
     namespace 'org.odk.collect.android'
 }

collect_app/src/main/res/layout/form_chooser_list_item.xml

@@ -18,7 +18,7 @@
         android:background="?colorSurfaceContainerLow"
         android:gravity="center"
         android:padding="@dimen/margin_small"
-        android:text="@string/incomplete"
+        android:text="@string/draft_errors"
         android:textAppearance="?textAppearanceLabelLarge"
         android:visibility="gone"
         app:drawableStartCompat="@drawable/baseline_error_24"

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

@@ -9,7 +9,7 @@
     the specific language governing permissions and limitations under the
     License.
 -->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" tools:locale="en">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:oat="http://schema.getodk.org/odkAndroidTools" tools:ignore="MissingTranslation" tools:locale="en">
     <!-- Text for the topmost button on the main screen. It should be short and action-oriented. -->
     <string name="enter_data">Start new form</string>
     <!-- Text for an action button on the main screen. -->
@@ -1234,7 +1234,7 @@
     <string name="edit_finalized_form_deprecation_message" tools:ignore="UnusedResources">In later versions, finalized forms will no longer be editable.</string>
 
     <!-- Label for Drafts list option that attempts to finalize all the drafts the user is currently looking at. Finalizing a draft locks it so it can't be edited and makes it eligible for autosend -->
-    <string name="finalize_all_drafts" tools:ignore="UnusedResources">Finalize all drafts</string>
+    <string name="finalize_all_drafts" oat:toReview="true">Finalize all drafts</string>
 
     <!-- Dialog title that asks if the user wants to finalize all drafts -->
     <plurals name="bulk_finalize_confirmation" tools:ignore="UnusedResources">
@@ -1246,19 +1246,19 @@
     <string name="bulk_finalize_explanation" tools:ignore="UnusedResources">Once you finalize all drafts, they will be in "Ready to send" and you will not be able to make edits. Any drafts that have errors will not be finalized.\n\nYou will not be able to undo this action.</string>
 
     <!-- Message shown after bulk finalization when finalizing all drafts has succeeded -->
-    <plurals name="bulk_finalize_success" tools:ignore="UnusedResources">
+    <plurals name="bulk_finalize_success" oat:toReview="true">
         <item quantity="one">Success! %d draft finalized.</item>
         <item quantity="other">Success! %d drafts finalized.</item>
     </plurals>
 
     <!-- Message shown after bulk finalization when no drafts finalized successfully -->
-    <plurals name="bulk_finalize_failure" tools:ignore="UnusedResources">
+    <plurals name="bulk_finalize_failure" oat:toReview="true">
         <item quantity="one">%d draft has errors that must be addressed before finalizing.</item>
         <item quantity="other">%d drafts have errors that must be addressed before finalizing.</item>
     </plurals>
 
     <!-- Message shown after bulk finalization when some drafts finalize successfully and others fail -->
-    <string name="bulk_finalize_partial_success" tools:ignore="UnusedResources">%d drafts finalized. %d drafts have errors that must be addressed before finalizing.</string>
+    <string name="bulk_finalize_partial_success" oat:toReview="true">%d drafts finalized. %d drafts have errors that must be addressed before finalizing.</string>
 
     <!-- Message shown when some drafts finalize successfully but others need to be finalized manually -->
     <string name="bulk_finalize_unsupported" tools:ignore="UnusedResources">%d drafts finalized. Drafts that are left need to be finalized manually.</string>