Skip to content

Update logo inside the app #11

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
mdrlzy merged 1 commit into from
Oct 28, 2025
Merged

Update logo inside the app #11

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
11 changes: 9 additions & 2 deletions app/src/main/java/dev/arkbuilders/drop/app/ui/Home/Home.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight
Expand All @@ -42,6 +44,7 @@ import compose.icons.tablericons.CloudDownload
import compose.icons.tablericons.CloudUpload
import compose.icons.tablericons.History
import dev.arkbuilders.drop.app.ProfileManager
import dev.arkbuilders.drop.app.R
import dev.arkbuilders.drop.app.UserProfile
import dev.arkbuilders.drop.app.data.HistoryRepository
import dev.arkbuilders.drop.app.data.TransferHistoryItem
Expand All @@ -54,7 +57,6 @@ import dev.arkbuilders.drop.app.ui.components.DropCard
import dev.arkbuilders.drop.app.ui.components.DropCardContent
import dev.arkbuilders.drop.app.ui.components.DropCardSize
import dev.arkbuilders.drop.app.ui.components.DropCardVariant
import dev.arkbuilders.drop.app.ui.components.DropLogoWithBackground
import dev.arkbuilders.drop.app.ui.components.DropOutlinedButton
import dev.arkbuilders.drop.app.ui.components.EmptyState
import dev.arkbuilders.drop.app.ui.profile.AvatarUtils
Expand Down Expand Up @@ -149,7 +151,12 @@ private fun HeaderSection(
Box(
modifier = Modifier.scale(logoScale)
) {
DropLogoWithBackground(size = 56.dp)
Icon(
modifier = Modifier.size(56.dp),
painter = painterResource(R.drawable.ic_logo),
contentDescription = null,
tint = Color.Unspecified,
)
}

Column {
Expand Down
195 changes: 0 additions & 195 deletions app/src/main/java/dev/arkbuilders/drop/app/ui/components/DropLogo.kt
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions app/src/main/java/dev/arkbuilders/drop/app/ui/receive/Receive.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.style.TextAlign
Expand All @@ -103,10 +104,10 @@ import compose.icons.tablericons.ArrowForward
import compose.icons.tablericons.Camera
import compose.icons.tablericons.CameraOff
import compose.icons.tablericons.Qrcode
import dev.arkbuilders.drop.app.R
import dev.arkbuilders.drop.app.TransferManager
import dev.arkbuilders.drop.app.data.ReceiveFileInfo
import dev.arkbuilders.drop.app.data.ReceivingProgress
import dev.arkbuilders.drop.app.ui.components.DropLogoIcon
import dev.arkbuilders.drop.app.ui.profile.AvatarUtils
import dev.arkbuilders.drop.app.ui.theme.DesignTokens
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -329,9 +330,11 @@ fun Receive(

Spacer(modifier = Modifier.width(DesignTokens.Spacing.md))

DropLogoIcon(
size = 32.dp,
tint = MaterialTheme.colorScheme.primary
Icon(
modifier = Modifier.size(32.dp),
painter = painterResource(R.drawable.ic_logo),
contentDescription = null,
tint = Color.Unspecified,
)

Spacer(modifier = Modifier.width(DesignTokens.Spacing.md))
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/dev/arkbuilders/drop/app/ui/send/Send.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight
Expand All @@ -116,8 +117,8 @@ import compose.icons.tablericons.Copy
import compose.icons.tablericons.FileText
import compose.icons.tablericons.Plus
import compose.icons.tablericons.Qrcode
import dev.arkbuilders.drop.app.R
import dev.arkbuilders.drop.app.TransferManager
import dev.arkbuilders.drop.app.ui.components.DropLogoIcon
import dev.arkbuilders.drop.app.ui.profile.AvatarUtils
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -605,8 +606,11 @@ private fun SendTopBar(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp)
) {
DropLogoIcon(
size = 24.dp, tint = MaterialTheme.colorScheme.primary
Icon(
modifier = Modifier.size(24.dp),
painter = painterResource(R.drawable.ic_logo),
contentDescription = null,
tint = Color.Unspecified,
)
Text(
text = "Send Files", style = MaterialTheme.typography.headlineSmall.copy(
Expand Down
28 changes: 28 additions & 0 deletions app/src/main/res/drawable/ic_logo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="397dp"
android:height="396dp"
android:viewportWidth="397"
android:viewportHeight="396">
<group>
<clip-path
android:pathData="M0,0h397v396h-397z"/>
<path
android:pathData="M352.89,88V44H308.78V0H264.67H220.56H176.45H132.33H88.22H44.11H0V44V88V132V176V220V264V308V352V396H44.11H88.22H132.33H176.45H220.56H264.67H308.78V352H352.89V308H397V264V220V176V132V88H352.89Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="397"
android:startY="198"
android:endX="0"
android:endY="198"
android:type="linear">
<item android:offset="0" android:color="#FF3CDDCE"/>
<item android:offset="1" android:color="#FF1690FE"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M220.56,61.77H176.45V105.77H220.56V61.77ZM264.67,149.78H176.45V105.78H132.34V149.78H88.23V193.78H308.78V149.78H264.67H264.67ZM220.56,200.34H88.22V244.34H220.55V288.34H264.66V244.34H308.77V200.34H220.55H220.56ZM176.45,332.34H220.56V288.34H176.45V332.34Z"
android:fillColor="#ffffff"/>
</group>
</vector>