From 9f77fbbc8cd6645eb298390f269e9e7879d6f735 Mon Sep 17 00:00:00 2001 From: Kanahia Date: Sun, 21 Jul 2024 12:59:24 +0530 Subject: [PATCH] Improved icons --- .../fr/free/nrw/commons/MainActivityTest.kt | 32 ------------------- .../commons/upload/PendingUploadsAdapter.kt | 2 +- .../commons/upload/PendingUploadsFragment.kt | 20 ++++++------ .../commons/upload/UploadProgressActivity.kt | 10 +++--- .../main/res/drawable/ic_cancel_upload.xml | 17 ++++++++++ ...resh_grey_24dp.xml => ic_refresh_24dp.xml} | 9 ++++-- .../res/drawable/ic_refresh_white_24dp.xml | 2 +- .../res/layout/activity_upload_progress.xml | 8 ----- .../main/res/layout/item_failed_upload.xml | 4 +-- .../main/res/layout/item_pending_upload.xml | 2 +- app/src/main/res/menu/menu_uploads.xml | 8 ++--- app/src/main/res/values/attrs.xml | 1 - app/src/main/res/values/styles.xml | 2 -- 13 files changed, 47 insertions(+), 70 deletions(-) create mode 100644 app/src/main/res/drawable/ic_cancel_upload.xml rename app/src/main/res/drawable/{ic_refresh_grey_24dp.xml => ic_refresh_24dp.xml} (70%) diff --git a/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt index c898ca029..458d8de3e 100644 --- a/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt +++ b/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt @@ -195,36 +195,4 @@ class MainActivityTest { Espresso.pressBack() UITestHelper.sleep(1000) } - - @Test - fun testLimitedConnectionModeToggle() { - val isEnabled = defaultKvStore - .getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false) - Espresso.onView( - Matchers.allOf( - ViewMatchers.withId(R.id.toggle_limited_connection_mode), - childAtPosition( - childAtPosition( - ViewMatchers.withId(R.id.toolbar), - 1 - ), - 0 - ), - ViewMatchers.isDisplayed() - ) - ).perform(ViewActions.click()) - UITestHelper.sleep(1000) - if (isEnabled) { - Assert.assertFalse( - defaultKvStore - .getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false) - ) - } else { - Assert.assertTrue( - defaultKvStore - .getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false) - ) - } - } - } \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt index 58c39d9d0..00ab5521c 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt @@ -101,7 +101,7 @@ class PendingUploadsAdapter(private val callback: Callback) : errorTextView.visibility = View.VISIBLE itemProgress.visibility = View.GONE } else { - if (state == Contribution.STATE_QUEUED){ + if (state == Contribution.STATE_QUEUED || state == Contribution.STATE_PAUSED){ errorTextView.text = "Queued" errorTextView.visibility = View.VISIBLE itemProgress.visibility = View.GONE 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 c45854168..db767dc0d 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 @@ -146,16 +146,16 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon val newContributionList: MutableList = sortedContributionsList.toMutableList() - val listOfRemoved: MutableList = mutableListOf() - val last = sortedContributionsList.last() - for (i in sortedContributionsList.indices) { - val current = sortedContributionsList[i] - if (current.transferred == 0L && (current.dateModifiedInMillis() / 100) > (last.dateModifiedInMillis() / 100)) { - listOfRemoved.add(current) - } - } - newContributionList.removeAll(listOfRemoved) - newContributionList.addAll(listOfRemoved) +// val listOfRemoved: MutableList = mutableListOf() +// val last = sortedContributionsList.last() +// for (i in sortedContributionsList.indices) { +// val current = sortedContributionsList[i] +// if (current.transferred == 0L && (current.dateModifiedInMillis() / 100) > (last.dateModifiedInMillis() / 100)) { +// listOfRemoved.add(current) +// } +// } +// newContributionList.removeAll(listOfRemoved) +// newContributionList.addAll(listOfRemoved) // TODO: WORK ON THE SORTING ISSUE val dataSource = object : PositionalDataSource() { 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 72d747b4d..e83b7271f 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 @@ -107,7 +107,7 @@ class UploadProgressActivity : BaseActivity() { Menu.NONE, getString(R.string.pause) ) - .setIcon(android.R.drawable.ic_media_pause) + .setIcon(R.drawable.pause_icon) .setOnMenuItemClickListener { pendingUploadsFragment!!.pauseUploads() setPausedIcon(true) @@ -122,7 +122,7 @@ class UploadProgressActivity : BaseActivity() { Menu.NONE, getString(R.string.cancel) ) - .setIcon(android.R.drawable.ic_menu_close_clear_cancel) + .setIcon(R.drawable.ic_cancel_upload) .setOnMenuItemClickListener { pendingUploadsFragment!!.deleteUploads() true @@ -137,7 +137,7 @@ class UploadProgressActivity : BaseActivity() { Menu.NONE, getString(R.string.resume) ) - .setIcon(android.R.drawable.ic_media_play) + .setIcon(R.drawable.play_icon) .setOnMenuItemClickListener { pendingUploadsFragment!!.restartUploads() setPausedIcon(false) @@ -151,7 +151,7 @@ class UploadProgressActivity : BaseActivity() { if (isErrorIconsVisisble) { if (menu!!.findItem(R.id.retry_icon) == null) { 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_24dp).setOnMenuItemClickListener { failedUploadsFragment!!.restartUploads() true } @@ -164,7 +164,7 @@ class UploadProgressActivity : BaseActivity() { Menu.NONE, getString(R.string.cancel) ) - .setIcon(android.R.drawable.ic_menu_close_clear_cancel) + .setIcon(R.drawable.ic_cancel_upload) .setOnMenuItemClickListener { failedUploadsFragment!!.deleteUploads() true diff --git a/app/src/main/res/drawable/ic_cancel_upload.xml b/app/src/main/res/drawable/ic_cancel_upload.xml new file mode 100644 index 000000000..15f8f297c --- /dev/null +++ b/app/src/main/res/drawable/ic_cancel_upload.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_refresh_grey_24dp.xml b/app/src/main/res/drawable/ic_refresh_24dp.xml similarity index 70% rename from app/src/main/res/drawable/ic_refresh_grey_24dp.xml rename to app/src/main/res/drawable/ic_refresh_24dp.xml index ae9eace8a..e1d22bc28 100644 --- a/app/src/main/res/drawable/ic_refresh_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_refresh_24dp.xml @@ -3,9 +3,12 @@ android:height="@dimen/half_standard_height" android:viewportHeight="24.0" android:viewportWidth="24.0"> - + - + diff --git a/app/src/main/res/drawable/ic_refresh_white_24dp.xml b/app/src/main/res/drawable/ic_refresh_white_24dp.xml index 08e2e5d7b..fce1f73e9 100644 --- a/app/src/main/res/drawable/ic_refresh_white_24dp.xml +++ b/app/src/main/res/drawable/ic_refresh_white_24dp.xml @@ -5,7 +5,7 @@ android:viewportWidth="24.0"> diff --git a/app/src/main/res/layout/activity_upload_progress.xml b/app/src/main/res/layout/activity_upload_progress.xml index 3a9a83340..5762770b4 100644 --- a/app/src/main/res/layout/activity_upload_progress.xml +++ b/app/src/main/res/layout/activity_upload_progress.xml @@ -36,14 +36,6 @@ app:tabTextColor="?attr/tabTextColor" /> - - - - - - - - + android:src="@drawable/ic_refresh_24dp" /> + android:src="@drawable/ic_cancel_upload" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_pending_upload.xml b/app/src/main/res/layout/item_pending_upload.xml index e9cbc8e06..08dce87ef 100644 --- a/app/src/main/res/layout/item_pending_upload.xml +++ b/app/src/main/res/layout/item_pending_upload.xml @@ -56,7 +56,7 @@ android:id="@+id/deleteButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@android:drawable/ic_menu_close_clear_cancel" + android:src="@drawable/ic_cancel_upload" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/menu/menu_uploads.xml b/app/src/main/res/menu/menu_uploads.xml index 3934c71a9..b5c3aa4f0 100644 --- a/app/src/main/res/menu/menu_uploads.xml +++ b/app/src/main/res/menu/menu_uploads.xml @@ -7,14 +7,14 @@ @@ -22,7 +22,7 @@ @@ -30,7 +30,7 @@ diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index fd7227a37..dab337c4b 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -43,7 +43,6 @@ - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4a6584c9d..94856e4eb 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -49,7 +49,6 @@ @color/white @color/white @drawable/ic_upload_white_24dp - @drawable/ic_refresh_white_24dp @drawable/ic_notifications_white_24dp @color/white @style/SwitchThemeDark @@ -111,7 +110,6 @@ @color/black @color/primaryDarkColor @drawable/ic_upload_blue_24dp - @drawable/ic_refresh_grey_24dp @drawable/ic_notifications_blue_24dp @color/primaryDarkColor @style/SwitchThemeLight