Skip to content

[ui] clarify brand mark #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bniladridas merged 1 commit into from
May 28, 2026
Merged

[ui] clarify brand mark #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions app/src/main/java/com/bniladridas/diff/ui/components/DiffComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.bniladridas.diff.ui.components

import androidx.compose.foundation.Image
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
Expand All @@ -19,6 +18,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
Expand All @@ -27,7 +27,6 @@ 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.res.painterResource
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -113,14 +112,19 @@ private fun NeutralTag(text: String) {
@Composable
fun BrandMark() {
Row(verticalAlignment = Alignment.CenterVertically) {
Image(
painter = painterResource(R.drawable.app_icon_foreground),
contentDescription = null,
contentScale = ContentScale.Crop,
Box(
modifier = Modifier
.size(16.dp)
.clip(RoundedCornerShape(3.dp)),
)
.size(24.dp)
.background(Color(0xFF111418), RoundedCornerShape(5.dp)),
contentAlignment = Alignment.Center,
) {
Icon(
painter = painterResource(R.drawable.ic_diff_mark),
contentDescription = null,
tint = Color.Unspecified,
modifier = Modifier.size(18.dp),
)
}
Spacer(Modifier.width(7.dp))
Text(
"DIFF",
Expand Down
26 changes: 26 additions & 0 deletions app/src/main/res/drawable/ic_diff_mark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/transparent"
android:pathData="M7,4.5H11C12.381,4.5 13.5,5.619 13.5,7V11C13.5,12.381 12.381,13.5 11,13.5H7C5.619,13.5 4.5,12.381 4.5,11V7C4.5,5.619 5.619,4.5 7,4.5Z"
android:strokeColor="#F3F1EC"
android:strokeLineJoin="round"
android:strokeWidth="1.8" />
<path
android:fillColor="@android:color/transparent"
android:pathData="M13,10.5H17C18.381,10.5 19.5,11.619 19.5,13V17C19.5,18.381 18.381,19.5 17,19.5H13C11.619,19.5 10.5,18.381 10.5,17V13C10.5,11.619 11.619,10.5 13,10.5Z"
android:strokeColor="#F3F1EC"
android:strokeLineJoin="round"
android:strokeWidth="1.8" />
<path
android:fillColor="@android:color/transparent"
android:pathData="M10.5,13.5V15.25C10.5,16.217 11.283,17 12.25,17H13"
android:strokeColor="#F3F1EC"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="1.8" />
</vector>