Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTask"
android:resizeableActivity="true"
android:theme="@style/Theme.Metrolist"
android:windowSoftInputMode="adjustResize">
<intent-filter>
Expand Down
26 changes: 25 additions & 1 deletion app/src/main/kotlin/com/metrolist/music/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,15 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalWindowInfo
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastAny
import androidx.compose.ui.window.Dialog
Expand Down Expand Up @@ -641,6 +643,26 @@ class MainActivity : ComponentActivity() {
pureBlack = pureBlack,
themeColor = themeColor,
) {
val currentDensity = LocalDensity.current
val windowInfo = LocalWindowInfo.current
val containerWidthDp = windowInfo.containerDpSize.width

val densityScale = remember(containerWidthDp) {
when {
containerWidthDp >= 840.dp -> 1.25f
containerWidthDp >= 720.dp -> 1.15f
containerWidthDp >= 600.dp -> 1.1f
else -> 1.0f
}
}
val scaledDensity: Density = remember(currentDensity, densityScale) {
Density(
density = currentDensity.density * densityScale,
fontScale = currentDensity.fontScale,
)
}

CompositionLocalProvider(LocalDensity provides scaledDensity) {
BoxWithConstraints(
modifier =
Modifier
Expand Down Expand Up @@ -756,8 +778,9 @@ class MainActivity : ComponentActivity() {
}

val isLandscape = configuration.containerDpSize.width > configuration.containerDpSize.height
val isTablet = configuration.containerDpSize.width >= 600.dp

val showRail = isLandscape && !inSearchScreen
val showRail = (isLandscape || isTablet) && !inSearchScreen

val navPadding =
if (shouldShowNavigationBar && !showRail) {
Expand Down Expand Up @@ -1367,6 +1390,7 @@ class MainActivity : ComponentActivity() {
}
}
}
}
}
}

Expand Down
Loading