AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Enhance usage of cloud, vault and selected vault asset

Browse Source
This commit is contained in:
Julian Raufelder 2021-03-25 16:26:59 +01:00
parent f3342943f9
commit a94bddd96d
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt
View File

@ -48,7 +48,7 @@ internal constructor(context: Context) : RecyclerViewBaseAdapter<CloudModel, Clo
private fun internalBind(cloudModel: CloudModel) { private fun internalBind(cloudModel: CloudModel) {
itemView.settings.setOnClickListener { callback.onCloudSettingsClicked(cloudModel) } itemView.settings.setOnClickListener { callback.onCloudSettingsClicked(cloudModel) }
itemView.cloudImage.setImageResource(cloudModel.cloudType().vaultImageResource) itemView.cloudImage.setImageResource(cloudModel.cloudType().cloudImageResource)
itemView.setOnClickListener { callback.onCloudConnectionClicked(cloudModel) } itemView.setOnClickListener { callback.onCloudConnectionClicked(cloudModel) }

3
presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
View File

@ -67,13 +67,13 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
boundVault = getItem(position) boundVault = getItem(position)
boundVault?.let { boundVault?.let {
itemView.cloudImage.setImageResource(it.cloudType.vaultImageResource)
itemView.vaultName.text = it.name itemView.vaultName.text = it.name
val boundVaultSelected = it == selectedVault val boundVaultSelected = it == selectedVault
itemView.selectedVault.isChecked = boundVaultSelected itemView.selectedVault.isChecked = boundVaultSelected
itemView.selectedVault.isClickable = !boundVaultSelected itemView.selectedVault.isClickable = !boundVaultSelected
if (boundVaultSelected) { if (boundVaultSelected) {
itemView.cloudImage.setImageResource(it.cloudType.vaultSelectedImageResource)
if (selectedLocation != null) { if (selectedLocation != null) {
itemView.chosenLocation.visibility = View.VISIBLE itemView.chosenLocation.visibility = View.VISIBLE
itemView.chosenLocation.text = selectedLocation itemView.chosenLocation.text = selectedLocation
@ -82,6 +82,7 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
} }
itemView.chooseFolderLocation.visibility = View.VISIBLE itemView.chooseFolderLocation.visibility = View.VISIBLE
} else { } else {
itemView.cloudImage.setImageResource(it.cloudType.vaultImageResource)
itemView.chosenLocation.visibility = View.GONE itemView.chosenLocation.visibility = View.GONE
itemView.chooseFolderLocation.visibility = View.GONE itemView.chooseFolderLocation.visibility = View.GONE
} }

5
presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
View File

@ -75,7 +75,10 @@ internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnIte
itemView.unlockedImage.setOnClickListener { callback.onVaultLockClicked(vaultModel) } itemView.unlockedImage.setOnClickListener { callback.onVaultLockClicked(vaultModel) }
itemView.settings.setOnClickListener { callback.onVaultSettingsClicked(vaultModel) } itemView.settings.setOnClickListener {
itemView.cloudImage.setImageResource(vaultModel.cloudType.vaultSelectedImageResource)
callback.onVaultSettingsClicked(vaultModel)
}
} }
} }

2
presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt
View File

@ -32,7 +32,7 @@ class CloudConnectionSettingsBottomSheet : BaseBottomSheet<CloudConnectionSettin
else -> throw IllegalStateException("Cloud model is not binded in the view") 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 { change_cloud.setOnClickListener {
callback?.onChangeCloudClicked(cloudModel) callback?.onChangeCloudClicked(cloudModel)
dismiss() dismiss()

2
presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt
View File

@ -31,7 +31,7 @@ class SettingsVaultBottomSheet : BaseBottomSheet<SettingsVaultBottomSheet.Callba
lock_vault.visibility = LinearLayout.GONE lock_vault.visibility = LinearLayout.GONE
} }
val cloudType = vaultModel.cloudType val cloudType = vaultModel.cloudType
cloud_image.setImageResource(cloudType.vaultImageResource) cloud_image.setImageResource(cloudType.vaultSelectedImageResource)
vault_name.text = vaultModel.name vault_name.text = vaultModel.name
vault_path.text = vaultModel.path vault_path.text = vaultModel.path