diff --git a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/commontask/components/CommonTaskHeader.kt b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/commontask/components/CommonTaskHeader.kt index 172346d..602a9b1 100644 --- a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/commontask/components/CommonTaskHeader.kt +++ b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/commontask/components/CommonTaskHeader.kt @@ -96,7 +96,7 @@ fun LazyListScope.CommonTaskHeader( isLoading = editActions.editStatus.isLoading ) - // sprint + /*// sprint if (commonTask.taskType != CommonTaskType.Epic) { ClickableBadge( text = commonTask.sprint?.name ?: stringResource(R.string.no_sprint), @@ -107,8 +107,9 @@ fun LazyListScope.CommonTaskHeader( isClickable = commonTask.taskType != CommonTaskType.Task ) } + */ - // swimlane + /*// swimlane if (commonTask.taskType == CommonTaskType.UserStory) { ClickableBadge( text = commonTask.swimlane?.name ?: stringResource(R.string.unclassifed), @@ -118,6 +119,7 @@ fun LazyListScope.CommonTaskHeader( onClick = { showSwimlaneSelector() } ) } + */ if (commonTask.taskType == CommonTaskType.Issue) { // type diff --git a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/kanban/KanbanBoard.kt b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/kanban/KanbanBoard.kt index 33b8739..1219e1c 100644 --- a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/kanban/KanbanBoard.kt +++ b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/kanban/KanbanBoard.kt @@ -53,6 +53,7 @@ fun KanbanBoard( val cellWidth = 280.dp val backgroundCellColor = MaterialTheme.colorScheme.surfaceColorAtElevation(kanbanBoardTonalElevation) + /* swimlanes.takeIf { it.isNotEmpty() }?.let { Row( verticalAlignment = Alignment.CenterVertically, @@ -86,6 +87,8 @@ fun KanbanBoard( ) } } + */ + val storiesToDisplay = stories.filter { it.swimlane?.id == selectedSwimlane?.id } @@ -280,25 +283,25 @@ fun KanbanBoardPreview() = TaigaMobileTheme { statuses = listOf( Status( id = 0, - name = "New", + name = stringResource(R.string. status_new), color = "#70728F", type = StatusType.Status ), Status( id = 1, - name = "In progress", + name = stringResource(R.string.status_in_progress), color = "#E47C40", type = StatusType.Status ), Status( id = 1, - name = "Done", + name = stringResource(R.string.status_done), color = "#A8E440", type = StatusType.Status ), Status( id = 1, - name = "Archived", + name = stringResource(R.string.status_ready_for_test), color = "#A9AABC", type = StatusType.Status ), diff --git a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/main/MainActivity.kt b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/main/MainActivity.kt index 7882300..d2c8918 100644 --- a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/main/MainActivity.kt +++ b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/main/MainActivity.kt @@ -186,11 +186,15 @@ class MainActivity : AppCompatActivity() { } } +// Кнопки на главном экране enum class Screens(val route: String, @StringRes val resourceId: Int, @DrawableRes val iconId: Int) { Dashboard(Routes.dashboard, R.string.dashboard_short, R.drawable.ic_dashboard), - Scrum(Routes.scrum, R.string.scrum, R.drawable.ic_scrum), Epics(Routes.epics, R.string.epics, R.drawable.ic_epics), - Issues(Routes.issues, R.string.issues, R.drawable.ic_issues), + Kanban(Routes.kanban, R.string.kanban, R.drawable.ic_kanban), + Team(Routes.team, R.string.team, R.drawable.ic_team), + //Settings(Routes.settings, R.string.settings, R.drawable.ic_settings) + //Scrum(Routes.scrum, R.string.scrum, R.drawable.ic_scrum), + //Issues(Routes.issues, R.string.issues, R.drawable.ic_issues), More(Routes.more, R.string.more, R.drawable.ic_more) } @@ -464,13 +468,13 @@ fun MoreScreen( } } - val space = 2.dp + //val space = 2.dp - Item(R.drawable.ic_team, R.string.team, Routes.team) - Spacer(Modifier.height(space)) - Item(R.drawable.ic_kanban, R.string.kanban, Routes.kanban) - Spacer(Modifier.height(space)) - Item(R.drawable.ic_wiki, R.string.wiki, Routes.wiki_selector) - Spacer(Modifier.height(space)) + //Item(R.drawable.ic_team, R.string.team, Routes.team) + //Spacer(Modifier.height(space)) + //Item(R.drawable.ic_kanban, R.string.kanban, Routes.kanban) + //Spacer(Modifier.height(space)) + //Item(R.drawable.ic_wiki, R.string.wiki, Routes.wiki_selector) + //Spacer(Modifier.height(space)) Item(R.drawable.ic_settings, R.string.settings, Routes.settings) } \ No newline at end of file diff --git a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/projectselector/ProjectSelectorScreen.kt b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/projectselector/ProjectSelectorScreen.kt index ff249cb..71f5549 100644 --- a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/projectselector/ProjectSelectorScreen.kt +++ b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/projectselector/ProjectSelectorScreen.kt @@ -1,11 +1,15 @@ package org.calculate.taigamobile.ui.screens.projectselector +import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image +import androidx.compose.foundation.background import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -23,6 +27,7 @@ import org.calculate.taigamobile.ui.components.containers.ContainerBox import org.calculate.taigamobile.ui.utils.subscribeOnError import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import retrofit2.http.Header @Composable fun ProjectSelectorScreen( @@ -64,6 +69,7 @@ fun ProjectSelectorScreen( } +@OptIn(ExperimentalFoundationApi::class) @Composable fun ProjectSelectorScreenContent( projects: LazyPagingItems? = null, @@ -95,6 +101,7 @@ fun ProjectSelectorScreenContent( } } +@OptIn(ExperimentalFoundationApi::class) @Composable private fun ItemProject( project: Project, @@ -110,29 +117,31 @@ private fun ItemProject( verticalAlignment = Alignment.CenterVertically ) { - Column(Modifier.weight(0.8f)) { - project.takeIf { it.isMember || it.isAdmin || it.isOwner }?.let { + + Column(Modifier.weight(0.8f)) { + project.takeIf { it.isMember || it.isAdmin || it.isOwner }?.let { + Text( + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.primary, + text = stringResource( + when { + project.isOwner -> R.string.project_owner + project.isAdmin -> R.string.project_admin + project.isMember -> R.string.project_member + else -> 0 + } + ) + ) + } + Text( - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.primary, - text = stringResource( - when { - project.isOwner -> R.string.project_owner - project.isAdmin -> R.string.project_admin - project.isMember -> R.string.project_member - else -> 0 - } + text = stringResource(R.string.project_name_template).format( + project.name, + project.slug ) ) } - Text( - text = stringResource(R.string.project_name_template).format( - project.name, - project.slug - ) - ) - } if (project.id == currentProjectId) { Image( diff --git a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/sprint/SprintKanban.kt b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/sprint/SprintKanban.kt index a1fd087..0e4cffe 100644 --- a/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/sprint/SprintKanban.kt +++ b/app/src/main/kotlin/org/calculate/taigamobile/ui/screens/sprint/SprintKanban.kt @@ -413,25 +413,29 @@ fun SprintKanbanPreview() = TaigaMobileTheme { statuses = listOf( Status( id = 0, - name = "New", + //name = "New", + name = stringResource(R.string.status_new), color = "#70728F", type = StatusType.Status ), Status( id = 1, - name = "In progress", + //name = "In progress", + name = stringResource(R.string.status_in_progress), color = "#E47C40", type = StatusType.Status ), Status( id = 1, - name = "Done", + //name = "Done", + name = stringResource(R.string.status_done), color = "#A8E440", type = StatusType.Status ), Status( id = 1, - name = "Archived", + //name = "Archived", + name = stringResource(R.string.status_ready_for_test), color = "#A9AABC", type = StatusType.Status ), @@ -444,7 +448,8 @@ fun SprintKanbanPreview() = TaigaMobileTheme { ref = 100, status = Status( id = 1, - name = "In progress", + //name = "In progress", + name = stringResource(R.string.status_in_progress), color = "#E47C40", type = StatusType.Status ), @@ -466,7 +471,8 @@ fun SprintKanbanPreview() = TaigaMobileTheme { ref = 100, status = Status( id = 1, - name = "In progress", + //name = "In progress", + name = stringResource(R.string.status_in_progress), color = "#E47C40", type = StatusType.Status ), @@ -488,7 +494,7 @@ fun SprintKanbanPreview() = TaigaMobileTheme { ref = 100, status = Status( id = 1, - name = "In progress", + name = stringResource(R.string.status_in_progress), color = "#E47C40", type = StatusType.Status ), @@ -510,7 +516,8 @@ fun SprintKanbanPreview() = TaigaMobileTheme { ref = 100, status = Status( id = 0, - name = "New", + //name = "New", + name = stringResource(R.string.status_new), color = "#70728F", type = StatusType.Status ), @@ -535,7 +542,8 @@ fun SprintKanbanPreview() = TaigaMobileTheme { ref = 100, status = Status( id = 0, - name = "New", + //name = "New", + name = stringResource(R.string.status_new), color = "#70728F", type = StatusType.Status ), diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1285b85..f10fa0d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -7,6 +7,11 @@ OK Annuler + Nouveau + Dans le processus + Peut être vérifié + Complété + Un problème est survenu. Vérifiez votre connexion. Erreur, vous n\'avez pas les autorisations suffisantes diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4ed6ef5..15b36f4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -9,6 +9,11 @@ ОК Отмена + Новая + В процессе + Можно проверять + Завершена + Произошла ошибка. Проверьте ваше подключение Ошибка, возможно у вас недостаточно прав diff --git a/app/src/main/res/values-ua/strings.xml b/app/src/main/res/values-ua/strings.xml index 67b38e6..0d7be26 100644 --- a/app/src/main/res/values-ua/strings.xml +++ b/app/src/main/res/values-ua/strings.xml @@ -7,6 +7,11 @@ ОК Скасувати + Нова + В процесі + Можна перевіряти + Завершено + Виникла помилка. Перевірте з\'єднання Помилка, у вас можливо недостатньо доступів diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index abe82c3..5b2e1ca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,6 +9,11 @@ OK Cancel + New + In progress + Ready for test + Done + An error has occurred. Check your connection Error, you may not have sufficient permissions