diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/InstallProgressAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/InstallProgressAdapter.kt index d1e59b8b..34ef126b 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/restore/InstallProgressAdapter.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/restore/InstallProgressAdapter.kt @@ -56,7 +56,7 @@ internal class AppInstallViewHolder(v: View) : AppViewHolder(v) { progressBar.visibility = INVISIBLE } FAILED -> { - appStatus.setImageResource(R.drawable.ic_cancel_red) + appStatus.setImageResource(R.drawable.ic_error_red) appStatus.visibility = VISIBLE progressBar.visibility = INVISIBLE } diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/AppViewHolder.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/AppViewHolder.kt index 120913ad..32ba6cf4 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/AppViewHolder.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/AppViewHolder.kt @@ -43,13 +43,9 @@ internal open class AppViewHolder(v: View) : RecyclerView.ViewHolder(v) { appInfo.visibility = GONE when (status) { SUCCEEDED -> appStatus.setImageResource(R.drawable.ic_check_green) - FAILED -> appStatus.setImageResource(R.drawable.ic_cancel_red) + FAILED -> appStatus.setImageResource(R.drawable.ic_error_red) else -> { - when (status) { - FAILED_NO_DATA -> appStatus.setImageResource(R.drawable.ic_radio_button_unchecked_yellow) - FAILED_NOT_ALLOWED -> appStatus.setImageResource(R.drawable.ic_block_yellow) - else -> appStatus.setImageResource(R.drawable.ic_error_yellow) - } + appStatus.setImageResource(R.drawable.ic_warning_yellow) appInfo.text = status.getInfo() appInfo.visibility = VISIBLE } diff --git a/app/src/main/res/drawable/ic_block_yellow.xml b/app/src/main/res/drawable/ic_block_yellow.xml deleted file mode 100644 index 8da274f6..00000000 --- a/app/src/main/res/drawable/ic_block_yellow.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="@color/yellow" - android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_cancel_red.xml b/app/src/main/res/drawable/ic_cancel_red.xml deleted file mode 100644 index 2ced3613..00000000 --- a/app/src/main/res/drawable/ic_cancel_red.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="@color/red" - android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_error_yellow.xml b/app/src/main/res/drawable/ic_error_red.xml similarity index 89% rename from app/src/main/res/drawable/ic_error_yellow.xml rename to app/src/main/res/drawable/ic_error_red.xml index a0fb86b6..ae907c98 100644 --- a/app/src/main/res/drawable/ic_error_yellow.xml +++ b/app/src/main/res/drawable/ic_error_red.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="@color/yellow" + android:fillColor="@color/red" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" /> </vector> diff --git a/app/src/main/res/drawable/ic_radio_button_unchecked_yellow.xml b/app/src/main/res/drawable/ic_warning_yellow.xml similarity index 59% rename from app/src/main/res/drawable/ic_radio_button_unchecked_yellow.xml rename to app/src/main/res/drawable/ic_warning_yellow.xml index c416c2d1..1edf4358 100644 --- a/app/src/main/res/drawable/ic_radio_button_unchecked_yellow.xml +++ b/app/src/main/res/drawable/ic_warning_yellow.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> <path android:fillColor="@color/yellow" - android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" /> + android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" /> </vector> diff --git a/app/src/main/res/layout/list_item_app_status.xml b/app/src/main/res/layout/list_item_app_status.xml index 6fd59700..e7a0236d 100644 --- a/app/src/main/res/layout/list_item_app_status.xml +++ b/app/src/main/res/layout/list_item_app_status.xml @@ -46,8 +46,8 @@ <ImageView android:id="@+id/appStatus" - android:layout_width="32dp" - android:layout_height="32dp" + android:layout_width="24dp" + android:layout_height="24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"