From ddd9fd2a3311d1b7484803c8b71e24bc54ae6094 Mon Sep 17 00:00:00 2001 From: b-dev-mobile Date: Mon, 13 Jul 2026 08:02:35 +0000 Subject: [PATCH] =?UTF-8?q?feat(app):=20=D0=BD=D0=B0=D1=82=D0=B8=D0=B2?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20=D0=97?= =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D0=BE=D0=BA=20=D0=B2=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D1=87=D0=BA=D0=B5=20(=D1=80=D0=B5=D0=B3?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D0=BF=D0=B8=D0=BD=D0=B3=D1=83=20b-mob-notes=20mail/104)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AppTab.Notes + пункт шторки «Заметки» → NotesScreen (было веб-ссылка /apps/notes/). Проверено компиляцией :app в чистом worktree origin/main. --- .../main/java/ru/forbion/f7cloud/mobile/ui/AppNavigation.kt | 3 ++- .../main/java/ru/forbion/f7cloud/mobile/ui/AppScaffold.kt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppNavigation.kt b/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppNavigation.kt index 56e763a..0899b87 100644 --- a/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppNavigation.kt +++ b/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppNavigation.kt @@ -18,6 +18,7 @@ enum class AppTab( Talk("Конференции", "spreed-header-icon.svg", "spreed-glass.svg"), Deck("Карточки", "deck-header-icon.svg", "deck-glass.svg"), Tasks("Задачи", "task-header-icon.svg", "task-glass.svg"), + Notes("Заметки", "notes-header-icon.svg", "notes-glass.svg"), Support("Поддержка", "icon-header-f7support.svg", "icon-header-f7support.svg"), ; @@ -43,7 +44,7 @@ private val coreAppMenuEntries = listOf( AppMenuEntry(AppTab.Calendar, "Календарь", "calendar"), AppMenuEntry(AppTab.Contacts, "Контакты", "contacts"), AppMenuEntry(AppTab.Deck, "Карточки", "cards"), - AppMenuEntry(null, "Заметки", "notes", webPath = "/apps/notes/"), + AppMenuEntry(AppTab.Notes, "Заметки", "notes"), AppMenuEntry(AppTab.Support, "Поддержка", "support"), ) diff --git a/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppScaffold.kt b/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppScaffold.kt index e86d88b..51cdc2f 100644 --- a/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppScaffold.kt +++ b/app/src/main/java/ru/forbion/f7cloud/mobile/ui/AppScaffold.kt @@ -79,6 +79,7 @@ import ru.forbion.f7cloud.feature.deck.DeckScreen import ru.forbion.f7cloud.feature.files.FilesScreen import ru.forbion.f7cloud.feature.f7support.SupportScreen import ru.forbion.f7cloud.feature.mail.MailScreen +import ru.forbion.f7cloud.feature.notes.NotesScreen import ru.forbion.f7cloud.feature.tasks.TasksScreen import ru.forbion.f7cloud.feature.talk.TalkScreen import ru.forbion.f7cloud.mobile.navigation.AppLinkResolver @@ -574,6 +575,11 @@ fun AppScaffold( onOpenListConsumed = { pendingTasksListSlug = null }, onUnauthorized = forceLogout, ) + AppTab.Notes -> NotesScreen( + session = currentSession, + modifier = contentModifier, + onUnauthorized = forceLogout, + ) AppTab.Support -> SupportScreen( session = currentSession, modifier = contentModifier,