Formatted code

getodk · Jul 11, 2023 · 4923901 · 4923901
1 parent abb3252
commit 4923901
Show file tree

Hide file tree

Showing 8 changed files with 421 additions and 94 deletions.
diff --git a/...p/src/androidTest/java/org/odk/collect/android/support/pages/ProjectSettingsDialogPage.kt b/...p/src/androidTest/java/org/odk/collect/android/support/pages/ProjectSettingsDialogPage.kt
@@ -21,39 +21,86 @@ internal class ProjectSettingsDialogPage : Page<ProjectSettingsDialogPage>() {
     }
 
     fun clickSettings(): ProjectSettingsPage {
-        return clickOnButtonInDialog(org.odk.collect.strings.R.string.settings, ProjectSettingsPage())
+        return clickOnButtonInDialog(
+            org.odk.collect.strings.R.string.settings,
+            ProjectSettingsPage()
+        )
     }
 
     fun clickAbout(): AboutPage {
-        return clickOnButtonInDialog(org.odk.collect.strings.R.string.about_preferences, AboutPage())
+        return clickOnButtonInDialog(
+            org.odk.collect.strings.R.string.about_preferences,
+            AboutPage()
+        )
     }
 
     fun clickAddProject(): QrCodeProjectCreatorDialogPage {
-        return clickOnButtonInDialog(org.odk.collect.strings.R.string.add_project, QrCodeProjectCreatorDialogPage())
+        return clickOnButtonInDialog(
+            org.odk.collect.strings.R.string.add_project,
+            QrCodeProjectCreatorDialogPage()
+        )
     }
 
     fun assertCurrentProject(projectName: String, subtext: String): ProjectSettingsDialogPage {
-        onView(allOf(hasDescendant(withText(projectName)), hasDescendant(withText(subtext)), withContentDescription(getTranslatedString(
-            org.odk.collect.strings.R.string.using_project, projectName)))).check(matches(isDisplayed()))
+        onView(
+            allOf(
+                hasDescendant(withText(projectName)),
+                hasDescendant(withText(subtext)),
+                withContentDescription(
+                    getTranslatedString(
+                        org.odk.collect.strings.R.string.using_project,
+                        projectName
+                    )
+                )
+            )
+        ).check(matches(isDisplayed()))
         return this
     }
 
     fun assertInactiveProject(projectName: String, subtext: String): ProjectSettingsDialogPage {
-        onView(allOf(hasDescendant(withText(projectName)), hasDescendant(withText(subtext)), withContentDescription(getTranslatedString(
-            org.odk.collect.strings.R.string.switch_to_project, projectName)))).check(matches(isDisplayed()))
+        onView(
+            allOf(
+                hasDescendant(withText(projectName)),
+                hasDescendant(withText(subtext)),
+                withContentDescription(
+                    getTranslatedString(
+                        org.odk.collect.strings.R.string.switch_to_project,
+                        projectName
+                    )
+                )
+            )
+        ).check(matches(isDisplayed()))
         return this
     }
 
     fun assertNotInactiveProject(projectName: String): ProjectSettingsDialogPage {
-        onView(allOf(hasDescendant(withText(projectName)), withContentDescription(getTranslatedString(
-            org.odk.collect.strings.R.string.switch_to_project, projectName)))).check(doesNotExist())
+        onView(
+            allOf(
+                hasDescendant(withText(projectName)),
+                withContentDescription(
+                    getTranslatedString(
+                        org.odk.collect.strings.R.string.switch_to_project,
+                        projectName
+                    )
+                )
+            )
+        ).check(doesNotExist())
         return this
     }
 
     fun selectProject(projectName: String): MainMenuPage {
         WaitFor.wait250ms() // https://github.com/android/android-test/issues/444
-        onView(allOf(hasDescendant(withText(projectName)), withContentDescription(getTranslatedString(
-            org.odk.collect.strings.R.string.switch_to_project, projectName))))
+        onView(
+            allOf(
+                hasDescendant(withText(projectName)),
+                withContentDescription(
+                    getTranslatedString(
+                        org.odk.collect.strings.R.string.switch_to_project,
+                        projectName
+                    )
+                )
+            )
+        )
             .inRoot(RootMatchers.isDialog())
             .perform(click())
         return MainMenuPage().assertOnPage()

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/DeleteSavedFormActivity.kt b/collect_app/src/main/java/org/odk/collect/android/activities/DeleteSavedFormActivity.kt
@@ -107,8 +107,11 @@ class DeleteSavedFormActivity : LocalizedActivity() {
         }
 
         TabLayoutMediator(binding.tabLayout, viewPager) { tab: TabLayout.Tab, position: Int ->
-            tab.text = if (position == 0) getString(org.odk.collect.strings.R.string.data) else getString(
-                org.odk.collect.strings.R.string.forms)
+            tab.text = if (position == 0) {
+                getString(org.odk.collect.strings.R.string.data)
+            } else {
+                getString(org.odk.collect.strings.R.string.forms)
+            }
         }.attach()
     }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/configure/qr/QRCodeScannerFragment.kt b/collect_app/src/main/java/org/odk/collect/android/configure/qr/QRCodeScannerFragment.kt
@@ -56,15 +56,27 @@ class QRCodeScannerFragment : BarCodeScannerFragment() {
                     File(storagePathProvider.getProjectRootDirPath() + File.separator + newProjectName).createNewFile()
                 }
 
-                showLongToast(requireContext(), getString(org.odk.collect.strings.R.string.successfully_imported_settings))
+                showLongToast(
+                    requireContext(),
+                    getString(org.odk.collect.strings.R.string.successfully_imported_settings)
+                )
                 ActivityUtils.startActivityAndCloseAllOthers(
                     requireActivity(),
                     MainMenuActivity::class.java
                 )
             }
-            SettingsImportingResult.INVALID_SETTINGS -> showLongToast(requireContext(), getString(
-                org.odk.collect.strings.R.string.invalid_qrcode))
-            SettingsImportingResult.GD_PROJECT -> showLongToast(requireContext(), getString(org.odk.collect.strings.R.string.settings_with_gd_protocol))
+
+            SettingsImportingResult.INVALID_SETTINGS -> showLongToast(
+                requireContext(),
+                getString(
+                    org.odk.collect.strings.R.string.invalid_qrcode
+                )
+            )
+
+            SettingsImportingResult.GD_PROJECT -> showLongToast(
+                requireContext(),
+                getString(org.odk.collect.strings.R.string.settings_with_gd_protocol)
+            )
         }
     }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/projects/QrCodeProjectCreatorDialog.kt b/collect_app/src/main/java/org/odk/collect/android/projects/QrCodeProjectCreatorDialog.kt
@@ -175,7 +175,10 @@ class QrCodeProjectCreatorDialog :
                 R.id.menu_item_scan_sd_card -> {
                     val photoPickerIntent = Intent(Intent.ACTION_GET_CONTENT)
                     photoPickerIntent.type = "image/*"
-                    intentLauncher.launchForResult(imageQrCodeImportResultLauncher, photoPickerIntent) {
+                    intentLauncher.launchForResult(
+                        imageQrCodeImportResultLauncher,
+                        photoPickerIntent
+                    ) {
                         showShortToast(
                             requireContext(),
                             getString(
@@ -249,7 +252,10 @@ class QrCodeProjectCreatorDialog :
             val settingsJson = try {
                 CompressionUtils.decompress(barcodeResult.text)
             } catch (e: Exception) {
-                showShortToast(requireContext(), getString(org.odk.collect.strings.R.string.invalid_qrcode))
+                showShortToast(
+                    requireContext(),
+                    getString(org.odk.collect.strings.R.string.invalid_qrcode)
+                )
                 ""
             }
             createProjectOrError(settingsJson)
@@ -288,10 +294,20 @@ class QrCodeProjectCreatorDialog :
                     )
                 )
             }
-            SettingsImportingResult.INVALID_SETTINGS -> ToastUtils.showLongToast(requireContext(), getString(
-                org.odk.collect.strings.R.string.invalid_qrcode))
-            SettingsImportingResult.GD_PROJECT -> ToastUtils.showLongToast(requireContext(), getString(
-                org.odk.collect.strings.R.string.settings_with_gd_protocol))
+
+            SettingsImportingResult.INVALID_SETTINGS -> ToastUtils.showLongToast(
+                requireContext(),
+                getString(
+                    org.odk.collect.strings.R.string.invalid_qrcode
+                )
+            )
+
+            SettingsImportingResult.GD_PROJECT -> ToastUtils.showLongToast(
+                requireContext(),
+                getString(
+                    org.odk.collect.strings.R.string.settings_with_gd_protocol
+                )
+            )
         }
     }