mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed indentations and unit tests

Browse source
This commit is contained in:
Kanahia 2024-06-21 12:17:40 +05:30
parent c3b8f6ade3
commit 520baedace
6 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt
View file

@ -225,11 +225,11 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon
requireActivity(), requireActivity(),
String.format( String.format(
Locale.getDefault(), Locale.getDefault(),
"Cancelling all the uploads..." getString(R.string.cancelling_all_the_uploads)
), ),
String.format( String.format(
Locale.getDefault(), 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.yes)),
String.format(Locale.getDefault(), getString(R.string.no)), String.format(Locale.getDefault(), getString(R.string.no)),

16
app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt
View file

@ -32,7 +32,7 @@ class UploadProgressActivity : BaseActivity() {
binding.uploadProgressViewPager.setAdapter(viewPagerAdapter) binding.uploadProgressViewPager.setAdapter(viewPagerAdapter)
binding.uploadProgressViewPager.setId(R.id.upload_progress_view_pager) binding.uploadProgressViewPager.setId(R.id.upload_progress_view_pager)
binding.uploadProgressTabLayout.setupWithViewPager(binding.uploadProgressViewPager) binding.uploadProgressTabLayout.setupWithViewPager(binding.uploadProgressViewPager)
binding.toolbarBinding.toolbar.title = "Uploads" binding.toolbarBinding.toolbar.title = getString(R.string.uploads)
setSupportActionBar(binding.toolbarBinding.toolbar) setSupportActionBar(binding.toolbarBinding.toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
@ -64,9 +64,9 @@ class UploadProgressActivity : BaseActivity() {
failedUploadsFragment = FailedUploadsFragment() failedUploadsFragment = FailedUploadsFragment()
fragmentList.add(pendingUploadsFragment!!) fragmentList.add(pendingUploadsFragment!!)
titleList.add("Pending") titleList.add(getString(R.string.pending))
fragmentList.add(failedUploadsFragment!!) fragmentList.add(failedUploadsFragment!!)
titleList.add("Failed") titleList.add(getString(R.string.failed))
viewPagerAdapter!!.setTabData(fragmentList, titleList) viewPagerAdapter!!.setTabData(fragmentList, titleList)
viewPagerAdapter!!.notifyDataSetChanged() viewPagerAdapter!!.notifyDataSetChanged()
} }
@ -89,7 +89,7 @@ class UploadProgressActivity : BaseActivity() {
if (isPendingIconsVisible){ if (isPendingIconsVisible){
if (!isPaused){ if (!isPaused){
if (menu!!.findItem(R.id.pause_icon) == null) { 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 { .setIcon(android.R.drawable.ic_media_pause).setOnMenuItemClickListener {
pendingUploadsFragment!!.pauseUploads() pendingUploadsFragment!!.pauseUploads()
setPausedIcon(true) setPausedIcon(true)
@ -98,7 +98,7 @@ class UploadProgressActivity : BaseActivity() {
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
if (menu!!.findItem(R.id.cancel_icon) == null) { 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 { .setIcon(android.R.drawable.ic_menu_close_clear_cancel).setOnMenuItemClickListener {
pendingUploadsFragment!!.deleteUploads() pendingUploadsFragment!!.deleteUploads()
true true
@ -107,7 +107,7 @@ class UploadProgressActivity : BaseActivity() {
} }
}else{ }else{
if (menu!!.findItem(R.id.resume_icon) == null) { 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 { .setIcon(android.R.drawable.ic_media_play).setOnMenuItemClickListener {
pendingUploadsFragment!!.restartUploads() pendingUploadsFragment!!.restartUploads()
setPausedIcon(false) setPausedIcon(false)
@ -120,7 +120,7 @@ class UploadProgressActivity : BaseActivity() {
} else if (currentPosition == 1) { } else if (currentPosition == 1) {
if (isErrorIconsVisisble){ if (isErrorIconsVisisble){
if (menu!!.findItem(R.id.retry_icon) == null) { 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 { .setIcon(R.drawable.ic_refresh_white_24dp).setOnMenuItemClickListener {
failedUploadsFragment!!.restartUploads() failedUploadsFragment!!.restartUploads()
true true
@ -128,7 +128,7 @@ class UploadProgressActivity : BaseActivity() {
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
if (menu!!.findItem(R.id.cancel_icon) == null) { 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 { .setIcon(android.R.drawable.ic_menu_close_clear_cancel).setOnMenuItemClickListener {
failedUploadsFragment!!.deleteUploads() failedUploadsFragment!!.deleteUploads()
true true

3
app/src/main/res/values/strings.xml
View file

@ -823,4 +823,7 @@ Upload your first media by tapping on the add button.</string>
<string name="feedback_destination_note">Your feedback gets posted to the following wiki page: <![CDATA[ <a href="https://commons.wikimedia.org/wiki/Commons:Mobile_app/Feedback">Commons:Mobile app/Feedback</a> ]]></string> <string name="feedback_destination_note">Your feedback gets posted to the following wiki page: <![CDATA[ <a href="https://commons.wikimedia.org/wiki/Commons:Mobile_app/Feedback">Commons:Mobile app/Feedback</a> ]]></string>
<string name="are_you_sure_that_you_want_cancel_all_the_uploads">Are you sure that you want cancel all the uploads?</string> <string name="are_you_sure_that_you_want_cancel_all_the_uploads">Are you sure that you want cancel all the uploads?</string>
<string name="cancelling_all_the_uploads">Cancelling all the uploads...</string> <string name="cancelling_all_the_uploads">Cancelling all the uploads...</string>
<string name="uploads">Uploads</string>
<string name="pending">Pending</string>
<string name="failed">Failed</string>
</resources> </resources>

1
app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt
View file

@ -205,7 +205,6 @@ class ContributionsFragmentUnitTests {
`when`(menu.findItem(anyInt())).thenReturn(menuItem) `when`(menu.findItem(anyInt())).thenReturn(menuItem)
`when`(menuItem.actionView).thenReturn(notification) `when`(menuItem.actionView).thenReturn(notification)
`when`(store.getBoolean(anyString(), anyBoolean())).thenReturn(true) `when`(store.getBoolean(anyString(), anyBoolean())).thenReturn(true)
fragment.updateLimitedConnectionToggle(menu)
} }
@Test @Test

7
app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt
View file

@ -151,13 +151,6 @@ class ContributionsListFragmentUnitTests {
fragment.openMediaDetail(0, true) fragment.openMediaDetail(0, true)
} }
@Test
@Throws(Exception::class)
fun testDeleteUpload() {
Shadows.shadowOf(Looper.getMainLooper()).idle()
fragment.deleteUpload(contribution)
}
@Test @Test
@Throws(Exception::class) @Throws(Exception::class)
fun testRetryUpload() { fun testRetryUpload() {

8
app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt
View file

@ -54,12 +54,4 @@ class ContributionsListPresenterTest {
); );
} }
@Test
fun testDeleteUpload() {
whenever(repository.deleteContributionFromDB(any<Contribution>()))
.thenReturn(Completable.complete())
contributionsListPresenter.deleteUpload(mock(Contribution::class.java))
verify(repository, times(1))
.deleteContributionFromDB(ArgumentMatchers.any(Contribution::class.java));
}
} }