Skip to content

Commit

Permalink
style: ktfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mai-LinhC
Mai-LinhC committed Apr 8, 2024
1 parent 324d8c2 commit a3b1e68
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 113 deletions.
65 changes: 34 additions & 31 deletions app/src/androidTest/java/com/github/se/assocify/screens/CreateAssoScreenTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.se.assocify.screens

import androidx.compose.ui.test.assertAll
import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createComposeRule
Expand All @@ -10,41 +9,45 @@ 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 com.github.se.assocify.ui.screens.treasury.TreasuryScreen
import io.mockk.every
import org.junit.Before
import org.junit.Rule
import org.junit.Test

class CreateAssoScreenTest {
@get:Rule
val composeTestRule = createComposeRule()
@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 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()
}
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()
}
}
}
}
155 changes: 77 additions & 78 deletions app/src/main/java/com/github/se/assocify/ui/screens/createAsso/CreateAssoScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,105 +38,104 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.unit.dp
import com.github.se.assocify.model.entities.Role
import com.github.se.assocify.model.entities.User

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun CreateAssoScreen(viewmodel: CreateAssoViewmodel = CreateAssoViewmodel(listOf())) {

val state by viewmodel.uiState.collectAsState()
val state by viewmodel.uiState.collectAsState()

// should also be in viewmodel probably
var name by remember { mutableStateOf("") }
// should also be in viewmodel probably
var name by remember { mutableStateOf("") }

Scaffold(
modifier = Modifier.testTag("createAssoScreen"),
modifier = Modifier.testTag("createAssoScreen"),
topBar = {
TopAppBar(
modifier = Modifier.fillMaxWidth().testTag("TopAppBar"),
navigationIcon = {
IconButton(onClick = { /*TODO : go back to previous screen*/ }) {
Icon(Icons.Default.ArrowBack, contentDescription = "Back")
}
},
title = {
Text(text = "Create your association")
TopAppBar(
modifier = Modifier.fillMaxWidth().testTag("TopAppBar"),
navigationIcon = {
IconButton(onClick = { /*TODO : go back to previous screen*/}) {
Icon(Icons.Default.ArrowBack, contentDescription = "Back")
}
)
},
title = { Text(text = "Create your association") })
},
contentWindowInsets = WindowInsets(50.dp, 10.dp, 50.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()
contentWindowInsets = WindowInsets(50.dp, 10.dp, 50.dp, 20.dp)) { innerPadding ->
Column(
modifier = Modifier.fillMaxSize().padding(innerPadding),
verticalArrangement = Arrangement.spacedBy(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
OutlinedIconButton(
modifier = Modifier.padding(top = 8.dp).testTag("logo")/*.background(MaterialTheme.colorScheme.primary)*/,
onClick = {
/* TODO : can add association logo */
}) {
Icon(Icons.Default.Person, contentDescription = "Logo")
}
OutlinedTextField(
value = name,
onValueChange = { name = it },
label = { Text("Name") },
modifier = Modifier.fillMaxWidth().testTag("name")
)
}
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(Icons.Default.Person, contentDescription = "Logo")
}
OutlinedTextField(
value = name,
onValueChange = { name = it },
label = { Text("Name") },
modifier = Modifier.fillMaxWidth().testTag("name"))
}

LazyColumn(
modifier = Modifier
.fillMaxWidth()
.weight(1f)
.background(MaterialTheme.colorScheme.primaryContainer)
.testTag("MemberList"),
verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.Top),
horizontalAlignment = Alignment.CenterHorizontally) {
state.forEach { member ->
item {
LazyColumn(
modifier =
Modifier.fillMaxWidth()
.weight(1f)
.background(MaterialTheme.colorScheme.primaryContainer)
.testTag("MemberList"),
verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.Top),
horizontalAlignment = Alignment.CenterHorizontally) {
state.forEach { member ->
item {
ListItem(
modifier =
Modifier
.testTag("MemberListItem")
,
colors = ListItemDefaults.colors(containerColor = MaterialTheme.colorScheme.primaryContainer),
modifier = Modifier.testTag("MemberListItem"),
colors =
ListItemDefaults.colors(
containerColor = MaterialTheme.colorScheme.primaryContainer),
headlineContent = { Text(member.name) },
overlineContent = { Text(member.role.name) },
leadingContent = { Icon(Icons.Default.Person, contentDescription = "Person") },
leadingContent = {
Icon(Icons.Default.Person, contentDescription = "Person")
},
trailingContent = {
IconButton(
onClick = {
/*TODO : edit member from list */
}) {
IconButton(
onClick = {
/*TODO : edit member from list */
}) {
Icon(Icons.Default.Edit, contentDescription = "Edit")
}
}
},
)
HorizontalDivider(modifier = Modifier.padding(start = 20.dp, end = 20.dp))
}
}
}
}
// Spacer(Modifier.weight(0.5f))
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") }
}
// Spacer(Modifier.weight(0.5f))
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")
}
}
// Spacer(Modifier.weight(0.1f))
}
// Spacer(Modifier.weight(0.1f))
}
}
}
}
6 changes: 2 additions & 4 deletions app/src/main/java/com/github/se/assocify/ui/screens/createAsso/CreateAssoViewmodel.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.github.se.assocify.ui.screens.createAsso

import androidx.lifecycle.ViewModel
import com.github.se.assocify.model.entities.Role
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

private val _uiState = MutableStateFlow(userList)
val uiState: StateFlow<List<User>> = _uiState
}

0 comments on commit a3b1e68

Please sign in to comment.