From a94bddd96db168db15801444a3493f68fe05ec3e Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Thu, 25 Mar 2021 16:26:59 +0100
Subject: [PATCH] Enhance usage of cloud, vault and selected vault asset

---
 .../presentation/ui/adapter/CloudConnectionListAdapter.kt    | 2 +-
 .../presentation/ui/adapter/SharedLocationsAdapter.kt        | 3 ++-
 .../org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt | 5 ++++-
 .../ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt     | 2 +-
 .../presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt  | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt
index ac5c6be7..1ddda74c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt
@@ -48,7 +48,7 @@ internal constructor(context: Context) : RecyclerViewBaseAdapter<CloudModel, Clo
 		private fun internalBind(cloudModel: CloudModel) {
 			itemView.settings.setOnClickListener { callback.onCloudSettingsClicked(cloudModel) }
 
-			itemView.cloudImage.setImageResource(cloudModel.cloudType().vaultImageResource)
+			itemView.cloudImage.setImageResource(cloudModel.cloudType().cloudImageResource)
 
 			itemView.setOnClickListener { callback.onCloudConnectionClicked(cloudModel) }
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
index b5cbc616..3f720ecc 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
@@ -67,13 +67,13 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
 			boundVault = getItem(position)
 
 			boundVault?.let {
-				itemView.cloudImage.setImageResource(it.cloudType.vaultImageResource)
 				itemView.vaultName.text = it.name
 
 				val boundVaultSelected = it == selectedVault
 				itemView.selectedVault.isChecked = boundVaultSelected
 				itemView.selectedVault.isClickable = !boundVaultSelected
 				if (boundVaultSelected) {
+					itemView.cloudImage.setImageResource(it.cloudType.vaultSelectedImageResource)
 					if (selectedLocation != null) {
 						itemView.chosenLocation.visibility = View.VISIBLE
 						itemView.chosenLocation.text = selectedLocation
@@ -82,6 +82,7 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
 					}
 					itemView.chooseFolderLocation.visibility = View.VISIBLE
 				} else {
+					itemView.cloudImage.setImageResource(it.cloudType.vaultImageResource)
 					itemView.chosenLocation.visibility = View.GONE
 					itemView.chooseFolderLocation.visibility = View.GONE
 				}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
index 3346d646..07c4d65f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
@@ -75,7 +75,10 @@ internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnIte
 
 			itemView.unlockedImage.setOnClickListener { callback.onVaultLockClicked(vaultModel) }
 
-			itemView.settings.setOnClickListener { callback.onVaultSettingsClicked(vaultModel) }
+			itemView.settings.setOnClickListener {
+				itemView.cloudImage.setImageResource(vaultModel.cloudType.vaultSelectedImageResource)
+				callback.onVaultSettingsClicked(vaultModel)
+			}
 		}
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt
index 55afddb8..363948b8 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt
@@ -32,7 +32,7 @@ class CloudConnectionSettingsBottomSheet : BaseBottomSheet<CloudConnectionSettin
 			else -> throw IllegalStateException("Cloud model is not binded in the view")
 		}
 
-		iv_cloud_image.setImageResource(cloudModel.cloudType().vaultImageResource)
+		iv_cloud_image.setImageResource(cloudModel.cloudType().cloudImageResource)
 		change_cloud.setOnClickListener {
 			callback?.onChangeCloudClicked(cloudModel)
 			dismiss()
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt
index 84f4c96a..163d759a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt
@@ -31,7 +31,7 @@ class SettingsVaultBottomSheet : BaseBottomSheet<SettingsVaultBottomSheet.Callba
 			lock_vault.visibility = LinearLayout.GONE
 		}
 		val cloudType = vaultModel.cloudType
-		cloud_image.setImageResource(cloudType.vaultImageResource)
+		cloud_image.setImageResource(cloudType.vaultSelectedImageResource)
 		vault_name.text = vaultModel.name
 		vault_path.text = vaultModel.path