Skip to content

DemoApp - First interation #42

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.

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
merged 7 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ dependencies {
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
implementation(project(":gravatar"))
implementation("io.coil-kt:coil-compose:2.5.0")

debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")

// Unit Test dependencies
testImplementation("junit:junit:4.13.2")
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET"/>

<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
Expand Down
34 changes: 2 additions & 32 deletions app/src/main/java/com/gravatar/demoapp/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,13 @@ package com.gravatar.demoapp
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.gravatar.demoapp.theme.GravatarDemoAppTheme
import com.gravatar.demoapp.ui.DemoGravatarApp

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
GravatarDemoAppTheme {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background,
) {
Greeting("Android")
}
}
DemoGravatarApp()
}
}
}

@Composable
fun Greeting(name: String, modifier: Modifier = Modifier) {
Text(
text = "Hello $name!",
modifier = modifier,
)
}

@Preview(showBackground = true)
@Composable
fun GreetingPreview() {
GravatarDemoAppTheme {
Greeting("Android")
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package com.gravatar.demoapp.ui

import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Checkbox
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuBox
import androidx.compose.material3.ExposedDropdownMenuDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import com.gravatar.DefaultAvatarImage
import com.gravatar.R

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun DefaultAvatarImageDropdown(
enabled: Boolean,
onEnabledChanged: (Boolean) -> Unit,
selectedOption: DefaultAvatarImage,
onSelectedOptionChange: (DefaultAvatarImage) -> Unit,
defaultAvatarOptions: List<DefaultAvatarImage>,
modifier: Modifier = Modifier,
) {
var expanded by remember { mutableStateOf(false) }
Row(modifier = modifier) {
Checkbox(
checked = enabled,
onCheckedChange = {
if (enabled) {
expanded = false
}
onEnabledChanged(!enabled)
},
)
ExposedDropdownMenuBox(
expanded = expanded,
onExpandedChange = { expanded = !expanded },
modifier = Modifier.fillMaxWidth(),
) {
TextField(
readOnly = true,
value = selectedOption.style,
onValueChange = { },
label = { Text(stringResource(R.string.default_avatar_image_label)) },
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
modifier = Modifier
.fillMaxWidth()
.menuAnchor(),
)
ExposedDropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
defaultAvatarOptions.forEach { selectionOption ->
DropdownMenuItem(text = { Text(text = selectionOption.style) }, onClick = {
onSelectedOptionChange.invoke(selectionOption)
expanded = false
})
}
}
}
}
}
106 changes: 106 additions & 0 deletions app/src/main/java/com/gravatar/demoapp/ui/DemoGravatarApp.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
package com.gravatar.demoapp.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Divider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
import com.gravatar.DefaultAvatarImage
import com.gravatar.R
import com.gravatar.demoapp.theme.GravatarDemoAppTheme
import com.gravatar.emailAddressToGravatarUrl

@Composable
fun DemoGravatarApp() {
var email by remember { mutableStateOf("[email protected]") }
var gravatarUrl by remember { mutableStateOf("") }
var avatarSize by remember { mutableStateOf<Int?>(null) }
var defaultAvatarImageEnabled by remember { mutableStateOf(false) }
var selectedDefaultAvatar by remember { mutableStateOf(DefaultAvatarImage.MONSTER) }
val defaultAvatarOptions = DefaultAvatarImage.entries

GravatarDemoAppTheme {
Surface {
Column(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.background)
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
GravatarImageSettings(
email = email,
size = avatarSize,
onEmailChanged = { email = it },
onSizeChange = { avatarSize = it },
onLoadGravatarClicked = {
gravatarUrl = emailAddressToGravatarUrl(
email = email,
size = avatarSize,
defaultAvatarImage = if (defaultAvatarImageEnabled) selectedDefaultAvatar else null,
)
},
onDefaultAvatarImageEnabledChanged = {
defaultAvatarImageEnabled = it
},
defaultAvatarImageEnabled = defaultAvatarImageEnabled,
selectedDefaultAvatarImage = selectedDefaultAvatar,
onDefaultAvatarImageChanged = { selectedDefaultAvatar = it },
defaultAvatarOptions = defaultAvatarOptions,
)

if (gravatarUrl.isNotEmpty()) {
GravatarDivider()

GravatarGeneratedUrl(gravatarUrl = gravatarUrl)

GravatarDivider()

GravatarImage(gravatarUrl = gravatarUrl)
}
}
}
}
}

@Composable
fun GravatarDivider() =
Divider(thickness = 1.dp, color = MaterialTheme.colorScheme.primary, modifier = Modifier.padding(vertical = 8.dp))

@Composable
fun GravatarGeneratedUrl(gravatarUrl: String) {
Text(
text = stringResource(R.string.gravatar_generated_url_label),
fontWeight = FontWeight.Bold,
)
Text(text = gravatarUrl)
}

@Composable
fun GravatarImage(gravatarUrl: String) = AsyncImage(model = gravatarUrl, contentDescription = null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should go ahead and log something onError here. This might be useful for testing.

And I wonder if we should show something specific when we get a 404 (eg. with the "Default avatar: 404" selected)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree; I've created a new ticket, #44, to create a PR with the error handling.


@Composable
fun GravatarEmailInput(email: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier) {
TextField(
value = email,
onValueChange = onValueChange,
label = { Text(stringResource(R.string.gravatar_email_input_label)) },
maxLines = 1,
modifier = modifier,
)
}
78 changes: 78 additions & 0 deletions app/src/main/java/com/gravatar/demoapp/ui/GravatarImageSettings.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package com.gravatar.demoapp.ui

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.gravatar.DefaultAvatarImage
import com.gravatar.R
import com.gravatar.demoapp.theme.GravatarDemoAppTheme

@Composable
fun GravatarImageSettings(
email: String,
size: Int?,
onEmailChanged: (String) -> Unit,
onSizeChange: (Int?) -> Unit,
onLoadGravatarClicked: () -> Unit,
defaultAvatarImageEnabled: Boolean,
onDefaultAvatarImageEnabledChanged: (Boolean) -> Unit,
selectedDefaultAvatarImage: DefaultAvatarImage,
onDefaultAvatarImageChanged: (DefaultAvatarImage) -> Unit,
defaultAvatarOptions: List<DefaultAvatarImage>,
) {
Column(
modifier = Modifier
.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally,
) {
GravatarEmailInput(email = email, onValueChange = onEmailChanged, Modifier.fillMaxWidth())
DefaultAvatarImageDropdown(
enabled = defaultAvatarImageEnabled,
selectedOption = selectedDefaultAvatarImage,
onEnabledChanged = onDefaultAvatarImageEnabledChanged,
onSelectedOptionChange = onDefaultAvatarImageChanged,
defaultAvatarOptions = defaultAvatarOptions,
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 8.dp),
)
TextField(
value = size?.toString() ?: "",
onValueChange = { value -> onSizeChange(value.toIntOrNull()) },
label = { Text(stringResource(R.string.gravatar_size_input_label)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
modifier = Modifier.padding(vertical = 8.dp),
)
Button(onClick = onLoadGravatarClicked) { Text(text = "Load Gravatar") }
}
}

@Preview
@Composable
fun GravatarImageSettingsPreview() {
GravatarDemoAppTheme {
GravatarImageSettings(
email = "[email protected]",
size = null,
onEmailChanged = {},
onSizeChange = {},
onLoadGravatarClicked = {},
defaultAvatarImageEnabled = true,
onDefaultAvatarImageEnabledChanged = {},
selectedDefaultAvatarImage = DefaultAvatarImage.BLANK,
onDefaultAvatarImageChanged = {},
defaultAvatarOptions = DefaultAvatarImage.entries,
)
}
}
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<resources>
<string name="app_name">Gravatar Demo App</string>
<string name="gravatar_email_input_label">Gravatar E-Mail</string>
<string name="gravatar_generated_url_label">Gravatar URL</string>
<string name="gravatar_size_input_label">Avatar Size</string>
<string name="default_avatar_image_label">Default Avatar</string>
</resources>