From 6f284a1c8b59b1152cb3fe086a8cb9bc37fddbbd Mon Sep 17 00:00:00 2001
From: malilex <alex.malishev270896@gmail.com>
Date: Mon, 18 Nov 2024 17:03:40 +0300
Subject: [PATCH] feat(sdds-acore/uikit): Focus selector was added to all
 viewgroups.

---
 .../sandbox/core/view/ComponentFragment.kt    |  3 +
 .../res/color-night/bg_cell_switch_track.xml  |  6 --
 .../bg_color_property_switch_track.xml        |  6 --
 .../color_cell_checkable_border.xml           |  5 --
 .../main/res/color-night/color_cell_text.xml  |  8 ---
 .../layout/fragment_component_scaffold.xml    | 38 ++++++------
 .../main/res/layout/layout_component_cell.xml |  2 +
 .../src/main/res/values/styles_chip.xml       | 12 ++++
 .../main/kotlin/com/sdds/uikit/CellLayout.kt  | 33 +++++++++-
 .../kotlin/com/sdds/uikit/CheckBoxGroup.kt    |  1 -
 .../main/kotlin/com/sdds/uikit/FlowLayout.kt  | 30 +++++++++-
 .../main/kotlin/com/sdds/uikit/FrameLayout.kt | 46 ++++++++++++--
 .../kotlin/com/sdds/uikit/LinearLayout.kt     | 60 +++++++++++++++++++
 .../main/kotlin/com/sdds/uikit/TextField.kt   | 12 ++++
 .../uikit/internal/base/ClipOutlineCompat.kt  | 20 +++++++
 .../internal/textfield/DecoratedFieldBox.kt   | 19 +-----
 .../com/sdds/uikit/shape/ShapeDrawable.kt     |  2 +-
 .../kotlin/com/sdds/uikit/shape/Shapeable.kt  |  4 +-
 .../uikit/src/main/res/values/base_attrs.xml  |  4 ++
 .../src/main/res/values/button_attrs.xml      |  8 +++
 .../src/main/res/values/cell_layout_attrs.xml | 14 +++++
 .../uikit/src/main/res/values/chip_attrs.xml  |  8 +++
 .../src/main/res/values/flow_layout_attrs.xml |  9 +++
 .../src/main/res/values/image_view_attrs.xml  |  8 +++
 .../src/main/res/values/wrappers_attrs.xml    | 27 ++++++++-
 25 files changed, 309 insertions(+), 76 deletions(-)
 delete mode 100644 playground/sandbox/src/main/res/color-night/bg_cell_switch_track.xml
 delete mode 100644 playground/sandbox/src/main/res/color-night/bg_color_property_switch_track.xml
 delete mode 100644 playground/sandbox/src/main/res/color-night/color_cell_checkable_border.xml
 delete mode 100644 playground/sandbox/src/main/res/color-night/color_cell_text.xml
 create mode 100644 sdds-core/uikit/src/main/kotlin/com/sdds/uikit/LinearLayout.kt
 create mode 100644 sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/base/ClipOutlineCompat.kt

diff --git a/playground/sandbox/src/main/kotlin/com/sdds/playground/sandbox/core/view/ComponentFragment.kt b/playground/sandbox/src/main/kotlin/com/sdds/playground/sandbox/core/view/ComponentFragment.kt
index 258ada1f..7dcb88be 100644
--- a/playground/sandbox/src/main/kotlin/com/sdds/playground/sandbox/core/view/ComponentFragment.kt
+++ b/playground/sandbox/src/main/kotlin/com/sdds/playground/sandbox/core/view/ComponentFragment.kt
@@ -68,6 +68,9 @@ internal abstract class ComponentFragment : Fragment(), PropertiesAdapter.Intera
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        _binding?.componentContainer?.setOnClickListener {
+            view.findFocus()?.clearFocus()
+        }
         propertiesOwner.properties
             .flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
             .onEach { propertiesAdapter.updateProperties(it) }
diff --git a/playground/sandbox/src/main/res/color-night/bg_cell_switch_track.xml b/playground/sandbox/src/main/res/color-night/bg_cell_switch_track.xml
deleted file mode 100644
index 092593e1..00000000
--- a/playground/sandbox/src/main/res/color-night/bg_cell_switch_track.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?serv_surfaceDefaultAccent" android:state_checked="true"/>
-    <item android:color="?serv_surfaceOnLightTransparentTertiary" android:state_focused="true"/>
-    <item android:color="?serv_surfaceDefaultTransparentTertiary" />
-</selector>
\ No newline at end of file
diff --git a/playground/sandbox/src/main/res/color-night/bg_color_property_switch_track.xml b/playground/sandbox/src/main/res/color-night/bg_color_property_switch_track.xml
deleted file mode 100644
index 092593e1..00000000
--- a/playground/sandbox/src/main/res/color-night/bg_color_property_switch_track.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?serv_surfaceDefaultAccent" android:state_checked="true"/>
-    <item android:color="?serv_surfaceOnLightTransparentTertiary" android:state_focused="true"/>
-    <item android:color="?serv_surfaceDefaultTransparentTertiary" />
-</selector>
\ No newline at end of file
diff --git a/playground/sandbox/src/main/res/color-night/color_cell_checkable_border.xml b/playground/sandbox/src/main/res/color-night/color_cell_checkable_border.xml
deleted file mode 100644
index c75c9d49..00000000
--- a/playground/sandbox/src/main/res/color-night/color_cell_checkable_border.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?serv_textInverseSecondary" android:state_focused="true"/>
-    <item android:color="?serv_textDefaultSecondary"/>
-</selector>
\ No newline at end of file
diff --git a/playground/sandbox/src/main/res/color-night/color_cell_text.xml b/playground/sandbox/src/main/res/color-night/color_cell_text.xml
deleted file mode 100644
index a005ffd3..00000000
--- a/playground/sandbox/src/main/res/color-night/color_cell_text.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:color="?serv_textInverseSecondary" android:state_focused="true" app:sd_state_secondary="true" />
-    <item android:color="?serv_textDefaultSecondary" android:state_focused="false" app:sd_state_secondary="true" />
-
-    <item android:color="?serv_textInversePrimary" android:state_focused="true" />
-    <item android:color="?serv_textDefaultPrimary" android:state_focused="false" />
-</selector>
\ No newline at end of file
diff --git a/playground/sandbox/src/main/res/layout/fragment_component_scaffold.xml b/playground/sandbox/src/main/res/layout/fragment_component_scaffold.xml
index 7ecb8950..46da6704 100644
--- a/playground/sandbox/src/main/res/layout/fragment_component_scaffold.xml
+++ b/playground/sandbox/src/main/res/layout/fragment_component_scaffold.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/sdds_spacer_8x"
@@ -21,18 +22,21 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
 
-        <FrameLayout
+        <com.sdds.uikit.FrameLayout
             android:id="@+id/component_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:focusable="false"
             android:clipChildren="false"/>
 
     </com.sdds.uikit.FrameLayout>
 
-    <com.sdds.uikit.FrameLayout
+    <com.sdds.uikit.LinearLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="@dimen/sdds_spacer_8x"
+        android:orientation="vertical"
+        app:sd_clipToOutline="true"
         app:sd_shapeAppearance="@style/Serv.SddsServ.Shape.Round.L"
         app:sd_strokeColor="?serv_surfaceDefaultSolidTertiary"
         app:sd_strokeWidth="1dp"
@@ -41,28 +45,22 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/component_canvas">
+        app:layout_constraintTop_toBottomOf="@id/component_canvas"
+        tools:targetApi="s">
+
+        <include
+            android:id="@+id/header"
+            layout="@layout/layout_header_property_item" />
 
-        <LinearLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/properties_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <include
-                android:id="@+id/header"
-                layout="@layout/layout_header_property_item"
-                />
+            android:orientation="vertical"
+            android:scrollbars="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/properties_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:scrollbars="vertical"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-        </LinearLayout>
-
-    </com.sdds.uikit.FrameLayout>
+    </com.sdds.uikit.LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/playground/sandbox/src/main/res/layout/layout_component_cell.xml b/playground/sandbox/src/main/res/layout/layout_component_cell.xml
index f78c4fc6..49dbdf57 100644
--- a/playground/sandbox/src/main/res/layout/layout_component_cell.xml
+++ b/playground/sandbox/src/main/res/layout/layout_component_cell.xml
@@ -4,6 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="?sd_cellStyle"
     android:id="@+id/cell"
+    android:focusable="true"
+    app:sd_shapeAppearance="?serv_shapeRoundM"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
diff --git a/playground/sandbox/src/main/res/values/styles_chip.xml b/playground/sandbox/src/main/res/values/styles_chip.xml
index 46a13adf..75e09f85 100644
--- a/playground/sandbox/src/main/res/values/styles_chip.xml
+++ b/playground/sandbox/src/main/res/values/styles_chip.xml
@@ -63,22 +63,34 @@
     <style name="Theme.Sandbox.Components.Chip.L.Embedded">
         <item name="android:minHeight">44dp</item>
         <item name="sd_shapeAppearance">?serv_shapeRoundS</item>
+        <item name="sd_fsStrokeInset">0dp</item>
+        <item name="sd_fsShapeAdjustment">0dp</item>
+        <item name="sd_fsScaleFactor">0.03</item>
     </style>
 
     <style name="Theme.Sandbox.Components.Chip.M.Embedded">
         <item name="android:minHeight">36dp</item>
         <item name="sd_shapeAppearance">?serv_shapeRoundXs</item>
+        <item name="sd_fsStrokeInset">0dp</item>
+        <item name="sd_fsShapeAdjustment">0dp</item>
+        <item name="sd_fsScaleFactor">0.03</item>
     </style>
 
     <style name="Theme.Sandbox.Components.Chip.S.Embedded">
         <item name="android:minHeight">28dp</item>
         <item name="sd_shapeAppearance">?serv_shapeRoundXxs</item>
+        <item name="sd_fsStrokeInset">0dp</item>
+        <item name="sd_fsShapeAdjustment">0dp</item>
+        <item name="sd_fsScaleFactor">0.03</item>
     </style>
 
     <style name="Theme.Sandbox.Components.Chip.XS.Embedded">
         <item name="android:minHeight">20dp</item>
         <item name="sd_shapeAppearance">?serv_shapeRoundXxs</item>
         <item name="sd_shapeAppearanceAdjustment">-2dp</item>
+        <item name="sd_fsStrokeInset">0dp</item>
+        <item name="sd_fsShapeAdjustment">0dp</item>
+        <item name="sd_fsScaleFactor">0.03</item>
     </style>
 
     <style name="Theme.Sandbox.Components.Chip.L.Pilled">
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CellLayout.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CellLayout.kt
index c3779086..796d7494 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CellLayout.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CellLayout.kt
@@ -22,6 +22,9 @@ import com.sdds.uikit.CellLayout.CellContent.START
 import com.sdds.uikit.CellLayout.CellContent.SUBTITLE
 import com.sdds.uikit.CellLayout.CellContent.TITLE
 import com.sdds.uikit.internal.base.configure
+import com.sdds.uikit.internal.base.isClippedToOutline
+import com.sdds.uikit.internal.focusselector.FocusSelectorDelegate
+import com.sdds.uikit.internal.focusselector.HasFocusSelector
 import com.sdds.uikit.shape.ShapeModel
 import com.sdds.uikit.shape.Shapeable
 import com.sdds.uikit.shape.shapeable
@@ -43,7 +46,7 @@ open class CellLayout @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = R.attr.sd_cellStyle,
     defStyleRes: Int = R.style.Sdds_Components_Cell,
-) : ViewGroup(context, attrs, defStyleAttr, defStyleRes), Shapeable {
+) : ViewGroup(context, attrs, defStyleAttr, defStyleRes), Shapeable, HasFocusSelector by FocusSelectorDelegate() {
 
     private val _shaper = shapeable(attrs, defStyleAttr)
     private val _startContentBounds: Rect = Rect()
@@ -143,6 +146,33 @@ open class CellLayout @JvmOverloads constructor(
         _disclosureEnabled = typedArray.getBoolean(R.styleable.CellLayout_sd_disclosureEnabled, false)
         _forceDuplicateParentState = typedArray.getBoolean(R.styleable.CellLayout_sd_forceDuplicateParentState, false)
         typedArray.recycle()
+        clipToOutline = context.isClippedToOutline(attrs, defStyleAttr, defStyleRes)
+        @Suppress("LeakingThis")
+        applySelector(this, context, attrs, defStyleAttr)
+    }
+
+    override fun setPressed(pressed: Boolean) {
+        if (isPressed != pressed) {
+            handlePressedChange(this, pressed)
+        }
+        super.setPressed(pressed)
+    }
+
+    override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
+        updateFocusSelector(this, gainFocus)
+        redispatchActivated()
+    }
+
+    override fun dispatchSetActivated(activated: Boolean) {
+        // При вызове setActivated хотим, чтобы на children всегда приходил activated = false
+        // Чтобы потом самостоятельно отправить им нужное значение
+        super.dispatchSetActivated(false)
+    }
+
+    private fun redispatchActivated() {
+        // отправляем всем children значение activate = true, если в контейнер в фокусе
+        super.dispatchSetActivated(isFocused)
     }
 
     override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
@@ -395,7 +425,6 @@ open class CellLayout @JvmOverloads constructor(
     }
 
     private fun View.applyContentRole(cellParams: LayoutParams) {
-        isDuplicateParentStateEnabled = cellParams.forceDuplicateParentState && _forceDuplicateParentState
         (this as? TextView)?.apply {
             when (cellParams.cellContent) {
                 LABEL -> {
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CheckBoxGroup.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CheckBoxGroup.kt
index 6fcec03e..299812b4 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CheckBoxGroup.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/CheckBoxGroup.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Checkable
 import android.widget.CompoundButton
-import android.widget.LinearLayout
 import androidx.core.view.children
 import androidx.core.view.marginTop
 import androidx.core.view.updateMarginsRelative
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FlowLayout.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FlowLayout.kt
index d111b686..acf31b26 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FlowLayout.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FlowLayout.kt
@@ -12,6 +12,12 @@ import android.view.ViewDebug
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import com.sdds.uikit.internal.base.configure
+import com.sdds.uikit.internal.base.isClippedToOutline
+import com.sdds.uikit.internal.focusselector.FocusSelectorDelegate
+import com.sdds.uikit.internal.focusselector.HasFocusSelector
+import com.sdds.uikit.shape.ShapeModel
+import com.sdds.uikit.shape.Shapeable
+import com.sdds.uikit.shape.shapeable
 
 /**
  * FlowLayout поддерживает позиционирование с автоматическим построчным переносом.
@@ -25,8 +31,9 @@ open class FlowLayout @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
     defStyleRes: Int = 0,
-) : ViewGroup(context, attrs, defStyleAttr, defStyleRes) {
+) : ViewGroup(context, attrs, defStyleAttr, defStyleRes), Shapeable, HasFocusSelector by FocusSelectorDelegate() {
 
+    private val _shapeable: Shapeable = shapeable(attrs, defStyleAttr)
     private val _flowManager: FlowLayoutManager
     private var _horizontalSpacing: Int
     private var _verticalSpacing: Int
@@ -46,6 +53,12 @@ open class FlowLayout @JvmOverloads constructor(
             }
         }
 
+    /**
+     * @see Shapeable.shape
+     */
+    override val shape: ShapeModel?
+        get() = _shapeable.shape
+
     init {
         if (DEBUG_BOUNDS) {
             setWillNotDraw(false)
@@ -56,12 +69,27 @@ open class FlowLayout @JvmOverloads constructor(
         _gravity = typedArray.getInt(R.styleable.FlowLayout_android_gravity, Gravity.TOP or Gravity.START)
         _flowManager = FlowLayoutManager(_horizontalSpacing, _verticalSpacing)
         typedArray.recycle()
+        clipToOutline = context.isClippedToOutline(attrs, defStyleAttr, defStyleRes)
+        @Suppress("LeakingThis")
+        applySelector(this, context, attrs, defStyleAttr)
     }
 
     internal fun getRowBounds(rowIndex: Int, outRect: Rect) {
         outRect.set(_flowManager.boundsList.getOrNull(rowIndex) ?: return)
     }
 
+    override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
+        updateFocusSelector(this, gainFocus)
+    }
+
+    override fun setPressed(pressed: Boolean) {
+        if (isPressed != pressed) {
+            handlePressedChange(this, pressed)
+        }
+        super.setPressed(pressed)
+    }
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         if (DEBUG_BOUNDS) _flowManager.drawDebug(canvas)
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FrameLayout.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FrameLayout.kt
index f3989759..4f652e28 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FrameLayout.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/FrameLayout.kt
@@ -1,26 +1,60 @@
 package com.sdds.uikit
 
 import android.content.Context
+import android.graphics.Rect
 import android.util.AttributeSet
-import com.sdds.uikit.internal.base.shape.ShapeHelper
+import com.sdds.uikit.internal.base.isClippedToOutline
+import com.sdds.uikit.internal.focusselector.FocusSelectorDelegate
+import com.sdds.uikit.internal.focusselector.HasFocusSelector
+import com.sdds.uikit.shape.ShapeModel
+import com.sdds.uikit.shape.Shapeable
+import com.sdds.uikit.shape.shapeable
 import android.widget.FrameLayout as AndroidFrameLayout
 
 /**
- * Реализация [FrameLayout] с поддержкой ShapeModel.
+ * Реализация [FrameLayout] с поддержкой ShapeModel и селектором фокуса
  * @param context контекст
  * @param attrs аттрибуты view
  * @param defStyleAttr аттрибут стиля по умолчанию
  * @author Малышев Александр on 27.08.2024
  */
-@Suppress("LeakingThis")
 open class FrameLayout @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
-) : AndroidFrameLayout(context, attrs, defStyleAttr) {
+    defStyleRes: Int = 0,
+) : AndroidFrameLayout(
+    context,
+    attrs,
+    defStyleAttr,
+    defStyleRes,
+),
+    Shapeable,
+    HasFocusSelector by FocusSelectorDelegate() {
+
+    private val _shapeable: Shapeable = shapeable(attrs, defStyleAttr, defStyleRes)
+
+    /**
+     * @see Shapeable.shape
+     */
+    override val shape: ShapeModel?
+        get() = _shapeable.shape
 
     init {
-        ShapeHelper(this, attrs, defStyleAttr)
-        clipToOutline = true
+        clipToOutline = context.isClippedToOutline(attrs, defStyleAttr, defStyleRes)
+        @Suppress("LeakingThis")
+        applySelector(this, context, attrs, defStyleAttr)
+    }
+
+    override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
+        updateFocusSelector(this, gainFocus)
+    }
+
+    override fun setPressed(pressed: Boolean) {
+        if (isPressed != pressed) {
+            handlePressedChange(this, pressed)
+        }
+        super.setPressed(pressed)
     }
 }
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/LinearLayout.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/LinearLayout.kt
new file mode 100644
index 00000000..f4fe70a7
--- /dev/null
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/LinearLayout.kt
@@ -0,0 +1,60 @@
+package com.sdds.uikit
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import com.sdds.uikit.internal.base.isClippedToOutline
+import com.sdds.uikit.internal.focusselector.FocusSelectorDelegate
+import com.sdds.uikit.internal.focusselector.HasFocusSelector
+import com.sdds.uikit.shape.ShapeModel
+import com.sdds.uikit.shape.Shapeable
+import com.sdds.uikit.shape.shapeable
+import android.widget.LinearLayout as AndroidLinearLayout
+
+/**
+ * Реализация [LinearLayout] с поддержкой ShapeModel и селектором фокуса
+ * @param context контекст
+ * @param attrs аттрибуты view
+ * @param defStyleAttr аттрибут стиля по умолчанию
+ * @author Малышев Александр on 27.08.2024
+ */
+open class LinearLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+    defStyleRes: Int = 0,
+) : AndroidLinearLayout(
+    context,
+    attrs,
+    defStyleAttr,
+    defStyleRes,
+),
+    Shapeable,
+    HasFocusSelector by FocusSelectorDelegate() {
+
+    private val _shapeable: Shapeable = shapeable(attrs, defStyleAttr, defStyleRes)
+
+    /**
+     * @see Shapeable.shape
+     */
+    override val shape: ShapeModel?
+        get() = _shapeable.shape
+
+    init {
+        clipToOutline = context.isClippedToOutline(attrs, defStyleAttr, defStyleRes)
+        @Suppress("LeakingThis")
+        applySelector(this, context, attrs, defStyleAttr)
+    }
+
+    override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
+        updateFocusSelector(this, gainFocus)
+    }
+
+    override fun setPressed(pressed: Boolean) {
+        if (isPressed != pressed) {
+            handlePressedChange(this, pressed)
+        }
+        super.setPressed(pressed)
+    }
+}
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/TextField.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/TextField.kt
index ad6377df..1e646fd5 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/TextField.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/TextField.kt
@@ -584,6 +584,18 @@ open class TextField @JvmOverloads constructor(
         return _decorationBox.baseline
     }
 
+    override fun applySelector(view: View, context: Context, attributeSet: AttributeSet?, defStyleAttr: Int) {
+        // Выключаем селектор для TextField, т.к. селектор должен добавляться в DecoratedFieldBox
+    }
+
+    override fun handlePressedChange(view: View, isPressed: Boolean) {
+        // Выключаем селектор для TextField, т.к. селектор должен добавляться в DecoratedFieldBox
+    }
+
+    override fun updateFocusSelector(view: View, focus: Boolean) {
+        // Выключаем селектор для TextField, т.к. селектор должен добавляться в DecoratedFieldBox
+    }
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         if (isRequired()) {
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/base/ClipOutlineCompat.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/base/ClipOutlineCompat.kt
new file mode 100644
index 00000000..f4bf8a1e
--- /dev/null
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/base/ClipOutlineCompat.kt
@@ -0,0 +1,20 @@
+package com.sdds.uikit.internal.base
+
+import android.content.Context
+import android.util.AttributeSet
+import com.sdds.uikit.R
+
+/**
+ * Возвращает значение [R.styleable.SdView_sd_clipToOutline] из атрибутов [attrs]
+ * @author Малышев Александр on 15.11.2024
+ */
+internal fun Context.isClippedToOutline(
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+    defStyleRes: Int = 0,
+): Boolean {
+    val typedArray = this.obtainStyledAttributes(attrs, R.styleable.SdView, defStyleAttr, defStyleRes)
+    val isClippedToOutline = typedArray.getBoolean(R.styleable.SdView_sd_clipToOutline, false)
+    typedArray.recycle()
+    return isClippedToOutline
+}
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/textfield/DecoratedFieldBox.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/textfield/DecoratedFieldBox.kt
index ec1bd493..86bf92f9 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/textfield/DecoratedFieldBox.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/internal/textfield/DecoratedFieldBox.kt
@@ -44,8 +44,6 @@ import com.sdds.uikit.internal.base.AnimationUtils
 import com.sdds.uikit.internal.base.configure
 import com.sdds.uikit.internal.base.shape.ShapeHelper
 import com.sdds.uikit.internal.base.unsafeLazy
-import com.sdds.uikit.internal.focusselector.FocusSelectorDelegate
-import com.sdds.uikit.internal.focusselector.HasFocusSelector
 import com.sdds.uikit.shape.ShapeModel
 import com.sdds.uikit.shape.Shapeable
 import com.sdds.uikit.viewstate.ViewState
@@ -65,9 +63,8 @@ internal class DecoratedFieldBox(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
-) : FlowLayout(context, attrs, defStyleAttr), ViewStateHolder, Shapeable, HasFocusSelector by FocusSelectorDelegate() {
+) : FlowLayout(context, attrs, defStyleAttr), ViewStateHolder {
 
-    private val _shapeHelper = ShapeHelper(this, attrs, defStyleAttr)
     private val _collapsingTextHelper: CollapsingTextHelper = CollapsingTextHelper(this)
     private val _collapsedBounds = Rect()
     private val _expandedBounds = Rect()
@@ -213,13 +210,9 @@ internal class DecoratedFieldBox(
             chipGroup.adapter = value
         }
 
-    override val shape: ShapeModel?
-        get() = _shapeHelper.shape
-
     init {
         setWillNotDraw(false)
         obtainAttributes(context, attrs, defStyleAttr)
-        applySelector(this, context, attrs, defStyleAttr)
         _collapsingTextHelper.apply {
             setTextSizeInterpolator(AnimationUtils.LINEAR_INTERPOLATOR)
             setPositionInterpolator(AnimationUtils.LINEAR_INTERPOLATOR)
@@ -435,7 +428,7 @@ internal class DecoratedFieldBox(
         if (labelEnabled) {
             mergeDrawableStates(drawableState, intArrayOf(R.attr.sd_state_inner_label))
         }
-        if (editText.isReadOnly) {
+        if (editText?.isReadOnly == true) {
             mergeDrawableStates(drawableState, intArrayOf(R.attr.sd_state_readonly))
         }
         return drawableState
@@ -477,7 +470,6 @@ internal class DecoratedFieldBox(
 
     override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
-        updateFocusSelector(this, gainFocus)
         redispatchActivated()
     }
 
@@ -492,13 +484,6 @@ internal class DecoratedFieldBox(
         super.dispatchSetActivated(isFocused)
     }
 
-    override fun setPressed(pressed: Boolean) {
-        if (isPressed != pressed) {
-            handlePressedChange(this, pressed)
-        }
-        super.setPressed(pressed)
-    }
-
     @Suppress("CustomViewStyleable", "LongMethod")
     private fun obtainAttributes(context: Context, attrs: AttributeSet?, defStyleAttr: Int) {
         val typedArray = context.obtainStyledAttributes(attrs, R.styleable.SdDecoratedFieldBox, defStyleAttr, 0)
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/ShapeDrawable.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/ShapeDrawable.kt
index 9b2e1882..28af378d 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/ShapeDrawable.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/ShapeDrawable.kt
@@ -40,7 +40,7 @@ open class ShapeDrawable() : Drawable(), Shapeable {
     private var _strokeWidth: Float = 0f
     private var _strokeTint: ColorStateList? = null
 
-    private val _shapePaint = Paint()
+    private val _shapePaint = Paint().configure(color = 0)
     private var _shapeTint: ColorStateList? = null
     private var _shape: Shape? = null
 
diff --git a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/Shapeable.kt b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/Shapeable.kt
index 68dd87b1..dc6121e6 100644
--- a/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/Shapeable.kt
+++ b/sdds-core/uikit/src/main/kotlin/com/sdds/uikit/shape/Shapeable.kt
@@ -20,5 +20,5 @@ interface Shapeable {
  * Возвращает для @receiver делегат [Shapeable], с помощью которого можно установить [ShapeModel], либо через
  * атрибуты [attributeSet], либо через [Shapeable.shape].
  */
-fun View.shapeable(attributeSet: AttributeSet? = null, defStyleRes: Int = 0): Shapeable =
-    ShapeHelper(this, attributeSet, defStyleRes)
+fun View.shapeable(attributeSet: AttributeSet? = null, defStyleAttr: Int = 0, defStyleRes: Int = 0): Shapeable =
+    ShapeHelper(this, attributeSet, defStyleAttr, defStyleRes)
diff --git a/sdds-core/uikit/src/main/res/values/base_attrs.xml b/sdds-core/uikit/src/main/res/values/base_attrs.xml
index 0c7d4c75..7d6fec73 100644
--- a/sdds-core/uikit/src/main/res/values/base_attrs.xml
+++ b/sdds-core/uikit/src/main/res/values/base_attrs.xml
@@ -178,4 +178,8 @@
         <attr name="android:lineBreakWordStyle" />
         <attr name="android:lineHeight"/>
     </declare-styleable>
+
+    <declare-styleable name="SdView">
+        <attr name="sd_clipToOutline" format="boolean" />
+    </declare-styleable>
 </resources>
diff --git a/sdds-core/uikit/src/main/res/values/button_attrs.xml b/sdds-core/uikit/src/main/res/values/button_attrs.xml
index 00231e06..334bca52 100644
--- a/sdds-core/uikit/src/main/res/values/button_attrs.xml
+++ b/sdds-core/uikit/src/main/res/values/button_attrs.xml
@@ -57,6 +57,14 @@
         <attr name="sd_disabledAlpha"/>
         <attr name="android:checkable"/>
         <attr name="android:checked"/>
+        <attr name="sd_fsAdditionalColor" />
+        <attr name="sd_fsMainColor" />
+        <attr name="sd_fsMode" />
+        <attr name="sd_fsScaleFactor" />
+        <attr name="sd_fsStrokeWidth" />
+        <attr name="sd_fsStrokeInset" />
+        <attr name="sd_fsShapeAppearance" />
+        <attr name="sd_fsShapeAdjustment" />
     </declare-styleable>
 
 </resources>
diff --git a/sdds-core/uikit/src/main/res/values/cell_layout_attrs.xml b/sdds-core/uikit/src/main/res/values/cell_layout_attrs.xml
index ea1c099e..9dc8c1be 100644
--- a/sdds-core/uikit/src/main/res/values/cell_layout_attrs.xml
+++ b/sdds-core/uikit/src/main/res/values/cell_layout_attrs.xml
@@ -23,6 +23,20 @@
         <attr name="sd_disclosureColor" format="color" />
         <attr name="sd_disclosureIcon" format="reference" />
         <attr name="sd_forceDuplicateParentState" format="boolean" />
+
+        <attr name="sd_shapeAppearance"/>
+        <attr name="sd_shapeAppearanceAdjustment"/>
+        <attr name="sd_strokeWidth"/>
+        <attr name="sd_strokeColor"/>
+        <attr name="sd_clipToOutline"/>
+        <attr name="sd_fsAdditionalColor" />
+        <attr name="sd_fsMainColor" />
+        <attr name="sd_fsMode" />
+        <attr name="sd_fsScaleFactor" />
+        <attr name="sd_fsStrokeWidth" />
+        <attr name="sd_fsStrokeInset" />
+        <attr name="sd_fsShapeAppearance" />
+        <attr name="sd_fsShapeAdjustment" />
     </declare-styleable>
 
     <declare-styleable name="CellLayout_Layout" tools:ignore="ResourceName">
diff --git a/sdds-core/uikit/src/main/res/values/chip_attrs.xml b/sdds-core/uikit/src/main/res/values/chip_attrs.xml
index aff6fc5a..7501cdbb 100644
--- a/sdds-core/uikit/src/main/res/values/chip_attrs.xml
+++ b/sdds-core/uikit/src/main/res/values/chip_attrs.xml
@@ -27,6 +27,14 @@
         <attr name="sd_strokeWidth"/>
         <attr name="android:checkable"/>
         <attr name="android:checked"/>
+        <attr name="sd_fsAdditionalColor" />
+        <attr name="sd_fsMainColor" />
+        <attr name="sd_fsMode" />
+        <attr name="sd_fsScaleFactor" />
+        <attr name="sd_fsStrokeWidth" />
+        <attr name="sd_fsStrokeInset" />
+        <attr name="sd_fsShapeAppearance" />
+        <attr name="sd_fsShapeAdjustment" />
     </declare-styleable>
 
     <declare-styleable name="ChipGroup" tools:ignore="ResourceName">
diff --git a/sdds-core/uikit/src/main/res/values/flow_layout_attrs.xml b/sdds-core/uikit/src/main/res/values/flow_layout_attrs.xml
index 5c8b99c9..373ebf17 100644
--- a/sdds-core/uikit/src/main/res/values/flow_layout_attrs.xml
+++ b/sdds-core/uikit/src/main/res/values/flow_layout_attrs.xml
@@ -13,6 +13,15 @@
         <attr name="sd_strokeWidth"/>
         <attr name="sd_strokeColor"/>
         <attr name="sd_viewState" />
+        <attr name="sd_clipToOutline"/>
+        <attr name="sd_fsAdditionalColor" />
+        <attr name="sd_fsMainColor" />
+        <attr name="sd_fsMode" />
+        <attr name="sd_fsScaleFactor" />
+        <attr name="sd_fsStrokeWidth" />
+        <attr name="sd_fsStrokeInset" />
+        <attr name="sd_fsShapeAppearance" />
+        <attr name="sd_fsShapeAdjustment" />
     </declare-styleable>
 
     <declare-styleable name="FlowLayout_Layout" tools:ignore="ResourceName">
diff --git a/sdds-core/uikit/src/main/res/values/image_view_attrs.xml b/sdds-core/uikit/src/main/res/values/image_view_attrs.xml
index fc9c31b2..7b577aa6 100644
--- a/sdds-core/uikit/src/main/res/values/image_view_attrs.xml
+++ b/sdds-core/uikit/src/main/res/values/image_view_attrs.xml
@@ -25,5 +25,13 @@
         <attr name="sd_shapeAppearance" />
         <attr name="sd_strokeWidth" />
         <attr name="sd_strokeColor" />
+        <attr name="sd_fsAdditionalColor" />
+        <attr name="sd_fsMainColor" />
+        <attr name="sd_fsMode" />
+        <attr name="sd_fsScaleFactor" />
+        <attr name="sd_fsStrokeWidth" />
+        <attr name="sd_fsStrokeInset" />
+        <attr name="sd_fsShapeAppearance" />
+        <attr name="sd_fsShapeAdjustment" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/sdds-core/uikit/src/main/res/values/wrappers_attrs.xml b/sdds-core/uikit/src/main/res/values/wrappers_attrs.xml
index ed2122d4..631821ff 100644
--- a/sdds-core/uikit/src/main/res/values/wrappers_attrs.xml
+++ b/sdds-core/uikit/src/main/res/values/wrappers_attrs.xml
@@ -3,8 +3,33 @@
 
     <declare-styleable name="FrameLayout" tools:ignore="ResourceName">
         <attr name="sd_shapeAppearance"/>
-        <attr name="sd_shapeAppearanceAdjustment" />
+        <attr name="sd_shapeAppearanceAdjustment"/>
         <attr name="sd_strokeWidth"/>
         <attr name="sd_strokeColor"/>
+        <attr name="sd_clipToOutline"/>
+        <attr name="sd_fsAdditionalColor" />
+        <attr name="sd_fsMainColor" />
+        <attr name="sd_fsMode" />
+        <attr name="sd_fsScaleFactor" />
+        <attr name="sd_fsStrokeWidth" />
+        <attr name="sd_fsStrokeInset" />
+        <attr name="sd_fsShapeAppearance" />
+        <attr name="sd_fsShapeAdjustment" />
+    </declare-styleable>
+
+    <declare-styleable name="LinearLayout" tools:ignore="ResourceName">
+        <attr name="sd_shapeAppearance"/>
+        <attr name="sd_shapeAppearanceAdjustment"/>
+        <attr name="sd_strokeWidth"/>
+        <attr name="sd_strokeColor"/>
+        <attr name="sd_clipToOutline"/>
+        <attr name="sd_fsAdditionalColor" />
+        <attr name="sd_fsMainColor" />
+        <attr name="sd_fsMode" />
+        <attr name="sd_fsScaleFactor" />
+        <attr name="sd_fsStrokeWidth" />
+        <attr name="sd_fsStrokeInset" />
+        <attr name="sd_fsShapeAppearance" />
+        <attr name="sd_fsShapeAdjustment" />
     </declare-styleable>
 </resources>
\ No newline at end of file