diff --git a/presentation/src/androidTest/java/org/cryptomator/presentation/ui/activity/VaultsOperationsTest.java b/presentation/src/androidTest/java/org/cryptomator/presentation/ui/activity/VaultsOperationsTest.java index 74e9d139..27c3fe97 100644 --- a/presentation/src/androidTest/java/org/cryptomator/presentation/ui/activity/VaultsOperationsTest.java +++ b/presentation/src/androidTest/java/org/cryptomator/presentation/ui/activity/VaultsOperationsTest.java @@ -81,7 +81,7 @@ public class VaultsOperationsTest { removeFolderInCloud(appComponent, "0/testLoggedInVault/", CloudType.values()[cloudId]); } - onView(withId(R.id.fab_vault)) // + onView(withId(R.id.floating_action_button)) // .perform(click()); awaitCompleted(); @@ -187,14 +187,14 @@ public class VaultsOperationsTest { onView(withId(android.R.id.button1)) // .perform(click()); - onView(withId(R.id.tv_vault_creation_hint)); + onView(withId(R.id.tv_creation_hint)); } @Test public void test08addExistingVaultsLeadsToAddedVaults() { waitForIdle(device); - onView(withId(R.id.fab_vault)) // + onView(withId(R.id.floating_action_button)) // .perform(click()); waitForIdle(device); diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt index e627fed1..e550df6b 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt @@ -42,7 +42,6 @@ class CloudConnectionListFragment : BaseFragment() { setupRecyclerView() rv_local_default_cloud.setOnClickListener { cloudConnectionListPresenter.onDefaultLocalCloudConnectionClicked() } floating_action_button.setOnClickListener { cloudConnectionListPresenter.onAddConnectionClicked() } - emptyCloudConnectionsHint.setText(R.string.screen_cloud_connections_no_connections) } override fun loadContent() { @@ -65,7 +64,7 @@ class CloudConnectionListFragment : BaseFragment() { } private fun updateConnectionListHint() { - rl_empty_cloud_connections_hint.visibility = if (cloudConnectionListAdapter.isEmpty) VISIBLE else GONE + rl_creation_hint.visibility = if (cloudConnectionListAdapter.isEmpty) VISIBLE else GONE } fun setSelectedCloudType(selectedCloudType: CloudTypeModel) { diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt index 9069acbc..6d46bdac 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt @@ -51,7 +51,7 @@ class VaultListFragment : BaseFragment() { override fun setupView() { setupRecyclerView() - fab_vault.setOnClickListener { vaultListPresenter.onCreateVaultClicked() } + floating_action_button.setOnClickListener { vaultListPresenter.onCreateVaultClicked() } } override fun onResume() { @@ -77,11 +77,11 @@ class VaultListFragment : BaseFragment() { } fun showVaultCreationHint() { - rl_vault_creation_hint.visibility = View.VISIBLE + rl_creation_hint.visibility = View.VISIBLE } fun hideVaultCreationHint() { - rl_vault_creation_hint.visibility = View.GONE + rl_creation_hint.visibility = View.GONE } fun isVaultLocked(vaultModel: VaultModel?): Boolean { diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/layout/VaultListCoordinatorLayout.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/layout/ArcAwareCoordinatorLayout.kt similarity index 90% rename from presentation/src/main/java/org/cryptomator/presentation/ui/layout/VaultListCoordinatorLayout.kt rename to presentation/src/main/java/org/cryptomator/presentation/ui/layout/ArcAwareCoordinatorLayout.kt index ffa345b7..265d67e4 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/layout/VaultListCoordinatorLayout.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/layout/ArcAwareCoordinatorLayout.kt @@ -13,7 +13,7 @@ import timber.log.Timber import kotlin.math.cos import kotlin.math.sin -class VaultListCoordinatorLayout : CoordinatorLayout { +class ArcAwareCoordinatorLayout : CoordinatorLayout { private val pixelsPerDp: Int @@ -34,16 +34,16 @@ class VaultListCoordinatorLayout : CoordinatorLayout { override fun dispatchDraw(canvas: Canvas) { super.dispatchDraw(canvas) - if (findViewById(R.id.rl_vault_creation_hint).visibility == VISIBLE) { + if (findViewById(R.id.rl_creation_hint).visibility == VISIBLE) { drawArcFromHintToFloatingActionButton(canvas) } } private fun drawArcFromHintToFloatingActionButton(canvas: Canvas) { - val vaultCreationHint = findViewById(R.id.tv_vault_creation_hint) - val floatingActionButton = findViewById(R.id.fab_vault) - val centerXOfHint = (vaultCreationHint.left + vaultCreationHint.right) / 2f - val bottomOfHint = vaultCreationHint.bottom.toFloat() + val creationHint = findViewById(R.id.tv_creation_hint) + val floatingActionButton = findViewById(R.id.floating_action_button) + val centerXOfHint = (creationHint.left + creationHint.right) / 2f + val bottomOfHint = creationHint.bottom.toFloat() val topOfFloatingActionButton = floatingActionButton.top.toFloat() when (val layoutDirection = resources.configuration.layoutDirection) { @@ -62,7 +62,7 @@ class VaultListCoordinatorLayout : CoordinatorLayout { .draw(canvas, strokeLineWithWidthOf1f()) } else -> { - Timber.tag("VaultListCoordinatorLay").e("Layout direction not supported, skip drawing arc") + Timber.tag("ArcAwareCoordinatorLayo").e("Layout direction not supported, skip drawing arc") } } } diff --git a/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml b/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml index 102efc5b..94300748 100644 --- a/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml +++ b/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml @@ -1,5 +1,5 @@ - - - + diff --git a/presentation/src/main/res/layout/fragment_vault_list.xml b/presentation/src/main/res/layout/fragment_vault_list.xml index fc6026e1..e27a6667 100644 --- a/presentation/src/main/res/layout/fragment_vault_list.xml +++ b/presentation/src/main/res/layout/fragment_vault_list.xml @@ -1,5 +1,5 @@ - - + diff --git a/presentation/src/main/res/layout/view_empty_cloud_connections.xml b/presentation/src/main/res/layout/view_empty_cloud_connections.xml index 3bfe6974..6f821c49 100644 --- a/presentation/src/main/res/layout/view_empty_cloud_connections.xml +++ b/presentation/src/main/res/layout/view_empty_cloud_connections.xml @@ -1,11 +1,13 @@ + + android:id="@+id/tv_creation_hint" + style="@style/AppTheme.Hint" + android:text="@string/screen_cloud_connections_no_connections" /> diff --git a/presentation/src/main/res/layout/view_vault_creation_hint.xml b/presentation/src/main/res/layout/view_vault_creation_hint.xml index d95f8687..78a85549 100644 --- a/presentation/src/main/res/layout/view_vault_creation_hint.xml +++ b/presentation/src/main/res/layout/view_vault_creation_hint.xml @@ -1,12 +1,12 @@