mirror of
https://github.com/Myzel394/Alibi.git
synced 2025-06-19 07:15:25 +02:00
fix: Improve responsive design
Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com>
This commit is contained in:
parent
0ec149ee02
commit
08084d207e
@ -35,12 +35,13 @@ fun BigButton(
|
|||||||
description: String? = null,
|
description: String? = null,
|
||||||
onClick: () -> Unit,
|
onClick: () -> Unit,
|
||||||
onLongClick: () -> Unit = {},
|
onLongClick: () -> Unit = {},
|
||||||
|
isBig: Boolean? = null,
|
||||||
) {
|
) {
|
||||||
val orientation = LocalConfiguration.current.orientation
|
val orientation = LocalConfiguration.current.orientation
|
||||||
|
|
||||||
BoxWithConstraints {
|
BoxWithConstraints {
|
||||||
val isLarge =
|
val isLarge = if (isBig == null)
|
||||||
maxWidth > 250.dp && maxHeight > 600.dp && orientation == Configuration.ORIENTATION_PORTRAIT
|
maxWidth > 250.dp && maxHeight > 600.dp && orientation == Configuration.ORIENTATION_PORTRAIT else isBig
|
||||||
|
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
@ -18,6 +18,7 @@ import app.myzel394.alibi.ui.components.atoms.VisualDensity
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LowStorageInfo(
|
fun LowStorageInfo(
|
||||||
|
modifier: Modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
|
||||||
appSettings: AppSettings,
|
appSettings: AppSettings,
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
@ -36,9 +37,7 @@ fun LowStorageInfo(
|
|||||||
println("LowStorageInfo: availableBytes: $availableBytes, requiredBytes: $requiredBytes, isLowOnStorage: $isLowOnStorage")
|
println("LowStorageInfo: availableBytes: $availableBytes, requiredBytes: $requiredBytes, isLowOnStorage: $isLowOnStorage")
|
||||||
|
|
||||||
if (isLowOnStorage)
|
if (isLowOnStorage)
|
||||||
Box(
|
Box(modifier = modifier) {
|
||||||
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp)
|
|
||||||
) {
|
|
||||||
BoxWithConstraints {
|
BoxWithConstraints {
|
||||||
val isLarge = maxHeight > 600.dp;
|
val isLarge = maxHeight > 600.dp;
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@ import app.myzel394.alibi.ui.models.AudioRecorderModel
|
|||||||
fun AudioRecordingStart(
|
fun AudioRecordingStart(
|
||||||
audioRecorder: AudioRecorderModel,
|
audioRecorder: AudioRecorderModel,
|
||||||
appSettings: AppSettings,
|
appSettings: AppSettings,
|
||||||
|
useLargeButtons: Boolean? = null,
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|
||||||
@ -59,6 +60,7 @@ fun AudioRecordingStart(
|
|||||||
label = stringResource(R.string.ui_audioRecorder_action_start_label),
|
label = stringResource(R.string.ui_audioRecorder_action_start_label),
|
||||||
icon = Icons.Default.Mic,
|
icon = Icons.Default.Mic,
|
||||||
onClick = triggerRecordAudio,
|
onClick = triggerRecordAudio,
|
||||||
|
isBig = useLargeButtons,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,7 @@ fun VideoRecordingStart(
|
|||||||
onHideAudioRecording: () -> Unit,
|
onHideAudioRecording: () -> Unit,
|
||||||
onShowAudioRecording: () -> Unit,
|
onShowAudioRecording: () -> Unit,
|
||||||
showPreview: Boolean,
|
showPreview: Boolean,
|
||||||
|
useLargeButtons: Boolean? = null,
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|
||||||
@ -87,6 +88,7 @@ fun VideoRecordingStart(
|
|||||||
showSheet = true
|
showSheet = true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
isBig = useLargeButtons,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -3,6 +3,7 @@ package app.myzel394.alibi.ui.components.RecorderScreen.organisms
|
|||||||
import android.content.res.Configuration
|
import android.content.res.Configuration
|
||||||
import androidx.compose.foundation.Image
|
import androidx.compose.foundation.Image
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
@ -100,6 +101,10 @@ fun StartRecording(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BoxWithConstraints {
|
||||||
|
val isLargeDisplay =
|
||||||
|
maxWidth > 250.dp && maxHeight > 600.dp && orientation == Configuration.ORIENTATION_PORTRAIT
|
||||||
|
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
@ -136,6 +141,7 @@ fun StartRecording(
|
|||||||
AudioRecordingStart(
|
AudioRecordingStart(
|
||||||
audioRecorder = audioRecorder,
|
audioRecorder = audioRecorder,
|
||||||
appSettings = appSettings,
|
appSettings = appSettings,
|
||||||
|
useLargeButtons = isLargeDisplay,
|
||||||
)
|
)
|
||||||
VideoRecordingStart(
|
VideoRecordingStart(
|
||||||
videoRecorder = videoRecorder,
|
videoRecorder = videoRecorder,
|
||||||
@ -143,6 +149,7 @@ fun StartRecording(
|
|||||||
onHideAudioRecording = onHideTopBar,
|
onHideAudioRecording = onHideTopBar,
|
||||||
onShowAudioRecording = onShowTopBar,
|
onShowAudioRecording = onShowTopBar,
|
||||||
showPreview = !showAudioRecorder,
|
showPreview = !showAudioRecorder,
|
||||||
|
useLargeButtons = isLargeDisplay,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -214,6 +221,14 @@ fun StartRecording(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LowStorageInfo(appSettings = appSettings)
|
LowStorageInfo(
|
||||||
|
modifier = if (isLargeDisplay) Modifier
|
||||||
|
.padding(16.dp)
|
||||||
|
.widthIn(max = 400.dp) else Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(4.dp),
|
||||||
|
appSettings = appSettings
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user