diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt index 6ea024cd9..912710ef1 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt @@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.pager.rememberPagerState -import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.InlineTextContent import androidx.compose.foundation.text.appendInlineContent import androidx.compose.material.Icon @@ -48,7 +47,6 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalClipboardManager @@ -599,15 +597,7 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) { .height(40.dp) .padding(10.dp) ) { - Box( - Modifier - .clip(CircleShape) - .fillMaxSize(0.6f) - .align(Alignment.Center) - .background(MaterialTheme.colors.background) - ) - - if (verifiedHash == true) { + if (verifiedHash) { IconButton( onClick = { scope.launch { @@ -626,7 +616,7 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) { modifier = Modifier.size(30.dp) ) } - } else if (verifiedHash == false) { + } else { IconButton( onClick = { scope.launch { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 598a4debb..75e1b7459 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -3240,30 +3240,12 @@ fun FollowingIcon(iconSize: Dp) { Modifier.size(iconSize) } - val backgroundColor = MaterialTheme.colors.background - - val myIconBackgroundModifier = remember { - Modifier - .clip(CircleShape) - .size(iconSize.times(0.6f)) - .drawBehind { drawRect(backgroundColor) } - } - - FollowingIcon(modifier, myIconBackgroundModifier) -} - -@Composable -fun FollowingIcon(modifier: Modifier, myIconBackgroundModifier: Modifier) { - Box(modifier = modifier, contentAlignment = Alignment.Center) { - Box(myIconBackgroundModifier) - - Icon( - painter = painterResource(R.drawable.ic_verified), - stringResource(id = R.string.following), - modifier = modifier, - tint = Following - ) - } + Icon( + painter = painterResource(R.drawable.ic_verified), + stringResource(id = R.string.following), + modifier = modifier, + tint = Following + ) } @Immutable diff --git a/app/src/main/res/drawable-hdpi/ic_verified.png b/app/src/main/res/drawable-hdpi/ic_verified.png index 994fb02f3..85a365e0b 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_verified.png and b/app/src/main/res/drawable-hdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_verified_transparent.png b/app/src/main/res/drawable-hdpi/ic_verified_transparent.png new file mode 100644 index 000000000..994fb02f3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_verified_transparent.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_verified.png b/app/src/main/res/drawable-mdpi/ic_verified.png index 8a70ec1d4..9542073ab 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_verified.png and b/app/src/main/res/drawable-mdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_verified_transparent.png b/app/src/main/res/drawable-mdpi/ic_verified_transparent.png new file mode 100644 index 000000000..8a70ec1d4 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_verified_transparent.png differ diff --git a/app/src/main/res/drawable-night-hdpi/ic_verified.png b/app/src/main/res/drawable-night-hdpi/ic_verified.png new file mode 100644 index 000000000..3ad814bc3 Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-night-mdpi/ic_verified.png b/app/src/main/res/drawable-night-mdpi/ic_verified.png new file mode 100644 index 000000000..e95bdec0e Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-night-xhdpi/ic_verified.png b/app/src/main/res/drawable-night-xhdpi/ic_verified.png new file mode 100644 index 000000000..411b700ec Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_verified.png b/app/src/main/res/drawable-night-xxhdpi/ic_verified.png new file mode 100644 index 000000000..d8605ab15 Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_verified.png b/app/src/main/res/drawable-night-xxxhdpi/ic_verified.png new file mode 100644 index 000000000..bbf7b53dc Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_verified.png b/app/src/main/res/drawable-xhdpi/ic_verified.png index 27ee31f90..7234f029f 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_verified.png and b/app/src/main/res/drawable-xhdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_verified_transparent.png b/app/src/main/res/drawable-xhdpi/ic_verified_transparent.png new file mode 100644 index 000000000..27ee31f90 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_verified_transparent.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_verified.png b/app/src/main/res/drawable-xxhdpi/ic_verified.png index 76f539089..e52a538bc 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_verified.png and b/app/src/main/res/drawable-xxhdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_verified_transparent.png b/app/src/main/res/drawable-xxhdpi/ic_verified_transparent.png new file mode 100644 index 000000000..76f539089 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_verified_transparent.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_verified.png b/app/src/main/res/drawable-xxxhdpi/ic_verified.png index 8213c188e..947c365d7 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_verified.png and b/app/src/main/res/drawable-xxxhdpi/ic_verified.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png b/app/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png new file mode 100644 index 000000000..8213c188e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png differ