From 520baedace97ff7aa2fd8204b409814e482469a2 Mon Sep 17 00:00:00 2001 From: Kanahia Date: Fri, 21 Jun 2024 12:17:40 +0530 Subject: [PATCH] Fixed indentations and unit tests --- .../nrw/commons/upload/PendingUploadsFragment.kt | 4 ++-- .../nrw/commons/upload/UploadProgressActivity.kt | 16 ++++++++-------- app/src/main/res/values/strings.xml | 3 +++ .../ContributionsFragmentUnitTests.kt | 1 - .../ContributionsListFragmentUnitTests.kt | 7 ------- .../ContributionsListPresenterTest.kt | 8 -------- 6 files changed, 13 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt index bc89b4866..e81156132 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt @@ -225,11 +225,11 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon requireActivity(), String.format( Locale.getDefault(), - "Cancelling all the uploads..." + getString(R.string.cancelling_all_the_uploads) ), String.format( Locale.getDefault(), - "Are you sure that you want cancel all the uploads?" + getString(R.string.are_you_sure_that_you_want_cancel_all_the_uploads) ), String.format(Locale.getDefault(), getString(R.string.yes)), String.format(Locale.getDefault(), getString(R.string.no)), diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt index 64516e754..389926e9b 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt @@ -32,7 +32,7 @@ class UploadProgressActivity : BaseActivity() { binding.uploadProgressViewPager.setAdapter(viewPagerAdapter) binding.uploadProgressViewPager.setId(R.id.upload_progress_view_pager) binding.uploadProgressTabLayout.setupWithViewPager(binding.uploadProgressViewPager) - binding.toolbarBinding.toolbar.title = "Uploads" + binding.toolbarBinding.toolbar.title = getString(R.string.uploads) setSupportActionBar(binding.toolbarBinding.toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) @@ -64,9 +64,9 @@ class UploadProgressActivity : BaseActivity() { failedUploadsFragment = FailedUploadsFragment() fragmentList.add(pendingUploadsFragment!!) - titleList.add("Pending") + titleList.add(getString(R.string.pending)) fragmentList.add(failedUploadsFragment!!) - titleList.add("Failed") + titleList.add(getString(R.string.failed)) viewPagerAdapter!!.setTabData(fragmentList, titleList) viewPagerAdapter!!.notifyDataSetChanged() } @@ -89,7 +89,7 @@ class UploadProgressActivity : BaseActivity() { if (isPendingIconsVisible){ if (!isPaused){ if (menu!!.findItem(R.id.pause_icon) == null) { - menu!!.add(Menu.NONE, R.id.pause_icon, Menu.NONE, "Pause") + menu!!.add(Menu.NONE, R.id.pause_icon, Menu.NONE, getString(R.string.pause)) .setIcon(android.R.drawable.ic_media_pause).setOnMenuItemClickListener { pendingUploadsFragment!!.pauseUploads() setPausedIcon(true) @@ -98,7 +98,7 @@ class UploadProgressActivity : BaseActivity() { .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) } if (menu!!.findItem(R.id.cancel_icon) == null) { - menu!!.add(Menu.NONE, R.id.cancel_icon, Menu.NONE, "Cancel") + menu!!.add(Menu.NONE, R.id.cancel_icon, Menu.NONE, getString(R.string.cancel)) .setIcon(android.R.drawable.ic_menu_close_clear_cancel).setOnMenuItemClickListener { pendingUploadsFragment!!.deleteUploads() true @@ -107,7 +107,7 @@ class UploadProgressActivity : BaseActivity() { } }else{ if (menu!!.findItem(R.id.resume_icon) == null) { - menu!!.add(Menu.NONE, R.id.resume_icon, Menu.NONE, "Resume") + menu!!.add(Menu.NONE, R.id.resume_icon, Menu.NONE, getString(R.string.resume)) .setIcon(android.R.drawable.ic_media_play).setOnMenuItemClickListener { pendingUploadsFragment!!.restartUploads() setPausedIcon(false) @@ -120,7 +120,7 @@ class UploadProgressActivity : BaseActivity() { } else if (currentPosition == 1) { if (isErrorIconsVisisble){ if (menu!!.findItem(R.id.retry_icon) == null) { - menu!!.add(Menu.NONE, R.id.retry_icon, Menu.NONE, "Retry") + menu!!.add(Menu.NONE, R.id.retry_icon, Menu.NONE, getString(R.string.retry)) .setIcon(R.drawable.ic_refresh_white_24dp).setOnMenuItemClickListener { failedUploadsFragment!!.restartUploads() true @@ -128,7 +128,7 @@ class UploadProgressActivity : BaseActivity() { .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) } if (menu!!.findItem(R.id.cancel_icon) == null) { - menu!!.add(Menu.NONE, R.id.cancel_icon, Menu.NONE, "Cancel") + menu!!.add(Menu.NONE, R.id.cancel_icon, Menu.NONE, getString(R.string.cancel)) .setIcon(android.R.drawable.ic_menu_close_clear_cancel).setOnMenuItemClickListener { failedUploadsFragment!!.deleteUploads() true diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1370610ea..3a9f73e44 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -823,4 +823,7 @@ Upload your first media by tapping on the add button. Your feedback gets posted to the following wiki page: Commons:Mobile app/Feedback ]]> Are you sure that you want cancel all the uploads? Cancelling all the uploads... + Uploads + Pending + Failed diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt index 10579c20e..098bab852 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt @@ -205,7 +205,6 @@ class ContributionsFragmentUnitTests { `when`(menu.findItem(anyInt())).thenReturn(menuItem) `when`(menuItem.actionView).thenReturn(notification) `when`(store.getBoolean(anyString(), anyBoolean())).thenReturn(true) - fragment.updateLimitedConnectionToggle(menu) } @Test diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt index 367b05bc2..74a68e63c 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt @@ -151,13 +151,6 @@ class ContributionsListFragmentUnitTests { fragment.openMediaDetail(0, true) } - @Test - @Throws(Exception::class) - fun testDeleteUpload() { - Shadows.shadowOf(Looper.getMainLooper()).idle() - fragment.deleteUpload(contribution) - } - @Test @Throws(Exception::class) fun testRetryUpload() { diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt index 6cc3fd38a..ff47f66f0 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt @@ -54,12 +54,4 @@ class ContributionsListPresenterTest { ); } - @Test - fun testDeleteUpload() { - whenever(repository.deleteContributionFromDB(any())) - .thenReturn(Completable.complete()) - contributionsListPresenter.deleteUpload(mock(Contribution::class.java)) - verify(repository, times(1)) - .deleteContributionFromDB(ArgumentMatchers.any(Contribution::class.java)); - } } \ No newline at end of file