main #4
@@ -12,10 +12,6 @@ import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
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.graphics.Color
|
||||
import androidx.compose.ui.res.painterResource
|
||||
@@ -51,10 +47,12 @@ fun BaseText24(
|
||||
@Composable
|
||||
fun BaseNoBackgroundButton(
|
||||
text: String,
|
||||
onClick: () -> Unit
|
||||
onClick: () -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Button(
|
||||
onClick = onClick,
|
||||
modifier = modifier,
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = Color.Transparent,
|
||||
contentColor = White,
|
||||
|
||||
@@ -18,12 +18,14 @@ import androidx.compose.runtime.Composable
|
||||
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.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import ru.myitschool.work.R
|
||||
import ru.myitschool.work.core.TestIds.Main
|
||||
import ru.myitschool.work.ui.BaseButton
|
||||
import ru.myitschool.work.ui.BaseNoBackgroundButton
|
||||
import ru.myitschool.work.ui.BaseText14
|
||||
@@ -60,26 +62,32 @@ fun MainScreen(
|
||||
|
||||
BaseNoBackgroundButton(
|
||||
text = "Обновить",
|
||||
onClick = { }
|
||||
onClick = { },
|
||||
modifier = Modifier.testTag(Main.REFRESH_BUTTON)
|
||||
)
|
||||
|
||||
BaseNoBackgroundButton(
|
||||
text = "Выйти",
|
||||
onClick = { }
|
||||
onClick = { },
|
||||
modifier = Modifier.testTag(Main.LOGOUT_BUTTON)
|
||||
)
|
||||
}
|
||||
|
||||
Image(
|
||||
painter = painterResource(R.drawable.avatar),
|
||||
contentDescription = "User avatar",
|
||||
modifier = Modifier.padding(20.dp)
|
||||
modifier = Modifier
|
||||
.testTag(Main.PROFILE_IMAGE)
|
||||
.padding(20.dp)
|
||||
)
|
||||
|
||||
BaseText20(
|
||||
text = "Артемий Артемиев Иванович",
|
||||
color = White,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.width(250.dp),
|
||||
modifier = Modifier
|
||||
.testTag(Main.PROFILE_NAME)
|
||||
.width(250.dp),
|
||||
style = Typography.bodyLarge
|
||||
)
|
||||
|
||||
@@ -114,6 +122,7 @@ fun MainScreen(
|
||||
btnContentColor = White,
|
||||
onClick = { navController.navigate(BookScreenDestination)},
|
||||
modifier = Modifier
|
||||
.testTag(Main.ADD_BUTTON)
|
||||
.padding(horizontal = 10.dp, vertical = 15.dp)
|
||||
.fillMaxWidth()
|
||||
)
|
||||
@@ -137,15 +146,18 @@ fun BookList() {
|
||||
fun BookListElement() {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.testTag(Main.getIdItemByPosition(1))
|
||||
.fillMaxWidth()
|
||||
.padding(vertical = 20.dp),
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
BaseText14(
|
||||
text = "Конгресс Холл"
|
||||
text = "Конгресс Холл",
|
||||
modifier = Modifier.testTag(Main.ITEM_PLACE)
|
||||
)
|
||||
BaseText14(
|
||||
text = "16.02.3026"
|
||||
text = "16.02.3026",
|
||||
modifier = Modifier.testTag(Main.ITEM_DATE)
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user