Add S3 bucket asset and reorder clouds

presentation/src/main/java/org/cryptomator/presentation/model/CloudTypeModel.kt

@@ -23,12 +23,12 @@ enum class CloudTypeModel(builder: Builder) {
 			.withVaultImageResource(R.drawable.pcloud_vault) //
 			.withVaultSelectedImageResource(R.drawable.pcloud_vault_selected) //
 			.withMultiInstances()),  //
-	WEBDAV(Builder("WEBDAV", R.string.cloud_names_webdav) //
-			.withCloudImageResource(R.drawable.webdav) //
+	S3(Builder("S3", R.string.cloud_names_s3) //
+			.withCloudImageResource(R.drawable.s3) //
 			.withVaultImageResource(R.drawable.webdav_vault) //
 			.withVaultSelectedImageResource(R.drawable.webdav_vault_selected) //
 			.withMultiInstances()),  //
-	S3(Builder("S3", R.string.cloud_names_s3) //
+	WEBDAV(Builder("WEBDAV", R.string.cloud_names_webdav) //
 			.withCloudImageResource(R.drawable.webdav) //
 			.withVaultImageResource(R.drawable.webdav_vault) //
 			.withVaultSelectedImageResource(R.drawable.webdav_vault_selected) //

presentation/src/main/java/org/cryptomator/presentation/presenter/CloudSettingsPresenter.kt

@@ -92,9 +92,9 @@ class CloudSettingsPresenter @Inject constructor( //
 
 	private fun effectiveTitle(cloudTypeModel: CloudTypeModel): String {
 		when (cloudTypeModel) {
-			CloudTypeModel.WEBDAV -> return context().getString(R.string.screen_cloud_settings_webdav_connections)
 			CloudTypeModel.PCLOUD -> return context().getString(R.string.screen_cloud_settings_pcloud_connections)
 			CloudTypeModel.S3 -> return context().getString(R.string.screen_cloud_settings_s3_connections)
+			CloudTypeModel.WEBDAV -> return context().getString(R.string.screen_cloud_settings_webdav_connections)
 			CloudTypeModel.LOCAL -> return context().getString(R.string.screen_cloud_settings_local_storage_locations)
 		}
 		return context().getString(R.string.screen_cloud_settings_title)
@@ -126,18 +126,14 @@ class CloudSettingsPresenter @Inject constructor( //
 					.filter { cloud -> !(BuildConfig.FLAVOR == "fdroid" && cloud.cloudType() == CloudTypeModel.GOOGLE_DRIVE) } //
 					.toMutableList() //
 					.also {
-						it.add(aWebdavCloud())
 						it.add(aPCloud())
 						it.add(aS3Cloud())
+						it.add(aWebdavCloud())
 						it.add(aLocalCloud())
 					}
 			view?.render(cloudModel)
 		}
 
-		private fun aWebdavCloud(): WebDavCloudModel {
-			return WebDavCloudModel(WebDavCloud.aWebDavCloudCloud().build())
-		}
-
 		private fun aPCloud(): PCloudModel {
 			return PCloudModel(PCloud.aPCloud().build())
 		}
@@ -146,6 +142,10 @@ class CloudSettingsPresenter @Inject constructor( //
 			return S3CloudModel(S3Cloud.aS3Cloud().build())
 		}
 
+		private fun aWebdavCloud(): WebDavCloudModel {
+			return WebDavCloudModel(WebDavCloud.aWebDavCloudCloud().build())
+		}
+
 		private fun aLocalCloud(): CloudModel {
 			return LocalStorageModel(LocalStorageCloud.aLocalStorage().build())
 		}