chore: версия 0.5.132 (140)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
feat(tasks): вложенные задачи (подзадачи) + per-task меню «⋯»
2026-07-10 07:32:34 +00:00 · 2026-07-10 07:32:19 +00:00 · 2026-07-10 07:19:26 +00:00 · 2026-07-10 07:19:26 +00:00 · 2026-07-10 07:14:08 +00:00 · 2026-07-10 07:13:56 +00:00
12 changed files with 292 additions and 17 deletions
@@ -39,8 +39,8 @@ android {
        applicationId 'ru.forbion.f7cloud.mobile'
        minSdk 26
        targetSdk 36
-        versionCode 137
-        versionName '0.5.129'
+        versionCode 140
+        versionName '0.5.132'
        missingDimensionStrategy 'default', 'f7'
        multiDexEnabled true

@@ -77,7 +77,31 @@ class F7MobileApp : F7cloudTalkApplication(), ImageLoaderFactory {
    }

    override fun newImageLoader(): ImageLoader {
+        // OkHttp с Basic-auth для хоста сервера: серверные картинки (иконки внешних сайтов
+        // /apps/external/img, превью и т.п.) требуют логина — без заголовка coil ловит 401.
+        val authedClient = okhttp3.OkHttpClient.Builder()
+            .addInterceptor { chain ->
+                val request = chain.request()
+                val session = runCatching { AuthStore(this).load() }.getOrNull()
+                val serverHost = session?.serverUrl?.let {
+                    runCatching { android.net.Uri.parse(it).host }.getOrNull()
+                }
+                val patched = if (session != null && serverHost != null && request.url.host == serverHost) {
+                    request.newBuilder()
+                        .header(
+                            "Authorization",
+                            okhttp3.Credentials.basic(session.username, session.appPassword),
+                        )
+                        .header("OCS-APIRequest", "true")
+                        .build()
+                } else {
+                    request
+                }
+                chain.proceed(patched)
+            }
+            .build()
        return ImageLoader.Builder(this)
+            .okHttpClient(authedClient)
            .components { add(SvgDecoder.Factory()) }
            .crossfade(false)
            .memoryCache {
@@ -48,7 +48,7 @@ object AppMenuRepository {
                    }
                    AppMenuExternalSite(
                        name = name,
-                        iconUrl = icon ?: defaultExternalIcon(session.serverUrl, name),
+                        iconUrl = resolveExternalIcon(session.serverUrl, icon, name),
                        openUrl = openUrl,
                    )
                }
@@ -56,12 +56,18 @@ object AppMenuRepository {
        }.getOrDefault(emptyList())
    }

-    private fun defaultExternalIcon(serverUrl: String, name: String): String {
+    /**
+     * Иконка внешнего сайта. API external отдаёт `icon` как ИМЯ ФАЙЛА (напр. «bitrix24.png»),
+     * а не URL — сайт грузит его с `/apps/external/img/{icon}` (см. layout.user.php). Раньше
+     * имя файла бралось как есть → битая ссылка → глобус-заглушка у Bitrix/1C.
+     */
+    private fun resolveExternalIcon(serverUrl: String, icon: String?, name: String): String {
        val base = serverUrl.trimEnd('/')
        return when {
-            name.contains("bitrix", ignoreCase = true) -> "$base/themes/forbion/images/header/bitrix-glass.svg"
-            name.contains("1c", ignoreCase = true) -> "$base/themes/forbion/images/header/1c-glass.svg"
-            else -> "$base/index.php/apps/external/img/external.svg"
+            icon.isNullOrBlank() -> "$base/index.php/apps/external/img/external.svg"
+            icon.startsWith("http") -> icon
+            icon.startsWith("/") -> "$base$icon"
+            else -> "$base/index.php/apps/external/img/$icon"
        }
    }
 }
@@ -35,13 +35,16 @@ private data class AppMenuEntry(

 // Состав меню — по дизайну выдвижного меню (Почта/Конференции/Задачи/Поддержка — только
 // в нижней панели; Уведомления/Настройки добавлены как нативные пункты, см. appMenuItems).
-// iconPath — базовое имя плоской menu-иконки (assets/menu/menu-<name>.svg)
+// iconPath — базовое имя плоской menu-иконки (assets/menu/menu-<name>.svg).
+// Состав/порядок 1:1 со шторкой сайта: Файлы·Календарь·Контакты·Карточки·Заметки·Поддержка
+// (Почта/Задачи/Конференции не тут — они в нижней панели).
 private val coreAppMenuEntries = listOf(
    AppMenuEntry(AppTab.Files, "Файлы", "files"),
    AppMenuEntry(AppTab.Calendar, "Календарь", "calendar"),
    AppMenuEntry(AppTab.Contacts, "Контакты", "contacts"),
    AppMenuEntry(AppTab.Deck, "Карточки", "cards"),
    AppMenuEntry(null, "Заметки", "notes", webPath = "/apps/notes/"),
+    AppMenuEntry(AppTab.Support, "Поддержка", "support"),
 )

 data class AppMenuExternalSite(
@@ -74,8 +77,14 @@ fun appMenuItems(
            externalUrl = site.openUrl,
        )
    }
-    // Нативные пункты — плоские menu-иконки темы, действия по label в AppScaffold
+    // Нативные пункты — плоские menu-иконки темы, действия по label в AppScaffold.
+    // Порядок как на сайте: после внешних сайтов — Личный кабинет, затем Уведомления, Настройки.
    val native = listOf(
+        F7AppMenuItem(
+            label = "Личный кабинет",
+            iconUrl = menuIcon("lk"),
+            selected = false,
+        ),
        F7AppMenuItem(
            label = "Уведомления",
            iconUrl = menuIcon("notifications"),
@@ -134,6 +134,7 @@ fun AppScaffold(
    var filesUploadRequest by remember { mutableIntStateOf(0) }
    var contactsCreateRequest by remember { mutableIntStateOf(0) }
    var tasksCreateRequest by remember { mutableIntStateOf(0) }
+    var tasksShowListsRequest by remember { mutableIntStateOf(0) }
    var supportCreateRequest by remember { mutableIntStateOf(0) }
    var calendarSettingsRequest by remember { mutableIntStateOf(0) }
    var talkChatsRequest by remember { mutableIntStateOf(0) }
@@ -458,7 +459,10 @@ fun AppScaffold(
                                        AppTab.Mail -> mailSidebarOpen = !mailSidebarOpen
                                        AppTab.Calendar -> calendarSidebarOpen = !calendarSidebarOpen
                                        AppTab.Files -> filesSidebarOpen = !filesSidebarOpen
-                                        // Разделы без сайдбара (Карточки/Конференции/Контакты/Задачи/
+                                        // Задачи: стрелка открывает панель списков (закрывает
+                                        // открытый список) — как сайдбар в Почте/Файлах.
+                                        AppTab.Tasks -> tasksShowListsRequest++
+                                        // Разделы без сайдбара (Карточки/Конференции/Контакты/
                                        // Поддержка): стрелка = «назад» к предыдущему разделу.
                                        else -> popTabHistory()?.let { activeTab = it }
                                    }
@@ -566,6 +570,7 @@ fun AppScaffold(
                    modifier = contentModifier,
                    createRequest = tasksCreateRequest,
                    openListSlug = pendingTasksListSlug,
+                    showListsRequest = tasksShowListsRequest,
                    onOpenListConsumed = { pendingTasksListSlug = null },
                    onUnauthorized = forceLogout,
                )
@@ -0,0 +1,17 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_205_498)">
+<path d="M35 17.5C35 22.3965 32.9889 26.823 29.748 29.999C29.7278 30.0189 29.7072 30.0387 29.6866 30.0585C29.4207 30.3164 29.1468 30.5662 28.8645 30.8073C28.3084 31.2838 27.7217 31.7251 27.1083 32.1287C24.3503 33.9441 21.0484 35 17.5 35C13.9516 35 10.6497 33.9441 7.89171 32.1287C7.27832 31.7251 6.69162 31.2838 6.13545 30.8073C5.85317 30.5662 5.57928 30.3164 5.3134 30.0585C5.2928 30.0387 5.2722 30.0189 5.25198 29.999C2.01145 26.823 0 22.3965 0 17.5C0 7.83487 7.83487 0 17.5 0C27.1651 0 35 7.83487 35 17.5Z" fill="#e5efe8"/>
+<path d="M15.3301 22.9482L15.1152 22.8213C14.4793 22.4435 13.9364 22.0278 13.4297 21.6855L13.4287 21.6846C12.6398 21.1521 12.1076 20.3166 11.9502 19.375L11.6738 17.7227L11.6123 17.3574H11.2422C10.6187 17.3573 10.1152 16.854 10.1152 16.2305C10.1153 15.7671 10.3933 15.37 10.792 15.1973L11.1914 15.0244L11.0205 14.624C10.5503 13.5216 10.2046 12.3526 9.99707 11.1533V11.1523C9.86377 10.3836 9.80431 9.64622 10.002 8.99707C10.2015 8.34043 10.6884 7.89652 11.1309 7.88086L11.1982 7.88672L11.457 7.9043L11.5967 7.68555C11.9829 7.08239 12.5985 6.66833 13.2754 6.42285H13.2764C13.9611 6.17432 14.6919 6.08725 15.4746 5.99707C15.7786 5.96223 16.0789 5.92659 16.3799 5.89648L16.3789 5.89551C17.769 5.76175 19.2371 5.73653 20.5977 6.11523C21.9531 6.4928 23.2258 7.32891 23.8887 8.625C24.4185 9.65968 24.5371 10.937 24.3965 12.1826C24.3036 13.0075 24.1053 13.8182 23.8662 14.6348L23.75 15.0303L24.1377 15.1699C24.5724 15.3256 24.8827 15.741 24.8828 16.2305C24.8828 16.8541 24.38 17.3574 23.7559 17.3574H23.3857L23.3242 17.7227L23.0479 19.375C22.8904 20.3168 22.3584 21.1522 21.5693 21.6846C21.0607 22.0276 20.5195 22.4431 19.8828 22.8213L19.6689 22.9482V24.3721L19.9746 24.4688L25.1543 26.1045C27.0535 26.7041 28.5119 28.1435 29.1777 29.9355C29.1138 29.9956 29.0512 30.0571 28.9863 30.1162L28.5791 30.4756C28.0371 30.9399 27.4652 31.3702 26.8672 31.7637C24.1785 33.5335 20.9593 34.5635 17.499 34.5635C14.0388 34.5635 10.8205 33.5334 8.13184 31.7637H8.13086C7.53293 31.3702 6.96095 30.9399 6.41895 30.4756L6.01172 30.1162C5.94669 30.057 5.88345 29.9958 5.81934 29.9355C6.48477 28.1431 7.94475 26.7039 9.84375 26.1045L15.0234 24.4688L15.3301 24.3721V22.9482Z" fill="#F5F5F5" stroke="black" stroke-width="0.875"/>
+<path d="M18.1351 24.5H16.7466C16.6261 24.5 16.5416 24.619 16.5814 24.7328L16.9294 25.7282C16.954 25.7984 17.0202 25.8454 17.0946 25.8454H17.7871C17.8615 25.8454 17.9277 25.7984 17.9523 25.7282L18.3003 24.7328C18.3401 24.619 18.2557 24.5 18.1351 24.5Z" fill="#70B62B"/>
+<path d="M15.7661 32.1765L16.9463 25.8847C16.9619 25.8019 17.0341 25.7419 17.1183 25.7419H17.7667C17.8518 25.7419 17.9246 25.8032 17.9391 25.8871L19.0289 32.1808C19.0379 32.2323 19.0233 32.285 18.9893 32.3247L17.5726 33.9747C17.504 34.0545 17.3811 34.0563 17.3103 33.9784L15.8086 32.3265C15.7717 32.2859 15.7559 32.2304 15.7661 32.1765Z" fill="#70B62B"/>
+<path d="M23.0874 17.1475C22.6802 17.1566 22.677 17.1565 22.6763 17.2303C22.6751 17.3617 22.5101 17.8603 22.3794 18.1348C22.193 18.5242 21.9528 18.8458 21.6003 19.1728C21.1508 19.5918 20.7029 19.8346 20.1019 19.9893C19.8544 20.0543 19.7678 20.0567 17.9148 20.0492L16.4625 20.0454C16.1964 20.0447 15.9796 20.2589 15.9771 20.525C15.9747 20.7901 16.1885 21.0065 16.4535 21.0072L17.954 21.0114C20.1116 21.0185 20.0763 21.0214 20.6873 20.8219C21.7131 20.4883 22.6568 19.6763 23.1759 18.6776C23.3586 18.3331 23.5398 17.8089 23.6007 17.4664C23.6243 17.3416 23.6479 17.2168 23.6546 17.1848C23.6614 17.1432 23.6455 17.1302 23.5813 17.136C23.5332 17.1388 23.3119 17.1464 23.0874 17.1475Z" fill="black"/>
+<rect x="22.451" y="12.5238" width="3.2" height="5.2" rx="0.6" transform="rotate(0.530608 22.451 12.5238)" fill="#F5F5F5" stroke="black" stroke-width="0.8"/>
+<rect x="9.45097" y="12.4037" width="3.2" height="5.2" rx="0.6" transform="rotate(0.530608 9.45097 12.4037)" fill="#F5F5F5" stroke="black" stroke-width="0.8"/>
+<path d="M15.293 20.4473C15.293 19.895 15.7407 19.4473 16.293 19.4473H17.293C17.8453 19.4473 18.293 19.895 18.293 20.4473C18.293 20.9996 17.8453 21.4473 17.293 21.4473H16.293C15.7407 21.4473 15.293 20.9996 15.293 20.4473Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_205_498">
+<rect width="35" height="35" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -0,0 +1,40 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_4199_10908)">
+<g filter="url(#filter0_di_4199_10908)">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#FDFDFD"/>
+<circle cx="17.5" cy="17.5" r="17" stroke="url(#paint0_linear_4199_10908)" stroke-opacity="0.2"/>
+</g>
+<path d="M15.3301 22.9482L15.1152 22.8213C14.4793 22.4435 13.9364 22.0278 13.4297 21.6855L13.4287 21.6846C12.6398 21.1521 12.1076 20.3166 11.9502 19.375L11.6738 17.7227L11.6123 17.3574H11.2422C10.6187 17.3573 10.1152 16.854 10.1152 16.2305C10.1153 15.7671 10.3933 15.37 10.792 15.1973L11.1914 15.0244L11.0205 14.624C10.5503 13.5216 10.2046 12.3526 9.99707 11.1533V11.1523C9.86377 10.3836 9.80431 9.64622 10.002 8.99707C10.2015 8.34043 10.6884 7.89652 11.1309 7.88086L11.1982 7.88672L11.457 7.9043L11.5967 7.68555C11.9829 7.08239 12.5985 6.66833 13.2754 6.42285H13.2764C13.9611 6.17432 14.6919 6.08725 15.4746 5.99707C15.7786 5.96223 16.0789 5.92659 16.3799 5.89648L16.3789 5.89551C17.769 5.76175 19.2371 5.73653 20.5977 6.11523C21.9531 6.4928 23.2258 7.32891 23.8887 8.625C24.4185 9.65968 24.5371 10.937 24.3965 12.1826C24.3036 13.0075 24.1053 13.8182 23.8662 14.6348L23.75 15.0303L24.1377 15.1699C24.5724 15.3256 24.8827 15.741 24.8828 16.2305C24.8828 16.8541 24.38 17.3574 23.7559 17.3574H23.3857L23.3242 17.7227L23.0479 19.375C22.8904 20.3168 22.3584 21.1522 21.5693 21.6846C21.0607 22.0276 20.5195 22.4431 19.8828 22.8213L19.6689 22.9482V24.3721L19.9746 24.4688L25.1543 26.1045C27.0535 26.7041 28.5119 28.1435 29.1777 29.9355C29.1138 29.9956 29.0512 30.0571 28.9863 30.1162L28.5791 30.4756C28.0371 30.9399 27.4652 31.3702 26.8672 31.7637C24.1785 33.5335 20.9593 34.5635 17.499 34.5635C14.0388 34.5635 10.8205 33.5334 8.13184 31.7637H8.13086C7.53293 31.3702 6.96095 30.9399 6.41895 30.4756L6.01172 30.1162C5.94669 30.057 5.88345 29.9958 5.81934 29.9355C6.48477 28.1431 7.94475 26.7039 9.84375 26.1045L15.0234 24.4688L15.3301 24.3721V22.9482Z" fill="#F5F5F5" stroke="black" stroke-width="0.875"/>
+<path d="M18.1351 24.5H16.7466C16.6261 24.5 16.5416 24.619 16.5814 24.7328L16.9294 25.7282C16.954 25.7984 17.0202 25.8454 17.0946 25.8454H17.7871C17.8615 25.8454 17.9277 25.7984 17.9523 25.7282L18.3003 24.7328C18.3401 24.619 18.2557 24.5 18.1351 24.5Z" fill="#70B62B"/>
+<path d="M15.7661 32.1768L16.9463 25.8849C16.9619 25.8022 17.0341 25.7422 17.1183 25.7422H17.7667C17.8518 25.7422 17.9246 25.8034 17.9391 25.8873L19.0289 32.1811C19.0379 32.2325 19.0233 32.2853 18.9893 32.3249L17.5726 33.975C17.504 34.0548 17.3811 34.0565 17.3103 33.9787L15.8086 32.3268C15.7717 32.2862 15.7559 32.2307 15.7661 32.1768Z" fill="#70B62B"/>
+<path d="M23.0874 17.1475C22.6802 17.1566 22.677 17.1565 22.6763 17.2303C22.6751 17.3617 22.5101 17.8603 22.3794 18.1348C22.193 18.5242 21.9528 18.8458 21.6003 19.1728C21.1508 19.5918 20.7029 19.8346 20.1019 19.9893C19.8544 20.0543 19.7678 20.0567 17.9148 20.0492L16.4625 20.0454C16.1964 20.0447 15.9796 20.2589 15.9771 20.525C15.9747 20.7901 16.1885 21.0065 16.4535 21.0072L17.954 21.0114C20.1116 21.0185 20.0763 21.0214 20.6873 20.8219C21.7131 20.4883 22.6568 19.6763 23.1759 18.6776C23.3586 18.3331 23.5398 17.8089 23.6007 17.4664C23.6243 17.3416 23.6479 17.2168 23.6546 17.1848C23.6614 17.1432 23.6455 17.1302 23.5813 17.136C23.5332 17.1388 23.3119 17.1464 23.0874 17.1475Z" fill="black"/>
+<rect x="22.451" y="12.5248" width="3.2" height="5.2" rx="0.6" transform="rotate(0.530608 22.451 12.5248)" fill="#F5F5F5" stroke="black" stroke-width="0.8"/>
+<rect x="9.45097" y="12.4037" width="3.2" height="5.2" rx="0.6" transform="rotate(0.530608 9.45097 12.4037)" fill="#F5F5F5" stroke="black" stroke-width="0.8"/>
+<path d="M15.293 20.4473C15.293 19.895 15.7407 19.4473 16.293 19.4473H17.293C17.8453 19.4473 18.293 19.895 18.293 20.4473C18.293 20.9996 17.8453 21.4473 17.293 21.4473H16.293C15.7407 21.4473 15.293 20.9996 15.293 20.4473Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_di_4199_10908" x="-2" y="-1" width="39" height="39" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.901961 0 0 0 0 0.901961 0 0 0 0 0.901961 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4199_10908"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4199_10908" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.25"/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.4 0"/>
+<feBlend mode="normal" in2="shape" result="effect2_innerShadow_4199_10908"/>
+</filter>
+<linearGradient id="paint0_linear_4199_10908" x1="1.09375" y1="1.59091" x2="35" y2="1.59091" gradientUnits="userSpaceOnUse">
+<stop stop-color="#C0FF7B"/>
+<stop offset="0.65625" stop-color="#70B62B"/>
+</linearGradient>
+<clipPath id="clip0_4199_10908">
+<rect width="35" height="35" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -75,6 +75,8 @@ data class DavTask(
    val description: String,
    val calendarName: String,
    val calendarHref: String,
+    /** UID родительской задачи (RELATED-TO;RELTYPE=PARENT) — для подзадач; пусто у корневых. */
+    val parentUid: String = "",
 ) {
    val isCompleted: Boolean
        get() = status.equals("COMPLETED", ignoreCase = true) || percentComplete >= 100
@@ -87,6 +89,11 @@ object CalDavClient {
    private val icsDue = Pattern.compile("DUE[^:]*:([^\\r\\n]+)", Pattern.CASE_INSENSITIVE)
    private val icsStatus = Pattern.compile("STATUS:([^\\r\\n]+)", Pattern.CASE_INSENSITIVE)
    private val icsUid = Pattern.compile("UID:([^\\r\\n]+)", Pattern.CASE_INSENSITIVE)
+    // RELATED-TO с необязательным RELTYPE=PARENT (или без параметров) → UID родителя.
+    private val icsRelatedTo = Pattern.compile(
+        "RELATED-TO(?:;[^:\\r\\n]*)?:([^\\r\\n]+)",
+        Pattern.CASE_INSENSITIVE,
+    )
    private val icsDtStamp = Pattern.compile("DTSTAMP[^:]*:([^\\r\\n]+)", Pattern.CASE_INSENSITIVE)
    private val icsLastModified = Pattern.compile("LAST-MODIFIED[^:]*:([^\\r\\n]+)", Pattern.CASE_INSENSITIVE)
    private val icsPriority = Pattern.compile("PRIORITY:([^\\r\\n]+)", Pattern.CASE_INSENSITIVE)
@@ -634,6 +641,7 @@ object CalDavClient {
        dueDate: LocalDate? = null,
        priority: Int = 0,
        description: String = "",
+        parentUid: String = "",
    ): DavTask {
        val uid = "${UUID.randomUUID()}@f7cloud.mobile"
        val ics = buildVTodoIcs(
@@ -644,6 +652,7 @@ object CalDavClient {
            priority = priority,
            percentComplete = 0,
            description = description,
+            parentUid = parentUid,
        )
        val url = calendar.href.trimEnd('/') + "/$uid.ics"
        val req = Request.Builder()
@@ -670,6 +679,7 @@ object CalDavClient {
            description = description,
            calendarName = calendar.displayName,
            calendarHref = calendar.href,
+            parentUid = parentUid,
        )
    }

@@ -691,6 +701,7 @@ object CalDavClient {
            priority = priority,
            percentComplete = percentComplete,
            description = description,
+            parentUid = task.parentUid, // не терять связь с родителем при правке подзадачи
        )
        val req = Request.Builder()
            .url(task.href)
@@ -938,6 +949,7 @@ object CalDavClient {
            description = extractIcs(icsDescription, ics),
            calendarName = calendarName,
            calendarHref = calendarHref,
+            parentUid = extractIcs(icsRelatedTo, ics).trim(),
        )
    }

@@ -949,6 +961,7 @@ object CalDavClient {
        priority: Int,
        percentComplete: Int,
        description: String,
+        parentUid: String = "",
    ): String {
        val now = Instant.now()
        return buildString {
@@ -976,6 +989,9 @@ object CalDavClient {
            if (description.isNotBlank()) {
                appendLine("DESCRIPTION:${escapeIcsText(description)}")
            }
+            if (parentUid.isNotBlank()) {
+                appendLine("RELATED-TO;RELTYPE=PARENT:${escapeIcsText(parentUid)}")
+            }
            appendLine("END:VTODO")
            appendLine("END:VCALENDAR")
        }
@@ -4,6 +4,7 @@ import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -345,7 +346,10 @@ fun TasksRow(
    onToggleComplete: () -> Unit,
    onOpen: () -> Unit,
    modifier: Modifier = Modifier,
+    onAddSubtask: (() -> Unit)? = null,
+    onDelete: (() -> Unit)? = null,
 ) {
+    var menuOpen by remember { mutableStateOf(false) }
    val hasMeta = showMeta && (task.listName.isNotBlank() || task.percentComplete in 1..99 || task.due.isNotBlank())
    Column(
        modifier = modifier
@@ -401,6 +405,43 @@ fun TasksRow(
                        color = task.dueDateColor(),
                    )
                }
+                // Меню «⋯»: вложенная задача / удалить (как в веб-версии)
+                if (onAddSubtask != null || onDelete != null) {
+                    Box {
+                        Text(
+                            "⋯",
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = F7Colors.TextSecondary,
+                            modifier = Modifier
+                                .size(24.dp)
+                                .clickable(
+                                    interactionSource = remember { MutableInteractionSource() },
+                                    indication = null,
+                                    onClick = { menuOpen = true },
+                                ),
+                            textAlign = androidx.compose.ui.text.style.TextAlign.Center,
+                        )
+                        androidx.compose.material3.DropdownMenu(
+                            expanded = menuOpen,
+                            onDismissRequest = { menuOpen = false },
+                            containerColor = androidx.compose.ui.graphics.Color.White,
+                        ) {
+                            onAddSubtask?.let { add ->
+                                androidx.compose.material3.DropdownMenuItem(
+                                    text = { Text("Добавить вложенную задачу", color = F7Colors.TextPrimary) },
+                                    onClick = { menuOpen = false; add() },
+                                )
+                            }
+                            onDelete?.let { del ->
+                                androidx.compose.material3.DropdownMenuItem(
+                                    text = { Text("Удалить задачу", color = F7Colors.Error) },
+                                    onClick = { menuOpen = false; del() },
+                                )
+                            }
+                        }
+                    }
+                }
            }
        }
        if (hasMeta) {
@@ -1064,3 +1105,42 @@ private fun SmartListSettingRow(
        }
    }
 }
+
+/** Диалог создания вложенной задачи (подзадачи) — по кнопке «Добавить вложенную задачу». */
+@Composable
+fun TaskSubtaskDialog(
+    parentTitle: String,
+    onConfirm: (String) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    var text by remember { mutableStateOf("") }
+    Dialog(onDismissRequest = onDismiss) {
+        Surface(shape = RoundedCornerShape(16.dp), color = Color.White) {
+            Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                Text(
+                    "Вложенная задача",
+                    style = MaterialTheme.typography.titleMedium.copy(fontSize = 18.sp),
+                    fontWeight = FontWeight.SemiBold,
+                    color = F7Colors.TextPrimary,
+                )
+                Text(
+                    "к «$parentTitle»",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = F7Colors.TextSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                F7OutlinedField(value = text, onValueChange = { text = it }, label = "Название")
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    F7SecondaryButton("Отмена", onClick = onDismiss, modifier = Modifier.weight(1f))
+                    F7PrimaryButton(
+                        text = "Создать",
+                        onClick = { onConfirm(text.trim()) },
+                        enabled = text.isNotBlank(),
+                        modifier = Modifier.weight(1f),
+                    )
+                }
+            }
+        }
+    }
+}
@@ -29,6 +29,7 @@ data class TaskItem(
    val description: String,
    val listHref: String,
    val listName: String,
+    val parentUid: String = "",
 ) {
    val isCompleted: Boolean
        get() = status.equals("COMPLETED", ignoreCase = true) || percentComplete >= 100
@@ -46,6 +47,7 @@ data class TaskItem(
        description = description,
        calendarName = listName,
        calendarHref = listHref,
+        parentUid = parentUid,
    )
 }

@@ -80,6 +82,7 @@ class TasksRepository {
        dueDate: LocalDate? = null,
        priority: Int = 0,
        description: String = "",
+        parentUid: String = "",
    ): TaskItem {
        val client = authedClient(session)
        val calendar = calendarForHref(session, listHref)
@@ -90,6 +93,7 @@ class TasksRepository {
            dueDate = dueDate,
            priority = priority,
            description = description,
+            parentUid = parentUid,
        ).toTaskItem()
    }

@@ -157,6 +161,7 @@ class TasksRepository {
        description = description,
        listHref = calendarHref,
        listName = calendarName,
+        parentUid = parentUid,
    )

    private fun calendarSlug(href: String): String {
@@ -17,6 +17,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -31,11 +34,19 @@ fun TasksScreen(
    modifier: Modifier = Modifier,
    createRequest: Int = 0,
    openListSlug: String? = null,
+    showListsRequest: Int = 0,
    onOpenListConsumed: () -> Unit = {},
    onUnauthorized: () -> Unit = {},
 ) {
    val vm: TasksViewModel = viewModel()
    val state by vm.state.collectAsState()
+    // Родитель для создаваемой подзадачи (открывает диалог ввода названия).
+    var subtaskParent by remember { mutableStateOf<TaskItem?>(null) }
+
+    // Стрелка «назад» нижней панели на Задачах → показать панель списков (закрыть открытый список).
+    LaunchedEffect(showListsRequest) {
+        if (showListsRequest > 0) vm.closeList()
+    }

    LaunchedEffect(session.serverUrl, session.username, session.davUserId) {
        vm.load(session)
@@ -103,6 +114,8 @@ fun TasksScreen(
                    onReload = { vm.refreshTasks(session) },
                    onToggleCompletedExpanded = vm::toggleCompletedExpanded,
                    onDeleteCompleted = { vm.deleteCompletedTasks(session) },
+                    onAddSubtask = { subtaskParent = it },
+                    onDeleteTask = { vm.deleteTask(session, it) },
                )
            }
        }
@@ -143,6 +156,18 @@ fun TasksScreen(
        onDismiss = vm::closeSettings,
        onSwipeBack = vm::closeSettings,
    )
+
+    // Диалог «Добавить вложенную задачу»
+    subtaskParent?.let { parent ->
+        TaskSubtaskDialog(
+            parentTitle = parent.summary,
+            onConfirm = { title ->
+                vm.createSubtask(session, parent, title)
+                subtaskParent = null
+            },
+            onDismiss = { subtaskParent = null },
+        )
+    }
 }

@OptIn(ExperimentalMaterial3Api::class)
@@ -162,7 +187,15 @@ private fun TasksMainContent(
    onReload: () -> Unit,
    onToggleCompletedExpanded: () -> Unit,
    onDeleteCompleted: () -> Unit,
+    onAddSubtask: (TaskItem) -> Unit,
+    onDeleteTask: (TaskItem) -> Unit,
 ) {
+    // Подзадачи (RELATED-TO) — рисуем под родителем с отступом; из верхнего уровня исключаем.
+    val childrenByParent = remember(state.visibleActiveGroups) {
+        state.visibleActiveGroups.flatMap { it.tasks }
+            .filter { it.parentUid.isNotBlank() }
+            .groupBy { it.parentUid }
+    }
    Column(modifier = Modifier.fillMaxSize()) {
        TasksToolbar(
            serverUrl = session.serverUrl,
@@ -212,13 +245,27 @@ private fun TasksMainContent(
                            modifier = Modifier.padding(bottom = 4.dp),
                        )
                    }
-                    items(group.tasks, key = { it.uid }) { task ->
+                    items(group.tasks.filter { it.parentUid.isBlank() }, key = { it.uid }) { task ->
+                        Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
                            TasksRow(
                                task = task,
                                serverUrl = session.serverUrl,
                                onToggleComplete = { onToggleComplete(task) },
                                onOpen = { onOpenTask(task) },
+                                onAddSubtask = { onAddSubtask(task) },
+                                onDelete = { onDeleteTask(task) },
                            )
+                            childrenByParent[task.uid].orEmpty().forEach { sub ->
+                                TasksRow(
+                                    task = sub,
+                                    serverUrl = session.serverUrl,
+                                    onToggleComplete = { onToggleComplete(sub) },
+                                    onOpen = { onOpenTask(sub) },
+                                    onDelete = { onDeleteTask(sub) },
+                                    modifier = Modifier.padding(start = 24.dp),
+                                )
+                            }
+                        }
                    }
                }

@@ -197,6 +197,7 @@ class TasksViewModel(
        summary: String,
        dueInput: String,
        priority: Int,
+        parentUid: String = "",
    ) {
        val listHref = _state.value.selectedListHref ?: return
        if (summary.isBlank()) {
@@ -218,6 +219,7 @@ class TasksViewModel(
                    summary = summary.trim(),
                    dueDate = dueDate,
                    priority = priority,
+                    parentUid = parentUid,
                )
            }.onSuccess {
                _state.update {
@@ -301,6 +303,30 @@ class TasksViewModel(
        }
    }

+    /** Удаление конкретной задачи из списка (per-task меню «⋯»), не только открытой детали. */
+    fun deleteTask(session: AuthSession, task: TaskItem) {
+        viewModelScope.launch(Dispatchers.IO) {
+            _state.update { it.copy(saving = true, error = null) }
+            runCatching { repository.deleteTask(session, task) }
+                .onSuccess {
+                    _state.update {
+                        it.copy(saving = false, detailTask = it.detailTask?.takeIf { d -> d.uid != task.uid })
+                    }
+                    _state.value.selectedListHref?.let { loadTasks(session, it) }
+                }
+                .onFailure { t ->
+                    _state.update {
+                        it.copy(saving = false, error = t.message ?: "Не удалось удалить", unauthorized = t is UnauthorizedException)
+                    }
+                }
+        }
+    }
+
+    /** Создать подзадачу к [parent] с заголовком [summary]. */
+    fun createSubtask(session: AuthSession, parent: TaskItem, summary: String) {
+        createTask(session, summary, "", 0, parentUid = parent.uid)
+    }
+
    fun deleteDetail(session: AuthSession) {
        val task = _state.value.detailTask ?: return
        viewModelScope.launch(Dispatchers.IO) {
Author	SHA1	Message	Date
b-dev-mobile	25cfbe9bdc	chore: версия 0.5.132 (140) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-07-10 07:32:34 +00:00
b-dev-mobile	c9340ab2ab	feat(tasks): вложенные задачи (подзадачи) + per-task меню «⋯» Паритет веб-версии Задач: - CalDAV: RELATED-TO;RELTYPE=PARENT в модели/парсере/билдере VTODO (DavTask.parentUid); createTask принимает parentUid; updateTask и toggleComplete сохраняют связь с родителем. - TasksRepository/VM: createSubtask(parent), deleteTask(task) для любой задачи (не только открытой детали). - UI: у задачи меню «⋯» → «Добавить вложенную задачу» / «Удалить задачу»; подзадачи рисуются под родителем с отступом 24dp; диалог ввода названия подзадачи. Подзадачи исключены из верхнего уровня (не дублируются). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-07-10 07:32:19 +00:00
b-dev-mobile	cdb2471445	chore: версия 0.5.131 (139) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-07-10 07:19:26 +00:00
b-dev-mobile	a5ebcd4d80	fix(tasks): стрелка нижней панели открывает панель списков задач Раньше на Задачах стрелка «назад» уводила на предыдущий раздел (Файлы). Теперь она закрывает открытый список и показывает панель списков задач (TasksListNavView: Все/Текущие/конкретные списки) — как сайдбар папок в Почте/Файлах/Календаре. Проброшен showListsRequest → vm.closeList(). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-07-10 07:19:26 +00:00
b-dev-mobile	374e8838e8	chore: версия 0.5.130 (138) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-07-10 07:14:08 +00:00
b-dev-mobile	47b2638b2b	fix(menu): состав шторки 1:1 (Поддержка + Личный кабинет) + иконки внешних сайтов По разметке сайта (layout.user.php): - Добавлены пункты «Поддержка» (AppTab.Support, icon-header-f7support) после Заметок и «Личный кабинет» (открывает нативную ProfileSheet, lk-header-icon) перед Уведомлениями — их не хватало. - Иконки внешних сайтов (Bitrix/1C) строились из имени файла как есть → битая ссылка → глобус. Теперь путь /index.php/apps/external/img/{icon}, как на сайте. - Coil: добавлен Basic-auth интерсептор для хоста сервера — серверные картинки (иконки external и пр.) требуют логина, без него был 401. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-07-10 07:13:56 +00:00