Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding margins when we have an inset #1298

Merged
merged 2 commits into from
May 6, 2024
Merged

Adding margins when we have an inset #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7ce5d
Adding margins when we have an inset
tevincent May 3, 2024
f8654ca
Apply suggestions from code review
KevinBoulongne May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions app/src/main/java/com/infomaniak/drive/ui/fileList/preview/PreviewPDFActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import com.infomaniak.drive.utils.Utils.ROOT_ID
import com.infomaniak.drive.views.FileInfoActionsView.OnItemClickListener
import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar
import com.infomaniak.lib.core.utils.getFileNameAndSize
import com.infomaniak.lib.core.utils.setMargins
import io.sentry.Sentry
import io.sentry.SentryLevel

Expand Down Expand Up @@ -84,9 +85,17 @@ class PreviewPDFActivity : AppCompatActivity(), OnItemClickListener {
bottomSheetFileInfos.initOnClickListener(this@PreviewPDFActivity)
}

override fun onStart() {
override fun onStart() = with(binding) {

super.onStart()
binding.header.setupWindowInsetsListener(rootView = binding.root, bottomSheetView = binding.bottomSheetFileInfos)

header.setupWindowInsetsListener(
rootView = root,
bottomSheetView = bottomSheetFileInfos,
) {
pdfContainer.setMargins(right = it?.right ?: 0)
}

setupStatusBarForPreview()
}

Expand Down
9 changes: 4 additions & 5 deletions app/src/main/java/com/infomaniak/drive/ui/fileList/preview/PreviewSliderFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ import com.infomaniak.drive.utils.Utils.openWith
import com.infomaniak.drive.views.FileInfoActionsView
import com.infomaniak.drive.views.PreviewHeaderView
import com.infomaniak.lib.core.models.ApiResponse
import com.infomaniak.lib.core.utils.getBackNavigationResult
import com.infomaniak.lib.core.utils.safeNavigate
import com.infomaniak.lib.core.utils.toggleEdgeToEdge
import com.infomaniak.lib.core.utils.whenResultIsOk
import com.infomaniak.lib.core.utils.*
import io.sentry.Sentry
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -187,7 +184,9 @@ class PreviewSliderFragment : Fragment(), FileInfoActionsView.OnItemClickListene
binding.header.setupWindowInsetsListener(
rootView = root,
bottomSheetView = binding.bottomSheetFileInfos,
)
) {
binding.pdfContainer.setMargins(right = it?.right ?: 0)
}
}

override fun onStart() {
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintSet
import androidx.core.graphics.Insets
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isGone
Expand Down Expand Up @@ -81,11 +82,13 @@ class PreviewHeaderView @JvmOverloads constructor(
fun setupWindowInsetsListener(
rootView: View,
bottomSheetView: View,
callback: ((insets: Insets?) -> Unit)? = null,
) {
val bottomSheetBehavior = BottomSheetBehavior.from(bottomSheetView)
ViewCompat.setOnApplyWindowInsetsListener(rootView) { _, windowInsets ->
with(windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())) {
setMargins(left = left, top = top, right = right)
// We add the same margins here on the left and right to have the view centered
setMargins(left = left + right, top = top, right = left + right)
val topOffset = getTopOffset(bottomSheetView)
bottomSheetBehavior.apply {
peekHeight = getDefaultPeekHeight() + bottom
Expand All @@ -98,6 +101,7 @@ class PreviewHeaderView @JvmOverloads constructor(
// Add padding to the bottom to allow the last element of the
// list to be displayed right over the android navigation bar
bottomSheetView.setPadding(0, 0, 0, bottom)
callback?.invoke(this)
}

windowInsets
Expand Down
Loading