cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style adjustments

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-07-03 11:18:37 +02:00
parent 7321e271b8
commit 112c44da91
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt
View File

@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Add
@@ -60,6 +61,7 @@ import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import net.engawapg.lib.zoomable.rememberZoomState import net.engawapg.lib.zoomable.rememberZoomState
@@ -190,10 +192,13 @@ private fun DocumentPreview(
Text("${currentPageIndex.intValue + 1} / ${pageIds.size}", Text("${currentPageIndex.intValue + 1} / ${pageIds.size}",
color = MaterialTheme.colorScheme.inverseOnSurface, color = MaterialTheme.colorScheme.inverseOnSurface,
modifier = Modifier modifier = Modifier
.align(Alignment.BottomEnd) .align(Alignment.TopStart)
.padding(all = 8.dp) .padding(all = 16.dp)
.background(MaterialTheme.colorScheme.inverseSurface.copy(alpha = 0.5f)) .background(
.padding(all = 4.dp) color = MaterialTheme.colorScheme.inverseSurface.copy(alpha = 0.5f),
shape = RoundedCornerShape(4.dp)
)
.padding(horizontal = 8.dp, vertical = 2.dp)
) )
} }
} }
@@ -234,12 +239,12 @@ fun NewDocumentDialog(onConfirm: () -> Unit, showDialog: MutableState<Boolean>)
showDialog.value = false showDialog.value = false
onConfirm() onConfirm()
}) { }) {
Text("Yes") Text("Yes", fontWeight = FontWeight.Bold)
} }
}, },
dismissButton = { dismissButton = {
TextButton(onClick = { showDialog.value = false }) { TextButton(onClick = { showDialog.value = false }) {
Text("Cancel") Text("Cancel", fontWeight = FontWeight.Bold)
} }
}, },
onDismissRequest = { showDialog.value = false }, onDismissRequest = { showDialog.value = false },

2
app/src/main/java/org/mydomain/myscan/view/PageList.kt
View File

@@ -100,7 +100,7 @@ private fun PageThumbnail(
val bitmap = image.asImageBitmap() val bitmap = image.asImageBitmap()
val isSelected = index == currentPageIndex val isSelected = index == currentPageIndex
val borderColor = val borderColor =
if (isSelected) MaterialTheme.colorScheme.primary else Color.Transparent if (isSelected) MaterialTheme.colorScheme.secondary else Color.Transparent
val maxImageSize = PAGE_LIST_ELEMENT_SIZE_DP.dp val maxImageSize = PAGE_LIST_ELEMENT_SIZE_DP.dp
var modifier = var modifier =
if (bitmap.height > bitmap.width) if (bitmap.height > bitmap.width)