Procházet zdrojové kódy

code improvements & grayscale modifier

Milan Jurkulak před 1 rokem
rodič
revize
3ab115ef59

+ 1 - 1
composeApp/src/androidMain/kotlin/org/mjdev/desktop/activity/MainActivity.kt

@@ -57,7 +57,7 @@ class MainActivity : ComponentActivity() {
             systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
         }
         setContent {
-            val permissionManager = rememberPermissionManager()
+            rememberPermissionManager()
             CompositionLocalProvider(
                 LocalDesktopContext provides DesktopContext.Companion.rememberDesktopContext(
                     baseContext

+ 3 - 1
composeApp/src/androidMain/kotlin/org/mjdev/desktop/context/DesktopContext.kt

@@ -75,7 +75,9 @@ class DesktopContext(
         } ?: DpSize(1024.dp, 640.dp)
 
     val allUsers
-        get() = User.allUsers(this)
+        get() = runCatching {
+            User.allUsers(this)
+        }.getOrNull() ?: emptyList<User>()
 
     override suspend fun logOut() {
     }

+ 0 - 1
composeApp/src/androidMain/kotlin/org/mjdev/desktop/main/MainView.kt

@@ -29,7 +29,6 @@ import org.mjdev.desktop.extensions.Compose.preview
 import org.mjdev.desktop.extensions.LaunchedEffect.runAsync
 import org.mjdev.desktop.extensions.MutableStateExt.rememberCalculated
 import org.mjdev.desktop.components.desktop.widgets.MemoryChart
-import org.mjdev.desktop.extensions.Compose.greyScale
 
 @SuppressLint("ComposableNaming")
 @Composable

+ 3 - 8
composeApp/src/commonMain/kotlin/org/mjdev/desktop/extensions/Compose.kt

@@ -281,19 +281,14 @@ object Compose {
 
     class GreyScaleModifier : DrawModifier {
         override fun ContentDrawScope.draw() {
-            val saturationMatrix = ColorMatrix().apply { setToSaturation(0.3f) }
+            val saturationMatrix = ColorMatrix().apply { setToSaturation(0f) }
             val saturationFilter = ColorFilter.colorMatrix(saturationMatrix)
             val paint = Paint().apply {
                 colorFilter = saturationFilter
             }
             drawIntoCanvas { canvas ->
-                canvas.saveLayer(Rect(
-                    0f,
-                    0f,
-                    size.width,
-                    size.height),
-                    paint
-                )
+                val bounds = Rect(0f, 0f, size.width, size.height)
+                canvas.saveLayer(bounds, paint)
                 drawContent()
                 canvas.restore()
             }