feat(app): нативный экран Заметок в оболочке (регистрация по пингу b-mob-notes mail/104)
AppTab.Notes + пункт шторки «Заметки» → NotesScreen (было веб-ссылка /apps/notes/). Проверено компиляцией :app в чистом worktree origin/main.
This commit is contained in:
@@ -18,6 +18,7 @@ enum class AppTab(
|
|||||||
Talk("Конференции", "spreed-header-icon.svg", "spreed-glass.svg"),
|
Talk("Конференции", "spreed-header-icon.svg", "spreed-glass.svg"),
|
||||||
Deck("Карточки", "deck-header-icon.svg", "deck-glass.svg"),
|
Deck("Карточки", "deck-header-icon.svg", "deck-glass.svg"),
|
||||||
Tasks("Задачи", "task-header-icon.svg", "task-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"),
|
Support("Поддержка", "icon-header-f7support.svg", "icon-header-f7support.svg"),
|
||||||
;
|
;
|
||||||
|
|
||||||
@@ -43,7 +44,7 @@ private val coreAppMenuEntries = listOf(
|
|||||||
AppMenuEntry(AppTab.Calendar, "Календарь", "calendar"),
|
AppMenuEntry(AppTab.Calendar, "Календарь", "calendar"),
|
||||||
AppMenuEntry(AppTab.Contacts, "Контакты", "contacts"),
|
AppMenuEntry(AppTab.Contacts, "Контакты", "contacts"),
|
||||||
AppMenuEntry(AppTab.Deck, "Карточки", "cards"),
|
AppMenuEntry(AppTab.Deck, "Карточки", "cards"),
|
||||||
AppMenuEntry(null, "Заметки", "notes", webPath = "/apps/notes/"),
|
AppMenuEntry(AppTab.Notes, "Заметки", "notes"),
|
||||||
AppMenuEntry(AppTab.Support, "Поддержка", "support"),
|
AppMenuEntry(AppTab.Support, "Поддержка", "support"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ import ru.forbion.f7cloud.feature.deck.DeckScreen
|
|||||||
import ru.forbion.f7cloud.feature.files.FilesScreen
|
import ru.forbion.f7cloud.feature.files.FilesScreen
|
||||||
import ru.forbion.f7cloud.feature.f7support.SupportScreen
|
import ru.forbion.f7cloud.feature.f7support.SupportScreen
|
||||||
import ru.forbion.f7cloud.feature.mail.MailScreen
|
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.tasks.TasksScreen
|
||||||
import ru.forbion.f7cloud.feature.talk.TalkScreen
|
import ru.forbion.f7cloud.feature.talk.TalkScreen
|
||||||
import ru.forbion.f7cloud.mobile.navigation.AppLinkResolver
|
import ru.forbion.f7cloud.mobile.navigation.AppLinkResolver
|
||||||
@@ -574,6 +575,11 @@ fun AppScaffold(
|
|||||||
onOpenListConsumed = { pendingTasksListSlug = null },
|
onOpenListConsumed = { pendingTasksListSlug = null },
|
||||||
onUnauthorized = forceLogout,
|
onUnauthorized = forceLogout,
|
||||||
)
|
)
|
||||||
|
AppTab.Notes -> NotesScreen(
|
||||||
|
session = currentSession,
|
||||||
|
modifier = contentModifier,
|
||||||
|
onUnauthorized = forceLogout,
|
||||||
|
)
|
||||||
AppTab.Support -> SupportScreen(
|
AppTab.Support -> SupportScreen(
|
||||||
session = currentSession,
|
session = currentSession,
|
||||||
modifier = contentModifier,
|
modifier = contentModifier,
|
||||||
|
|||||||
Reference in New Issue
Block a user