-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from PeriodPals/feat/alert/ui
Feat/alert/UI: AlertScreen UI
- Loading branch information
Showing
2 changed files
with
182 additions
and
0 deletions.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
app/src/androidTest/java/com/android/periodpals/ui/alert/AlertScreenTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package com.android.periodpals.ui.alert | ||
|
||
import androidx.compose.material3.MaterialTheme | ||
import androidx.compose.ui.test.assertIsDisplayed | ||
import androidx.compose.ui.test.assertTextEquals | ||
import androidx.compose.ui.test.junit4.createComposeRule | ||
import androidx.compose.ui.test.onNodeWithTag | ||
import androidx.compose.ui.test.performClick | ||
import androidx.compose.ui.test.performTextInput | ||
import org.junit.Rule | ||
import org.junit.Test | ||
|
||
class AlertScreenTest { | ||
|
||
@get:Rule val composeTestRule = createComposeRule() | ||
|
||
@Test | ||
fun displayAllComponents() { | ||
composeTestRule.setContent { MaterialTheme { AlertScreen() } } | ||
|
||
composeTestRule.onNodeWithTag("alertInstruction").assertIsDisplayed() | ||
composeTestRule.onNodeWithTag("alertProduct").assertIsDisplayed() | ||
composeTestRule.onNodeWithTag("alertUrgency").assertIsDisplayed() | ||
composeTestRule.onNodeWithTag("alertLocation").assertIsDisplayed() | ||
composeTestRule.onNodeWithTag("alertMessage").assertIsDisplayed() | ||
composeTestRule | ||
.onNodeWithTag("alertSubmit") | ||
.assertIsDisplayed() | ||
.assertTextEquals("Ask for Help") | ||
} | ||
|
||
@Test | ||
fun interactWithComponents() { | ||
composeTestRule.setContent { MaterialTheme { AlertScreen() } } | ||
|
||
composeTestRule.onNodeWithTag("alertProduct").performClick() | ||
composeTestRule.onNodeWithTag("Pads").performClick() | ||
// composeTestRule.onNodeWithTag("alertProduct").assertTextEquals("Pads") | ||
composeTestRule.onNodeWithTag("alertUrgency").performClick() | ||
composeTestRule.onNodeWithTag("!! Medium").performClick() | ||
// composeTestRule.onNodeWithTag("alertUrgency").assertTextEquals("!! Medium") | ||
|
||
composeTestRule.onNodeWithTag("alertLocation").performTextInput("Rolex") | ||
composeTestRule.onNodeWithTag("alertMessage").performTextInput("I need help finding a tampon") | ||
|
||
composeTestRule.onNodeWithTag("alertSubmit").performClick() | ||
} | ||
} |
134 changes: 134 additions & 0 deletions
134
app/src/main/java/com/android/periodpals/ui/alert/AlertScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
package com.android.periodpals.ui.alert | ||
|
||
import androidx.compose.foundation.layout.Arrangement | ||
import androidx.compose.foundation.layout.Column | ||
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.width | ||
import androidx.compose.material3.Button | ||
import androidx.compose.material3.DropdownMenuItem | ||
import androidx.compose.material3.ExperimentalMaterial3Api | ||
import androidx.compose.material3.ExposedDropdownMenuBox | ||
import androidx.compose.material3.ExposedDropdownMenuDefaults | ||
import androidx.compose.material3.MaterialTheme | ||
import androidx.compose.material3.OutlinedTextField | ||
import androidx.compose.material3.Scaffold | ||
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.platform.testTag | ||
import androidx.compose.ui.text.style.TextAlign | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import androidx.compose.ui.unit.dp | ||
|
||
@Preview | ||
@Composable | ||
fun AlertScreen() { | ||
var location by remember { mutableStateOf("") } | ||
var message by remember { mutableStateOf("") } | ||
|
||
// TODO("TOP APP BAR and BOTTOM NAVIGATION") | ||
Scaffold( | ||
modifier = Modifier.testTag("alertScreen"), | ||
content = { paddingValues -> | ||
Column( | ||
modifier = Modifier.fillMaxSize().padding(30.dp).padding(paddingValues), | ||
horizontalAlignment = Alignment.CenterHorizontally, | ||
verticalArrangement = Arrangement.SpaceEvenly) { | ||
// Text Instruction | ||
Text( | ||
"Push a notification to users near you! If they are available and have the products you need, they'll be able to help you!", | ||
modifier = Modifier.testTag("alertInstruction"), | ||
textAlign = TextAlign.Center, | ||
style = MaterialTheme.typography.titleSmall) | ||
|
||
// Product selection | ||
ExposedDropdownMenuSample( | ||
listOf("Tampons", "Pads", "No Preference"), "Product Needed", "alertProduct") | ||
|
||
// Urgency indicator | ||
ExposedDropdownMenuSample( | ||
listOf("!!! High", "!! Medium", "! Low"), "Urgency level", "alertUrgency") | ||
|
||
// Location | ||
OutlinedTextField( | ||
value = location, | ||
onValueChange = { location = it }, | ||
label = { Text("Location") }, | ||
placeholder = { Text("Enter your location") }, | ||
modifier = Modifier.fillMaxWidth().testTag("alertLocation")) | ||
|
||
// Message Box | ||
OutlinedTextField( | ||
value = message, | ||
onValueChange = { message = it }, | ||
label = { Text("Message") }, | ||
placeholder = { Text("Write a message for the other users") }, | ||
modifier = Modifier.fillMaxWidth().height(150.dp).testTag("alertMessage")) | ||
|
||
// Submit Button | ||
Button( | ||
onClick = { | ||
// TODO("Save alert on supabase + navigation to | ||
// AlertListScreen") | ||
}, | ||
modifier = | ||
Modifier.width(300.dp).height(100.dp).testTag("alertSubmit").padding(16.dp), | ||
) { | ||
Text("Ask for Help", style = MaterialTheme.typography.headlineMedium) | ||
} | ||
} | ||
}) | ||
} | ||
|
||
@OptIn(ExperimentalMaterial3Api::class) | ||
@Composable | ||
fun ExposedDropdownMenuSample(list: List<String>, label: String, testTag: String) { | ||
var options = list | ||
var expanded by remember { mutableStateOf(false) } | ||
var text by remember { mutableStateOf("Please choose one option") } | ||
|
||
ExposedDropdownMenuBox( | ||
modifier = Modifier.testTag(testTag), | ||
expanded = expanded, | ||
onExpandedChange = { expanded = it }, | ||
) { | ||
TextField( | ||
// The `menuAnchor` modifier must be passed to the text field to handle | ||
// expanding/collapsing the menu on click. A read-only text field has | ||
// the anchor type `PrimaryNotEditable`. | ||
modifier = Modifier.menuAnchor(), | ||
value = text, | ||
onValueChange = {}, | ||
readOnly = true, | ||
singleLine = true, | ||
label = { Text(label) }, | ||
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) }, | ||
colors = ExposedDropdownMenuDefaults.textFieldColors(), | ||
) | ||
ExposedDropdownMenu( | ||
expanded = expanded, | ||
onDismissRequest = { expanded = false }, | ||
) { | ||
options.forEach { option -> | ||
DropdownMenuItem( | ||
modifier = Modifier.testTag(option), | ||
text = { Text(option) }, | ||
onClick = { | ||
text = option | ||
expanded = false | ||
}, | ||
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding, | ||
) | ||
} | ||
} | ||
} | ||
} |