diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuickSaveTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuickSaveTest.java index ad827377759..05d3a517314 100644 --- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuickSaveTest.java +++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuickSaveTest.java @@ -69,7 +69,7 @@ public void whenEditingANonFinalizedForm_withViolatedConstraintsOnCurrentScreen_ .clickSave() .pressBackAndDiscardChanges() - .clickDrafts(1, false) + .clickDrafts(1) .clickOnForm("Two Question Required") .assertText("Another Reuben"); } diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuittingFormTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuittingFormTest.java index ffc898e6ca9..9fedebff695 100644 --- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuittingFormTest.java +++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/QuittingFormTest.java @@ -104,7 +104,7 @@ public void whenEditingANonFinalizedForm_withViolatedConstraintsOnCurrentScreen_ .pressBack(new SaveOrDiscardFormDialog<>(new MainMenuPage())) .clickSaveChanges() - .clickDrafts(1, false) + .clickDrafts(1) .clickOnForm("Two Question Required") .assertText("Another Reuben"); } diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formmanagement/BulkFinalizationTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formmanagement/BulkFinalizationTest.kt index b50d46a28d5..a1aacd5b3ec 100644 --- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formmanagement/BulkFinalizationTest.kt +++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formmanagement/BulkFinalizationTest.kt @@ -103,7 +103,7 @@ class BulkFinalizationTest { .clickOptionsIcon(string.finalize_all_drafts) .clickOnString(string.finalize_all_drafts) - .clickOnTextInDialog(string.finalize, EditSavedFormPage(false)) + .clickOnTextInDialog(string.finalize, EditSavedFormPage()) .checkIsSnackbarWithQuantityDisplayed(plurals.bulk_finalize_failure, 1) } @@ -119,7 +119,7 @@ class BulkFinalizationTest { .clickOnForm("One Question") .killAndReopenApp(rule, recentAppsRule, MainMenuPage()) - .clickDrafts(false) + .clickDrafts() .clickFinalizeAll(1) .clickFinalize() .checkIsSnackbarWithMessageDisplayed(string.bulk_finalize_unsupported, 0) diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/projects/SwitchProjectTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/projects/SwitchProjectTest.kt index e4859bf8e9d..032ef44a5f8 100644 --- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/projects/SwitchProjectTest.kt +++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/projects/SwitchProjectTest.kt @@ -120,7 +120,7 @@ class SwitchProjectTest { .pressBack(MainMenuPage()) // Check instances - .clickDrafts(1, false) + .clickDrafts(1) .assertText("Two Question") .pressBack(MainMenuPage()) diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/BulkFinalizationConfirmationDialogPage.kt b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/BulkFinalizationConfirmationDialogPage.kt index f72c414fd17..c9264fff985 100644 --- a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/BulkFinalizationConfirmationDialogPage.kt +++ b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/BulkFinalizationConfirmationDialogPage.kt @@ -21,10 +21,10 @@ class BulkFinalizationConfirmationDialogPage(private val count: Int) : Page { - private final boolean firstOpen; - - public EditSavedFormPage(boolean first) { - this.firstOpen = first; - } @Override public EditSavedFormPage assertOnPage() { - closeDraftsPillsEducationDialog(); assertText(org.odk.collect.strings.R.string.review_data); return this; } - private void closeDraftsPillsEducationDialog() { - if (firstOpen) { - assertTextInDialog(org.odk.collect.strings.R.string.new_feature); - clickOKOnDialog(); - } - } - public EditSavedFormPage checkInstanceState(String instanceName, String desiredStatus) { int desiredImageId = getInstanceIcon(desiredStatus); diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/MainMenuPage.java b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/MainMenuPage.java index 1ec048a1b76..cd2b446c109 100644 --- a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/MainMenuPage.java +++ b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/MainMenuPage.java @@ -77,21 +77,13 @@ private void goToBlankForm(String formName) { } public EditSavedFormPage clickDrafts() { - return clickDrafts(true); - } - - public EditSavedFormPage clickDrafts(boolean firstOpen) { onView(withId(R.id.review_data)).perform(click()); - return new EditSavedFormPage(firstOpen).assertOnPage(); + return new EditSavedFormPage().assertOnPage(); } public EditSavedFormPage clickDrafts(int formCount) { - return clickDrafts(formCount, true); - } - - public EditSavedFormPage clickDrafts(int formCount, boolean firstOpen) { assertNumberOfEditableForms(formCount); - return clickDrafts(firstOpen); + return clickDrafts(); } public MainMenuPage assertNumberOfFinalizedForms(int number) { diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserList.java b/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserList.java index 5415d91590c..8b8c9ba0eb6 100644 --- a/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserList.java +++ b/collect_app/src/main/java/org/odk/collect/android/activities/InstanceChooserList.java @@ -34,8 +34,6 @@ import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; - import org.odk.collect.android.R; import org.odk.collect.android.adapters.InstanceListCursorAdapter; import org.odk.collect.android.dao.CursorLoaderFactory; @@ -59,8 +57,6 @@ import org.odk.collect.lists.EmptyListView; import org.odk.collect.material.MaterialProgressDialogFragment; import org.odk.collect.settings.SettingsProvider; -import org.odk.collect.settings.keys.MetaKeys; -import org.odk.collect.strings.R.string; import java.util.Arrays; @@ -117,16 +113,6 @@ public void onCreate(Bundle savedInstanceState) { if (formMode == null || ApplicationConstants.FormModes.EDIT_SAVED.equalsIgnoreCase(formMode)) { setTitle(getString(org.odk.collect.strings.R.string.review_data)); editMode = true; - - if (!settingsProvider.getMetaSettings().getBoolean(MetaKeys.DRAFTS_PILLS_EDUCATION_SHOWN)) { - new MaterialAlertDialogBuilder(this) - .setTitle(string.new_feature) - .setMessage(string.drafts_pills_education_message) - .setPositiveButton(string.ok, null) - .show(); - - settingsProvider.getMetaSettings().save(MetaKeys.DRAFTS_PILLS_EDUCATION_SHOWN, true); - } } else { setTitle(getString(org.odk.collect.strings.R.string.view_sent_forms)); EmptyListView emptyListView = findViewById(android.R.id.empty); diff --git a/settings/src/main/java/org/odk/collect/settings/keys/MetaKeys.kt b/settings/src/main/java/org/odk/collect/settings/keys/MetaKeys.kt index 12dc4f2bc40..c7917a7651d 100644 --- a/settings/src/main/java/org/odk/collect/settings/keys/MetaKeys.kt +++ b/settings/src/main/java/org/odk/collect/settings/keys/MetaKeys.kt @@ -12,5 +12,4 @@ object MetaKeys { const val LAST_LAUNCHED = "last_launched" const val LAST_USED_PEN_COLOR = "last_used_pen_color" const val PERMISSIONS_REQUESTED = "permissions_requested" - const val DRAFTS_PILLS_EDUCATION_SHOWN = "drafts_pills_education_shown" } diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml index 455be814623..e00b0a42988 100644 --- a/strings/src/main/res/values-cs/strings.xml +++ b/strings/src/main/res/values-cs/strings.xml @@ -1026,10 +1026,8 @@ Zrušte zaškrtnutím, aby se skrylo z konceptů - Nová funkce - - Návrh seznamu nyní zobrazuje validační chyby. Při každém uložení formuláře jako návrhu je aktualizován jeho validační stav. Návrhy označené jako \"Chyby\" buď nemají vyplněné povinné otázky, nebo obsahují hodnoty, které nejsou povolené. - + + Nic není k zobrazení Žádné prázdné formuláře diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml index 88322dbb5bb..9e8b1900785 100644 --- a/strings/src/main/res/values-de/strings.xml +++ b/strings/src/main/res/values-de/strings.xml @@ -1063,10 +1063,8 @@ Abwählen um von Entwürfen zu verbergen - Neue Funktion - - Die Entwurfsliste zeigt jetzt Validierungsfehler an. Bei jedem Speichern als Entwurf eines Formulars wird dessen Validierungsstatus aktualisiert.\n\nEntwürfe, die mit \"Fehler\" markiert sind, haben entweder fehlende Antworten bei Pflichtfragen oder ungültige Antworten. - + + Keine Inhalte vorhanden. Keine leeren Formulare diff --git a/strings/src/main/res/values-es/strings.xml b/strings/src/main/res/values-es/strings.xml index d8bc1884314..d82cac092ea 100644 --- a/strings/src/main/res/values-es/strings.xml +++ b/strings/src/main/res/values-es/strings.xml @@ -1075,10 +1075,8 @@ Desmarque para ocultarse de los borradores - Nueva función - - La lista borrador ahora muestra errores de validación. Cada vez que guarda un formulario como borrador, su estado de validación se actualiza.\n\nA los borradores marcados con \"Errores\" les faltan preguntas obligatorias o tienen valores que no están permitidos. - + + No hay nada disponible para mostrar. No hay formularios en blanco diff --git a/strings/src/main/res/values-fa-rAF/strings.xml b/strings/src/main/res/values-fa-rAF/strings.xml index 40ee900af9f..9c4258f95f2 100644 --- a/strings/src/main/res/values-fa-rAF/strings.xml +++ b/strings/src/main/res/values-fa-rAF/strings.xml @@ -979,10 +979,8 @@ برای پنهان شدن از پیش نویس ها، علامت را بردارید. - ویژگی های جدید - - فهرست پیش‌نویس اکنون خطاهای اعتبارسنجی را نشان می‌دهد. هر بار که فرمی را به‌عنوان پیش‌نویس ذخیره می‌کنید، وضعیت اعتبارسنجی آن به‌روزرسانی می‌شود.\n\nپیش‌نویس‌هایی که با «خطاها» علامت‌گذاری شده‌اند، یا سؤالات لازم را ندارند یا مقادیری دارند که مجاز نیستند. - + + چیزی برای نمایش در دسترس نیست diff --git a/strings/src/main/res/values-fa/strings.xml b/strings/src/main/res/values-fa/strings.xml index 40ee900af9f..9c4258f95f2 100644 --- a/strings/src/main/res/values-fa/strings.xml +++ b/strings/src/main/res/values-fa/strings.xml @@ -979,10 +979,8 @@ برای پنهان شدن از پیش نویس ها، علامت را بردارید. - ویژگی های جدید - - فهرست پیش‌نویس اکنون خطاهای اعتبارسنجی را نشان می‌دهد. هر بار که فرمی را به‌عنوان پیش‌نویس ذخیره می‌کنید، وضعیت اعتبارسنجی آن به‌روزرسانی می‌شود.\n\nپیش‌نویس‌هایی که با «خطاها» علامت‌گذاری شده‌اند، یا سؤالات لازم را ندارند یا مقادیری دارند که مجاز نیستند. - + + چیزی برای نمایش در دسترس نیست diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml index b0c57e6d751..0872f91ac41 100644 --- a/strings/src/main/res/values-fi/strings.xml +++ b/strings/src/main/res/values-fi/strings.xml @@ -1063,10 +1063,8 @@ Poista rasti piilottaaksesi Luonnos-näkymästä - Uusi ominaisuus - - Luonnoslista näyttää nyt varmennusvirheet. Lomakkeen varmennustila päivitetään aina kun tallennat lomakkeen luonnoksena.\n\nLuonnoksissa, joissa on merkintä \"Virhe\", on joko puuttuvia vaadittuja vastauksia tai arvoja, joita ei sallita. - + + Ei näytettävää Ei tyhjiä lomakkeita diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml index 5b0cde9e3f0..0dda5afff99 100644 --- a/strings/src/main/res/values-fr/strings.xml +++ b/strings/src/main/res/values-fr/strings.xml @@ -1076,10 +1076,8 @@ Décochez pour masquer dans les ébauches. - Nouvelle fonctionnalité - - La liste des ébauches montre désormais les erreurs de validation. Chaque fois que vous enregistrez une ébauche, son statut de validation est mis à jour.\n\nLes ébauches marquées avec \"Erreurs\" ont des questions obligatoires non renseignées ou contiennent des valeurs non autorisées. - + + Rien à afficher Aucun Formulaire Vierge diff --git a/strings/src/main/res/values-it/strings.xml b/strings/src/main/res/values-it/strings.xml index 4a516807723..36a35cbd0f8 100644 --- a/strings/src/main/res/values-it/strings.xml +++ b/strings/src/main/res/values-it/strings.xml @@ -1074,10 +1074,8 @@ Deseleziona per nasconderlo dalle bozze - Nuova funzionalità - - La lista bozza ora mostra gli errori di convalida. Ogni volta che salvi un formulario come bozza, il suo stato di convalida viene aggiornato.\n\nLe bozze contrassegnate con \"Errori\" mancano di domande obbligatorie o contengono valori non consentiti. - + + Niente disponibile da visualizzare Nessun formulario vuoto diff --git a/strings/src/main/res/values-pt/strings.xml b/strings/src/main/res/values-pt/strings.xml index 3a51bdcc1fe..3f6621f04be 100644 --- a/strings/src/main/res/values-pt/strings.xml +++ b/strings/src/main/res/values-pt/strings.xml @@ -1041,10 +1041,8 @@ Desmarque para não aparecer em Rascunhos - Nova funcionalidade - - A lista de rascunhos agora mostra os erros de validação. A cada vez que você salva um formulário como rascunho o status de validação dele é atualizado. \n\nRascunhos marcados como \"Erro\" não tem dados em questões de preenchimento obrigatório ou contém dados que não são permitidos. - + + Não há nada para exibir Não há formulários em branco diff --git a/strings/src/main/res/values-ru/strings.xml b/strings/src/main/res/values-ru/strings.xml index 3f9369f94ab..93c3c4be0c4 100644 --- a/strings/src/main/res/values-ru/strings.xml +++ b/strings/src/main/res/values-ru/strings.xml @@ -976,10 +976,8 @@ Снимите галочку, чтобы скрыть из черновиков - Новая функция - - Список черновиков теперь показывает ошибки при проверке. Каждый раз, когда вы сохраняете форму как черновик, ее статус проверки обновляется.\n\nЧерновики, помеченные как «Ошибки», либо не содержат обязательных вопросов, либо содержат недопустимые значения. - + + Ничего недоступно для отображения Нет пустых форм diff --git a/strings/src/main/res/values-sl/strings.xml b/strings/src/main/res/values-sl/strings.xml index 68aa84b8a29..7de07ec2d58 100644 --- a/strings/src/main/res/values-sl/strings.xml +++ b/strings/src/main/res/values-sl/strings.xml @@ -1045,10 +1045,8 @@ Odkljukajte, da ne prikazujete v osnutkih - Nova funkcionalnost - - Seznam osnutekov zdaj prikazuje zaznane napake. Vsakič, ko obrazec shranite kot osnutek, se izpolnjeni odgovori ponovno preverijo. \n\nOsnutki, označeni z \"Napake\", imajo manjkajoča zahtevana vprašanja ali imajo vrednosti, ki niso dovoljene. - + + Ničesar ni na voljo za prikaz Brez praznih obrazcev diff --git a/strings/src/main/res/values-ur/strings.xml b/strings/src/main/res/values-ur/strings.xml index 46cbb876573..ca4139f1af6 100644 --- a/strings/src/main/res/values-ur/strings.xml +++ b/strings/src/main/res/values-ur/strings.xml @@ -1035,10 +1035,8 @@ Constraint processing ڈرافٹس میں سے چھپانے کے لئے uncheck کریں - نیا فیچر - - ڈرافٹ کی فہرست اب validation کی غلطیاں بھی دکھائے گی۔ ہر دفعہ جب آپ کسی فارم کو ڈرافٹ کے طور پر محفوظ کریں گے، اس کا validation کا سٹیٹس update ہو جائے گا۔ جن ڈرافٹس میں غلطیاں موجود ہیں، ان میں یا تو ضروری سوالات کے جوابات نہیں ہیں، یا پھران میں کوئی value غلط ہے۔ - + + یہاں دکھانے کو کچھ نہیں ہے diff --git a/strings/src/main/res/values-zh-rTW/strings.xml b/strings/src/main/res/values-zh-rTW/strings.xml index e5c7893d9fd..d3a463a6273 100644 --- a/strings/src/main/res/values-zh-rTW/strings.xml +++ b/strings/src/main/res/values-zh-rTW/strings.xml @@ -1051,10 +1051,8 @@ 取消選擇可隱藏在草稿中的項目 - 新功能 - - 草稿列表現在已顯示驗證錯誤。每次將表單儲存為草稿時,其驗證狀態都會更新。\n\n標有「錯誤」的草稿要麼缺少必填問題,要麼包含不允許的值。 - + + 沒有可顯示的內容 無空白表格 diff --git a/strings/src/main/res/values-zh/strings.xml b/strings/src/main/res/values-zh/strings.xml index 94df1f7224a..bb54508a10d 100644 --- a/strings/src/main/res/values-zh/strings.xml +++ b/strings/src/main/res/values-zh/strings.xml @@ -1036,10 +1036,8 @@ 取消选中即可在草稿中隐藏 - 新功能 - - 草稿列表现在已显示验证错误。每次将表单保存为草稿时,其验证状态都会更新。\n\n标有“错误”的草稿要么缺少必填问题,要么包含不允许的值。 - + + 没有可显示的内容 無空白表格 diff --git a/strings/src/main/res/values/strings.xml b/strings/src/main/res/values/strings.xml index 83ca2dcb533..bf577b68638 100644 --- a/strings/src/main/res/values/strings.xml +++ b/strings/src/main/res/values/strings.xml @@ -1316,12 +1316,6 @@ Uncheck to hide from Drafts - - New feature - - - The draft list now shows validation errors. Each time you save a form as draft, its validation status is updated.\n\nDrafts marked with \"Errors\" are either missing required questions or have values that are not allowed. - Nothing available to display