Merge pull request #74 from dluvian/solve-issues

Solve issues
dluvian · Feb 11, 2024 · db6a783 · db6a783
2 parents 47046b4 + 11bb416
commit db6a783
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/app/src/main/java/com/dluvian/nozzle/ui/app/views/relayEditor/RelayEditorScreen.kt b/app/src/main/java/com/dluvian/nozzle/ui/app/views/relayEditor/RelayEditorScreen.kt
@@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color.Companion.DarkGray
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import com.dluvian.nozzle.R
@@ -228,7 +227,6 @@ private fun RelayRow(relay: String, trailingContent: @Composable (() -> Unit)) {
                     spacing = MarqueeSpacing.fractionOfContainer(1f / 4f)
                 ),
             text = relay,
-            color = DarkGray,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis
         )

diff --git a/app/src/main/java/com/dluvian/nozzle/ui/components/interactors/NamedCheckbox.kt b/app/src/main/java/com/dluvian/nozzle/ui/components/interactors/NamedCheckbox.kt
@@ -19,6 +19,6 @@ fun NamedCheckbox(
                 onCheckedChange = { onClick() },
             )
         },
-        name = name
+        name = name,
     )
 }
diff --git a/app/src/main/java/com/dluvian/nozzle/ui/components/postCard/PostCard.kt b/app/src/main/java/com/dluvian/nozzle/ui/components/postCard/PostCard.kt
@@ -11,12 +11,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.semantics.invisibleToUser
+import androidx.compose.ui.semantics.semantics
 import com.dluvian.nozzle.model.PostWithMeta
 import com.dluvian.nozzle.model.ThreadPosition
 import com.dluvian.nozzle.model.TrustType
@@ -29,7 +32,7 @@ import com.dluvian.nozzle.ui.theme.sizing
 import com.dluvian.nozzle.ui.theme.spacing
 
 
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class)
 @Composable
 fun PostCard(
     post: PostWithMeta,
@@ -96,7 +99,9 @@ fun PostCard(
         .clipToBounds()
     ) {
         PostCardProfilePicture(
-            modifier = Modifier.size(sizing.profilePicture),
+            modifier = Modifier
+                .size(sizing.profilePicture)
+                .semantics { this.invisibleToUser() },
             pubkey = post.pubkey,
             picture = post.picture,
             showProfilePicture = showProfilePicture,

diff --git a/app/src/main/java/com/dluvian/nozzle/ui/theme/Theme.kt b/app/src/main/java/com/dluvian/nozzle/ui/theme/Theme.kt
@@ -26,6 +26,9 @@ private val darkColorPalette = darkColorScheme(
     onSecondary = Color(0xFF4a2800),
     secondaryContainer = Color(0xFF693c00),
     onSecondaryContainer = Color(0xFFffdcbe),
+    background = Color.Black,
+    surface = Color.Black,
+    surfaceVariant = Color.Black,
 )
 
 @Composable