diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..cde3e19 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,57 @@ + + + + \ No newline at end of file diff --git a/data/src/main/java/com/nto/data/repository/DataRepositoryImpl.kt b/data/src/main/java/com/nto/data/repository/DataRepositoryImpl.kt index 28e550b..d721e70 100644 --- a/data/src/main/java/com/nto/data/repository/DataRepositoryImpl.kt +++ b/data/src/main/java/com/nto/data/repository/DataRepositoryImpl.kt @@ -35,7 +35,7 @@ class DataRepositoryImpl @Inject constructor(@ApplicationContext private val con else UserDTO(isError = true, isUnauthorized = result.code() == 403) } - override suspend fun getVisits(id: String): VisitCardWrapper { + override suspend fun getVisits(id: String?): VisitCardWrapper { val result = Provider.provideRetrofit().getVisits(getToken()).execute() return if (result.isSuccessful) { VisitCardWrapper(result.body()!!) diff --git a/presentation/src/main/java/com/nto/presentation/composable/cards/VisitCard.kt b/presentation/src/main/java/com/nto/presentation/composable/cards/VisitCard.kt index 6088ac4..0cc5ed5 100644 --- a/presentation/src/main/java/com/nto/presentation/composable/cards/VisitCard.kt +++ b/presentation/src/main/java/com/nto/presentation/composable/cards/VisitCard.kt @@ -21,8 +21,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.nto.data.models.cards.VisitCardDTO +import com.nto.data.models.cards.VisitType import com.nto.presentation.R import com.nto.presentation.theme.NTOTheme +import java.time.format.DateTimeFormatter @Composable fun VisitCard(data: VisitCardDTO, modifier: Modifier = Modifier) { @@ -49,7 +51,7 @@ fun VisitCard(data: VisitCardDTO, modifier: Modifier = Modifier) { ) Spacer(modifier = Modifier.height(10.dp)) Text( - text = data.id, + text = data.id.toString(), style = NTOTheme.typography.displaySmall, fontSize = 12.sp, fontWeight = FontWeight.Thin @@ -57,14 +59,14 @@ fun VisitCard(data: VisitCardDTO, modifier: Modifier = Modifier) { } Column(horizontalAlignment = Alignment.End) { Text( - text = data.dateString, + text = data.dateString.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME), style = NTOTheme.typography.displaySmall, fontSize = 12.sp, color = NTOTheme.colors.disabledText ) Spacer(modifier = Modifier.height(10.dp)) Text( - text = stringResource(if (data.isCode) R.string.label_qr_login else R.string.label_card_login), + text = stringResource(if (data.visitType == VisitType.PHONE_ENTRY) R.string.label_qr_login else R.string.label_card_login), style = NTOTheme.typography.displaySmall, fontSize = 12.sp, color = NTOTheme.colors.disabledText @@ -78,6 +80,6 @@ fun VisitCard(data: VisitCardDTO, modifier: Modifier = Modifier) { @Composable private fun VisitCardPreview() { NTOTheme { - VisitCard(VisitCardDTO("Кабинет 207", "id: 129008", "24 января 20:01")) + VisitCard(VisitCardDTO("Кабинет 207")) } } \ No newline at end of file