From cac214340e0c3dbab3e552da3464d44945a40d94 Mon Sep 17 00:00:00 2001 From: b-dev-mobile Date: Fri, 10 Jul 2026 05:58:00 +0000 Subject: [PATCH] =?UTF-8?q?fix(menu):=20=D0=BF=D0=BB=D0=BE=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8=20=D1=88?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BA=D0=B8=20=D0=BA=D0=B0=D0=BA=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B1=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=D0=BC?= =?UTF-8?q?=20=D1=81=D0=B0=D0=B9=D1=82=D0=B5=20(images/menu,=20=D0=BD?= =?UTF-8?q?=D0=B5=20glass)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Шторка показывала glass-кружки (frosted 49px из images/header/*-glass), а мобильный сайт рисует ПЛОСКИЕ двухцветные иконки из images/menu/*.svg (зелёный #70B62B + чёрный контур). Забандлил menu-*.svg (files/calendar/ contacts/cards/notes/settings + notifications из not-menu-icon-big), переключил пункты приложений и нативные Уведомления/Настройки на них. Неиспользуемые glass/header-ассеты удалены (нижняя панель грузит иконки с сервера). Co-Authored-By: Claude Fable 5 --- .../f7cloud/mobile/ui/AppNavigation.kt | 24 ++++---- .../src/main/assets/menu/calendar-glass.svg | 44 -------------- .../src/main/assets/menu/contact-glass.svg | 48 --------------- .../src/main/assets/menu/deck-glass.svg | 52 ----------------- .../src/main/assets/menu/deck-header-icon.svg | 17 ------ .../src/main/assets/menu/files-glass.svg | 52 ----------------- .../src/main/assets/menu/mail-glass.svg | 46 --------------- .../src/main/assets/menu/mail-header-icon.svg | 8 --- .../src/main/assets/menu/menu-calendar.svg | 12 ++++ .../src/main/assets/menu/menu-cards.svg | 22 +++++++ .../src/main/assets/menu/menu-conferences.svg | 18 ++++++ .../src/main/assets/menu/menu-contacts.svg | 9 +++ .../src/main/assets/menu/menu-files.svg | 19 ++++++ .../src/main/assets/menu/menu-mail.svg | 7 +++ .../src/main/assets/menu/menu-notes.svg | 15 +++++ .../main/assets/menu/menu-notifications.svg | 5 ++ .../src/main/assets/menu/menu-settings.svg | 3 + .../src/main/assets/menu/menu-tasks.svg | 19 ++++++ .../src/main/assets/menu/mobile-lk-glass.svg | 31 ---------- .../menu/mobile-notifications-glass.svg | 39 ------------- .../assets/menu/mobile-settings-glass.svg | 29 ---------- .../src/main/assets/menu/notes-glass.svg | 51 ---------------- .../main/assets/menu/notification-badge.svg | 5 -- .../src/main/assets/menu/search-glass.svg | 40 ------------- .../main/assets/menu/sidebar-chevron-left.svg | 3 - .../src/main/assets/menu/spreed-glass.svg | 42 -------------- .../main/assets/menu/spreed-header-icon.svg | 15 ----- .../src/main/assets/menu/task-glass.svg | 58 ------------------- 28 files changed, 142 insertions(+), 591 deletions(-) delete mode 100644 core/designsystem/src/main/assets/menu/calendar-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/contact-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/deck-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/deck-header-icon.svg delete mode 100644 core/designsystem/src/main/assets/menu/files-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/mail-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/mail-header-icon.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-calendar.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-cards.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-conferences.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-contacts.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-files.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-mail.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-notes.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-notifications.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-settings.svg create mode 100644 core/designsystem/src/main/assets/menu/menu-tasks.svg delete mode 100644 core/designsystem/src/main/assets/menu/mobile-lk-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/mobile-notifications-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/mobile-settings-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/notes-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/notification-badge.svg delete mode 100644 core/designsystem/src/main/assets/menu/search-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/sidebar-chevron-left.svg delete mode 100644 core/designsystem/src/main/assets/menu/spreed-glass.svg delete mode 100644 core/designsystem/src/main/assets/menu/spreed-header-icon.svg delete mode 100644 core/designsystem/src/main/assets/menu/task-glass.svg 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 ef6102d..d8d9e5b 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 @@ -2,8 +2,9 @@ package ru.forbion.f7cloud.mobile.ui import ru.forbion.f7cloud.core.designsystem.F7AppMenuItem -// Иконки-glass шторки — локальные (assets/menu/, из живой темы forbion): офлайн + точные. -private fun glass(name: String): String = "file:///android_asset/menu/$name" +// Иконки шторки — ПЛОСКИЕ menu-иконки живой темы forbion (images/menu/*.svg: зелёный+чёрный +// контур), а не glass-кружки. Локальные (assets/menu/menu-*.svg) — офлайн и 1:1 с сайтом. +private fun menuIcon(name: String): String = "file:///android_asset/menu/menu-$name.svg" enum class AppTab( val title: String, @@ -34,12 +35,13 @@ private data class AppMenuEntry( // Состав меню — по дизайну выдвижного меню (Почта/Конференции/Задачи/Поддержка — только // в нижней панели; Уведомления/Настройки добавлены как нативные пункты, см. appMenuItems). +// iconPath — базовое имя плоской menu-иконки (assets/menu/menu-.svg) private val coreAppMenuEntries = listOf( - AppMenuEntry(AppTab.Files, "Файлы", "files-glass.svg"), - AppMenuEntry(AppTab.Calendar, "Календарь", "calendar-glass.svg"), - AppMenuEntry(AppTab.Contacts, "Контакты", "contact-glass.svg"), - AppMenuEntry(AppTab.Deck, "Карточки", "deck-glass.svg"), - AppMenuEntry(null, "Заметки", "notes-glass.svg", webPath = "/apps/notes/"), + AppMenuEntry(AppTab.Files, "Файлы", "files"), + AppMenuEntry(AppTab.Calendar, "Календарь", "calendar"), + AppMenuEntry(AppTab.Contacts, "Контакты", "contacts"), + AppMenuEntry(AppTab.Deck, "Карточки", "cards"), + AppMenuEntry(null, "Заметки", "notes", webPath = "/apps/notes/"), ) data class AppMenuExternalSite( @@ -59,7 +61,7 @@ fun appMenuItems( val core = coreAppMenuEntries.map { entry -> F7AppMenuItem( label = entry.label, - iconUrl = glass(entry.iconPath), + iconUrl = menuIcon(entry.iconPath), selected = entry.tab == active, externalUrl = entry.webPath?.let { "$base$it" }, ) @@ -72,16 +74,16 @@ fun appMenuItems( externalUrl = site.openUrl, ) } - // Нативные пункты — тоже glass-иконки живой темы (mobile-*-glass), действия по label в AppScaffold + // Нативные пункты — плоские menu-иконки темы, действия по label в AppScaffold val native = listOf( F7AppMenuItem( label = "Уведомления", - iconUrl = glass("mobile-notifications-glass.svg"), + iconUrl = menuIcon("notifications"), selected = false, ), F7AppMenuItem( label = "Настройки", - iconUrl = glass("mobile-settings-glass.svg"), + iconUrl = menuIcon("settings"), selected = false, ), ) diff --git a/core/designsystem/src/main/assets/menu/calendar-glass.svg b/core/designsystem/src/main/assets/menu/calendar-glass.svg deleted file mode 100644 index 6908875..0000000 --- a/core/designsystem/src/main/assets/menu/calendar-glass.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/contact-glass.svg b/core/designsystem/src/main/assets/menu/contact-glass.svg deleted file mode 100644 index 8f30fa1..0000000 --- a/core/designsystem/src/main/assets/menu/contact-glass.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/deck-glass.svg b/core/designsystem/src/main/assets/menu/deck-glass.svg deleted file mode 100644 index 471ba7d..0000000 --- a/core/designsystem/src/main/assets/menu/deck-glass.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/deck-header-icon.svg b/core/designsystem/src/main/assets/menu/deck-header-icon.svg deleted file mode 100644 index 77928ff..0000000 --- a/core/designsystem/src/main/assets/menu/deck-header-icon.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/files-glass.svg b/core/designsystem/src/main/assets/menu/files-glass.svg deleted file mode 100644 index 0e6dc37..0000000 --- a/core/designsystem/src/main/assets/menu/files-glass.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/mail-glass.svg b/core/designsystem/src/main/assets/menu/mail-glass.svg deleted file mode 100644 index 57f7f4e..0000000 --- a/core/designsystem/src/main/assets/menu/mail-glass.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/mail-header-icon.svg b/core/designsystem/src/main/assets/menu/mail-header-icon.svg deleted file mode 100644 index 382e3a5..0000000 --- a/core/designsystem/src/main/assets/menu/mail-header-icon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/menu-calendar.svg b/core/designsystem/src/main/assets/menu/menu-calendar.svg new file mode 100644 index 0000000..07989bf --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-calendar.svg @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-cards.svg b/core/designsystem/src/main/assets/menu/menu-cards.svg new file mode 100644 index 0000000..1141878 --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-cards.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-conferences.svg b/core/designsystem/src/main/assets/menu/menu-conferences.svg new file mode 100644 index 0000000..350f86a --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-conferences.svg @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-contacts.svg b/core/designsystem/src/main/assets/menu/menu-contacts.svg new file mode 100644 index 0000000..6374f9f --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-contacts.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-files.svg b/core/designsystem/src/main/assets/menu/menu-files.svg new file mode 100644 index 0000000..73f03d7 --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-files.svg @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-mail.svg b/core/designsystem/src/main/assets/menu/menu-mail.svg new file mode 100644 index 0000000..64b7529 --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-mail.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-notes.svg b/core/designsystem/src/main/assets/menu/menu-notes.svg new file mode 100644 index 0000000..14a2f0f --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-notes.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-notifications.svg b/core/designsystem/src/main/assets/menu/menu-notifications.svg new file mode 100644 index 0000000..f74e819 --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-notifications.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/core/designsystem/src/main/assets/menu/menu-settings.svg b/core/designsystem/src/main/assets/menu/menu-settings.svg new file mode 100644 index 0000000..3a46b86 --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-settings.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/menu-tasks.svg b/core/designsystem/src/main/assets/menu/menu-tasks.svg new file mode 100644 index 0000000..e3756b6 --- /dev/null +++ b/core/designsystem/src/main/assets/menu/menu-tasks.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/designsystem/src/main/assets/menu/mobile-lk-glass.svg b/core/designsystem/src/main/assets/menu/mobile-lk-glass.svg deleted file mode 100644 index 72634fb..0000000 --- a/core/designsystem/src/main/assets/menu/mobile-lk-glass.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/mobile-notifications-glass.svg b/core/designsystem/src/main/assets/menu/mobile-notifications-glass.svg deleted file mode 100644 index cd500ef..0000000 --- a/core/designsystem/src/main/assets/menu/mobile-notifications-glass.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/mobile-settings-glass.svg b/core/designsystem/src/main/assets/menu/mobile-settings-glass.svg deleted file mode 100644 index f05c975..0000000 --- a/core/designsystem/src/main/assets/menu/mobile-settings-glass.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/notes-glass.svg b/core/designsystem/src/main/assets/menu/notes-glass.svg deleted file mode 100644 index a5099be..0000000 --- a/core/designsystem/src/main/assets/menu/notes-glass.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/notification-badge.svg b/core/designsystem/src/main/assets/menu/notification-badge.svg deleted file mode 100644 index fd4104f..0000000 --- a/core/designsystem/src/main/assets/menu/notification-badge.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/core/designsystem/src/main/assets/menu/search-glass.svg b/core/designsystem/src/main/assets/menu/search-glass.svg deleted file mode 100644 index 61d72b7..0000000 --- a/core/designsystem/src/main/assets/menu/search-glass.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/sidebar-chevron-left.svg b/core/designsystem/src/main/assets/menu/sidebar-chevron-left.svg deleted file mode 100644 index 61a0ea5..0000000 --- a/core/designsystem/src/main/assets/menu/sidebar-chevron-left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/core/designsystem/src/main/assets/menu/spreed-glass.svg b/core/designsystem/src/main/assets/menu/spreed-glass.svg deleted file mode 100644 index 308ce00..0000000 --- a/core/designsystem/src/main/assets/menu/spreed-glass.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/spreed-header-icon.svg b/core/designsystem/src/main/assets/menu/spreed-header-icon.svg deleted file mode 100644 index 819744d..0000000 --- a/core/designsystem/src/main/assets/menu/spreed-header-icon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/assets/menu/task-glass.svg b/core/designsystem/src/main/assets/menu/task-glass.svg deleted file mode 100644 index c34d9b3..0000000 --- a/core/designsystem/src/main/assets/menu/task-glass.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -