Skip to content
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

Jump to bottom

Android - Digit Classification - New main color & logo #30

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Android - Digit Classification - New main color & logo #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4c011
feat: use new main color and logo
st-haingo Sep 12, 2024
d633e50
feat: using theme
st-haingo Sep 15, 2024
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
Binary file added examples/digit_classifier/android/app/src/main/ic_launcher-playstore.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
112 changes: 54 additions & 58 deletions ...ier/android/app/src/main/java/com/google/aiedge/examples/digit_classifier/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,15 @@ import androidx.compose.foundation.gestures.detectDragGestures
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
Expand All @@ -58,13 +57,14 @@ import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.graphics.painter.ColorPainter
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.google.aiedge.examples.digit_classifier.ui.ApplicationTheme


class MainActivity : ComponentActivity() {
Expand All @@ -75,45 +75,47 @@ class MainActivity : ComponentActivity() {
setContent {
val uiState by viewModel.uiState.collectAsStateWithLifecycle()

Scaffold(
topBar = {
Header()
},
) { paddingValue ->
Column(
modifier = Modifier.padding(paddingValue),
horizontalAlignment = Alignment.CenterHorizontally
) {
// Board composable for drawing and interaction
Board(
modifier = Modifier.fillMaxWidth(),
drawOffsets = uiState.drawOffsets,
onDragStart = {
viewModel.draw(it)
},
onDrag = {
viewModel.draw(it)
},
onDragEnd = {},
onDraw = {
if (uiState.drawOffsets.isNotEmpty()) {
viewModel.classify(it)
}
},
)

Spacer(modifier = Modifier.height(30.dp))
Text("Prediction result: ${uiState.digit}")
Spacer(modifier = Modifier.height(5.dp))
Text("Confidence: ${uiState.score}")
Spacer(Modifier.weight(1f))
Button(onClick = {
viewModel.cleanBoard()
}) {
Text("Clear")
ApplicationTheme {
Scaffold(
topBar = {
Header()
},
) { paddingValue ->
Column(
modifier = Modifier.padding(paddingValue),
horizontalAlignment = Alignment.CenterHorizontally
) {
// Board composable for drawing and interaction
Board(
modifier = Modifier.fillMaxWidth(),
drawOffsets = uiState.drawOffsets,
onDragStart = {
viewModel.draw(it)
},
onDrag = {
viewModel.draw(it)
},
onDragEnd = {},
onDraw = {
if (uiState.drawOffsets.isNotEmpty()) {
viewModel.classify(it)
}
},
)

Spacer(modifier = Modifier.height(30.dp))
Text(stringResource(id = R.string.result, uiState.digit))
Spacer(modifier = Modifier.height(5.dp))
Text(stringResource(id = R.string.confidence, uiState.score))
Spacer(Modifier.weight(1f))
Button(onClick = {
viewModel.cleanBoard()
}) {
Text(stringResource(id = R.string.clear))
}
}
}

}
}
}
}
Expand Down Expand Up @@ -159,7 +161,7 @@ class MainActivity : ComponentActivity() {
modifier = modifier
.fillMaxWidth()
.height(screenWidth)
.background(Color.Black)
.background(MaterialTheme.colorScheme.primary)
.detectDrag(
onDragStart = {
onDragStart(Start(it.x, it.y))
Expand Down Expand Up @@ -198,24 +200,18 @@ class MainActivity : ComponentActivity() {

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun Header(modifier: Modifier = Modifier) {
fun Header() {
TopAppBar(
modifier = modifier,
colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.LightGray),
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.secondary,
),
title = {
Row(
modifier = Modifier.fillMaxSize(),
verticalAlignment = Alignment.CenterVertically,
) {
Image(
modifier = Modifier.size(50.dp),
painter = ColorPainter(color = Color.White),
contentDescription = null,
)

Spacer(modifier = modifier.width(10.dp))
Text(text = "LiteRT", color = Color.Blue, fontWeight = FontWeight.SemiBold)
}
Image(
modifier = Modifier.size(120.dp),
alignment = Alignment.CenterStart,
painter = painterResource(id = R.drawable.logo),
contentDescription = null,
)
},
)
}
Expand Down
7 changes: 7 additions & 0 deletions ...ssifier/android/app/src/main/java/com/google/aiedge/examples/digit_classifier/ui/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.google.aiedge.examples.digit_classifier.ui

import androidx.compose.ui.graphics.Color

val darkBlue = Color(0xFF020f59)
val teal = Color(0xFF00c99e)
val cyan = Color(0xFF5be3e3)
21 changes: 21 additions & 0 deletions ...ssifier/android/app/src/main/java/com/google/aiedge/examples/digit_classifier/ui/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.google.aiedge.examples.digit_classifier.ui

import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable

private val colorScheme = lightColorScheme(
primary = darkBlue,
secondary = teal,
onSurfaceVariant = teal,
)

@Composable
fun ApplicationTheme(
content: @Composable () -> Unit
) {
MaterialTheme(
colorScheme = colorScheme,
content = content
)
}
Loading