Skip to content

Commit

Permalink
Merge pull request #1237 from Infomaniak/overlay-transparent-button
Browse files Browse the repository at this point in the history 
Modify SwitchAccount button so it doesn't overlap with Search menu in RootFilesFragment
  • Loading branch information
@tevincent
tevincent authored Mar 22, 2024
2 parents 0f8a51a + 1c6d807 commit 66679fa
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 17 deletions.
22 changes: 10 additions & 12 deletions app/src/main/java/com/infomaniak/drive/utils/Extensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ import android.os.Build.VERSION
import android.os.Build.VERSION_CODES
import android.provider.MediaStore
import android.text.format.Formatter
import android.transition.AutoTransition
import android.transition.TransitionManager
import android.transition.TransitionSet
import android.util.DisplayMetrics
import android.transition.*
import android.util.Patterns
import android.view.ViewGroup
import android.view.animation.Animation
Expand All @@ -46,7 +43,7 @@ import androidx.core.view.children
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.Lifecycle.*
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LiveData
Expand Down Expand Up @@ -405,21 +402,22 @@ fun LayoutSwitchDriveBinding.setDriveHeader(currentDrive: Drive) {
}

fun LayoutSwitchDriveBinding.setupSwitchDriveButton(fragment: Fragment) {
switchDriveButton.apply {
AccountUtils.getCurrentDrive()?.let { setDriveHeader(it) }

if (DriveInfosController.hasSingleDrive(AccountUtils.currentUserId)) {
AccountUtils.getCurrentDrive()?.let(::setDriveHeader)

if (DriveInfosController.hasSingleDrive(AccountUtils.currentUserId)) {
switchDriveButton.apply {
icon = null
isEnabled = false
} else {
setOnClickListener { fragment.safeNavigate(R.id.switchDriveDialog) }
}
} else {
offsetOverlayedRipple.setOnClickListener { fragment.safeNavigate(R.id.switchDriveDialog) }
}

fragment.viewLifecycleOwner.lifecycle.addObserver(
object : LifecycleEventObserver {
override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
if (event == Lifecycle.Event.ON_RESUME) AccountUtils.getCurrentDrive()?.let { setDriveHeader(it) }
override fun onStateChanged(source: LifecycleOwner, event: Event) {
if (event == Event.ON_RESUME) AccountUtils.getCurrentDrive()?.let(::setDriveHeader)
}
},
)
Expand Down
53 changes: 48 additions & 5 deletions app/src/main/res/layout/layout_switch_drive.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="120.8dp"
android:gravity="bottom"
android:paddingStart="16dp"
android:paddingEnd="@dimen/marginStandard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
Expand All @@ -30,8 +31,7 @@
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="@dimen/marginStandard"
android:clickable="false"
android:contentDescription="@string/buttonSwitchDrive"
android:ellipsize="end"
android:fontFamily="@font/suisseintl_bold"
Expand All @@ -45,6 +45,49 @@
app:iconGravity="end"
app:iconSize="28dp"
app:iconTint="@color/iconColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
tools:text="Drive de test dev infomaniak" />

</LinearLayout>
<!-- To prevent the button from overlapping the toolbar Search button in the
RootFilesFragment, we do all of this complex computations with views. -->
<com.google.android.material.button.MaterialButton
android:id="@+id/offsetOverlayedRipple"
style="@style/TextButton"
android:layout_width="0dp"
android:layout_height="0dp"
app:backgroundTint="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="@id/switchDriveButton"
app:layout_constraintEnd_toEndOf="@id/maxRippleEnd"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="@id/switchDriveButton"
app:layout_constraintTop_toTopOf="@id/switchDriveButton" />

<View
android:id="@+id/switchDriveButtonEndView"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/switchDriveButton"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/buttonNegativeInset"
android:layout_width="16dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<androidx.constraintlayout.widget.Barrier
android:id="@+id/maxRippleEnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:barrierDirection="start"
app:constraint_referenced_ids="switchDriveButtonEndView,buttonNegativeInset" />

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 66679fa

Please sign in to comment.