Skip to content

Commit

Permalink
Changed the logo in the About section to add the "by droidcon" mention.
Browse files Browse the repository at this point in the history
  • Loading branch information
Antoine Robiez committed Mar 29, 2024
1 parent 56237d2 commit 18f2a38
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 33 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"originHash" : "a1569f9895aa2be8e24832f98525d5da4eb90b5d158a82691c15b47eb72a13d7",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand Down Expand Up @@ -42,17 +41,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "a732a4b47f59e4f725a2ea10f0c77e93a7131117",
"version" : "9.3.0"
"revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
"version" : "9.4.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3",
"version" : "7.12.1"
"revision" : "26c898aed8bed13b8a63057ee26500abbbcb8d55",
"version" : "7.13.1"
}
},
{
Expand All @@ -69,8 +68,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "76135c9f4e1ac85459d5fec61b6f76ac47ab3a4c",
"version" : "3.3.1"
"revision" : "9534039303015a84837090d20fa21cae6e5eadb6",
"version" : "3.3.2"
}
},
{
Expand All @@ -87,17 +86,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "9d108e9112aa1d65ce508facf804674546116d9c",
"version" : "1.22.3"
"revision" : "43aaef65e0c665daadf848761d560e446d350d3d",
"version" : "1.22.4"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
"version" : "2.30909.0"
"revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
"version" : "2.30910.0"
}
},
{
Expand All @@ -119,5 +118,5 @@
}
}
],
"version" : 3
"version" : 2
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@ package com.androidmakers.ui.about

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -24,9 +28,9 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import dev.icerock.moko.resources.compose.painterResource
import dev.icerock.moko.resources.compose.stringResource
import fr.androidmakers.domain.model.Partner
import fr.paug.androidmakers.ui.MR
import moe.tlaster.precompose.koin.koinViewModel

@Composable
fun AboutScreen(
versionName: String,
Expand Down Expand Up @@ -71,8 +75,9 @@ private fun IntroCard(
Column(Modifier.padding(vertical = 8.dp)) {
Image(
modifier = Modifier
.height(64.dp)
.fillMaxWidth(),
.heightIn(max = 128.dp)
.fillMaxWidth()
.padding(horizontal = 32.dp),
painter = painterResource(MR.images.logo_android_makers),
contentDescription = "Logo"
)
Expand Down Expand Up @@ -103,8 +108,12 @@ private fun SocialCard(
onXLogoClick: () -> Unit,
onYouTubeLogoClick: () -> Unit
) {
val darkMode = isSystemInDarkTheme()
Card(Modifier.fillMaxWidth()) {
Column(Modifier.padding(8.dp)) {
Column(
modifier = Modifier.padding(8.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Row(
Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.Center
Expand All @@ -113,27 +122,34 @@ private fun SocialCard(
}
Row(
Modifier
.fillMaxWidth()
.padding(top = 8.dp),
horizontalArrangement = Arrangement.Center
horizontalArrangement = Arrangement.spacedBy(16.dp),
) {
Icon(
modifier = Modifier
.size(96.dp, 64.dp)
.clickable(onClick = onXLogoClick)
.padding(12.dp),
IconButton(
onClick = onXLogoClick,
modifier = Modifier.size(64.dp)
) {
Icon(
modifier = Modifier.size(36.dp),
painter = painterResource(MR.images.ic_network_x),
tint = Color(0xFF000000),
tint = if (darkMode) {
Color.White
} else {
Color.Black
},
contentDescription = "X"
)
Icon(
modifier = Modifier
.size(96.dp, 64.dp)
.clickable(onClick = onYouTubeLogoClick),
)
}
IconButton(
modifier = Modifier.size(64.dp),
onClick = onYouTubeLogoClick
) {
Image(
modifier = Modifier.size(48.dp),
painter = painterResource(MR.images.ic_network_youtube),
tint = Color(0xffff0000),
contentDescription = "YouTube"
)
)
}
}
}
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 18f2a38

Please sign in to comment.