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

Improved icons

Browse source
This commit is contained in:
Kanahia 2024-07-21 12:59:24 +05:30
parent 170d0b156e
commit 9f77fbbc8c
13 changed files with 47 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt
View file

@ -195,36 +195,4 @@ class MainActivityTest {
Espresso.pressBack() Espresso.pressBack()
UITestHelper.sleep(1000) 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)
)
}
}
} }

2
app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt
View file

@ -101,7 +101,7 @@ class PendingUploadsAdapter(private val callback: Callback) :
errorTextView.visibility = View.VISIBLE errorTextView.visibility = View.VISIBLE
itemProgress.visibility = View.GONE itemProgress.visibility = View.GONE
} else { } else {
if (state == Contribution.STATE_QUEUED){ if (state == Contribution.STATE_QUEUED || state == Contribution.STATE_PAUSED){
errorTextView.text = "Queued" errorTextView.text = "Queued"
errorTextView.visibility = View.VISIBLE errorTextView.visibility = View.VISIBLE
itemProgress.visibility = View.GONE itemProgress.visibility = View.GONE

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

@ -146,16 +146,16 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon
val newContributionList: MutableList<Contribution> = val newContributionList: MutableList<Contribution> =
sortedContributionsList.toMutableList() sortedContributionsList.toMutableList()
val listOfRemoved: MutableList<Contribution> = mutableListOf() // val listOfRemoved: MutableList<Contribution> = mutableListOf()
val last = sortedContributionsList.last() // val last = sortedContributionsList.last()
for (i in sortedContributionsList.indices) { // for (i in sortedContributionsList.indices) {
val current = sortedContributionsList[i] // val current = sortedContributionsList[i]
if (current.transferred == 0L && (current.dateModifiedInMillis() / 100) > (last.dateModifiedInMillis() / 100)) { // if (current.transferred == 0L && (current.dateModifiedInMillis() / 100) > (last.dateModifiedInMillis() / 100)) {
listOfRemoved.add(current) // listOfRemoved.add(current)
} // }
} // }
newContributionList.removeAll(listOfRemoved) // newContributionList.removeAll(listOfRemoved)
newContributionList.addAll(listOfRemoved) // newContributionList.addAll(listOfRemoved)
// TODO: WORK ON THE SORTING ISSUE // TODO: WORK ON THE SORTING ISSUE
val dataSource = object : PositionalDataSource<Contribution>() { val dataSource = object : PositionalDataSource<Contribution>() {

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

@ -107,7 +107,7 @@ class UploadProgressActivity : BaseActivity() {
Menu.NONE, Menu.NONE,
getString(R.string.pause) getString(R.string.pause)
) )
.setIcon(android.R.drawable.ic_media_pause) .setIcon(R.drawable.pause_icon)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
pendingUploadsFragment!!.pauseUploads() pendingUploadsFragment!!.pauseUploads()
setPausedIcon(true) setPausedIcon(true)
@ -122,7 +122,7 @@ class UploadProgressActivity : BaseActivity() {
Menu.NONE, Menu.NONE,
getString(R.string.cancel) getString(R.string.cancel)
) )
.setIcon(android.R.drawable.ic_menu_close_clear_cancel) .setIcon(R.drawable.ic_cancel_upload)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
pendingUploadsFragment!!.deleteUploads() pendingUploadsFragment!!.deleteUploads()
true true
@ -137,7 +137,7 @@ class UploadProgressActivity : BaseActivity() {
Menu.NONE, Menu.NONE,
getString(R.string.resume) getString(R.string.resume)
) )
.setIcon(android.R.drawable.ic_media_play) .setIcon(R.drawable.play_icon)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
pendingUploadsFragment!!.restartUploads() pendingUploadsFragment!!.restartUploads()
setPausedIcon(false) setPausedIcon(false)
@ -151,7 +151,7 @@ class UploadProgressActivity : BaseActivity() {
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, getString(R.string.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_24dp).setOnMenuItemClickListener {
failedUploadsFragment!!.restartUploads() failedUploadsFragment!!.restartUploads()
true true
} }
@ -164,7 +164,7 @@ class UploadProgressActivity : BaseActivity() {
Menu.NONE, Menu.NONE,
getString(R.string.cancel) getString(R.string.cancel)
) )
.setIcon(android.R.drawable.ic_menu_close_clear_cancel) .setIcon(R.drawable.ic_cancel_upload)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
failedUploadsFragment!!.deleteUploads() failedUploadsFragment!!.deleteUploads()
true true

17
app/src/main/res/drawable/ic_cancel_upload.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/mediaDetailsHeadingText"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<group
android:scaleX="1.44427"
android:scaleY="1.44427"
android:translateX="-5.33124"
android:translateY="-5.33124">
<path
android:fillColor="@android:color/white"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
</group>
</vector>

9
app/src/main/res/drawable/ic_refresh_grey_24dp.xml → app/src/main/res/drawable/ic_refresh_24dp.xml
View file

@ -3,9 +3,12 @@
android:height="@dimen/half_standard_height" android:height="@dimen/half_standard_height"
android:viewportHeight="24.0" android:viewportHeight="24.0"
android:viewportWidth="24.0"> android:viewportWidth="24.0">
<group android:scaleX="1.44427"
android:scaleY="1.44427"
android:translateX="-5.33124"
android:translateY="-5.33124">
<path <path
android:fillColor="@color/achievement_background_dark" android:fillColor="?attr/mediaDetailsHeadingText"
android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
</group>
</vector> </vector>

2
app/src/main/res/drawable/ic_refresh_white_24dp.xml
View file

@ -5,7 +5,7 @@
android:viewportWidth="24.0"> android:viewportWidth="24.0">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="@color/white"
android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
</vector> </vector>

8
app/src/main/res/layout/activity_upload_progress.xml
View file

@ -36,14 +36,6 @@
app:tabTextColor="?attr/tabTextColor" /> app:tabTextColor="?attr/tabTextColor" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<!-- <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- android:id="@+id/mediaContainer"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_below="@id/toolbar_layout"-->
<!-- android:orientation="horizontal"-->
<!-- android:visibility="gone" />-->
<fr.free.nrw.commons.explore.ParentViewPager <fr.free.nrw.commons.explore.ParentViewPager
android:id="@+id/upload_progress_view_pager" android:id="@+id/upload_progress_view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"

4
app/src/main/res/layout/item_failed_upload.xml
View file

@ -50,12 +50,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dimen_10" android:layout_marginEnd="@dimen/dimen_10"
android:src="?attr/refresh_icon_drawable" /> android:src="@drawable/ic_refresh_24dp" />
<ImageView <ImageView
android:id="@+id/deleteButton" android:id="@+id/deleteButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@android:drawable/ic_menu_close_clear_cancel" /> android:src="@drawable/ic_cancel_upload" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/item_pending_upload.xml
View file

@ -56,7 +56,7 @@
android:id="@+id/deleteButton" android:id="@+id/deleteButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

8
app/src/main/res/menu/menu_uploads.xml
View file

@ -7,14 +7,14 @@
<item <item
android:id="@+id/resume_icon" android:id="@+id/resume_icon"
android:title="Resume" android:title="Resume"
android:icon="@android:drawable/ic_media_play" android:icon="@drawable/play_icon"
android:orderInCategory="1" android:orderInCategory="1"
app:showAsAction="ifRoom" app:showAsAction="ifRoom"
/> />
<item <item
android:id="@+id/pause_icon" android:id="@+id/pause_icon"
android:title="Pause" android:title="Pause"
android:icon="@android:drawable/ic_media_pause" android:icon="@drawable/pause_icon"
android:orderInCategory="1" android:orderInCategory="1"
app:showAsAction="ifRoom" app:showAsAction="ifRoom"
/> />
@ -22,7 +22,7 @@
<item <item
android:id="@+id/retry_icon" android:id="@+id/retry_icon"
android:title="Retry" android:title="Retry"
android:icon="?attr/refresh_icon_drawable" android:icon="@drawable/ic_refresh_24dp"
android:orderInCategory="1" android:orderInCategory="1"
app:showAsAction="ifRoom" app:showAsAction="ifRoom"
/> />
@ -30,7 +30,7 @@
<item <item
android:id="@+id/cancel_icon" android:id="@+id/cancel_icon"
android:title="Cancel" android:title="Cancel"
android:icon="@android:drawable/ic_menu_close_clear_cancel" android:icon="@drawable/ic_remove"
android:orderInCategory="1" android:orderInCategory="1"
app:showAsAction="ifRoom" app:showAsAction="ifRoom"
/> />

1
app/src/main/res/values/attrs.xml
View file

@ -43,7 +43,6 @@
<attr name="card_item_color" format="reference"/> <attr name="card_item_color" format="reference"/>
<attr name="notification_icon_drawable" format="reference"/> <attr name="notification_icon_drawable" format="reference"/>
<attr name="upload_icon_drawable" format="reference"/> <attr name="upload_icon_drawable" format="reference"/>
<attr name="refresh_icon_drawable" format="reference"/>
<attr name="notification_icon_text_color" format="reference"/> <attr name="notification_icon_text_color" format="reference"/>
<attr name="toggle_theme" format="reference"/> <attr name="toggle_theme" format="reference"/>
<attr name="contributionsListTextSecondary" format="reference"/> <attr name="contributionsListTextSecondary" format="reference"/>

2
app/src/main/res/values/styles.xml
View file

@ -49,7 +49,6 @@
<item name="more_bottom_sheet_drawable_color">@color/white</item> <item name="more_bottom_sheet_drawable_color">@color/white</item>
<item name="card_item_color">@color/white</item> <item name="card_item_color">@color/white</item>
<item name="upload_icon_drawable">@drawable/ic_upload_white_24dp</item> <item name="upload_icon_drawable">@drawable/ic_upload_white_24dp</item>
<item name="refresh_icon_drawable">@drawable/ic_refresh_white_24dp</item>
<item name="notification_icon_drawable">@drawable/ic_notifications_white_24dp</item> <item name="notification_icon_drawable">@drawable/ic_notifications_white_24dp</item>
<item name="notification_icon_text_color">@color/white</item> <item name="notification_icon_text_color">@color/white</item>
<item name="toggle_theme">@style/SwitchThemeDark</item> <item name="toggle_theme">@style/SwitchThemeDark</item>
@ -111,7 +110,6 @@
<item name="more_bottom_sheet_drawable_color">@color/black</item> <item name="more_bottom_sheet_drawable_color">@color/black</item>
<item name="card_item_color">@color/primaryDarkColor</item> <item name="card_item_color">@color/primaryDarkColor</item>
<item name="upload_icon_drawable">@drawable/ic_upload_blue_24dp</item> <item name="upload_icon_drawable">@drawable/ic_upload_blue_24dp</item>
<item name="refresh_icon_drawable">@drawable/ic_refresh_grey_24dp</item>
<item name="notification_icon_drawable">@drawable/ic_notifications_blue_24dp</item> <item name="notification_icon_drawable">@drawable/ic_notifications_blue_24dp</item>
<item name="notification_icon_text_color">@color/primaryDarkColor</item> <item name="notification_icon_text_color">@color/primaryDarkColor</item>
<item name="toggle_theme">@style/SwitchThemeLight</item> <item name="toggle_theme">@style/SwitchThemeLight</item>