highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-26 17:52:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the manual testing/debugging code. Remove the LocalConfiguration API in favour of DeviceUtils.isLandscapeMetric.

Browse Source
This commit is contained in:
KotlinGeekDev 2024-08-17 18:51:07 +01:00
parent 9613afb7ea
commit 1b429475aa
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
View File

@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.components
import android.app.Activity
import android.content.Context
import android.content.ContextWrapper
import android.content.res.Configuration
import android.util.Log
import android.view.Window
import androidx.compose.animation.AnimatedVisibility
@ -54,7 +53,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.platform.LocalView
@ -66,8 +64,6 @@ import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.window.DialogWindowProvider
import androidx.core.net.toUri
import androidx.window.core.layout.WindowHeightSizeClass
import androidx.window.core.layout.WindowWidthSizeClass
import coil.annotation.ExperimentalCoilApi
import coil.compose.AsyncImage
import coil.compose.AsyncImagePainter
@ -126,37 +122,11 @@ fun ZoomableContentView(
var dialogOpen by remember(content) { mutableStateOf(false) }
val activity = LocalView.current.context.getActivity()
val orientation = LocalConfiguration.current.orientation
val currentWindowSize = currentWindowAdaptiveInfo().windowSizeClass
val detectedWindowSize =
if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
when (currentWindowSize.windowHeightSizeClass) {
WindowHeightSizeClass.COMPACT -> "Likely a Normal device in Landscape mode"
WindowHeightSizeClass.MEDIUM -> "Likely Small tablet, or Foldable device in Landscape"
WindowHeightSizeClass.EXPANDED -> "Likely a Large tablet, Foldable or Desktop device in Landscape"
else -> "Unknown device, likely in Landscape"
}
} else {
when (currentWindowSize.windowWidthSizeClass) {
WindowWidthSizeClass.COMPACT -> "Likely a Normal device in Portrait mode"
WindowWidthSizeClass.MEDIUM -> "Likely Small tablet, or Foldable device in Portrait"
WindowWidthSizeClass.EXPANDED -> "Likely a Large tablet, Foldable or Desktop device in Portrait"
else -> "Unknown device, likely in Portrait"
}
}
val (windowSize, sOrientation, isLandscapeMode) =
when (orientation) {
Configuration.ORIENTATION_LANDSCAPE -> Triple(detectedWindowSize, "Landscape", true)
Configuration.ORIENTATION_PORTRAIT -> Triple(detectedWindowSize, "Portrait", false)
else -> Triple(detectedWindowSize, "Unknown orientation(maybe a foldable device?)", false)
}
val isLandscapeMode = DeviceUtils.isLandscapeMetric(LocalContext.current)
val isFoldableOrLarge = DeviceUtils.windowIsLarge(windowSize = currentWindowSize, isInLandscapeMode = isLandscapeMode)
Log.d("AmethystConf", "Device type based on window size is $windowSize, and orientation is: $sOrientation")
val contentScale =
if (isFiniteHeight) {
ContentScale.Fit