mirror of
https://github.com/gezimos/inkOS.git
synced 2026-06-11 06:44:17 -04:00
Wallpaper Setter Fix string 3
This commit is contained in:
Gezim
@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.material.AlertDialog
|
||||
import androidx.compose.material.Divider
|
||||
import androidx.compose.material.Icon
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Info
|
||||
@@ -56,6 +55,7 @@ fun SetWallpaper(
|
||||
val prefs = remember { Prefs(context) }
|
||||
val hasInkosWallpaper = remember { mutableStateOf(prefs.inkosWallpaperPath != null) }
|
||||
val showInkosDialog = remember { mutableStateOf(false) }
|
||||
val showAndroidOptions = remember { mutableStateOf(false) }
|
||||
val textIslandsShape = prefs.textIslandsShape
|
||||
val titleFontSize = if (fontSize != androidx.compose.ui.unit.TextUnit.Unspecified) (fontSize.value * 1.5).sp else fontSize
|
||||
val buttonFontSize = fontSize
|
||||
@@ -104,7 +104,8 @@ fun SetWallpaper(
|
||||
// Content
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.weight(1f)
|
||||
.fillMaxWidth()
|
||||
.padding(24.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center
|
||||
@@ -121,116 +122,142 @@ fun SetWallpaper(
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
// First box: inkOS wallpaper buttons + info below
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(containerShape)
|
||||
.background(Theme.colors.background)
|
||||
.border(2.dp, Theme.colors.text, containerShape)
|
||||
.padding(24.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp)
|
||||
// Simplified: show inkOS + Android options; tapping Android shows Android choices
|
||||
if (!showAndroidOptions.value) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(containerShape)
|
||||
.background(Theme.colors.background)
|
||||
.border(2.dp, Theme.colors.text, containerShape)
|
||||
.padding(24.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
SetWallpaperOptionButton(
|
||||
text = "inkOS Wallpaper",
|
||||
onClick = onSetInkOSNoCrop,
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
|
||||
if (hasInkosWallpaper.value) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
SetWallpaperOptionButton(
|
||||
text = "inkOS",
|
||||
onClick = {
|
||||
onSetInkOSNoCrop()
|
||||
hasInkosWallpaper.value = true
|
||||
},
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
|
||||
SetWallpaperOptionButton(
|
||||
text = "✕",
|
||||
onClick = {
|
||||
hasInkosWallpaper.value = false
|
||||
val prefs = Prefs(context)
|
||||
prefs.inkosWallpaperPath = null
|
||||
},
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.width(60.dp)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
SetWallpaperOptionButton(
|
||||
text = "✕",
|
||||
text = "inkOS",
|
||||
onClick = {
|
||||
hasInkosWallpaper.value = false
|
||||
val prefs = Prefs(context)
|
||||
prefs.inkosWallpaperPath = null
|
||||
onSetInkOSNoCrop()
|
||||
hasInkosWallpaper.value = true
|
||||
},
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.width(60.dp)
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
|
||||
SetWallpaperOptionButton(
|
||||
text = "Android",
|
||||
onClick = { showAndroidOptions.value = true },
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
} else {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(containerShape)
|
||||
.background(Theme.colors.background)
|
||||
.border(2.dp, Theme.colors.text, containerShape)
|
||||
.padding(24.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
SetWallpaperOptionButton(
|
||||
text = "Home Screen",
|
||||
onClick = onSetForHome,
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
if (supportsLockScreen) {
|
||||
SetWallpaperOptionButton(
|
||||
text = "Lock Screen",
|
||||
onClick = onSetForLockScreen,
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
SetWallpaperOptionButton(
|
||||
text = "Both",
|
||||
onClick = onSetForBoth,
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(4.dp))
|
||||
|
||||
Divider(color = Theme.colors.text, thickness = 1.dp)
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.Center,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.Info,
|
||||
contentDescription = "Info",
|
||||
tint = Theme.colors.text,
|
||||
modifier = Modifier
|
||||
.size(24.dp)
|
||||
.clickable { showInkosDialog.value = true }
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
|
||||
Text(
|
||||
text = "What is inkOS wallpaper?",
|
||||
style = SettingsTheme.typography.body,
|
||||
fontSize = buttonFontSize,
|
||||
color = Theme.colors.text,
|
||||
modifier = Modifier.clickable { showInkosDialog.value = true },
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
// Bottom info will be added after this Column so it sits at the bottom of the screen
|
||||
}
|
||||
|
||||
// Second box: set wallpaper for (home/lock/both)
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(containerShape)
|
||||
.background(Theme.colors.background)
|
||||
.border(2.dp, Theme.colors.text, containerShape)
|
||||
.padding(24.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||
// Bottom: inkOS info link
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(bottom = 16.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.Center,
|
||||
modifier = Modifier.clickable { showInkosDialog.value = true }
|
||||
) {
|
||||
SetWallpaperOptionButton(
|
||||
text = "Home Screen",
|
||||
onClick = onSetForHome,
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
Icon(
|
||||
imageVector = Icons.Filled.Info,
|
||||
contentDescription = "Info",
|
||||
tint = Theme.colors.text,
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
|
||||
if (supportsLockScreen) {
|
||||
SetWallpaperOptionButton(
|
||||
text = "Lock Screen",
|
||||
onClick = onSetForLockScreen,
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
|
||||
SetWallpaperOptionButton(
|
||||
text = "Both",
|
||||
onClick = onSetForBoth,
|
||||
fontSize = titleFontSize,
|
||||
shape = buttonShape,
|
||||
isPrimary = false,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
Text(
|
||||
text = "What is inkOS wallpaper?",
|
||||
style = SettingsTheme.typography.body,
|
||||
fontSize = buttonFontSize,
|
||||
color = Theme.colors.text,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,8 @@ import com.github.gezimos.inkos.style.SettingsTheme
|
||||
import com.github.gezimos.inkos.style.Theme
|
||||
import com.google.gson.Gson
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@Composable
|
||||
fun WallpaperUI(
|
||||
@@ -579,24 +581,46 @@ fun WallpaperUI(
|
||||
},
|
||||
onSetInkOSNoCrop = {
|
||||
val prefs = Prefs(context)
|
||||
val bitmap = if (currentImageUri != null) {
|
||||
wallpaperUtility.loadBitmapFromUri(currentImageUri!!)
|
||||
} else if (currentImageResourceId != null) {
|
||||
wallpaperUtility.loadBitmapFromResource(currentImageResourceId!!)
|
||||
} else null
|
||||
if (bitmap != null) {
|
||||
val processed = currentEditorState?.let { wallpaperUtility.applyEditorStateToBitmap(bitmap, it) } ?: bitmap
|
||||
val path = wallpaperUtility.saveBitmapToInternalStorage(processed, "inkos_wallpaper.png")
|
||||
prefs.inkosWallpaperPath = path
|
||||
if (processed != bitmap) processed.recycle()
|
||||
bitmap.recycle()
|
||||
}
|
||||
|
||||
// Capture current inputs then hide the selection screen so the loading overlay can show.
|
||||
val resourceId = currentImageResourceId
|
||||
val uri = currentImageUri
|
||||
val editorState = currentEditorState ?: WallpaperEditorState()
|
||||
|
||||
showSetWallpaperScreen = false
|
||||
pendingWallpaperAction = null
|
||||
currentImageResourceId = null
|
||||
currentImageUri = null
|
||||
currentEditorState = null
|
||||
onWallpaperSet?.invoke() ?: onBackClick()
|
||||
|
||||
scope.launch {
|
||||
try {
|
||||
isLoading = true
|
||||
|
||||
val bitmap = withContext(Dispatchers.IO) {
|
||||
if (uri != null) {
|
||||
wallpaperUtility.loadBitmapFromUri(uri)
|
||||
} else if (resourceId != null) {
|
||||
wallpaperUtility.loadBitmapFromResource(resourceId)
|
||||
} else null
|
||||
}
|
||||
|
||||
if (bitmap != null) {
|
||||
val processed = editorState.let { wallpaperUtility.applyEditorStateToBitmap(bitmap, it) }
|
||||
withContext(Dispatchers.IO) {
|
||||
val path = wallpaperUtility.saveBitmapToInternalStorage(processed, "inkos_wallpaper.png")
|
||||
prefs.inkosWallpaperPath = path
|
||||
}
|
||||
if (processed != bitmap) processed.recycle()
|
||||
bitmap.recycle()
|
||||
}
|
||||
|
||||
isLoading = false
|
||||
onWallpaperSet?.invoke() ?: onBackClick()
|
||||
} catch (_: Exception) {
|
||||
isLoading = false
|
||||
}
|
||||
}
|
||||
},
|
||||
fontSize = buttonFontSize,
|
||||
isDark = isDark,
|
||||
|
||||
Reference in New Issue
Block a user