Skip to content

Commit 796df12

Browse files
authored
Update logo inside the app (#11)
1 parent d9a0a37 commit 796df12

File tree

5 files changed

+51
-204
lines changed

5 files changed

+51
-204
lines changed

app/src/main/java/dev/arkbuilders/drop/app/ui/Home/Home.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ import androidx.compose.runtime.setValue
2929
import androidx.compose.ui.Alignment
3030
import androidx.compose.ui.Modifier
3131
import androidx.compose.ui.draw.scale
32+
import androidx.compose.ui.graphics.Color
33+
import androidx.compose.ui.res.painterResource
3234
import androidx.compose.ui.semantics.contentDescription
3335
import androidx.compose.ui.semantics.semantics
3436
import androidx.compose.ui.text.font.FontWeight
@@ -42,6 +44,7 @@ import compose.icons.tablericons.CloudDownload
4244
import compose.icons.tablericons.CloudUpload
4345
import compose.icons.tablericons.History
4446
import dev.arkbuilders.drop.app.ProfileManager
47+
import dev.arkbuilders.drop.app.R
4548
import dev.arkbuilders.drop.app.UserProfile
4649
import dev.arkbuilders.drop.app.data.HistoryRepository
4750
import dev.arkbuilders.drop.app.data.TransferHistoryItem
@@ -54,7 +57,6 @@ import dev.arkbuilders.drop.app.ui.components.DropCard
5457
import dev.arkbuilders.drop.app.ui.components.DropCardContent
5558
import dev.arkbuilders.drop.app.ui.components.DropCardSize
5659
import dev.arkbuilders.drop.app.ui.components.DropCardVariant
57-
import dev.arkbuilders.drop.app.ui.components.DropLogoWithBackground
5860
import dev.arkbuilders.drop.app.ui.components.DropOutlinedButton
5961
import dev.arkbuilders.drop.app.ui.components.EmptyState
6062
import dev.arkbuilders.drop.app.ui.profile.AvatarUtils
@@ -149,7 +151,12 @@ private fun HeaderSection(
149151
Box(
150152
modifier = Modifier.scale(logoScale)
151153
) {
152-
DropLogoWithBackground(size = 56.dp)
154+
Icon(
155+
modifier = Modifier.size(56.dp),
156+
painter = painterResource(R.drawable.ic_logo),
157+
contentDescription = null,
158+
tint = Color.Unspecified,
159+
)
153160
}
154161

155162
Column {

app/src/main/java/dev/arkbuilders/drop/app/ui/components/DropLogo.kt

Lines changed: 0 additions & 195 deletions
This file was deleted.

app/src/main/java/dev/arkbuilders/drop/app/ui/receive/Receive.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import androidx.compose.ui.graphics.Color
8282
import androidx.compose.ui.platform.LocalClipboardManager
8383
import androidx.compose.ui.platform.LocalContext
8484
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
85+
import androidx.compose.ui.res.painterResource
8586
import androidx.compose.ui.text.font.FontWeight
8687
import androidx.compose.ui.text.input.ImeAction
8788
import androidx.compose.ui.text.style.TextAlign
@@ -103,10 +104,10 @@ import compose.icons.tablericons.ArrowForward
103104
import compose.icons.tablericons.Camera
104105
import compose.icons.tablericons.CameraOff
105106
import compose.icons.tablericons.Qrcode
107+
import dev.arkbuilders.drop.app.R
106108
import dev.arkbuilders.drop.app.TransferManager
107109
import dev.arkbuilders.drop.app.data.ReceiveFileInfo
108110
import dev.arkbuilders.drop.app.data.ReceivingProgress
109-
import dev.arkbuilders.drop.app.ui.components.DropLogoIcon
110111
import dev.arkbuilders.drop.app.ui.profile.AvatarUtils
111112
import dev.arkbuilders.drop.app.ui.theme.DesignTokens
112113
import kotlinx.coroutines.delay
@@ -329,9 +330,11 @@ fun Receive(
329330

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

332-
DropLogoIcon(
333-
size = 32.dp,
334-
tint = MaterialTheme.colorScheme.primary
333+
Icon(
334+
modifier = Modifier.size(32.dp),
335+
painter = painterResource(R.drawable.ic_logo),
336+
contentDescription = null,
337+
tint = Color.Unspecified,
335338
)
336339

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

app/src/main/java/dev/arkbuilders/drop/app/ui/send/Send.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
9595
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
9696
import androidx.compose.ui.platform.LocalContext
9797
import androidx.compose.ui.platform.LocalHapticFeedback
98+
import androidx.compose.ui.res.painterResource
9899
import androidx.compose.ui.semantics.contentDescription
99100
import androidx.compose.ui.semantics.semantics
100101
import androidx.compose.ui.text.font.FontWeight
@@ -116,8 +117,8 @@ import compose.icons.tablericons.Copy
116117
import compose.icons.tablericons.FileText
117118
import compose.icons.tablericons.Plus
118119
import compose.icons.tablericons.Qrcode
120+
import dev.arkbuilders.drop.app.R
119121
import dev.arkbuilders.drop.app.TransferManager
120-
import dev.arkbuilders.drop.app.ui.components.DropLogoIcon
121122
import dev.arkbuilders.drop.app.ui.profile.AvatarUtils
122123
import kotlinx.coroutines.currentCoroutineContext
123124
import kotlinx.coroutines.delay
@@ -605,8 +606,11 @@ private fun SendTopBar(
605606
verticalAlignment = Alignment.CenterVertically,
606607
horizontalArrangement = Arrangement.spacedBy(12.dp)
607608
) {
608-
DropLogoIcon(
609-
size = 24.dp, tint = MaterialTheme.colorScheme.primary
609+
Icon(
610+
modifier = Modifier.size(24.dp),
611+
painter = painterResource(R.drawable.ic_logo),
612+
contentDescription = null,
613+
tint = Color.Unspecified,
610614
)
611615
Text(
612616
text = "Send Files", style = MaterialTheme.typography.headlineSmall.copy(
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="397dp"
4+
android:height="396dp"
5+
android:viewportWidth="397"
6+
android:viewportHeight="396">
7+
<group>
8+
<clip-path
9+
android:pathData="M0,0h397v396h-397z"/>
10+
<path
11+
android:pathData="M352.89,88V44H308.78V0H264.67H220.56H176.45H132.33H88.22H44.11H0V44V88V132V176V220V264V308V352V396H44.11H88.22H132.33H176.45H220.56H264.67H308.78V352H352.89V308H397V264V220V176V132V88H352.89Z">
12+
<aapt:attr name="android:fillColor">
13+
<gradient
14+
android:startX="397"
15+
android:startY="198"
16+
android:endX="0"
17+
android:endY="198"
18+
android:type="linear">
19+
<item android:offset="0" android:color="#FF3CDDCE"/>
20+
<item android:offset="1" android:color="#FF1690FE"/>
21+
</gradient>
22+
</aapt:attr>
23+
</path>
24+
<path
25+
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"
26+
android:fillColor="#ffffff"/>
27+
</group>
28+
</vector>

0 commit comments

Comments
 (0)