UI - Create new association page

app/src/androidTest/java/com/github/se/assocify/screens/CreateAssoScreenTest.kt

@@ -0,0 +1,53 @@
+package com.github.se.assocify.screens
+
+import androidx.compose.ui.test.assertCountEquals
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onAllNodesWithTag
+import androidx.compose.ui.test.onNodeWithTag
+import com.github.se.assocify.model.entities.Role
+import com.github.se.assocify.model.entities.User
+import com.github.se.assocify.ui.screens.createAsso.CreateAssoScreen
+import com.github.se.assocify.ui.screens.createAsso.CreateAssoViewmodel
+import org.junit.Rule
+import org.junit.Test
+
+class CreateAssoScreenTest {
+ @get:Rule val composeTestRule = createComposeRule()
+
+ private val bigList =
+ listOf(
+ User("1", "jean", Role("com")),
+ User("2", "roger", Role("tres")),
+ User("1", "jean", Role("com")),
+ User("1", "jean", Role("com")),
+ User("1", "jean", Role("com")),
+ User("1", "jean", Role("com")),
+ User("1", "jean", Role("com")),
+ User("1", "jean", Role("com")),
+ User("2", "roger", Role("tres")),
+ User("2", "roger", Role("tres")),
+ User("2", "roger", Role("tres")),
+ User("2", "roger", Role("tres")),
+ User("2", "roger", Role("tres")),
+ User("2", "roger", Role("tres")))
+ private val smallList = listOf(User("1", "jean", Role("com")), User("2", "roger", Role("tres")))
+
+ private val bigView = CreateAssoViewmodel(bigList)
+ private val smallView = CreateAssoViewmodel(smallList)
+
+ @Test
+ fun displaySmall() {
+ composeTestRule.setContent { CreateAssoScreen(smallView) }
+ with(composeTestRule) {
+ onNodeWithTag("createAssoScreen").assertIsDisplayed()
+ onNodeWithTag("TopAppBar").assertIsDisplayed()
+ onNodeWithTag("logo").assertIsDisplayed()
+ onNodeWithTag("name").assertIsDisplayed()
+ onNodeWithTag("MemberList").assertIsDisplayed()
+ onAllNodesWithTag("MemberListItem").assertCountEquals(2)
+ onNodeWithTag("addMember").assertIsDisplayed()
+ onNodeWithTag("create").assertIsDisplayed()
+ }
+ }
+}

app/src/main/java/com/github/se/assocify/ui/screens/createAsso/CreateAssoScreen.kt

@@ -0,0 +1,136 @@
+package com.github.se.assocify.ui.screens.createAsso
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedIconButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+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.draw.clip
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.github.se.assocify.R
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CreateAssoScreen(viewmodel: CreateAssoViewmodel = CreateAssoViewmodel(listOf())) {
+
+ val state by viewmodel.uiState.collectAsState()
+
+ // should also be in viewmodel probably
+ var name by remember { mutableStateOf("") }
+
+ Scaffold(
+ modifier = Modifier.testTag("createAssoScreen"),
+ topBar = {
+ TopAppBar(
+ modifier = Modifier.fillMaxWidth().testTag("TopAppBar"),
+ navigationIcon = {
+ IconButton(onClick = { /*TODO : go back to previous screen*/}) {
+ Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
+ }
+ },
+ title = { Text(text = "Create your association") })
+ },
+ contentWindowInsets = WindowInsets(20.dp, 10.dp, 20.dp, 20.dp)) { innerPadding ->
+ Column(
+ modifier = Modifier.fillMaxSize().padding(innerPadding),
+ verticalArrangement = Arrangement.spacedBy(16.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(15.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier.fillMaxWidth()) {
+ OutlinedIconButton(
+ modifier =
+ Modifier.padding(top = 8.dp)
+ .testTag("logo") /*.background(MaterialTheme.colorScheme.primary)*/,
+ onClick = {
+ /* TODO : can add association logo */
+ }) {
+ Icon(
+ painter = painterResource(id = R.drawable.landscape),
+ contentDescription = "Logo")
+ }
+ OutlinedTextField(
+ value = name,
+ onValueChange = { name = it },
+ label = { Text("Association Name") },
+ modifier = Modifier.fillMaxWidth().testTag("name"))
+ }
+
+ LazyColumn(
+ modifier = Modifier.fillMaxWidth().weight(1f).testTag("MemberList"),
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.Top),
+ horizontalAlignment = Alignment.CenterHorizontally) {
+ state.forEach { member ->
+ item {
+ ListItem(
+ modifier =
+ Modifier.clip(RoundedCornerShape(10.dp)).testTag("MemberListItem"),
+ headlineContent = { Text(member.name) },
+ overlineContent = { Text(member.role.name) },
+ leadingContent = {
+ Icon(Icons.Default.Person, contentDescription = "Person")
+ },
+ trailingContent = {
+ IconButton(
+ onClick = {
+ /*TODO : edit member from list */
+ }) {
+ Icon(Icons.Default.Edit, contentDescription = "Edit")
+ }
+ },
+ )
+ HorizontalDivider()
+ }
+ }
+ }
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ modifier = Modifier.fillMaxWidth()) {
+ OutlinedButton(
+ onClick = { /*TODO : add members to list*/},
+ modifier = Modifier.fillMaxWidth().testTag("addMember")) {
+ Icon(Icons.Default.Add, contentDescription = "Add members")
+ Text("Add members")
+ }
+ Button(
+ onClick = { /*TODO : add asso to DB */},
+ modifier = Modifier.fillMaxWidth().testTag("create")) {
+ Text("Create")
+ }
+ }
+ }
+ }
+}

app/src/main/java/com/github/se/assocify/ui/screens/createAsso/CreateAssoViewmodel.kt

@@ -0,0 +1,11 @@
+package com.github.se.assocify.ui.screens.createAsso
+
+import androidx.lifecycle.ViewModel
+import com.github.se.assocify.model.entities.User
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+class CreateAssoViewmodel(userList: List<User>) : ViewModel() {
+ private val _uiState = MutableStateFlow(userList)
+ val uiState: StateFlow<List<User>> = _uiState
+}

app/src/main/res/drawable/landscape.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m40,720 l240,-320 180,240h300L560,374 460,506l-50,-66 150,-200 360,480L40,720ZM561,640ZM200,640h160l-80,-107 -80,107ZM200,640h160,-160Z"/>
+</vector>