From 39297abc6c3828fbaae12fe314d5280b86ebf361 Mon Sep 17 00:00:00 2001
From: Vineyro <safronov9991@gmail.com>
Date: Mon, 16 Jun 2025 12:24:55 +0700
Subject: [PATCH] total refactor

---
 .idea/deploymentTargetSelector.xml            |   2 +-
 app/build.gradle.kts                          |   5 +-
 .../java/llc/arma/ble/app/ui/MainActivity.kt  | 287 ++-----
 .../arma/ble/app/ui/common/BottomDialog.kt    |  50 --
 .../ble/app/ui/common/RetryUntilNotNull.kt    |  32 +
 .../app/ui/common/RetryingLoadingTempalte.kt  |  64 ++
 .../llc/arma/ble/app/ui/common/WriteFlow.kt   | 394 ++++++++++
 .../llc/arma/ble/app/ui/mapper/BleMapper.kt   |  68 --
 .../arma/ble/app/ui/mapper/BleViewMapper.kt   |  68 --
 .../java/llc/arma/ble/app/ui/mapper/Mapper.kt |   9 -
 .../llc/arma/ble/app/ui/mapper/TxMapper.kt    |  23 -
 .../arma/ble/app/ui/mapper/TxViewMapper.kt    |  24 -
 .../java/llc/arma/ble/app/ui/model/BleView.kt | 118 ---
 .../llc/arma/ble/app/ui/screen/BleInfoView.kt |   1 -
 .../ble/app/ui/screen/ble/BleListContract.kt  |  15 +-
 .../ble/app/ui/screen/ble/BleListScreen.kt    | 388 ++++++---
 .../ble/app/ui/screen/ble/BleListViewModel.kt |  70 +-
 .../screen/connection/ConnectionContract.kt   | 129 ---
 .../ui/screen/connection/ConnectionScreen.kt  | 326 --------
 .../screen/connection/ConnectionViewModel.kt  | 240 ------
 .../app/ui/screen/filter/BleFilterContract.kt |   1 +
 .../app/ui/screen/filter/BleFilterScreen.kt   | 736 ++++++++++--------
 .../ui/screen/filter/BleFilterViewModel.kt    |  12 +-
 .../history/main/AcceleromterHistory.kt       |   7 +-
 .../main/AccelerometerContract.kt             |  86 +-
 .../accelerometer/main/AccelerometerScreen.kt | 125 +--
 .../main/AccelerometerViewModel.kt            | 244 +++---
 .../main/view/AccelFftAxisEdit.kt             |  47 --
 .../main/view/AccelRealtimeViewEdit.kt        |  23 -
 .../accelerometer/main/view/DisplayState.kt   |  87 ++-
 .../accelerometer/main/view/LoadingState.kt   |  13 +-
 .../accelerometer/main/view/Write.kt          | 262 -------
 .../rt/AccelerometerAccelContract.kt          |  37 +-
 .../rt/AccelerometerAccelViewModel.kt         | 149 ++--
 .../accelerometer/rt/AcceleromterAccel.kt     | 715 +++++++++++------
 .../{ => form}/AccelerometerRealtimeForm.kt   |  11 +-
 .../spectre/AccelerometerSpectre.kt           |  10 +-
 .../write/AccelerometerWriteScreen.kt         |  62 ++
 .../write/AccelerometerWriteViewModel.kt      | 149 ++++
 .../inspection/beacon/BeaconContract.kt       |  55 +-
 .../screen/inspection/beacon/BeaconScreen.kt  |  88 +--
 .../inspection/beacon/BeaconViewModel.kt      | 163 +---
 .../inspection/beacon/view/DisplayState.kt    | 121 +--
 .../ui/screen/inspection/beacon/view/Write.kt | 239 ------
 .../beacon/write/BeaconWriteScreen.kt         |  62 ++
 .../beacon/write/BeaconWriteViewModel.kt      | 102 +++
 .../gate/history/GateHistoryScreen.kt         |   9 +-
 .../gate/history/GateHistoryViewModel.kt      |   1 -
 .../inspection/gate/main/GateContract.kt      |  20 +-
 .../screen/inspection/gate/main/GateScreen.kt | 120 +--
 .../inspection/gate/main/GateViewModel.kt     | 208 ++---
 .../inspection/gate/main/view/DisplayState.kt | 220 +++---
 .../screen/inspection/gate/main/view/Write.kt | 326 --------
 .../gate/table/GateBleTableContract.kt        |  48 +-
 .../gate/table/GateBleTableScreen.kt          | 552 +++++--------
 .../gate/table/GateBleTableViewModel.kt       | 179 ++---
 .../ui/screen/inspection/gate/table/Write.kt  | 205 -----
 .../gate/table/write/BleTableWriteScreen.kt   |  62 ++
 .../table/write/BleTableWriteViewModel.kt     | 103 +++
 .../inspection/gate/write/GateWriteScreen.kt  |  62 ++
 .../gate/write/GateWriteViewModel.kt          | 113 +++
 .../selector/ble/BleSelectorContract.kt       |  26 +
 .../selector/ble/BleSelectorScreen.kt         | 152 ++++
 .../selector/ble/BleSelectorViewModel.kt      |  64 ++
 .../duration/DurationSelectorScreen.kt        | 179 +++--
 .../duration/DurationSelectorViewModel.kt     |   1 -
 .../selector/power/TxPowerSelectorContract.kt |   8 +-
 .../selector/power/TxPowerSelectorScreen.kt   | 145 +++-
 .../power/TxPowerSelectorViewModel.kt         |   1 -
 .../history/ThermometerHistoryContract.kt     |   7 +-
 .../history/ThermometerHistoryScreen.kt       | 168 ++--
 .../history/ThermometerHistoryViewModel.kt    |  33 +-
 .../thermometer/main/DisplayState.kt          | 204 ++---
 .../thermometer/main/LoadingState.kt          |  16 +-
 .../thermometer/main/ThermometerContract.kt   |  47 +-
 .../thermometer/main/ThermometerScreen.kt     |  88 +--
 .../thermometer/main/ThermometerViewModel.kt  | 278 +++----
 .../inspection/thermometer/main/Write.kt      | 234 ------
 .../write/ThermometerWriteScreen.kt           |  61 ++
 .../write/ThermometerWriteViewModel.kt        | 132 ++++
 .../arma/ble/app/ui/screen/locale/Locale.kt   |  32 +
 .../arma/ble/app/ui/screen/main/MainScreen.kt | 349 +--------
 .../screen/password/ChangePasswordScreen.kt   |   4 -
 .../password/ChangePasswordViewModel.kt       |   5 +-
 .../java/llc/arma/ble/app/ui/theme/Theme.kt   |   6 -
 .../java/llc/arma/ble/app/ui/theme/Type.kt    |   2 -
 .../ble/data/repository/BleRepositoryImpl.kt  | 629 +++++++--------
 .../repository/GetAccelerometerHistory.kt     | 324 ++++----
 .../GetAccelerometerRealtimeData.kt           | 172 ++--
 .../repository/ReadAccelerometerSpectre.kt    | 198 ++---
 .../ble/data/repository/ReadHostHistory.kt    | 530 ++++++-------
 .../data/repository/ReadTemperatureHistory.kt | 203 +++--
 .../extensions/BleEnumExtensions.kt           |   6 +-
 .../extensions/BleScanResultExtensions.kt     |  36 +-
 .../java/llc/arma/ble/domain/model/Ble.kt     |  88 +++
 .../java/llc/arma/ble/domain/model/BleName.kt |   3 +
 .../ble/domain/repository/BleRepository.kt    |   6 +-
 .../GetAccelerometerMeasureBySerialFlow.kt    |   4 +-
 .../usecase/GetTemperatureHistoryBySerial.kt  |   4 +-
 common/build.gradle.kts                       |   2 +
 .../arma/common/ClearAccelerometerHistory.kt  |  95 +++
 .../arma/common/GetAccelerometerHistory.kt    |   3 +-
 .../common/GetAccelerometerRealtimeData.kt    |   2 +-
 .../java/llc/arma/common/GetBleBySerial.kt    |   2 +-
 .../arma/common/ReadAccelerometerSpectre.kt   |   2 +-
 .../java/llc/arma/common/ReadHostHistory.kt   |   2 +-
 .../llc/arma/common/ReadTemperatureHistory.kt |   2 +-
 gradle/libs.versions.toml                     |   4 +-
 vgate/build.gradle.kts                        |   4 +-
 vgate/src/main/ic_launcher-playstore.png      | Bin 0 -> 36680 bytes
 .../vgate/app/ui/screens/main/MainScreen.kt   |   8 +-
 .../app/ui/screens/reader/BleReaderScreen.kt  |   2 +-
 .../screens/selector/BleSelectorViewModel.kt  |   6 +-
 .../vehicle/form/VehicleFormContract.kt       |  13 +-
 .../screens/vehicle/form/VehicleFormScreen.kt |  33 +
 .../vehicle/form/VehicleFormViewModel.kt      |  75 +-
 .../selector/VehicleSelectorViewModel.kt      |   1 +
 .../domain/usecase/SendWaitingReports.kt      |   2 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   5 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   5 +-
 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 1468 bytes
 .../mipmap-hdpi/ic_launcher_foreground.webp   | Bin 0 -> 2492 bytes
 .../res/mipmap-hdpi/ic_launcher_round.webp    | Bin 2898 -> 3016 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 1076 bytes
 .../mipmap-mdpi/ic_launcher_foreground.webp   | Bin 0 -> 1458 bytes
 .../res/mipmap-mdpi/ic_launcher_round.webp    | Bin 1772 -> 1914 bytes
 .../main/res/mipmap-xhdpi/ic_launcher.webp    | Bin 1900 -> 1996 bytes
 .../mipmap-xhdpi/ic_launcher_foreground.webp  | Bin 0 -> 3618 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.webp   | Bin 3918 -> 3920 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.webp   | Bin 2884 -> 2976 bytes
 .../mipmap-xxhdpi/ic_launcher_foreground.webp | Bin 0 -> 6414 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.webp  | Bin 5914 -> 6512 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.webp  | Bin 3844 -> 4114 bytes
 .../ic_launcher_foreground.webp               | Bin 0 -> 9682 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 9216 bytes
 .../res/values/ic_launcher_background.xml     |   4 +
 136 files changed, 5954 insertions(+), 6910 deletions(-)
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/common/RetryUntilNotNull.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/common/RetryingLoadingTempalte.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/common/WriteFlow.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/mapper/BleMapper.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/mapper/BleViewMapper.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/mapper/Mapper.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/mapper/TxMapper.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/mapper/TxViewMapper.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/model/BleView.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelFftAxisEdit.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/Write.kt
 rename app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/{ => form}/AccelerometerRealtimeForm.kt (96%)
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteScreen.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteViewModel.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/Write.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteScreen.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteViewModel.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/Write.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/Write.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteScreen.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteViewModel.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteScreen.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteViewModel.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorContract.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorScreen.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorViewModel.kt
 delete mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/Write.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteScreen.kt
 create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteViewModel.kt
 create mode 100644 common/src/main/java/llc/arma/common/ClearAccelerometerHistory.kt
 create mode 100644 vgate/src/main/ic_launcher-playstore.png
 create mode 100644 vgate/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
 create mode 100644 vgate/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
 create mode 100644 vgate/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
 create mode 100644 vgate/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
 create mode 100644 vgate/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
 create mode 100644 vgate/src/main/res/values/ic_launcher_background.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 494db10..bf18bdf 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-02-12T02:51:30.451430800Z">
+        <DropdownSelection timestamp="2025-06-11T08:44:02.119013Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=BV5900DNS00004122" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a47cc5f..c3518ae 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -106,11 +106,12 @@ dependencies {
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)
 
-    implementation(libs.scanner)
-    implementation(libs.client)
+    //implementation(libs.scanner)
+    //implementation(libs.client)
 
     //implementation("no.nordicsemi.kotlin.ble:core:2.0.0-alpha02")
     implementation("no.nordicsemi.kotlin.ble:client-android:2.0.0-alpha02")
+    implementation("org.slf4j:slf4j-simple:2.1.0-alpha1")
 
     implementation(libs.accompanist.permissions)
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt b/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt
index 724e385..a5b836b 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt
@@ -7,70 +7,45 @@ import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.content.Intent
-import android.hardware.camera2.CameraCharacteristics
-import android.hardware.camera2.CameraManager
 import android.os.Build
 import android.os.Bundle
-import android.view.SurfaceView
 import androidx.activity.ComponentActivity
-import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 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.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import llc.arma.ble.app.ui.common.BottomState
-import llc.arma.ble.app.ui.common.LocalBottomDialogState
 import llc.arma.ble.app.ui.screen.main.MainScreen
 import llc.arma.ble.app.ui.theme.BleTheme
+import org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY
 
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
+    init {
+
+        System.setProperty(DEFAULT_LOG_LEVEL_KEY, "Debug")
+
+    }
+
     @SuppressLint("MissingPermission")
-    @OptIn(ExperimentalPermissionsApi::class, ExperimentalMaterialApi::class)
+    @OptIn(ExperimentalPermissionsApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -78,192 +53,94 @@ class MainActivity : ComponentActivity() {
 
         enableEdgeToEdge()
 
-        //installSplashScreen()
+        installSplashScreen()
 
         setContent {
 
             BleTheme {
 
-                val modalState =
-                    rememberModalBottomSheetState(
-                        skipHalfExpanded = true,
-                        initialValue = ModalBottomSheetValue.Hidden
-                    )
-
-                var sheetContent by remember() {
-                    mutableStateOf<@Composable () -> Unit>({})
-                }
-
-                if(modalState.currentValue == ModalBottomSheetValue.Hidden){
-                    sheetContent = {}
-                }
-
-                CompositionLocalProvider(
-                    LocalBottomDialogState provides BottomState(
-                        sheetState = modalState,
-                        setContent = {
-                            sheetContent = it
-                        }
-                    )
-                ) {
-
-                    BoxWithConstraints(
-                        modifier = Modifier.navigationBarsPadding()
+                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                    Surface(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .navigationBarsPadding(),
+                        color = MaterialTheme.colorScheme.background
                     ) {
 
-                        val maxHeight = with(LocalDensity.current) {
-                            this@BoxWithConstraints.constraints.maxHeight.toDp()
-                        }
+                        val multiplePermissionsState =
 
-                        ModalBottomSheetLayout(
-                            modifier = Modifier,
-                            sheetShape = RoundedCornerShape(
-                                topStart = 25.dp,
-                                topEnd = 25.dp
-                            ),
-                            sheetElevation = 0.dp,
-                            sheetState = modalState,
-                            sheetContent = {
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
 
-                                val statusBarHeight = with(LocalDensity.current) {
-                                    WindowInsets.statusBars.getTop(this).toDp()
+                                rememberMultiplePermissionsState(
+                                    listOf(
+                                        Manifest.permission.READ_MEDIA_VIDEO,
+                                        Manifest.permission.READ_MEDIA_IMAGES,
+                                        Manifest.permission.BLUETOOTH_SCAN,
+                                        Manifest.permission.BLUETOOTH_CONNECT
+                                    )
+                                )
+
+                            } else {
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                                    rememberMultiplePermissionsState(
+                                        listOf(
+                                            Manifest.permission.READ_EXTERNAL_STORAGE,
+                                            Manifest.permission.BLUETOOTH_SCAN,
+                                            Manifest.permission.BLUETOOTH_CONNECT
+                                        )
+                                    )
+                                } else {
+                                    rememberMultiplePermissionsState(
+                                        listOf(
+                                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                            Manifest.permission.READ_EXTERNAL_STORAGE,
+                                            Manifest.permission.ACCESS_FINE_LOCATION,
+                                            Manifest.permission.ACCESS_COARSE_LOCATION
+                                        )
+                                    )
                                 }
-                                val scope = rememberCoroutineScope()
-
-                                Column(
-                                    modifier = Modifier.heightIn(max = maxHeight - statusBarHeight),
-                                    horizontalAlignment = Alignment.CenterHorizontally
-                                ) {
-
-                                    Surface(
-                                        modifier = Modifier.fillMaxWidth()
-                                    ) {
-
-                                        Column(
-                                            modifier = Modifier.navigationBarsPadding()
-                                        ) {
-
-                                            Spacer(modifier = Modifier.height(14.dp))
-
-                                            Surface(
-                                                shape = CircleShape,
-                                                color = MaterialTheme.colorScheme.primary.copy(alpha = 0.7f),
-                                                modifier = Modifier
-                                                    .align(Alignment.CenterHorizontally)
-                                                    .size(
-                                                        width = 54.dp,
-                                                        height = 5.dp
-                                                    )
-
-                                            ) {}
-
-                                            Spacer(modifier = Modifier.height(12.dp))
-
-                                            sheetContent()
-
-                                        }
-
-                                    }
-
-                                }
-
-                                BackHandler(modalState.isVisible) {
-                                    scope.launch { modalState.hide() }
-                                }
-
-                            },
-                            content = {
-
-                                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                                    Surface(
-                                        modifier = Modifier
-                                            .fillMaxSize()
-                                            .navigationBarsPadding(),
-                                        color = MaterialTheme.colorScheme.background
-                                    ) {
-
-                                        val multiplePermissionsState =
-
-                                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-
-                                                rememberMultiplePermissionsState(
-                                                    listOf(
-                                                        Manifest.permission.READ_MEDIA_VIDEO,
-                                                        Manifest.permission.READ_MEDIA_IMAGES,
-                                                        Manifest.permission.BLUETOOTH_SCAN,
-                                                        Manifest.permission.BLUETOOTH_CONNECT
-                                                    )
-                                                )
-
-                                            } else {
-                                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                                                    rememberMultiplePermissionsState(
-                                                        listOf(
-                                                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                                                            Manifest.permission.BLUETOOTH_SCAN,
-                                                            Manifest.permission.BLUETOOTH_CONNECT
-                                                        )
-                                                    )
-                                                } else {
-                                                    rememberMultiplePermissionsState(
-                                                        listOf(
-                                                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                                                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                                                            Manifest.permission.ACCESS_FINE_LOCATION,
-                                                            Manifest.permission.ACCESS_COARSE_LOCATION
-                                                        )
-                                                    )
-                                                }
-                                            }
-
-                                        var bleEnabled by remember {
-                                            mutableStateOf(mBluetoothAdapter.isEnabled)
-                                        }
-
-                                        val lifecycleOwner = LocalLifecycleOwner.current
-                                        val lifecycleState by lifecycleOwner.lifecycle.currentStateFlow.collectAsState()
-
-                                        LaunchedEffect(lifecycleState) {
-                                            bleEnabled = mBluetoothAdapter.isEnabled
-                                        }
-
-                                        if (multiplePermissionsState.allPermissionsGranted) {
-
-                                            if (bleEnabled) {
-
-                                                MainScreen()
-
-                                            } else {
-
-                                                val context = LocalContext.current
-
-                                                LaunchedEffect(mBluetoothAdapter.isEnabled) {
-                                                    val intent =
-                                                        Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-                                                    (context as Activity).startActivityForResult(
-                                                        intent,
-                                                        1
-                                                    )
-                                                }
-                                            }
-
-                                        } else {
-
-                                            LaunchedEffect(multiplePermissionsState) {
-                                                multiplePermissionsState.launchMultiplePermissionRequest()
-                                            }
-
-                                        }
-
-                                    }
-                                }
-
                             }
 
-                        )
+                        var bleEnabled by remember {
+                            mutableStateOf(mBluetoothAdapter.isEnabled)
+                        }
+
+                        val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current
+                        val lifecycleState by lifecycleOwner.lifecycle.currentStateFlow.collectAsState()
+
+                        LaunchedEffect(lifecycleState) {
+                            bleEnabled = mBluetoothAdapter.isEnabled
+                        }
+
+                        if (multiplePermissionsState.allPermissionsGranted) {
+
+                            if (bleEnabled) {
+
+                                MainScreen()
+
+                            } else {
+
+                                val context = LocalContext.current
+
+                                LaunchedEffect(mBluetoothAdapter.isEnabled) {
+                                    val intent =
+                                        Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+                                    (context as Activity).startActivityForResult(
+                                        intent,
+                                        1
+                                    )
+                                }
+                            }
+
+                        } else {
+
+                            LaunchedEffect(multiplePermissionsState) {
+                                multiplePermissionsState.launchMultiplePermissionRequest()
+                            }
+
+                        }
 
                     }
-
                 }
 
             }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt b/app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt
deleted file mode 100644
index 65243d9..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package llc.arma.ble.app.ui.common
-
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.remember
-
-val LocalBottomDialogState = compositionLocalOf<BottomState?> { null }
-
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-fun rememberBottomDialogState(): BottomDialogState {
-
-    val state = LocalBottomDialogState.current
-
-    return remember {
-        BottomDialogState(
-            sheetState = state?.sheetState,
-            setContent = state?.setContent ?: { }
-        )
-    }
-}
-
-class BottomState @OptIn(ExperimentalMaterialApi::class) constructor(
-    val sheetState: ModalBottomSheetState?,
-    val setContent: (@Composable () -> Unit) -> Unit,
-)
-
-class BottomDialogState @OptIn(ExperimentalMaterialApi::class) constructor(
-    val sheetState: ModalBottomSheetState?,
-    val setContent: (@Composable () -> Unit) -> Unit,
-) {
-
-    @OptIn(ExperimentalMaterialApi::class)
-    suspend fun show(
-        content: @Composable () -> Unit
-    ){
-        setContent(content)
-        //if(sheetState?.currentValue != ModalBottomSheetValue.Expanded)
-        sheetState?.show()
-    }
-
-    @OptIn(ExperimentalMaterialApi::class)
-    suspend fun hide(){
-        sheetState?.hide()
-        setContent { }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/common/RetryUntilNotNull.kt b/app/src/main/java/llc/arma/ble/app/ui/common/RetryUntilNotNull.kt
new file mode 100644
index 0000000..98c6495
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/common/RetryUntilNotNull.kt
@@ -0,0 +1,32 @@
+package llc.arma.ble.app.ui.common
+
+import kotlinx.coroutines.delay
+
+
+suspend inline fun <T> retryUntilNotNull(
+    retryDelay: Long = 10_000,
+    onNewAttempt: (attempt: Int) -> Unit,
+    block: () -> T?
+) : T {
+
+    var attempt = 0
+
+    var result: T? = null
+
+    while (result == null) {
+
+        result = block()
+
+        if(result == null) {
+
+            onNewAttempt(++attempt)
+
+            delay(retryDelay)
+
+        }
+
+    }
+
+    return result
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/common/RetryingLoadingTempalte.kt b/app/src/main/java/llc/arma/ble/app/ui/common/RetryingLoadingTempalte.kt
new file mode 100644
index 0000000..0d5c3df
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/common/RetryingLoadingTempalte.kt
@@ -0,0 +1,64 @@
+package llc.arma.ble.app.ui.common
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material3.ContainedLoadingIndicator
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun RetryingLoadingTemplate(
+    attempt: Int?,
+    onCancel: () -> Unit,
+) {
+
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier.widthIn(max = 230.dp)
+    ) {
+
+        ContainedLoadingIndicator()
+
+        attempt?.let {
+
+            Spacer(Modifier.height(16.dp))
+
+            Text(
+                text = "Повторная попытка ${it}"
+            )
+
+            Text(
+                text = "Во время загрузки произошла ошибка",
+                textAlign = TextAlign.Center,
+                style = MaterialTheme.typography.bodySmall
+            )
+
+            Spacer(Modifier.height(8.dp))
+
+            TextButton(
+                onClick = onCancel
+            ) {
+
+                Text(
+                    text = "Отмена"
+                )
+
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/common/WriteFlow.kt b/app/src/main/java/llc/arma/ble/app/ui/common/WriteFlow.kt
new file mode 100644
index 0000000..2d89052
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/common/WriteFlow.kt
@@ -0,0 +1,394 @@
+package llc.arma.ble.app.ui.common
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ContainedLoadingIndicator
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.max
+import llc.arma.ble.R
+import llc.arma.ble.app.ui.screen.ShapeType
+import llc.arma.ble.app.ui.screen.ShapeType.Companion.takeShapeType
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
+import llc.arma.ble.app.ui.screen.locale.localizedName
+import llc.arma.ble.domain.model.Ble
+
+class WriteFlowContract {
+
+    sealed class Event : ViewEvent {
+
+        data object OnWrite : Event()
+
+        data object OnNavigateUp : Event()
+
+    }
+
+    sealed class State : ViewState {
+
+        data object Loading : State()
+
+        data class Display(
+            val items: List<WriteItemData>
+        ) : State()
+
+        data object Writing : State()
+
+        data object Success : State()
+
+        data object Error : State()
+
+    }
+
+    sealed class Effect : ViewSideEffect {
+
+        sealed class Navigation : Effect(){
+
+            data object Up : Navigation()
+
+            data object UpSuccess : Navigation()
+
+        }
+
+    }
+
+}
+
+@Composable
+fun WriteFlow(
+    state: WriteFlowContract.State,
+    onEvent: (event: WriteFlowContract.Event) -> Unit
+) {
+
+    when(state){
+        is WriteFlowContract.State.Display -> DisplayState(state, onEvent)
+        is WriteFlowContract.State.Error -> ErrorState(state, onEvent)
+        is WriteFlowContract.State.Loading -> LoadingState()
+        is WriteFlowContract.State.Success -> SuccessState(state, onEvent)
+        is WriteFlowContract.State.Writing -> WritingState(state, onEvent)
+    }
+
+}
+
+@Composable
+fun LoadingState(){}
+
+data class WriteItemData(
+    val title: String,
+    val subtitle: String
+)
+
+@Composable
+fun DisplayState(
+    state: WriteFlowContract.State.Display,
+    onEvent: (event: WriteFlowContract.Event) -> Unit
+){
+
+    Column(
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+
+        Text(
+            text = "Запись изменений",
+            style = MaterialTheme.typography.titleLarge
+        )
+
+        Column (
+            verticalArrangement = Arrangement.spacedBy(2.dp),
+            modifier = Modifier.heightIn(max = 400.dp).verticalScroll(rememberScrollState())
+        ) {
+
+            val items = state.items
+
+            items.forEach {
+                WriteItem(
+                    shapeType = items.takeShapeType(it),
+                    itemData = it
+                )
+            }
+
+        }
+
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.align(Alignment.End)
+        ) {
+
+            OutlinedButton(
+                onClick = {
+                    onEvent(WriteFlowContract.Event.OnNavigateUp)
+                }
+            ) {
+                Text(
+                    text = "Отменить"
+                )
+            }
+
+            Button(
+                onClick = {
+                    onEvent(WriteFlowContract.Event.OnWrite)
+                }
+            ) {
+                Text(
+                    text = "Записать"
+                )
+            }
+
+        }
+
+    }
+
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun WritingState(
+    state: WriteFlowContract.State.Writing,
+    onEvent: (event: WriteFlowContract.Event) -> Unit
+){
+
+    Column(
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+
+        Text(
+            text = "Запись изменений",
+            style = MaterialTheme.typography.titleLarge
+        )
+
+        Box(
+            contentAlignment = Alignment.Center,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(120.dp)
+                .align(Alignment.CenterHorizontally)
+        ){
+
+            ContainedLoadingIndicator()
+
+        }
+
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.align(Alignment.End)
+        ) {
+
+            OutlinedButton(
+                onClick = {
+                    onEvent(WriteFlowContract.Event.OnNavigateUp)
+                }
+            ) {
+                Text(
+                    text = "Отменить"
+                )
+            }
+
+            Button(
+                enabled = false,
+                onClick = {}
+            ) {
+                Text(
+                    text = "Записать"
+                )
+            }
+
+        }
+
+    }
+
+}
+
+@Composable
+fun ErrorState(
+    state: WriteFlowContract.State.Error,
+    onEvent: (event: WriteFlowContract.Event) -> Unit
+){
+
+    Column(
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+
+        Text(
+            text = "Запись изменений",
+            style = MaterialTheme.typography.titleLarge
+        )
+
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(120.dp)
+                .padding(8.dp)
+                .align(Alignment.CenterHorizontally)
+        ){
+
+            Image(
+
+                painter = painterResource(R.drawable.ic_error),
+                contentDescription = null,
+                modifier = Modifier.weight(1f).aspectRatio(1f),
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Text(
+                modifier = Modifier.align(Alignment.CenterHorizontally),
+                text = "Ошибка записи"
+            )
+
+        }
+
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.align(Alignment.End)
+        ) {
+
+            OutlinedButton(
+                onClick = {
+                    onEvent(WriteFlowContract.Event.OnNavigateUp)
+                }
+            ) {
+                Text(
+                    text = "Отменить"
+                )
+            }
+
+            Button(
+                onClick = {
+                    onEvent(WriteFlowContract.Event.OnWrite)
+                }
+            ) {
+                Text(
+                    text = "Повторить"
+                )
+            }
+
+        }
+
+    }
+
+}
+
+@Composable
+fun SuccessState(
+    state: WriteFlowContract.State.Success,
+    onEvent: (event: WriteFlowContract.Event) -> Unit
+){
+
+    Column(
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+
+        Text(
+            text = "Запись изменений",
+            style = MaterialTheme.typography.titleLarge
+        )
+
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(120.dp)
+                .padding(8.dp)
+                .align(Alignment.CenterHorizontally)
+        ){
+
+            Image(
+
+                painter = painterResource(R.drawable.ic_done),
+                contentDescription = null,
+                modifier = Modifier.weight(1f).aspectRatio(1f),
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Text(
+                modifier = Modifier.align(Alignment.CenterHorizontally),
+                text = "Успешно завершено"
+            )
+
+        }
+
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.align(Alignment.End)
+        ) {
+
+            Button(
+                onClick = {
+                    onEvent(WriteFlowContract.Event.OnNavigateUp)
+                }
+            ) {
+                Text(
+                    text = "Ок"
+                )
+            }
+
+        }
+
+    }
+
+}
+
+@Composable
+private fun WriteItem(
+    shapeType: ShapeType,
+    itemData: WriteItemData
+){
+
+    Surface(
+        color = MaterialTheme.colorScheme.surfaceContainer,
+        shape = shapeType.shape
+    ) {
+
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(
+                    vertical = 8.dp,
+                    horizontal = 16.dp
+                )
+
+        ) {
+
+            Column(
+                modifier = Modifier.weight(1f)
+            ) {
+
+                Text(text = itemData.title)
+
+                Text(
+                    style = MaterialTheme.typography.bodyMedium,
+                    text = itemData.subtitle
+                )
+
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/mapper/BleMapper.kt b/app/src/main/java/llc/arma/ble/app/ui/mapper/BleMapper.kt
deleted file mode 100644
index e60a92a..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/mapper/BleMapper.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package llc.arma.ble.app.ui.mapper
-
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.domain.model.Ble
-import javax.inject.Inject
-
-class BleMapper @Inject constructor(
-    private val txMapper: TxMapper
-) : Mapper<Ble, BleView> {
-
-    override fun map(input: Ble): BleView {
-        return when(input){
-            is Ble.Beacon -> {
-                BleView.Beacon(
-                    info = input.info,
-                    state = BleView.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    )
-                )
-            }
-            is Ble.Thermometer -> {
-                BleView.Thermometer(
-                    info = input.info,
-                    state = BleView.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    ),
-                    thermometerState = BleView.Thermometer.ThermometerState(
-                        temperature = BleView.Thermometer.ThermometerState.TemperatureState(input.thermometerState.temperature, false),
-                        historyInterval = input.thermometerState.historyInterval,
-                        saveHistory = input.thermometerState.saveHistory
-                    )
-                )
-            }
-
-            is Ble.Accelerometer -> {
-                BleView.Accelerometer(
-                    info = input.info,
-                    state = BleView.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    ),
-                    accelerometerState = BleView.Accelerometer.AccelerometerState(
-                        saveHistorySettings = input.accelerometerState.saveHistorySettings,
-                        historyInterval = input.accelerometerState.historyInterval,
-                        readInterval = input.accelerometerState.readInterval
-                    )
-                )
-            }
-
-            is Ble.Gate -> {
-                BleView.Gate(
-                    info = input.info,
-                    state = BleView.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    ),
-                    hostState = BleView.Gate.HostState(
-                        historyInterval = input.gateState.historyInterval,
-                        readInterval = input.gateState.readInterval
-                    )
-                )
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/mapper/BleViewMapper.kt b/app/src/main/java/llc/arma/ble/app/ui/mapper/BleViewMapper.kt
deleted file mode 100644
index 7eeaded..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/mapper/BleViewMapper.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package llc.arma.ble.app.ui.mapper
-
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.domain.model.Ble
-import javax.inject.Inject
-
-class BleViewMapper @Inject constructor(
-    private val txMapper: TxViewMapper
-) : Mapper<BleView, Ble> {
-
-    override fun map(input: BleView): Ble {
-        return when(input){
-            is BleView.Beacon -> {
-                Ble.Beacon(
-                    info = input.info,
-                    state = Ble.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    )
-                )
-            }
-            is BleView.Thermometer -> {
-                Ble.Thermometer(
-                    info = input.info,
-                    state = Ble.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    ),
-                    thermometerState = Ble.Thermometer.ThermometerState(
-                        temperature = input.thermometerState.temperature.value,
-                        historyInterval = input.thermometerState.historyInterval,
-                        saveHistory = input.thermometerState.saveHistory
-                    )
-                )
-            }
-
-            is BleView.Accelerometer -> {
-                Ble.Accelerometer(
-                    info = input.info,
-                    state = Ble.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    ),
-                    accelerometerState = Ble.Accelerometer.AccelerometerState(
-                        saveHistorySettings = input.accelerometerState.saveHistory,
-                        historyInterval = input.accelerometerState.historyInterval,
-                        readInterval = input.accelerometerState.readInterval
-                    )
-                )
-            }
-
-            is BleView.Gate -> {
-                Ble.Gate(
-                    info = input.info,
-                    state = Ble.BleState(
-                        tx = txMapper.map(input.state.tx),
-                        version = input.state.version
-                    ),
-                    gateState = Ble.Gate.HostState(
-                        historyInterval = input.hostState.historyInterval,
-                        readInterval = input.hostState.readInterval
-                    )
-                )
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/mapper/Mapper.kt b/app/src/main/java/llc/arma/ble/app/ui/mapper/Mapper.kt
deleted file mode 100644
index 715aaae..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/mapper/Mapper.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package llc.arma.ble.app.ui.mapper
-
-interface Mapper<I, O> {
-
-    fun map(input: I): O
-
-    fun map(input: List<I>): List<O> = input.map { map(it) }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/mapper/TxMapper.kt b/app/src/main/java/llc/arma/ble/app/ui/mapper/TxMapper.kt
deleted file mode 100644
index bd824fb..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/mapper/TxMapper.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package llc.arma.ble.app.ui.mapper
-
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.domain.model.Ble
-import javax.inject.Inject
-
-class TxMapper @Inject constructor() : Mapper<Ble.BleState.TX, BleView.BleState.TX> {
-
-    override fun map(input: Ble.BleState.TX): BleView.BleState.TX {
-        return when(input){
-            Ble.BleState.TX.MINUS_40 -> BleView.BleState.TX.MINUS_40
-            Ble.BleState.TX.MINUS_20 -> BleView.BleState.TX.MINUS_20
-            Ble.BleState.TX.MINUS_16 -> BleView.BleState.TX.MINUS_16
-            Ble.BleState.TX.MINUS_12 -> BleView.BleState.TX.MINUS_12
-            Ble.BleState.TX.MINUS_8 -> BleView.BleState.TX.MINUS_8
-            Ble.BleState.TX.MINUS_4 -> BleView.BleState.TX.MINUS_4
-            Ble.BleState.TX.ZERO -> BleView.BleState.TX.ZERO
-            Ble.BleState.TX.PLUS_3 -> BleView.BleState.TX.PLUS_3
-            Ble.BleState.TX.PLUS_4 -> BleView.BleState.TX.PLUS_4
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/mapper/TxViewMapper.kt b/app/src/main/java/llc/arma/ble/app/ui/mapper/TxViewMapper.kt
deleted file mode 100644
index 838e768..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/mapper/TxViewMapper.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package llc.arma.ble.app.ui.mapper
-
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.domain.model.Ble
-import javax.inject.Inject
-
-class TxViewMapper @Inject constructor() : Mapper<BleView.BleState.TX, Ble.BleState.TX> {
-
-    override fun map(input: BleView.BleState.TX): Ble.BleState.TX {
-        return when(input){
-            BleView.BleState.TX.MINUS_40 -> Ble.BleState.TX.MINUS_40
-            BleView.BleState.TX.MINUS_20 -> Ble.BleState.TX.MINUS_20
-            BleView.BleState.TX.MINUS_16 -> Ble.BleState.TX.MINUS_16
-            BleView.BleState.TX.MINUS_12 -> Ble.BleState.TX.MINUS_12
-            BleView.BleState.TX.MINUS_8 -> Ble.BleState.TX.MINUS_8
-            BleView.BleState.TX.MINUS_4 -> Ble.BleState.TX.MINUS_4
-            BleView.BleState.TX.ZERO -> Ble.BleState.TX.ZERO
-            BleView.BleState.TX.PLUS_3 -> Ble.BleState.TX.PLUS_3
-            BleView.BleState.TX.PLUS_4 -> Ble.BleState.TX.PLUS_4
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/model/BleView.kt b/app/src/main/java/llc/arma/ble/app/ui/model/BleView.kt
deleted file mode 100644
index 1e75bf9..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/model/BleView.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-package llc.arma.ble.app.ui.model
-
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableLongStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import llc.arma.ble.data.repository.BleRepositoryImpl
-import llc.arma.ble.domain.model.Ble
-import llc.arma.ble.domain.model.BleInfo
-
-sealed class BleView(
-    val info: BleInfo
-) {
-
-    class Accelerometer(
-        info: BleInfo,
-        val state: BleState,
-        val accelerometerState: AccelerometerState
-    ) : BleView(info) {
-
-        class AccelerometerState(
-            saveHistorySettings: Ble.Accelerometer.HistorySettings,
-            historyInterval: Long,
-            readInterval: Long
-        ) {
-            var saveHistory by mutableStateOf(saveHistorySettings)
-            var historyInterval by mutableLongStateOf(historyInterval)
-            var readInterval by mutableLongStateOf(readInterval)
-        }
-
-    }
-
-    class Beacon(
-        info: BleInfo,
-        val state: BleState
-    ) : BleView(info)
-
-    class Thermometer(
-        info: BleInfo,
-        val state: BleState,
-        val thermometerState: ThermometerState
-    ) : BleView(info) {
-
-        class ThermometerState(
-            temperature: TemperatureState,
-            saveHistory: Boolean,
-            historyInterval: Long
-        ) {
-
-            class TemperatureState(
-                val value: Float,
-                val loading: Boolean
-            )
-
-            var temperature by mutableStateOf(temperature)
-            var saveHistory by mutableStateOf(saveHistory)
-            var historyInterval by mutableLongStateOf(historyInterval)
-
-        }
-
-    }
-
-    class Gate(
-        info: BleInfo,
-        val state: BleState,
-        val hostState: HostState
-    ) : BleView(info) {
-
-        class HostState(
-            historyInterval: Long,
-            readInterval: Long
-        ) {
-            var historyInterval by mutableLongStateOf(historyInterval)
-            var readInterval by mutableLongStateOf(readInterval)
-        }
-
-    }
-
-    class BleState(
-        tx: TX,
-        val version: BleRepositoryImpl.Version
-    ){
-
-        var tx by mutableStateOf(tx)
-
-        enum class TX(val value: Int) {
-            MINUS_40(-40),
-            MINUS_20(-20),
-            MINUS_16(-16),
-            MINUS_12(-12),
-            MINUS_8(-8),
-            MINUS_4(-4),
-            ZERO(0),
-            PLUS_3(3),
-            PLUS_4(4);
-
-            val powerPercentage: Int
-                get() {
-                    return when(this){
-                        MINUS_40 -> 1
-                        MINUS_20 -> 5
-                        MINUS_16 -> 7
-                        MINUS_12 -> 10
-                        MINUS_8 -> 16
-                        MINUS_4 -> 20
-                        ZERO -> 40
-                        PLUS_3 -> 80
-                        PLUS_4 -> 100
-                    }
-                }
-
-        }
-
-
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/BleInfoView.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/BleInfoView.kt
index 7287a01..dea8a33 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/BleInfoView.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/BleInfoView.kt
@@ -22,7 +22,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListContract.kt
index 24acbfe..8b303b7 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListContract.kt
@@ -3,7 +3,6 @@ package llc.arma.ble.app.ui.screen.ble
 import llc.arma.ble.app.ui.common.ViewEvent
 import llc.arma.ble.app.ui.common.ViewSideEffect
 import llc.arma.ble.app.ui.common.ViewState
-import llc.arma.ble.domain.model.BleFilter
 import llc.arma.ble.domain.model.BleInfo
 
 class BleListContract {
@@ -22,8 +21,18 @@ class BleListContract {
 
     data class State(
         val bleList: List<BleInfo>,
-        val bleFilter: BleFilter
-    ) : ViewState
+        val filterIsEmpty: Boolean,
+        val summary: BleSummary
+    ) : ViewState {
+
+        data class BleSummary(
+            val all: Int,
+            val lowBattery: Int,
+            val lost: Int,
+            val active: Int
+        )
+
+    }
 
     sealed class Effect : ViewSideEffect {
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListScreen.kt
index 03903fd..3fdf48f 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListScreen.kt
@@ -1,7 +1,6 @@
 package llc.arma.ble.app.ui.screen.ble
 
 import android.os.SystemClock
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -20,17 +19,21 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowRightAlt
+import androidx.compose.material.icons.rounded.Battery1Bar
 import androidx.compose.material.icons.rounded.BatteryFull
-import androidx.compose.material.icons.rounded.CompareArrows
+import androidx.compose.material.icons.rounded.Bluetooth
 import androidx.compose.material.icons.rounded.FilterAlt
-import androidx.compose.material.icons.rounded.Link
+import androidx.compose.material.icons.rounded.KeyboardArrowDown
+import androidx.compose.material.icons.rounded.Summarize
+import androidx.compose.material.icons.rounded.TimerOff
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.FilledIconToggleButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -38,21 +41,22 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableLongStateOf
+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.draw.alpha
-import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
@@ -63,25 +67,20 @@ import com.ramcosta.composedestinations.generated.destinations.AccelerometerScre
 import com.ramcosta.composedestinations.generated.destinations.BeaconScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.BleFilterScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.GateScreenDestination
-import com.ramcosta.composedestinations.generated.destinations.ThermometerHistoryScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.ThermometerScreenDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.SignalLevel
-import llc.arma.ble.app.ui.common.rememberBottomDialogState
 import llc.arma.ble.app.ui.screen.ShapeType
 import llc.arma.ble.app.ui.screen.ShapeType.Companion.takeShapeType
 import llc.arma.ble.app.ui.screen.locale.icon
-import llc.arma.ble.domain.model.BleFilter
 import llc.arma.ble.domain.model.BleInfo
-import llc.arma.ble.domain.model.ConnectedBleInfo
 import kotlin.math.pow
 
 @Destination<RootGraph>(start = true)
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun BleListScreen(
     //onNavigationEvent: (BleListContract.Effect.Navigation) -> Unit
@@ -131,47 +130,16 @@ fun BleListScreen(
                 },
                 actions = {
 
-                    Row(
-                        modifier = Modifier
-                            .padding(horizontal = 8.dp)
-                            .align(Alignment.CenterVertically)
-                    ) {
-
-                        Text(text = "${state.bleList.size}")
-
-                        Spacer(modifier = Modifier.width(12.dp))
-
-                        Text(text = "${state.bleList.filter {
-                            it.batteryLevel == 100
-                        }.filterNot { SystemClock.elapsedRealtime() - it.scanTime > 10_000 }.size}")
-
-                        Text(text = " | ")
-
-                        Text(
-                            text = "${state.bleList.filter { SystemClock.elapsedRealtime() - it.scanTime > 10_000 }.size}",
-                            color = LocalContentColor.current.copy(alpha = ContentAlpha.disabled)
-                        )
-
-                        Text(text = " | ")
-
-                        Text(
-                            text = "${state.bleList.filter { it.batteryLevel < 100 }.size}",
-                            color = MaterialTheme.colorScheme.error
-                        )
-
-                    }
-
-                    IconButton(
-                        onClick = {
+                    FilledIconToggleButton(
+                        checked = state.filterIsEmpty.not(),
+                        onCheckedChange = {
                             viewModel.setEvent(BleListContract.Event.OnShowFilter)
                         }
                     ) {
-
                         Icon(
                             imageVector = Icons.Rounded.FilterAlt,
                             contentDescription = null
                         )
-
                     }
 
                 }
@@ -183,39 +151,9 @@ fun BleListScreen(
             modifier = Modifier.padding(it)
         ) {
 
-            val filteredData = remember(state.bleList, state.bleFilter) {
+            var showSummary by remember { mutableStateOf(false) }
 
-                state.bleList.filter {
-                    (it.type == state.bleFilter.bleType || state.bleFilter.bleType == null) &&
-                            it.name.contains(state.bleFilter.name) &&
-                            it.serial.contains(state.bleFilter.mac) &&
-                            state.bleFilter.rssi.contains(it.rssi?.toFloat() ?: Float.MIN_VALUE) &&
-                            state.bleFilter.battery.contains(it.batteryLevel.toFloat())
-                }.let {
-                    when (state.bleFilter.sortField) {
-                        BleFilter.Field.Name -> it.sortedBy { it.name }
-                        BleFilter.Field.Mac -> it.sortedBy { it.serial }
-                        BleFilter.Field.Distance -> it.sortedBy {
-                            10.0.pow(
-                                (it.tx.toDouble() - (it.rssi?.toDouble() ?: 0.0) - 74) / 20
-                            ).toFloat()
-                        }
-
-                        BleFilter.Field.Dbm -> it.sortedBy { it.rssi ?: 0 }
-                        BleFilter.Field.Battery -> it.sortedBy { it.batteryLevel }
-                    }
-                }.let {
-
-                    when (state.bleFilter.sortOrder) {
-                        BleFilter.Order.Asc -> it
-                        BleFilter.Order.Desc -> it.reversed()
-                    }
-
-                }
-
-            }
-
-            if(filteredData.isEmpty()){
+            if(state.bleList.isEmpty()){
                 LinearProgressIndicator(
                     strokeCap = StrokeCap.Round,
                     modifier = Modifier
@@ -224,7 +162,7 @@ fun BleListScreen(
                 )
             }
 
-            if(filteredData.isEmpty()){
+            if(state.bleList.isEmpty()){
 
                 Box(modifier = Modifier.fillMaxSize()){
                     Text(
@@ -242,14 +180,130 @@ fun BleListScreen(
                     verticalArrangement = Arrangement.spacedBy(2.dp),
                 ) {
 
+                    item {
+
+                        SummaryItem(
+                            shape = if(showSummary) ShapeType.Start else ShapeType.Singleton,
+                            onClick = { showSummary = showSummary.not() }
+                        ) {
+
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                modifier = Modifier.padding(vertical = 4.dp)
+                            ) {
+
+                                if(showSummary) {
+
+                                    Text("Итоги")
+
+                                } else {
+
+                                    Text("${state.summary.all} - ${state.summary.active} | ")
+
+                                    Text(
+                                        text = "${state.summary.lost}",
+                                        color = LocalContentColor.current.copy(alpha = 0.5f)
+                                    )
+
+                                    Text(" | ")
+
+                                    Text(
+                                        text = "${state.summary.lowBattery}",
+                                        color = MaterialTheme.colorScheme.error
+                                    )
+
+                                }
+
+                                Spacer(
+                                    modifier = Modifier.weight(1f)
+                                )
+
+                                Icon(
+                                    imageVector = Icons.Rounded.KeyboardArrowDown,
+                                    contentDescription = null,
+                                    modifier = Modifier.rotate(if(showSummary) 180f else 0f)
+                                )
+
+                            }
+
+                        }
+
+                    }
+
+                    if(showSummary) {
+
+                        item {
+
+                            SummaryItem(
+                                shape = ShapeType.Middle,
+                                icon = Icons.Rounded.Summarize,
+                                onClick = { showSummary = true }
+                            ) {
+
+                                Text("Всего: ${state.summary.all}")
+
+                            }
+
+                        }
+
+                        item {
+
+                            SummaryItem(
+                                shape = ShapeType.Middle,
+                                icon = Icons.Rounded.Bluetooth
+                            ) {
+
+                                Text("Активные: ${state.summary.active}")
+
+                            }
+
+                        }
+
+                        item {
+
+                            SummaryItem(
+                                shape = ShapeType.Middle,
+                                icon = Icons.Rounded.TimerOff,
+                                contentColor = LocalContentColor.current.copy(alpha = 0.7f)
+                            ) {
+
+                                Text(
+                                    style = MaterialTheme.typography.bodyMedium,
+                                    text = "Потерянные: ${state.summary.lost}"
+                                )
+
+                            }
+
+                        }
+
+                        item {
+
+                            SummaryItem(
+                                contentColor = MaterialTheme.colorScheme.error,
+                                shape = ShapeType.End,
+                                icon = Icons.Rounded.Battery1Bar
+                            ) {
+                                Text("Разряженные: ${state.summary.lowBattery}")
+                            }
+
+                        }
+
+                    }
+
+                    item {
+                        Spacer(
+                            modifier = Modifier.height(12.dp)
+                        )
+                    }
+
                     items(
-                        items = filteredData,
+                        items = state.bleList,
                         key = { it.serial }
                     ) {
 
                         BleItem(
                             ble = it,
-                            shapeType = filteredData.takeShapeType(it),
+                            shapeType = state.bleList.takeShapeType(it),
                             onClick = {
                                 viewModel.setEvent(BleListContract.Event.OnConnectToBle(it.serial))
                             }
@@ -264,7 +318,48 @@ fun BleListScreen(
 
     }
 
+}
 
+@Composable
+fun SummaryItem(
+    shape: ShapeType,
+    icon: ImageVector? = null,
+    contentColor: Color = Color.Unspecified,
+    onClick: (() -> Unit)? = null,
+    label: @Composable () -> Unit
+){
+
+    Surface(
+        shape = shape.shape,
+        color = MaterialTheme.colorScheme.surfaceContainer,
+        modifier = Modifier.fillMaxWidth()
+    ) {
+
+        CompositionLocalProvider(LocalContentColor provides contentColor) {
+
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                modifier = Modifier.clickable { onClick?.invoke() }.padding(horizontal = 16.dp, vertical = 8.dp)
+            ) {
+
+                if(icon != null) {
+
+                    Icon(
+                        imageVector = icon,
+                        contentDescription = null,
+                        modifier = Modifier.size(16.dp)
+                    )
+
+                }
+
+                label()
+
+            }
+
+        }
+
+    }
 
 }
 
@@ -301,6 +396,7 @@ private fun Int.toSignalLevel(): Int {
 fun BleItem(
     shapeType: ShapeType,
     ble: BleInfo,
+    checked: Boolean,
     onClick: () -> Unit
 ){
 
@@ -313,7 +409,6 @@ fun BleItem(
     val highAlpha = ContentAlpha.high
     val disabledAlpha = ContentAlpha.disabled
 
-
     var time by remember {
         mutableLongStateOf(
             SystemClock.elapsedRealtime()
@@ -333,27 +428,118 @@ fun BleItem(
         highAlpha
     }
 
+    Surface(
+        shape = shapeType.shape,
+        color = color,
+        onClick = onClick,
+        modifier = Modifier
+            .alpha(alpha)
+            .fillMaxWidth()
+    ) {
+
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(
+                horizontal = 16.dp,
+                vertical = 12.dp
+            )
+        ) {
+
+            BleItemContent(
+                ble = ble,
+                color = color,
+                time = time,
+            )
+
+            Checkbox(
+                checked = checked,
+                onCheckedChange = null
+            )
+
+        }
+
+    }
+
+}
+
+@Composable
+fun BleItem(
+    shapeType: ShapeType,
+    ble: BleInfo,
+    onClick: () -> Unit
+){
+
+    val color = if(ble.batteryLevel < 100){
+        MaterialTheme.colorScheme.errorContainer
+    } else {
+        MaterialTheme.colorScheme.surfaceContainer
+    }
+
+    var time by remember {
+        mutableLongStateOf(
+            SystemClock.elapsedRealtime()
+        )
+    }
+
+    LaunchedEffect(ble.scanTime) {
+        while(true) {
+            time = SystemClock.elapsedRealtime()
+            delay(1000)
+        }
+    }
+
+    val alpha = if(time - ble.scanTime > 10_000){
+        ContentAlpha.disabled
+    } else {
+        ContentAlpha.high
+    }
+
+    Surface(
+        shape = shapeType.shape,
+        color = color,
+        onClick = onClick,
+        modifier = Modifier
+            .alpha(alpha)
+            .fillMaxWidth()
+    ) {
+
+        BleItemContent(
+            ble = ble,
+            color = color,
+            time = time,
+            modifier = Modifier.padding(
+                horizontal = 16.dp, vertical = 12.dp
+            )
+        )
+
+    }
+
+}
+
+@Composable
+private fun BleItemContent(
+    ble: BleInfo,
+    color: Color,
+    time: Long,
+    modifier: Modifier = Modifier
+){
+
     Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(shapeType.shape)
-            .background(color)
-            .clickable(onClick = onClick)
-            .padding(horizontal = 16.dp, vertical = 12.dp)
-            .alpha(alpha)
-
+        modifier = modifier.fillMaxWidth()
     ) {
 
         Box {
 
             ItemIcon {
+
                 Icon(
                     modifier = Modifier.align(Alignment.Center),
                     imageVector = ble.type.icon,
                     contentDescription = null
                 )
+
             }
 
             if(ble.tableStatus !== BleInfo.HistoryTableStatus.DISABLED){
@@ -403,7 +589,7 @@ fun BleItem(
                     modifier = Modifier.alpha(0.7f)
                 ) {
 
-                    val color = if(ble.batteryLevel < 100){
+                    val contentColor = if(ble.batteryLevel < 100){
                         MaterialTheme.colorScheme.error
                     } else {
                         LocalContentColor.current
@@ -413,7 +599,7 @@ fun BleItem(
                         modifier = Modifier.size(16.dp),
                         imageVector = Icons.Rounded.BatteryFull,
                         contentDescription = null,
-                        tint = color
+                        tint = contentColor
                     )
 
                     Box {
@@ -427,7 +613,7 @@ fun BleItem(
                         Text(
                             style = MaterialTheme.typography.bodyMedium,
                             text = ble.batteryLevel.toString() + " %",
-                            color = color
+                            color = contentColor
                         )
 
                     }
@@ -447,16 +633,8 @@ fun BleItem(
                     modifier = Modifier.alpha(0.7f)
                 ) {
 
-                    Icon(
-                        modifier = Modifier.size(16.dp),
-                        imageVector = Icons.Rounded.CompareArrows,
-                        contentDescription = null
-                    )
-
-                    Spacer(modifier = Modifier.width(4.dp))
-
                     val distance = remember(ble.rssi, ble.tx) {
-                        String.format("%.3f", (10.0.pow((ble.tx.toDouble() - (ble.rssi?.toDouble() ?: 0.0) - 74) / 20))) + " м."
+                        String.format("%.2f", (10.0.pow((ble.tx.toDouble() - (ble.rssi?.toDouble() ?: 0.0) - 74) / 20))) + " м."
                     }
 
                     Text(
@@ -474,7 +652,7 @@ fun BleItem(
                     SignalLevel(level = ble.rssi?.toSignalLevel() ?: 0)
 
                     Spacer(modifier = Modifier.width(4.dp))
-                    
+
                     Box {
 
                         Text(
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListViewModel.kt
index 28c6eac..b9eba6f 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/ble/BleListViewModel.kt
@@ -1,17 +1,18 @@
 package llc.arma.ble.app.ui.screen.ble
 
+import android.os.SystemClock
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
 import llc.arma.ble.domain.model.BleFilter
 import llc.arma.ble.domain.model.BleInfo
 import llc.arma.ble.domain.usecase.GetBleAroundFlow
 import llc.arma.ble.domain.usecase.filter.GetFilterFlow
 import javax.inject.Inject
+import kotlin.math.pow
 
 @HiltViewModel
 class BleListViewModel @Inject constructor(
@@ -19,25 +20,8 @@ class BleListViewModel @Inject constructor(
     private val getBleAroundFlow: GetBleAroundFlow
 ) : BaseViewModel<BleListContract.State, BleListContract.Event, BleListContract.Effect>() {
 
-    private var scannerJob: Job? = null
-
-    init {
-
-        viewModelScope.launch {
-
-            getFilterFlow.invoke().onEach {
-                setState {
-                    copy(
-                        bleFilter = it
-                    )
-                }
-            }.launchIn(this)
-        }
-
-    }
-
     override fun setInitialState(): BleListContract.State =
-        BleListContract.State(emptyList(), BleFilter())
+        BleListContract.State(emptyList(), false, BleListContract.State.BleSummary(0,0,0,0))
 
     override fun handleEvents(event: BleListContract.Event) {
         when(event){
@@ -86,6 +70,8 @@ class BleListViewModel @Inject constructor(
         }
     }
 
+    private var scannerJob: Job? = null
+
     private fun reduce(
         state: BleListContract.State,
         event: BleListContract.Event.OnResetScanner
@@ -93,12 +79,50 @@ class BleListViewModel @Inject constructor(
 
         scannerJob?.cancel()
 
-        scannerJob = getBleAroundFlow().onEach {
+        scannerJob = getFilterFlow().combine(getBleAroundFlow()){ filter, ble ->
+
+            val bleList = ble.filter {
+                (it.type == filter.bleType || filter.bleType == null) &&
+                        it.name.contains(filter.name) &&
+                        it.serial.contains(filter.mac) &&
+                        filter.rssi.contains(it.rssi?.toFloat() ?: Float.MIN_VALUE) &&
+                        filter.battery.contains(it.batteryLevel.toFloat())
+            }.let {
+                when (filter.sortField) {
+                    BleFilter.Field.Name -> it.sortedBy { it.name }
+                    BleFilter.Field.Mac -> it.sortedBy { it.serial }
+                    BleFilter.Field.Distance -> it.sortedBy {
+                        10.0.pow(
+                            (it.tx.toDouble() - (it.rssi?.toDouble() ?: 0.0) - 74) / 20
+                        ).toFloat()
+                    }
+
+                    BleFilter.Field.Dbm -> it.sortedBy { it.rssi ?: 0 }
+                    BleFilter.Field.Battery -> it.sortedBy { it.batteryLevel }
+                }
+            }.let {
+
+                when (filter.sortOrder) {
+                    BleFilter.Order.Asc -> it
+                    BleFilter.Order.Desc -> it.reversed()
+                }
+
+            }
+
             setState {
-                copy(
-                    bleList = it
+                BleListContract.State(
+                    bleList,
+                    filter == BleFilter(),
+                    BleListContract.State.BleSummary(
+                        all = ble.size,
+                        active = ble.filter { it.batteryLevel == 100 }
+                            .filterNot { SystemClock.elapsedRealtime() - it.scanTime > 10_000 }.size,
+                        lost = ble.count { SystemClock.elapsedRealtime() - it.scanTime > 10_000 },
+                        lowBattery = ble.count { it.batteryLevel < 100 }
+                    )
                 )
             }
+
         }.launchIn(viewModelScope)
     }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt
deleted file mode 100644
index c5cd83f..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package llc.arma.ble.app.ui.screen.connection
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-import llc.arma.ble.app.ui.common.ViewEvent
-import llc.arma.ble.app.ui.common.ViewSideEffect
-import llc.arma.ble.app.ui.common.ViewState
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
-import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconContract
-import llc.arma.ble.app.ui.screen.inspection.gate.main.GateContract
-import llc.arma.ble.app.ui.screen.inspection.thermometer.main.ThermometerContract
-import llc.arma.ble.domain.common.BleException
-import llc.arma.ble.domain.model.Ble
-import llc.arma.ble.domain.model.BleInfo
-import llc.arma.ble.domain.usecase.AccelScale
-import llc.arma.ble.domain.usecase.AccelViewMode
-import llc.arma.ble.domain.usecase.FftAxis
-import llc.arma.ble.domain.usecase.FftFrequency
-import llc.arma.ble.domain.usecase.FftViewMode
-
-class ConnectionContract {
-
-    sealed class Event : ViewEvent {
-
-        data object RefreshBle : Event()
-
-        data object OnNavigateUp : Event()
-
-        data class OnBeaconNavigationEvent(
-            val event: BeaconContract.Effect.Navigation
-        ) : Event()
-
-        data class OnHostNavigationEvent(
-            val event: GateContract.Effect.Navigation
-        ) : Event()
-
-        data class OnThermometerNavigationEvent(
-            val event: ThermometerContract.Effect.Navigation
-        ) : Event()
-
-        data class OnAccelNavigationEvent(
-            val event: AccelerometerContract.Effect.Navigation
-        ) : Event()
-
-
-    }
-
-    sealed class State : ViewState {
-
-        data object Loading : State()
-
-        data class DisplayException(
-            val tries: Long,
-            val exception: BleException
-        ) : State()
-
-        data class Display(
-            val ble: Ble
-        ) : State()
-
-    }
-
-    sealed class Effect : ViewSideEffect {
-
-        sealed class Navigation : Effect() {
-
-            data object NavigateUp : Navigation()
-
-            data class NavigateToChangePassword(
-                val serial: String
-            ) : Navigation()
-
-            data class NavigateToRotationsStatistic(
-                val serial: String
-            ) : Navigation()
-
-            data class NavigateToThermometerHistory(
-                val bleSerial: String
-            ) : Navigation()
-
-        }
-
-        sealed class InnerNavigation : Effect() {
-
-            @Parcelize
-            data class NavigateToAccelHistory(
-                val ble: BleInfo,
-                val accelScale: AccelScale,
-                val accelMode: AccelViewMode,
-                val fftAxis: FftAxis,
-                val fftMode: FftViewMode,
-                val frequency: FftFrequency
-            ) : InnerNavigation(), Parcelable
-
-            @Parcelize
-            data class NavigateToAccelRealtime(
-                val ble: BleInfo,
-                val accelScale: AccelScale,
-                val accelMode: AccelViewMode,
-                val fftAxis: FftAxis,
-                val fftMode: FftViewMode,
-                val frequency: FftFrequency
-            ) : InnerNavigation(), Parcelable
-
-            @Parcelize
-            data class NavigateToAccelSpectre(
-                val ble: BleInfo,
-                val accelScale: AccelScale,
-                val accelMode: AccelViewMode,
-                val fftAxis: FftAxis,
-                val fftMode: FftViewMode,
-                val frequency: FftFrequency
-            ) : InnerNavigation(), Parcelable
-
-            @Parcelize
-            data class NavigateToHostHistory(
-                val ble: BleInfo
-            ) : InnerNavigation(), Parcelable
-
-            @Parcelize
-            data class NavigateHostToBleTable(
-                val serial: String
-            ) : InnerNavigation(), Parcelable
-
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt
deleted file mode 100644
index 948ee7b..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt
+++ /dev/null
@@ -1,326 +0,0 @@
-package llc.arma.ble.app.ui.screen.connection
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.SizeTransform
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.animation.togetherWith
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowBack
-import androidx.compose.material3.ContainedLoadingIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import llc.arma.ble.app.ui.common.SmallPrimaryButton
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ConnectionScreen(
-    onNavigationEvent: (ConnectionContract.Effect.Navigation) -> Unit
-) {
-
-    val viewModel = hiltViewModel<ConnectionViewModel>()
-    val state = viewModel.viewState.value
-
-    var innerScreen by rememberSaveable {
-        mutableStateOf<ConnectionContract.Effect.InnerNavigation?>(null)
-    }
-
-    BackHandler(innerScreen != null) {
-        innerScreen = null
-    }
-
-    LaunchedEffect("effect"){
-        viewModel.effect.onEach {
-            when(it){
-                is ConnectionContract.Effect.Navigation -> onNavigationEvent(it)
-                is ConnectionContract.Effect.InnerNavigation -> {
-                    innerScreen = it
-                }
-            }
-        }.launchIn(this)
-    }
-
-    Box {
-
-        Column {
-
-            TopAppBar(
-                navigationIcon = {
-                    IconButton(
-                        onClick = {
-                            if(innerScreen != null) {
-                                innerScreen = null
-                            } else {
-                                viewModel.setEvent(ConnectionContract.Event.OnNavigateUp)
-                            }
-                        },
-                        content = {
-                            Icon(
-                                imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
-                                contentDescription = null
-                            )
-                        }
-                    )
-                },
-                title = {
-
-                    AnimatedContent(
-                        targetState = when (state) {
-                            is ConnectionContract.State.Display -> state.ble.info.name
-                            is ConnectionContract.State.DisplayException -> "Исключение"
-                            is ConnectionContract.State.Loading -> "Соединение.."
-                        },
-                        transitionSpec = {
-                            ((slideInVertically { height -> height } + fadeIn()).togetherWith(
-                                slideOutVertically { height -> -height } + fadeOut())).using(
-                                SizeTransform(clip = false)
-                            )
-                        }
-                    ) { targetText ->
-                        Text(
-                            text = targetText
-                        )
-                    }
-
-                }
-            )
-
-            /*when (state) {
-                is ConnectionContract.State.DisplayException -> DisplayException(
-                    viewState = state,
-                    onEvent = viewModel::setEvent
-                )
-
-                is ConnectionContract.State.Loading -> LoadingState()
-                is ConnectionContract.State.Display -> {
-                    when (state.ble) {
-                        is Ble.Beacon -> BeaconScreen(
-                            null,
-                            onNavigationEvent = {
-                                viewModel.setEvent(
-                                    ConnectionContract.Event.OnBeaconNavigationEvent(
-                                        it
-                                    )
-                                )
-                            }
-                        )
-
-                        is Ble.Thermometer -> {
-
-                            ThermometerScreen(
-                                txSelectResult = null,
-                                //ble = state.ble,
-                                onNavigationEvent = {
-                                    viewModel.setEvent(
-                                        ConnectionContract.Event.OnThermometerNavigationEvent(
-                                            it
-                                        )
-                                    )
-                                }
-                            )
-
-                        }
-
-                        is Ble.Accelerometer -> {
-                            /*AccelerometerScreen {
-                                viewModel.setEvent(
-                                    ConnectionContract.Event.OnAccelNavigationEvent(it)
-                                )
-                            }*/
-                        }
-
-                        is Ble.Gate -> {
-                            GateScreen(
-                                null,
-                                null,
-                                onNavigationEvent = {
-                                    viewModel.setEvent(
-                                        ConnectionContract.Event.OnHostNavigationEvent(it)
-                                    )
-                                }
-                            )
-                        }
-
-                    }
-
-                }
-
-            }*/
-
-        }
-
-        /*
-
-        innerScreen?.let {
-
-            Surface(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .statusBarsPadding()
-            ) {
-
-                when(it){
-                    is ConnectionContract.Effect.InnerNavigation.NavigateToAccelHistory -> {
-
-                        AccelerometerHistory(
-                            ble = it.ble,
-                            accelMode = it.accelMode,
-                            fftAxis = it.fftAxis,
-                            fftMode = it.fftMode,
-                            frequency = it.frequency,
-                            accelScale = it.accelScale,
-                            onDismiss = {
-                                innerScreen = null
-                            }
-                        ){
-                            onNavigationEvent(ConnectionContract.Effect.Navigation.NavigateToRotationsStatistic(it.ble.serial))
-                        }
-
-                    }
-
-                    is ConnectionContract.Effect.InnerNavigation.NavigateToAccelRealtime -> {
-                        AccelerometerRealtime(
-                            ble = it.ble,
-                            accelMode = it.accelMode,
-                            fftAxis = it.fftAxis,
-                            fftMode = it.fftMode,
-                            frequency = it.frequency,
-                            accelScale = it.accelScale,
-                            onDismiss = {
-                                innerScreen = null
-                            }
-                        )
-                    }
-                    is ConnectionContract.Effect.InnerNavigation.NavigateToAccelSpectre -> {
-                        AccelerometerSpectre(
-                            ble = it.ble,
-                            accelMode = it.accelMode,
-                            fftAxis = it.fftAxis,
-                            fftMode = it.fftMode,
-                            frequency = it.frequency,
-                            accelScale = it.accelScale,
-                            onDismiss = {
-                                innerScreen = null
-                            }
-                        )
-                    }
-
-                    is ConnectionContract.Effect.InnerNavigation.NavigateToHostHistory -> {
-                        /*GateHistoryScreen(
-                            ble = it.ble,
-                            onDismiss = {
-                                innerScreen = null
-                            }
-                        )*/
-
-                    }
-
-                    is ConnectionContract.Effect.InnerNavigation.NavigateHostToBleTable -> {
-
-                        GateBleTableScreen {
-                            when(it){
-                                GateBleTableContract.Effect.Navigation.Up -> {
-                                    innerScreen = null
-                                }
-                            }
-                        }
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        */
-
-    }
-
-}
-
-
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
-@Composable
-private fun LoadingState(){
-    Box(
-        contentAlignment = Alignment.Center,
-        modifier = Modifier.fillMaxSize()
-    ) {
-        ContainedLoadingIndicator()
-    }
-}
-
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
-@Composable
-private fun DisplayException(
-    viewState: ConnectionContract.State.DisplayException,
-    onEvent: (ConnectionContract.Event) -> Unit
-){
-
-    Box(
-        modifier = Modifier.fillMaxSize()
-    ) {
-
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.align(Alignment.Center).widthIn(max = 270.dp)
-        ) {
-
-
-            ContainedLoadingIndicator()
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Text(
-                textAlign = TextAlign.Center,
-                style = MaterialTheme.typography.titleMedium,
-                text = "Повторная попытка ${viewState.tries}"
-            )
-
-            Text(
-                textAlign = TextAlign.Center,
-                style = MaterialTheme.typography.titleMedium,
-                text = "Неудалось соединится с устройством"
-            )
-
-            Spacer(modifier = Modifier.height(18.dp))
-
-            SmallPrimaryButton(
-                label = "Отмена"
-            ) {
-                onEvent(ConnectionContract.Event.OnNavigateUp)
-            }
-
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt
deleted file mode 100644
index b91d837..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt
+++ /dev/null
@@ -1,240 +0,0 @@
-package llc.arma.ble.app.ui.screen.connection
-
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import llc.arma.ble.app.ui.common.BaseViewModel
-import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconContract
-import llc.arma.ble.domain.usecase.GetBleBySerial
-import javax.inject.Inject
-
-@HiltViewModel
-class ConnectionViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle,
-    private val getBleBySerial: GetBleBySerial,
-) : BaseViewModel<ConnectionContract.State, ConnectionContract.Event, ConnectionContract.Effect>() {
-
-    init {
-        refreshBle()
-    }
-
-    override fun setInitialState() = ConnectionContract.State.Loading
-
-    override fun handleEvents(event: ConnectionContract.Event) {
-        when(event){
-            is ConnectionContract.Event.OnBeaconNavigationEvent -> reduce(viewState.value, event)
-            is ConnectionContract.Event.OnHostNavigationEvent -> reduce(viewState.value, event)
-            is ConnectionContract.Event.OnNavigateUp -> reduce(viewState.value, event)
-            is ConnectionContract.Event.OnThermometerNavigationEvent -> reduce(viewState.value, event)
-            is ConnectionContract.Event.RefreshBle -> reduce(viewState.value, event)
-            is ConnectionContract.Event.OnAccelNavigationEvent -> reduce(viewState.value, event)
-        }
-    }
-
-    private fun reduce(
-        state: ConnectionContract.State,
-        event: ConnectionContract.Event.OnHostNavigationEvent
-    ) {
-        /*when(event.event){
-            GateContract.Effect.Navigation.Up -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateUp
-                }
-            }
-            is GateContract.Effect.Navigation.ChangePassword -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateToChangePassword(savedStateHandle.get<String>("serial")!!)
-                }
-            }
-
-            is GateContract.Effect.Navigation.GateHistory -> {
-                setEffect {
-                    ConnectionContract.Effect.InnerNavigation.NavigateToHostHistory(
-                        event.event.ble
-                    )
-                }
-            }
-
-            is GateContract.Effect.Navigation.BleTable -> {
-                setEffect {
-                    ConnectionContract.Effect.InnerNavigation.NavigateHostToBleTable(
-                        event.event.serial
-                    )
-                }
-            }
-
-            is GateContract.Effect.Navigation.TxSelector -> TODO()
-            is GateContract.Effect.Navigation.ReadIntervalSelector -> TODO()
-        }*/
-    }
-
-    private fun reduce(
-        state: ConnectionContract.State,
-        event: ConnectionContract.Event.OnBeaconNavigationEvent
-    ) {
-        when(event.event){
-            BeaconContract.Effect.Navigation.Up -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateUp
-                }
-            }
-            is BeaconContract.Effect.Navigation.PasswordForm -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateToChangePassword(savedStateHandle.get<String>("serial")!!)
-                }
-            }
-
-            is BeaconContract.Effect.Navigation.TxSelector -> TODO()
-        }
-    }
-
-    private fun reduce(
-        state: ConnectionContract.State,
-        event: ConnectionContract.Event.OnThermometerNavigationEvent
-    ) {
-        /*(event.event){
-            ThermometerContract.Effect.Navigation.Up -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateUp
-                }
-            }
-            ThermometerContract.Effect.Navigation.ChangePassword -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateToChangePassword(savedStateHandle.get<String>("serial")!!)
-                }
-            }
-
-            is ThermometerContract.Effect.Navigation.ThermometerHistory -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateToThermometerHistory(event.event.bleSerial)
-                }
-            }
-
-            is ThermometerContract.Effect.Navigation.TxSelector -> TODO()
-        }*/
-    }
-
-    private fun reduce(
-        state: ConnectionContract.State,
-        event: ConnectionContract.Event.OnAccelNavigationEvent
-    ) {
-        /*when(event.event){
-            is AccelerometerContract.Effect.Navigation.ChangePassword -> {
-                setEffect {
-                    ConnectionContract.Effect.Navigation.NavigateToChangePassword(savedStateHandle.get<String>("serial")!!)
-                }
-            }
-
-            is AccelerometerContract.Effect.Navigation.AccelHistory -> {
-                setEffect {
-                    ConnectionContract.Effect.InnerNavigation.NavigateToAccelHistory(
-                        event.event.ble,
-                        event.event.accelScale,
-                        event.event.accelMode,
-                        event.event.fftAxis,
-                        event.event.fftMode,
-                        event.event.frequency
-                    )
-                }
-            }
-
-            is AccelerometerContract.Effect.Navigation.AccelRealtime -> {
-                setEffect {
-                    ConnectionContract.Effect.InnerNavigation.NavigateToAccelRealtime(
-                        event.event.ble,
-                        event.event.accelScale,
-                        event.event.accelMode,
-                        event.event.fftAxis,
-                        event.event.fftMode,
-                        event.event.frequency
-                    )
-                }
-            }
-            is AccelerometerContract.Effect.Navigation.AccelSpectre -> {
-                setEffect {
-                    ConnectionContract.Effect.InnerNavigation.NavigateToAccelSpectre(
-                        event.event.ble,
-                        event.event.accelScale,
-                        event.event.accelMode,
-                        event.event.fftAxis,
-                        event.event.fftMode,
-                        event.event.frequency
-                    )
-                }
-            }
-
-            is AccelerometerContract.Effect.Navigation.TxPowerSelector -> TODO()
-            is AccelerometerContract.Effect.Navigation.ReadIntervalSelector -> TODO()
-            is AccelerometerContract.Effect.Navigation.SaveIntervalSelector -> TODO()
-        }
-        */
-    }
-
-    private fun reduce(
-        state: ConnectionContract.State,
-        event: ConnectionContract.Event.OnNavigateUp
-    ) {
-
-        setEffect {
-            ConnectionContract.Effect.Navigation.NavigateUp
-        }
-
-    }
-
-    private fun reduce(
-        state: ConnectionContract.State,
-        event: ConnectionContract.Event.RefreshBle
-    ) {
-
-        refreshBle()
-
-    }
-
-    private fun refreshBle(){
-        /*val serial = savedStateHandle.get<String>("serial")
-
-        if(serial != null){
-
-            viewModelScope.launch {
-
-                setState {
-                    ConnectionContract.State.Loading
-                }
-
-                var tries = 0L
-
-                while (true) {
-
-                    getBleBySerial(serial, this).fold(
-                        onSuccess = {
-
-                            it.onEach {
-                                setState {
-                                    ConnectionContract.State.Display(
-                                        ble = it
-                                    )
-                                }
-                            }.launchIn(viewModelScope)
-
-                            return@launch
-
-                        },
-                        onFailure = {
-                            setState {
-                                tries += 1
-                                ConnectionContract.State.DisplayException(tries, it)
-                            }
-                        }
-                    )
-
-                }
-            }
-        } else {
-            throw IllegalArgumentException("serial arg must not be null")
-        }*/
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterContract.kt
index 7d3f094..9947b38 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterContract.kt
@@ -26,6 +26,7 @@ class BleFilterContract {
         data object Loading : State()
 
         data class Display(
+            val origin: BleFilter,
             val filter: BleFilter
         ) : State()
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterScreen.kt
index 0d7eee3..be3ba94 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterScreen.kt
@@ -1,5 +1,6 @@
 package llc.arma.ble.app.ui.screen.filter
 
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -152,399 +153,447 @@ private fun DisplayState(
     state: BleFilterContract.State.Display
 ){
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = Modifier
-            .padding(16.dp)
-            .verticalScroll(rememberScrollState())
-    ) {
+    Column {
 
-        Surface(
-            color = MaterialTheme.colorScheme.surfaceContainer,
-            shape = RoundedCornerShape(16.dp)
+        Column(
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier
+                .weight(1f)
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = 16.dp)
+                .padding(bottom = 16.dp)
         ) {
 
-            Column(
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-                modifier = Modifier.padding(16.dp)
+            Surface(
+                color = MaterialTheme.colorScheme.surfaceContainer,
+                shape = RoundedCornerShape(16.dp)
             ) {
 
-                Row(
-                    verticalAlignment = Alignment.CenterVertically
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    modifier = Modifier.padding(16.dp)
                 ) {
 
-                    var expanded by remember { mutableStateOf(false) }
-
-                    val sortTextFileState = TextFieldState(
-                        state.filter.sortField.localized,
-                        TextRange(state.filter.sortField.localized.length)
-                    )
-
-                    ExposedDropdownMenuBox(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(end = 8.dp),
-                        expanded = expanded,
-                        onExpandedChange = {
-                            expanded = it
-                        }
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
 
-                        OutlinedTextField(
-                            state = sortTextFileState,
-                            readOnly = true,
-                            lineLimits = TextFieldLineLimits.SingleLine,
-                            label = { Text("Сортировка") },
-                            leadingIcon = {
-                                Icon(
-                                    imageVector = Icons.AutoMirrored.Rounded.Sort,
-                                    contentDescription = null,
-                                    modifier = Modifier.padding(12.dp)
-                                )
-                            },
-                            trailingIcon = {
-                                ExposedDropdownMenuDefaults.TrailingIcon(
-                                    expanded = expanded
-                                )
-                            },
-                            modifier = Modifier
-                                .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
-                                .fillMaxWidth(),
-                        )
+                        var expanded by remember { mutableStateOf(false) }
 
-                        ExposedDropdownMenu(
+                        val sortTextFileState = remember(state.filter.sortField) {
+                            TextFieldState(
+                                state.filter.sortField.localized,
+                                TextRange(state.filter.sortField.localized.length)
+                            )
+                        }
+
+                        ExposedDropdownMenuBox(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(end = 8.dp),
                             expanded = expanded,
-                            onDismissRequest = { expanded = false },
+                            onExpandedChange = {
+                                expanded = it
+                            }
                         ) {
 
-                            BleFilter.Field.entries.forEach { selectionOption ->
-                                DropdownMenuItem(
-                                    onClick = {
-                                        viewModel.setEvent(BleFilterContract.Event.OnFilterChanged(
-                                            state.filter.copy(
-                                                sortField = selectionOption
+                            OutlinedTextField(
+                                state = sortTextFileState,
+                                readOnly = true,
+                                lineLimits = TextFieldLineLimits.SingleLine,
+                                label = { Text("Сортировка") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.AutoMirrored.Rounded.Sort,
+                                        contentDescription = null,
+                                        modifier = Modifier.padding(12.dp)
+                                    )
+                                },
+                                trailingIcon = {
+                                    ExposedDropdownMenuDefaults.TrailingIcon(
+                                        expanded = expanded
+                                    )
+                                },
+                                modifier = Modifier
+                                    .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
+                                    .fillMaxWidth(),
+                            )
+
+                            ExposedDropdownMenu(
+                                expanded = expanded,
+                                onDismissRequest = { expanded = false },
+                            ) {
+
+                                BleFilter.Field.entries.forEach { selectionOption ->
+                                    DropdownMenuItem(
+                                        onClick = {
+                                            viewModel.setEvent(
+                                                BleFilterContract.Event.OnFilterChanged(
+                                                    state.filter.copy(
+                                                        sortField = selectionOption
+                                                    )
+                                                )
                                             )
-                                        ))
-                                        expanded = false
-                                    },
-                                    text = {
-                                        Text(text = selectionOption.localized)
-                                    },
-                                    contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
-                                )
+                                            expanded = false
+                                        },
+                                        text = {
+                                            Text(text = selectionOption.localized)
+                                        },
+                                        contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
+                                    )
+                                }
                             }
                         }
+
                     }
 
-                }
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-
-                    var expanded by remember { mutableStateOf(false) }
-                    val sortTextFieldState = TextFieldState(
-                        state.filter.sortOrder.localized,
-                        TextRange(state.filter.sortOrder.localized.length)
-                    )
-
-                    ExposedDropdownMenuBox(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(end = 8.dp),
-                        expanded = expanded,
-                        onExpandedChange = {
-                            expanded = it
-                        }
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
 
-                        OutlinedTextField(
-                            state = sortTextFieldState,
-                            readOnly = true,
-                            label = { Text("Напрвление сортировки") },
-                            leadingIcon = {
-                                Icon(
-                                    imageVector = Icons.Rounded.SortByAlpha,
-                                    contentDescription = null,
-                                )
-                            },
-                            trailingIcon = {
-                                ExposedDropdownMenuDefaults.TrailingIcon(
-                                    expanded = expanded
-                                )
-                            },
-                            modifier = Modifier
-                                .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
-                                .fillMaxWidth(),
-                        )
+                        var expanded by remember { mutableStateOf(false) }
 
-                        ExposedDropdownMenu(
+                        val sortTextFieldState = remember(state.filter.sortOrder) {
+                            TextFieldState(
+                                state.filter.sortOrder.localized,
+                                TextRange(state.filter.sortOrder.localized.length)
+                            )
+                        }
+
+                        ExposedDropdownMenuBox(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(end = 8.dp),
                             expanded = expanded,
-                            onDismissRequest = { expanded = false }
+                            onExpandedChange = {
+                                expanded = it
+                            }
                         ) {
 
-                            BleFilter.Order.entries.forEach { selectionOption ->
-                                DropdownMenuItem(
-                                    onClick = {
-                                        viewModel.setEvent(BleFilterContract.Event.OnFilterChanged(
-                                            state.filter.copy(sortOrder = selectionOption)
-                                        ))
-                                        expanded = false
-                                    },
-                                    text = {
-                                        Text(text = selectionOption.localized)
-                                    },
-                                    contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
-                                )
+                            OutlinedTextField(
+                                state = sortTextFieldState,
+                                readOnly = true,
+                                label = { Text("Напрвление сортировки") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Rounded.SortByAlpha,
+                                        contentDescription = null,
+                                    )
+                                },
+                                trailingIcon = {
+                                    ExposedDropdownMenuDefaults.TrailingIcon(
+                                        expanded = expanded
+                                    )
+                                },
+                                modifier = Modifier
+                                    .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
+                                    .fillMaxWidth(),
+                            )
+
+                            ExposedDropdownMenu(
+                                expanded = expanded,
+                                onDismissRequest = { expanded = false }
+                            ) {
+
+                                BleFilter.Order.entries.forEach { selectionOption ->
+                                    DropdownMenuItem(
+                                        onClick = {
+                                            viewModel.setEvent(
+                                                BleFilterContract.Event.OnFilterChanged(
+                                                    state.filter.copy(sortOrder = selectionOption)
+                                                )
+                                            )
+                                            expanded = false
+                                        },
+                                        text = {
+                                            Text(text = selectionOption.localized)
+                                        },
+                                        contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
+                                    )
+                                }
                             }
                         }
+
                     }
 
-                }
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-
-                    var expanded by remember { mutableStateOf(false) }
-                    val typeTextFiledState = TextFieldState(
-                        state.filter.bleType.localized,
-                        TextRange(state.filter.bleType.localized.length)
-                    )
-
-                    ExposedDropdownMenuBox(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(end = 8.dp),
-                        expanded = expanded,
-                        onExpandedChange = {
-                            expanded = it
-                        }
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
 
-                        OutlinedTextField(
-                            state = typeTextFiledState,
-                            lineLimits = TextFieldLineLimits.SingleLine,
-                            readOnly = true,
-                            label = { Text("Тип") },
-                            leadingIcon = {
-                                Icon(
-                                    imageVector = Icons.Rounded.Bluetooth,
-                                    contentDescription = null
-                                )
-                            },
-                            trailingIcon = {
-                                ExposedDropdownMenuDefaults.TrailingIcon(
-                                    expanded = expanded
-                                )
-                            },
-                            modifier = Modifier
-                                .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
-                                .fillMaxWidth(),
-                        )
+                        var expanded by remember { mutableStateOf(false) }
 
-                        ExposedDropdownMenu(
+                        val typeTextFiledState = remember(state.filter.bleType) {
+                            TextFieldState(
+                                state.filter.bleType.localized,
+                                TextRange(state.filter.bleType.localized.length)
+                            )
+                        }
+
+                        ExposedDropdownMenuBox(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(end = 8.dp),
                             expanded = expanded,
-                            onDismissRequest = { expanded = false }
+                            onExpandedChange = {
+                                expanded = it
+                            }
                         ) {
 
-                            mutableListOf<BleInfo.Type?>(null).apply {
-                                addAll(BleInfo.Type.entries.toTypedArray())
-                            }.forEach { selectionOption ->
-                                DropdownMenuItem(
-                                    onClick = {
-                                        viewModel.setEvent(BleFilterContract.Event.OnFilterChanged(
-                                            state.filter.copy(bleType = selectionOption)
-                                        ))
-                                        expanded = false
-                                    },
-                                    text = {
-                                        Text(text = selectionOption.localized)
-                                    },
-                                    contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
-                                )
+                            OutlinedTextField(
+                                state = typeTextFiledState,
+                                lineLimits = TextFieldLineLimits.SingleLine,
+                                readOnly = true,
+                                label = { Text("Тип") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Rounded.Bluetooth,
+                                        contentDescription = null
+                                    )
+                                },
+                                trailingIcon = {
+                                    ExposedDropdownMenuDefaults.TrailingIcon(
+                                        expanded = expanded
+                                    )
+                                },
+                                modifier = Modifier
+                                    .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
+                                    .fillMaxWidth(),
+                            )
+
+                            ExposedDropdownMenu(
+                                expanded = expanded,
+                                onDismissRequest = { expanded = false }
+                            ) {
+
+                                mutableListOf<BleInfo.Type?>(null).apply {
+                                    addAll(BleInfo.Type.entries.toTypedArray())
+                                }.forEach { selectionOption ->
+                                    DropdownMenuItem(
+                                        onClick = {
+                                            viewModel.setEvent(
+                                                BleFilterContract.Event.OnFilterChanged(
+                                                    state.filter.copy(bleType = selectionOption)
+                                                )
+                                            )
+                                            expanded = false
+                                        },
+                                        text = {
+                                            Text(text = selectionOption.localized)
+                                        },
+                                        contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
+                                    )
+                                }
                             }
                         }
+
                     }
 
+                    OutlinedTextField(
+                        value = state.filter.name,
+                        singleLine = true,
+                        onValueChange = {
+                            viewModel.setEvent(
+                                BleFilterContract.Event.OnFilterChanged(
+                                    state.filter.copy(name = it)
+                                )
+                            )
+                        },
+                        label = { Text(text = "Имя") },
+                        leadingIcon = {
+                            Icon(
+                                imageVector = Icons.Rounded.Search,
+                                contentDescription = null
+                            )
+                        },
+                        trailingIcon = {
+
+                            if (state.filter.name.isNotEmpty()) {
+
+                                IconButton(
+                                    onClick = {
+                                        viewModel.setEvent(
+                                            BleFilterContract.Event.OnFilterChanged(
+                                                state.filter.copy(name = "")
+                                            )
+                                        )
+                                    }
+                                ) {
+                                    Icon(
+                                        imageVector = Icons.Rounded.Close,
+                                        contentDescription = null
+                                    )
+                                }
+
+                            }
+
+                        },
+                        modifier = Modifier
+                            .padding(end = 8.dp)
+                            .fillMaxWidth()
+
+                    )
+
+                    OutlinedTextField(
+                        value = state.filter.mac,
+                        singleLine = true,
+                        onValueChange = {
+                            viewModel.setEvent(
+                                BleFilterContract.Event.OnFilterChanged(
+                                    state.filter.copy(mac = it)
+                                )
+                            )
+                        },
+                        label = { Text(text = "Mac") },
+                        leadingIcon = {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Rounded.ShortText,
+                                contentDescription = null,
+                            )
+                        },
+                        trailingIcon = {
+
+                            if (state.filter.mac.isNotEmpty()) {
+
+                                IconButton(
+                                    onClick = {
+                                        viewModel.setEvent(
+                                            BleFilterContract.Event.OnFilterChanged(
+                                                state.filter.copy(mac = "")
+                                            )
+                                        )
+                                    }
+                                ) {
+                                    Icon(
+                                        imageVector = Icons.Rounded.Close,
+                                        contentDescription = null
+                                    )
+                                }
+
+                            }
+
+                        },
+                        modifier = Modifier
+                            .padding(end = 8.dp)
+                            .fillMaxWidth()
+                    )
+
                 }
 
-                OutlinedTextField(
-                    value = state.filter.name,
-                    singleLine = true,
-                    onValueChange = {
-                        viewModel.setEvent(BleFilterContract.Event.OnFilterChanged(
-                            state.filter.copy(name = it)
-                        ))
-                    },
-                    label = { Text(text = "Имя") },
-                    leadingIcon = {
-                        Icon(
-                            imageVector = Icons.Rounded.Search,
-                            contentDescription = null
-                        )
-                    },
-                    trailingIcon = {
-
-                        if(state.filter.name.isNotEmpty()) {
-
-                            IconButton(
-                                onClick = {
-                                    viewModel.setEvent(BleFilterContract.Event.OnFilterChanged(
-                                        state.filter.copy(name = "")
-                                    ))
-                                }
-                            ) {
-                                Icon(
-                                    imageVector = Icons.Rounded.Close,
-                                    contentDescription = null
-                                )
-                            }
-
-                        }
-
-                    },
-                    modifier = Modifier
-                        .padding(end = 8.dp)
-                        .fillMaxWidth()
-
-                )
-
-                OutlinedTextField(
-                    value = state.filter.mac,
-                    singleLine = true,
-                    onValueChange = {
-                        viewModel.setEvent(BleFilterContract.Event.OnFilterChanged(
-                            state.filter.copy(mac = it)
-                        ))
-                    },
-                    label = { Text(text = "Mac") },
-                    leadingIcon = {
-                        Icon(
-                            imageVector = Icons.AutoMirrored.Rounded.ShortText,
-                            contentDescription = null,
-                        )
-                    },
-                    trailingIcon = {
-
-                        if (state.filter.mac.isNotEmpty()) {
-
-                            IconButton(
-                                onClick = {
-                                    viewModel.setEvent(BleFilterContract.Event.OnFilterChanged(
-                                        state.filter.copy(mac = "")
-                                    ))
-                                }
-                            ) {
-                                Icon(
-                                    imageVector = Icons.Rounded.Close,
-                                    contentDescription = null
-                                )
-                            }
-
-                        }
-
-                    },
-                    modifier = Modifier
-                        .padding(end = 8.dp)
-                        .fillMaxWidth()
-                )
-
             }
 
-        }
-
-        Surface(
-            color = MaterialTheme.colorScheme.surfaceContainer,
-            shape = RoundedCornerShape(16.dp)
-        ) {
-
-            Column(
-                modifier = Modifier
-                    .padding(16.dp)
+            Surface(
+                color = MaterialTheme.colorScheme.surfaceContainer,
+                shape = RoundedCornerShape(16.dp)
             ) {
 
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
+                Column(
+                    modifier = Modifier
+                        .padding(16.dp)
                 ) {
 
-                    Icon(
-                        imageVector = Icons.Rounded.SignalCellularAlt,
-                        contentDescription = null,
-                        modifier = Modifier.padding(12.dp)
-                    )
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
 
-                    Column {
-
-                        RangeSlider(
-                            value = state.filter.rssi,
-                            onValueChange = {
-                                viewModel.setEvent(
-                                    BleFilterContract.Event.OnFilterChanged(
-                                        state.filter.copy(rssi = it)
-                                    )
-                                )
-                            },
-                            valueRange = (-100f)..(-10f),
-                            colors = SliderDefaults.colors(
-                                activeTickColor = MaterialTheme.colorScheme.primary,
-                                inactiveTickColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.38f)
-                            )
+                        Icon(
+                            imageVector = Icons.Rounded.SignalCellularAlt,
+                            contentDescription = null,
+                            modifier = Modifier.padding(12.dp)
                         )
 
-                        Row {
+                        Column {
 
-                            Text(text = state.filter.rssi.start.toInt().toString() + " dBm")
+                            var sliderState by remember(state.filter.rssi) {
+                                mutableStateOf(state.filter.rssi)
+                            }
 
-                            Spacer(modifier = Modifier.weight(1f))
+                            RangeSlider(
+                                value = sliderState,
+                                onValueChange = {
+                                    sliderState = it
+                                },
+                                onValueChangeFinished = {
+                                    viewModel.setEvent(
+                                        BleFilterContract.Event.OnFilterChanged(
+                                            state.filter.copy(rssi = sliderState)
+                                        )
+                                    )
+                                },
+                                valueRange = (-100f)..(-10f),
+                                colors = SliderDefaults.colors(
+                                    activeTickColor = MaterialTheme.colorScheme.primary,
+                                    inactiveTickColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.38f)
+                                )
+                            )
 
-                            Text(text = state.filter.rssi.endInclusive.toInt().toString() + " dBm")
+                            Row {
+
+                                Text(text = state.filter.rssi.start.toInt().toString() + " dBm")
+
+                                Spacer(modifier = Modifier.weight(1f))
+
+                                Text(
+                                    text = state.filter.rssi.endInclusive.toInt()
+                                        .toString() + " dBm"
+                                )
+
+                            }
 
                         }
 
                     }
 
-                }
+                    Spacer(modifier = Modifier.height(12.dp))
 
-                Spacer(modifier = Modifier.height(12.dp))
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-
-                    Icon(
-                        imageVector = Icons.Rounded.BatteryFull,
-                        contentDescription = null,
-                        modifier = Modifier.padding(12.dp)
-                    )
-
-                    Column(
-                        verticalArrangement = Arrangement.Center
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
 
-                        RangeSlider(
-                            value = state.filter.battery,
-                            onValueChange = {
-                                viewModel.setEvent(
-                                    BleFilterContract.Event.OnFilterChanged(
-                                        state.filter.copy(battery = it)
-                                    )
-                                )
-                            },
-                            valueRange = 0f..100f,
-                            colors = SliderDefaults.colors(
-                                activeTickColor = MaterialTheme.colorScheme.primary,
-                                inactiveTickColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.38f)
-                            )
+                        Icon(
+                            imageVector = Icons.Rounded.BatteryFull,
+                            contentDescription = null,
+                            modifier = Modifier.padding(12.dp)
                         )
 
-                        Row {
+                        Column(
+                            verticalArrangement = Arrangement.Center
+                        ) {
 
-                            Text(text = state.filter.battery.start.toInt().toString() + " %")
+                            var sliderState by remember(state.filter.battery) {
+                                mutableStateOf(state.filter.battery)
+                            }
 
-                            Spacer(modifier = Modifier.weight(1f))
+                            RangeSlider(
+                                value = sliderState,
+                                onValueChange = {
+                                    sliderState = it
+                                },
+                                onValueChangeFinished = {
+                                    viewModel.setEvent(
+                                        BleFilterContract.Event.OnFilterChanged(
+                                            state.filter.copy(battery = sliderState)
+                                        )
+                                    )
+                                },
+                                valueRange = 0f..100f,
+                                colors = SliderDefaults.colors(
+                                    activeTickColor = MaterialTheme.colorScheme.primary,
+                                    inactiveTickColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.38f)
+                                )
+                            )
 
-                            Text(text = state.filter.battery.endInclusive.toInt().toString() + " %")
+                            Row {
+
+                                Text(text = state.filter.battery.start.toInt().toString() + " %")
+
+                                Spacer(modifier = Modifier.weight(1f))
+
+                                Text(
+                                    text = state.filter.battery.endInclusive.toInt()
+                                        .toString() + " %"
+                                )
+
+                            }
 
                         }
 
@@ -556,17 +605,28 @@ private fun DisplayState(
 
         }
 
-        Spacer(modifier = Modifier.height(8.dp))
-
-        Button(
-            onClick = {
-                viewModel.setEvent(BleFilterContract.Event.OnSave)
-            },
-            modifier = Modifier.fillMaxWidth()
+        Box(
+            modifier = Modifier.fillMaxWidth().animateContentSize()
         ) {
-            Text(
-                text = "Применить"
-            )
+
+            if(state.filter != state.origin) {
+
+                Button(
+                    onClick = {
+                        viewModel.setEvent(BleFilterContract.Event.OnSave)
+                    },
+                    modifier = Modifier
+                        .padding(16.dp)
+                        .fillMaxWidth()
+                        .height(48.dp)
+                ) {
+                    Text(
+                        text = "Применить"
+                    )
+                }
+
+            }
+
         }
 
     }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterViewModel.kt
index c115c1e..2088cfb 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/filter/BleFilterViewModel.kt
@@ -22,7 +22,7 @@ class BleFilterViewModel @Inject constructor(
 
             val filter = getFilterFlow.invoke().firstOrNull() ?: BleFilter()
 
-            setState { BleFilterContract.State.Display(filter) }
+            setState { BleFilterContract.State.Display(filter, filter) }
 
         }
 
@@ -74,7 +74,15 @@ class BleFilterViewModel @Inject constructor(
         state: BleFilterContract.State,
         event: BleFilterContract.Event.OnFilterChanged,
     ) {
-        setState { BleFilterContract.State.Display(event.filter) }
+        if(state is BleFilterContract.State.Display) {
+
+            setState {
+                state.copy(
+                    filter = event.filter
+                )
+            }
+
+        }
     }
 
     private fun reduce(
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/history/main/AcceleromterHistory.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/history/main/AcceleromterHistory.kt
index 05f65d6..475a9d9 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/history/main/AcceleromterHistory.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/history/main/AcceleromterHistory.kt
@@ -23,7 +23,10 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
@@ -335,8 +338,6 @@ private fun DisplayState(
                         labelRotationDegrees = -90f,
                     )
 
-                    val scrollState = rememberChartScrollState()
-
                     when(lastMeasure){
                         is Ble.Accelerometer.HistoryPoint.Acceleration,
                         is Ble.Accelerometer.HistoryPoint.Angle -> {
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerContract.kt
index cee3aec..bd03a22 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerContract.kt
@@ -3,40 +3,42 @@ package llc.arma.ble.app.ui.screen.inspection.accelerometer.main
 import llc.arma.ble.app.ui.common.ViewEvent
 import llc.arma.ble.app.ui.common.ViewSideEffect
 import llc.arma.ble.app.ui.common.ViewState
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.RealtimeViewMode
 import llc.arma.ble.domain.model.Ble
-import llc.arma.ble.domain.model.BleInfo
 import llc.arma.ble.domain.usecase.AccelScale
 import llc.arma.ble.domain.usecase.AccelViewMode
-import llc.arma.ble.domain.usecase.FftAxis
-import llc.arma.ble.domain.usecase.FftFrequency
-import llc.arma.ble.domain.usecase.FftViewMode
 
 class AccelerometerContract {
 
     sealed class Event : ViewEvent {
 
-        data object OnShowChart : Event()
+        data object OnNavigateUp : Event()
+
+        data object OnRestart : Event()
 
         data object OnShowAccelerometerHistory : Event()
 
         data object OnShowRealtimeForm : Event()
 
-        data object OnPowerEdit : Event()
-
-        data object OnShowWriteBlePreview : Event()
-
         data object OnWriteBle : Event()
 
         data object OnChangePassword : Event()
 
         data object OnSaveIntervalEdit : Event()
 
+        data class OnSaveIntervalChanged(
+            val interval: Long
+        ) : Event()
+
         data object OnReadIntervalEdit : Event()
 
+        data class OnReadIntervalChanged(
+            val interval: Long
+        ) : Event()
+
+        data object OnPowerEdit : Event()
+
         data class OnPowerChanged(
-            val tx: BleView.BleState.TX
+            val tx: Ble.BleState.TX
         ) : Event()
 
         data object OnShowHistoryForm : Event()
@@ -48,59 +50,30 @@ class AccelerometerContract {
             val scale: AccelScale
         ) : Event()
 
-        data class OnSaveIntervalChanged(
-            val interval: Long
-        ) : Event()
-
-        data class OnReadIntervalChanged(
-            val interval: Long
-        ) : Event()
-
     }
 
     sealed class State : ViewState {
 
-        data object Loading : State()
+        data class Loading(
+            val attempt: Int?
+        ) : State()
 
         data class Display(
             val origin: Ble.Accelerometer,
-            val accelerometer: BleView.Accelerometer,
-            val writeState: WriteState?,
-            val accelViewMode: AccelViewMode,
-            val accelRealtimeViewMode: RealtimeViewMode,
-            val accelScale: AccelScale,
-            val fftViewMode: FftViewMode,
-            val fftAxis: FftAxis,
-            val fftFrequency: FftFrequency,
-        ) : State() {
-
-            sealed class WriteState {
-
-                data class DisplayPreview(
-                    val writeRequest: Ble.Accelerometer.WriteRequest
-                ) : WriteState()
-
-                data class Writing(
-                    val writeRequest: Ble.Accelerometer.WriteRequest
-                ) : WriteState()
-
-                data object Success : WriteState()
-
-                data object Failure : WriteState()
-
-            }
-
-        }
+            val accelerometer: Ble.Accelerometer
+        ) : State()
 
     }
 
     sealed class Effect : ViewSideEffect {
 
-
-        object ShowWriteBle : Effect()
-
         sealed class Navigation : Effect() {
 
+            data class Write(
+                val serial: String,
+                val request: Ble.Accelerometer.WriteRequest
+            ) : Effect()
+
             data object ShowRealtimeForm : Effect()
 
             data object ShowHistoryForm : Effect()
@@ -114,7 +87,7 @@ class AccelerometerContract {
             ) : Navigation()
 
             data class TxPowerSelector(
-                val tx: BleView.BleState.TX
+                val tx: Ble.BleState.TX
             ) : Navigation()
 
             data class ChangePassword(
@@ -122,14 +95,11 @@ class AccelerometerContract {
             ) : Navigation()
 
             data class AccelHistory(
-                val ble: BleInfo,
-                val accelScale: AccelScale,
-                val accelMode: AccelViewMode,
-                val fftAxis: FftAxis,
-                val fftMode: FftViewMode,
-                val frequency: FftFrequency
+                val serial: String
             ) : Navigation()
 
+            data object Up : Navigation()
+
         }
 
     }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerScreen.kt
index 59019ba..859229a 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerScreen.kt
@@ -2,23 +2,17 @@ package llc.arma.ble.app.ui.screen.inspection.accelerometer.main
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material3.Scaffold
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.annotation.Destination
@@ -26,30 +20,23 @@ import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.generated.destinations.AccelerometerHistoryDestination
 import com.ramcosta.composedestinations.generated.destinations.AccelerometerHistoryFormDestination
 import com.ramcosta.composedestinations.generated.destinations.AccelerometerRealtimeFormDestination
+import com.ramcosta.composedestinations.generated.destinations.AccelerometerWriteScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.ChangePasswordScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.DurationSelectorScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.TxPowerSelectorScreenDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.ResultRecipient
 import com.ramcosta.composedestinations.result.onResult
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import llc.arma.ble.app.ui.common.rememberBottomDialogState
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.app.ui.screen.inspection.accelerometer.history.form.AccelerometerHistoryFormData
 import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.DisplayState
 import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.LoadingState
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.Write
 import llc.arma.ble.app.ui.screen.inspection.selector.duration.DurationSelectResult
 import llc.arma.ble.app.ui.screen.locale.localized
+import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.model.BleInfo
 
-enum class SheetPage {
-    WRITE
-}
-
 @Destination<RootGraph>
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -57,19 +44,14 @@ fun AccelerometerScreen(
     navigator: DestinationsNavigator,
     bleSerial: String,
     historyFormResult: ResultRecipient<AccelerometerHistoryFormDestination, AccelerometerHistoryFormData>,
-    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, BleView.BleState.TX>,
+    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, Ble.BleState.TX>,
     readDurationSelectResult: ResultRecipient<DurationSelectorScreenDestination, DurationSelectResult>,
+    writeResult: ResultRecipient<AccelerometerWriteScreenDestination, Boolean>,
 ) {
 
     val viewModel = hiltViewModel<AccelerometerViewModel>()
     val state = viewModel.viewState.value
 
-    val bottomDialog = rememberBottomDialogState()
-
-    var sheetPage by rememberSaveable {
-        mutableStateOf<SheetPage?>(null)
-    }
-
     historyFormResult.onResult {
         viewModel.setEvent(AccelerometerContract.Event.OnEnableSaveHistory(it.mode, it.scale))
     }
@@ -90,65 +72,16 @@ fun AccelerometerScreen(
 
     }
 
-    LaunchedEffect(
-        key1 = bottomDialog.sheetState?.currentValue,
-        block = {
-            if(bottomDialog.sheetState?.currentValue == ModalBottomSheetValue.Hidden) {
-                bottomDialog.setContent {}
-                sheetPage = null
-            }
-        }
-    )
-
-    val scope = rememberCoroutineScope()
-
-    LaunchedEffect(sheetPage) {
-        when (sheetPage) {
-            SheetPage.WRITE -> bottomDialog.show {
-
-                val currentState = viewModel.viewState.value
-
-                if (currentState is AccelerometerContract.State.Display) {
-
-                    currentState.writeState?.let {
-
-                        Write(
-                            state = it,
-                            onEvent = viewModel::setEvent
-                        )
-
-                    }
-
-                }
-            }
-            null -> {
-                bottomDialog.hide()
-            }
-
-        }
-
+    writeResult.onResult {
+        if(it) viewModel.setEvent(AccelerometerContract.Event.OnRestart)
     }
 
-    DisposableEffect(Unit){
-        onDispose {
-            scope.launch {
-                bottomDialog.hide()
-            }
-        }
-    }
-
-    LaunchedEffect("effect"){
+    LaunchedEffect(Unit){
         viewModel.effect.onEach {
             when(it){
 
-                is AccelerometerContract.Effect.ShowWriteBle -> launch {
-                    sheetPage = null
-                    delay(100)
-                    sheetPage = SheetPage.WRITE
-                }
-
                 is AccelerometerContract.Effect.Navigation.AccelHistory ->
-                    navigator.navigate(AccelerometerHistoryDestination(it.ble.serial))
+                    navigator.navigate(AccelerometerHistoryDestination(it.serial))
 
                 is AccelerometerContract.Effect.Navigation.ChangePassword ->
                     navigator.navigate(ChangePasswordScreenDestination(it.serial))
@@ -156,13 +89,14 @@ fun AccelerometerScreen(
                 is AccelerometerContract.Effect.Navigation.ReadIntervalSelector ->
                     navigator.navigate(DurationSelectorScreenDestination(
                         qualifier = "ReadIntervalSelector",
-                        duration = it.interval
+                        duration = it.interval,
+                        minimum = 1000
                     ))
 
                 is AccelerometerContract.Effect.Navigation.SaveIntervalSelector ->
                     navigator.navigate(DurationSelectorScreenDestination(
                         qualifier = "SaveIntervalSelector",
-                        duration = it.interval
+                        duration = it.interval,
                     ))
 
                 is AccelerometerContract.Effect.Navigation.TxPowerSelector ->
@@ -173,6 +107,15 @@ fun AccelerometerScreen(
 
                 AccelerometerContract.Effect.Navigation.ShowRealtimeForm ->
                     navigator.navigate(AccelerometerRealtimeFormDestination(bleSerial))
+
+                is AccelerometerContract.Effect.Navigation.Write ->
+                    navigator.navigate(AccelerometerWriteScreenDestination(
+                        bleSerial = it.serial,
+                        writeRequest = it.request
+                    ))
+
+                AccelerometerContract.Effect.Navigation.Up ->
+                    navigator.navigateUp()
             }
         }.launchIn(this)
     }
@@ -194,6 +137,20 @@ fun AccelerometerScreen(
                 },
                 title = {
                     Text(text = BleInfo.Type.ACCELEROMETER.localized)
+                },
+                actions = {
+                    if(state is AccelerometerContract.State.Display){
+                        IconButton(
+                            onClick = {
+                                viewModel.setEvent(AccelerometerContract.Event.OnRestart)
+                            }
+                        ) {
+                            Icon(
+                                imageVector = Icons.Rounded.Refresh,
+                                contentDescription = null
+                            )
+                        }
+                    }
                 }
             )
         }
@@ -205,13 +162,11 @@ fun AccelerometerScreen(
 
             when(state){
                 is AccelerometerContract.State.Display -> {
-                    DisplayState(
-                        origin = state.origin,
-                        ble = state.accelerometer,
-                        onEvent = viewModel::setEvent
-                    )
+                    DisplayState(viewModel, state)
                 }
-                is AccelerometerContract.State.Loading -> LoadingState()
+                is AccelerometerContract.State.Loading -> LoadingState(
+                    viewModel, state
+                )
             }
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerViewModel.kt
index f17b578..1b6969b 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/AccelerometerViewModel.kt
@@ -4,18 +4,12 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.ramcosta.composedestinations.generated.destinations.AccelerometerScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
-import llc.arma.ble.app.ui.mapper.BleMapper
-import llc.arma.ble.app.ui.mapper.BleViewMapper
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.RealtimeViewMode
+import llc.arma.ble.app.ui.common.retryUntilNotNull
+import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconContract
 import llc.arma.ble.domain.model.Ble
-import llc.arma.ble.domain.usecase.AccelScale
-import llc.arma.ble.domain.usecase.AccelViewMode
-import llc.arma.ble.domain.usecase.FftAxis
-import llc.arma.ble.domain.usecase.FftFrequency
-import llc.arma.ble.domain.usecase.FftViewMode
 import llc.arma.ble.domain.usecase.GetBleBySerial
 import llc.arma.ble.domain.usecase.WriteBle
 import javax.inject.Inject
@@ -23,66 +17,21 @@ import javax.inject.Inject
 @HiltViewModel
 class AccelerometerViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle,
-    getBleBySerial: GetBleBySerial,
-    private val bleMapper: BleMapper,
-    private val bleViewMapper: BleViewMapper,
-    private val writeBle: WriteBle
+    private val getBleBySerial: GetBleBySerial,
 ) : BaseViewModel<AccelerometerContract.State, AccelerometerContract.Event, AccelerometerContract.Effect>() {
 
     init {
 
-        val params = AccelerometerScreenDestination.argsFrom(savedStateHandle)
-
-        viewModelScope.launch {
-
-            val ble = getBleBySerial.invoke(params.bleSerial, this).fold(
-                onSuccess = { it },
-                onFailure = { null }
-            )
-
-            if(ble != null && ble is Ble.Accelerometer){
-                setState {
-
-                    when(this){
-                        is AccelerometerContract.State.Display -> {
-                            copy(
-                                origin = Ble.Accelerometer(
-                                    info = ble.info,
-                                    state = origin.state,
-                                    accelerometerState = origin.accelerometerState
-                                )
-                            )
-                        }
-                        AccelerometerContract.State.Loading -> {
-                            AccelerometerContract.State.Display(
-                                origin = ble,
-                                accelerometer = bleMapper.map(ble) as BleView.Accelerometer,
-                                writeState = null,
-                                accelViewMode = AccelViewMode.ACCELERATION,
-                                accelRealtimeViewMode = RealtimeViewMode.Accel(
-                                    AccelViewMode.ACCELERATION
-                                ),
-                                fftAxis = FftAxis.AUTO,
-                                fftFrequency = FftFrequency.F_400,
-                                fftViewMode = FftViewMode.SPECTRE,
-                                accelScale = AccelScale.S_2
-                            )
-                        }
-                    }
-                }
-            }
-
-        }
+        loadData()
 
     }
 
-    override fun setInitialState() = AccelerometerContract.State.Loading
+    override fun setInitialState() = AccelerometerContract.State.Loading(null)
 
     override fun handleEvents(event: AccelerometerContract.Event) {
         when(event){
             is AccelerometerContract.Event.OnPowerChanged -> reduce(viewState.value, event)
             is AccelerometerContract.Event.OnPowerEdit -> reduce(viewState.value, event)
-            is AccelerometerContract.Event.OnShowWriteBlePreview -> reduce(viewState.value, event)
             is AccelerometerContract.Event.OnWriteBle -> reduce(viewState.value, event)
             is AccelerometerContract.Event.OnDisableSaveHistory -> reduce(viewState.value, event)
             is AccelerometerContract.Event.OnShowAccelerometerHistory -> reduce(viewState.value, event)
@@ -93,22 +42,32 @@ class AccelerometerViewModel @Inject constructor(
             is AccelerometerContract.Event.OnReadIntervalEdit -> reduce(viewState.value, event)
             is AccelerometerContract.Event.OnEnableSaveHistory -> reduce(viewState.value, event)
             is AccelerometerContract.Event.OnShowHistoryForm -> reduce(viewState.value, event)
-            is AccelerometerContract.Event.OnShowChart -> reduce(viewState.value, event)
             is AccelerometerContract.Event.OnShowRealtimeForm -> reduce(viewState.value, event)
+            is AccelerometerContract.Event.OnRestart -> reduce(viewState.value, event)
+            is AccelerometerContract.Event.OnNavigateUp -> reduce(viewState.value, event)
         }
     }
 
     private fun reduce(
         state: AccelerometerContract.State,
-        event: AccelerometerContract.Event.OnShowChart
+        event: AccelerometerContract.Event.OnNavigateUp
     ) {
 
         setEffect {
-            AccelerometerContract.Effect.Navigation.ShowHistoryForm
+            AccelerometerContract.Effect.Navigation.Up
         }
 
     }
 
+    private fun reduce(
+        state: AccelerometerContract.State,
+        event: AccelerometerContract.Event.OnRestart
+    ) {
+
+        loadData()
+
+    }
+
     private fun reduce(
         state: AccelerometerContract.State,
         event: AccelerometerContract.Event.OnShowRealtimeForm
@@ -138,7 +97,15 @@ class AccelerometerViewModel @Inject constructor(
 
         if(state is AccelerometerContract.State.Display) {
 
-            state.accelerometer.accelerometerState.readInterval = event.interval
+            setState {
+                state.copy(
+                    accelerometer = state.accelerometer.copy(
+                        accelerometerState = state.accelerometer.accelerometerState.copy(
+                            readInterval = event.interval
+                        )
+                    )
+                )
+            }
 
         }
 
@@ -184,7 +151,15 @@ class AccelerometerViewModel @Inject constructor(
 
         if(state is AccelerometerContract.State.Display) {
 
-            state.accelerometer.accelerometerState.historyInterval = event.interval
+            setState {
+                state.copy(
+                    accelerometer = state.accelerometer.copy(
+                        accelerometerState = state.accelerometer.accelerometerState.copy(
+                            historyInterval = event.interval
+                        )
+                    )
+                )
+            }
 
         }
 
@@ -212,7 +187,15 @@ class AccelerometerViewModel @Inject constructor(
 
         if(state is AccelerometerContract.State.Display) {
 
-            state.accelerometer.accelerometerState.saveHistory = Ble.Accelerometer.HistorySettings.Disabled
+            setState {
+                state.copy(
+                    accelerometer = state.accelerometer.copy(
+                        accelerometerState = state.accelerometer.accelerometerState.copy(
+                            saveHistorySettings = Ble.Accelerometer.HistorySettings.Disabled
+                        )
+                    )
+                )
+            }
 
         }
 
@@ -225,11 +208,19 @@ class AccelerometerViewModel @Inject constructor(
 
         if(state is AccelerometerContract.State.Display) {
 
-            state.accelerometer.accelerometerState.saveHistory = Ble.Accelerometer.HistorySettings.Enabled(
-                scale = event.scale,
-                mode = event.mode,
-                detailed = true
-            )
+            setState {
+                state.copy(
+                    accelerometer = state.accelerometer.copy(
+                        accelerometerState = state.accelerometer.accelerometerState.copy(
+                            saveHistorySettings = Ble.Accelerometer.HistorySettings.Enabled(
+                                scale = event.scale,
+                                mode = event.mode,
+                                detailed = true
+                            )
+                        )
+                    )
+                )
+            }
 
         }
 
@@ -246,12 +237,7 @@ class AccelerometerViewModel @Inject constructor(
             setEffect {
 
                 AccelerometerContract.Effect.Navigation.AccelHistory(
-                    ble = state.accelerometer.info,
-                    accelMode = state.origin.accelerometerState.saveHistorySettings.mode,
-                    fftAxis = state.fftAxis,
-                    fftMode = state.fftViewMode,
-                    frequency = state.fftFrequency,
-                    accelScale = state.accelScale
+                    serial = state.accelerometer.info.serial
                 )
             }
 
@@ -261,12 +247,12 @@ class AccelerometerViewModel @Inject constructor(
 
     private fun reduce(
         state: AccelerometerContract.State,
-        event: AccelerometerContract.Event.OnShowWriteBlePreview
+        event: AccelerometerContract.Event.OnWriteBle
     ) {
 
         if(state is AccelerometerContract.State.Display){
 
-            val newBle = bleViewMapper.map(state.accelerometer) as Ble.Accelerometer
+            val newBle = state.accelerometer
 
             val writeRequest = Ble.Accelerometer.WriteRequest(
                 tx = if(newBle.state.tx == state.origin.state.tx) null else newBle.state.tx,
@@ -275,16 +261,8 @@ class AccelerometerViewModel @Inject constructor(
                 readInterval = if(newBle.accelerometerState.readInterval == state.origin.accelerometerState.readInterval) null else newBle.accelerometerState.readInterval,
             )
 
-            setState {
-                state.copy(
-                    writeState = AccelerometerContract.State.Display.WriteState.DisplayPreview(
-                        writeRequest
-                    )
-                )
-            }
-
             setEffect {
-                AccelerometerContract.Effect.ShowWriteBle
+                AccelerometerContract.Effect.Navigation.Write(state.accelerometer.info.serial, writeRequest)
             }
 
         }
@@ -298,7 +276,15 @@ class AccelerometerViewModel @Inject constructor(
 
         if(state is AccelerometerContract.State.Display) {
 
-            state.accelerometer.state.tx = event.tx
+            setState {
+                state.copy(
+                    accelerometer = state.accelerometer.copy(
+                        state = state.accelerometer.state.copy(
+                            tx = event.tx
+                        )
+                    )
+                )
+            }
 
         }
 
@@ -318,68 +304,50 @@ class AccelerometerViewModel @Inject constructor(
         }
     }
 
-    private fun reduce(
-        state: AccelerometerContract.State,
-        event: AccelerometerContract.Event.OnWriteBle
-    ) {
+    private var loadJob: Job? = null
 
-        if(state is AccelerometerContract.State.Display){
+    private fun loadData(){
 
-            state.writeState?.let { request ->
+        val params = AccelerometerScreenDestination.argsFrom(savedStateHandle)
 
-                if(request is AccelerometerContract.State.Display.WriteState.DisplayPreview) {
+        loadJob?.cancel()
+        loadJob = viewModelScope.launch {
 
-                    viewModelScope.launch {
+            setState {
+                AccelerometerContract.State.Loading(null)
+            }
 
-                        setState {
-                            state.copy(
-                                writeState = AccelerometerContract.State.Display.WriteState.Writing(
-                                    request.writeRequest
+            val ble = retryUntilNotNull(
+                onNewAttempt = {
+                    setState {
+                        AccelerometerContract.State.Loading(it)
+                    }
+                }
+            ){
+                getBleBySerial.invoke(params.bleSerial, this).getOrNull()
+            }
+
+            if( ble is Ble.Accelerometer){
+                setState {
+
+                    when(this){
+                        is AccelerometerContract.State.Display -> {
+                            copy(
+                                origin = Ble.Accelerometer(
+                                    info = ble.info,
+                                    state = origin.state,
+                                    accelerometerState = origin.accelerometerState
                                 )
                             )
                         }
-
-                        writeBle(state.accelerometer.info.serial, request.writeRequest).fold(
-                            onSuccess = {
-
-                                val currentState = viewState.value
-
-                                if(currentState is AccelerometerContract.State.Display) {
-
-                                    val newBleObject = Ble.Accelerometer(
-                                        info = currentState.origin.info,
-                                        state = currentState.origin.state.copy(
-                                            tx = request.writeRequest.tx ?: state.origin.state.tx
-                                        ),
-                                        accelerometerState = currentState.origin.accelerometerState.copy(
-                                            saveHistorySettings = request.writeRequest.saveHistorySettings
-                                                ?: currentState.origin.accelerometerState.saveHistorySettings
-                                        )
-                                    )
-
-                                    setState {
-                                        currentState.copy(
-                                            origin = newBleObject,
-                                            writeState = AccelerometerContract.State.Display.WriteState.Success
-                                        )
-                                    }
-
-                                }
-
-                            },
-                            onFailure = {
-                                setState {
-                                    state.copy(
-                                        writeState = AccelerometerContract.State.Display.WriteState.Failure
-                                    )
-                                }
-                            }
-                        )
-
+                        is AccelerometerContract.State.Loading -> {
+                            AccelerometerContract.State.Display(
+                                origin = ble,
+                                accelerometer = ble
+                            )
+                        }
                     }
-
                 }
-
             }
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelFftAxisEdit.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelFftAxisEdit.kt
deleted file mode 100644
index 811870b..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelFftAxisEdit.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
-import llc.arma.ble.app.ui.screen.locale.localized
-import llc.arma.ble.domain.usecase.FftAxis
-
-@Composable
-fun SelectorItem(
-    label: String,
-    selected: Boolean,
-    onClick: () -> Unit
-){
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(8.dp))
-            .clickable(onClick = onClick)
-            .padding(4.dp)
-    ) {
-
-        RadioButton(
-            selected = selected,
-            onClick = onClick
-        )
-
-        Text(text = label)
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelRealtimeViewEdit.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelRealtimeViewEdit.kt
index 3792582..086e95a 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelRealtimeViewEdit.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/AccelRealtimeViewEdit.kt
@@ -1,29 +1,6 @@
 package llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-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.draw.clip
-import androidx.compose.ui.unit.dp
 import kotlinx.serialization.Serializable
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
-import llc.arma.ble.app.ui.screen.locale.localized
 import llc.arma.ble.domain.usecase.AccelViewMode
 
 @Serializable
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/DisplayState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/DisplayState.kt
index e8ef350..d7dfc19 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/DisplayState.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/DisplayState.kt
@@ -1,28 +1,31 @@
 package llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view
 
-import androidx.compose.foundation.background
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
 import androidx.compose.material.icons.rounded.KeyboardArrowDown
+import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.unit.dp
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.app.ui.screen.BleInfoView
 import llc.arma.ble.app.ui.screen.ShapeType
 import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
+import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerViewModel
 import llc.arma.ble.app.ui.screen.inspection.thermometer.main.BleMenuItem
 import llc.arma.ble.app.ui.screen.locale.localized
+import llc.arma.ble.app.ui.screen.locale.value
 import llc.arma.ble.data.repository.BleRepositoryImpl
 import llc.arma.ble.domain.model.Ble
 import kotlin.time.DurationUnit
@@ -30,9 +33,8 @@ import kotlin.time.toDuration
 
 @Composable
 fun DisplayState(
-    onEvent: (AccelerometerContract.Event) -> Unit,
-    origin: Ble.Accelerometer,
-    ble: BleView.Accelerometer
+    viewModel: AccelerometerViewModel,
+    state: AccelerometerContract.State.Display
 ) {
 
     val scrollState = rememberScrollState()
@@ -48,8 +50,8 @@ fun DisplayState(
         ) {
 
             BleInfoView(
-                bleInfo = origin.info,
-                version = origin.state.version
+                bleInfo = state.origin.info,
+                version = state.origin.state.version
             )
 
             Column(
@@ -59,7 +61,7 @@ fun DisplayState(
                 BleMenuItem(
                     shapeType = ShapeType.Start,
                     title = "Мощность",
-                    subtitle = "${ble.state.tx.value} db",
+                    subtitle = "${state.accelerometer.state.tx.value} db",
                     icon = {
                         Icon(
                             imageVector = Icons.Rounded.KeyboardArrowDown,
@@ -67,10 +69,10 @@ fun DisplayState(
                         )
                     }
                 ) {
-                    onEvent(AccelerometerContract.Event.OnPowerEdit)
+                    viewModel.setEvent(AccelerometerContract.Event.OnPowerEdit)
                 }
 
-                val history = ble.accelerometerState.saveHistory
+                val history = state.accelerometer.accelerometerState.saveHistorySettings
 
                 BleMenuItem(
                     shapeType = ShapeType.Middle,
@@ -82,12 +84,12 @@ fun DisplayState(
                     },
                     icon = {
                         Switch(
-                            checked = ble.accelerometerState.saveHistory is Ble.Accelerometer.HistorySettings.Enabled,
+                            checked = state.accelerometer.accelerometerState.saveHistorySettings is Ble.Accelerometer.HistorySettings.Enabled,
                             onCheckedChange = {
                                 if(it){
-                                    onEvent(AccelerometerContract.Event.OnShowHistoryForm)
+                                    viewModel.setEvent(AccelerometerContract.Event.OnShowHistoryForm)
                                 } else {
-                                    onEvent(AccelerometerContract.Event.OnDisableSaveHistory)
+                                    viewModel.setEvent(AccelerometerContract.Event.OnDisableSaveHistory)
                                 }
 
                             }
@@ -95,12 +97,12 @@ fun DisplayState(
                     }
                 )
 
-                if (ble.accelerometerState.saveHistory is Ble.Accelerometer.HistorySettings.Enabled) {
+                if (state.accelerometer.accelerometerState.saveHistorySettings is Ble.Accelerometer.HistorySettings.Enabled) {
 
                     BleMenuItem(
                         shapeType = ShapeType.Middle,
                         title = "Интервал измерений",
-                        subtitle = ble.accelerometerState.historyInterval
+                        subtitle = state.accelerometer.accelerometerState.historyInterval
                             .toDuration(DurationUnit.MILLISECONDS).toComponents { hours, minutes, seconds, _ ->
                                 "$hours ч. $minutes мин. $seconds сек." },
                         icon = {
@@ -111,20 +113,20 @@ fun DisplayState(
                         }
                     ) {
 
-                        onEvent(AccelerometerContract.Event.OnSaveIntervalEdit)
+                        viewModel.setEvent(AccelerometerContract.Event.OnSaveIntervalEdit)
 
                     }
 
                 }
 
-                if (ble.state.version > BleRepositoryImpl.Version.fromString("0.0.0-0")) {
+                if (state.accelerometer.state.version > BleRepositoryImpl.Version.fromString("0.0.0-0")) {
 
-                    if (ble.accelerometerState.saveHistory is Ble.Accelerometer.HistorySettings.Enabled) {
+                    if (state.accelerometer.accelerometerState.saveHistorySettings is Ble.Accelerometer.HistorySettings.Enabled) {
 
                         BleMenuItem(
                             shapeType = ShapeType.Middle,
                             title = "Интервал чтения",
-                            subtitle = ble.accelerometerState.readInterval
+                            subtitle = state.accelerometer.accelerometerState.readInterval
                                 .toDuration(DurationUnit.MILLISECONDS).toComponents { hours, minutes, seconds, _ ->
                                     "$hours ч. $minutes мин. $seconds сек." },
                             icon = {
@@ -135,7 +137,7 @@ fun DisplayState(
                             }
                         ) {
 
-                            onEvent(AccelerometerContract.Event.OnReadIntervalEdit)
+                            viewModel.setEvent(AccelerometerContract.Event.OnReadIntervalEdit)
 
                         }
 
@@ -154,12 +156,12 @@ fun DisplayState(
                     }
                 ) {
 
-                    when (origin.accelerometerState.saveHistorySettings) {
+                    when (state.origin.accelerometerState.saveHistorySettings) {
                         is Ble.Accelerometer.HistorySettings.Disabled ->
-                            onEvent(AccelerometerContract.Event.OnShowRealtimeForm)
+                            viewModel.setEvent(AccelerometerContract.Event.OnShowRealtimeForm)
 
                         is Ble.Accelerometer.HistorySettings.Enabled ->
-                            onEvent(AccelerometerContract.Event.OnShowAccelerometerHistory)
+                            viewModel.setEvent(AccelerometerContract.Event.OnShowAccelerometerHistory)
                     }
 
                 }
@@ -174,25 +176,36 @@ fun DisplayState(
                         )
                     }
                 ) {
-                    onEvent(AccelerometerContract.Event.OnChangePassword)
+                    viewModel.setEvent(AccelerometerContract.Event.OnChangePassword)
                 }
 
             }
 
         }
 
-        PrimaryButton(
-            modifier = Modifier.shadow(
-                if(scrollState.canScrollForward){
-                    8.dp
-                } else {
-                    0.dp
-                }
-            ).background(MaterialTheme.colorScheme.background),
-            label = "Сохранить"
+        Box(
+            modifier = Modifier.fillMaxWidth().animateContentSize()
         ) {
 
-            onEvent(AccelerometerContract.Event.OnShowWriteBlePreview)
+            if(state.origin != state.accelerometer) {
+
+                Button(
+                    onClick = {
+                        viewModel.setEvent(AccelerometerContract.Event.OnWriteBle)
+                    },
+                    modifier = Modifier
+                        .padding(16.dp)
+                        .fillMaxWidth()
+                        .height(48.dp)
+                ) {
+
+                    Text(
+                        text = "Сохранить"
+                    )
+
+                }
+
+            }
 
         }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/LoadingState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/LoadingState.kt
index 944f8f1..5c656ea 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/LoadingState.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/LoadingState.kt
@@ -2,23 +2,30 @@ package llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ContainedLoadingIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import llc.arma.ble.app.ui.common.RetryingLoadingTemplate
+import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
+import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerViewModel
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
-fun LoadingState(){
+fun LoadingState(
+    viewModel: AccelerometerViewModel,
+    state: AccelerometerContract.State.Loading
+){
 
     Box(
         contentAlignment = Alignment.Center,
         modifier = Modifier.fillMaxSize()
     ) {
 
-        ContainedLoadingIndicator()
+        RetryingLoadingTemplate(state.attempt) {
+            viewModel.setEvent(AccelerometerContract.Event.OnNavigateUp)
+        }
 
     }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/Write.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/Write.kt
deleted file mode 100644
index 5f83865..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/main/view/Write.kt
+++ /dev/null
@@ -1,262 +0,0 @@
-package llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import llc.arma.ble.R
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.common.SecondaryButton
-import llc.arma.ble.app.ui.screen.ShapeType
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
-import llc.arma.ble.app.ui.screen.inspection.thermometer.main.BleMenuItem
-import llc.arma.ble.app.ui.screen.locale.localizedName
-import llc.arma.ble.domain.model.Ble
-
-@Composable
-fun Write(
-    state: AccelerometerContract.State.Display.WriteState,
-    onEvent: (AccelerometerContract.Event) -> Unit
-) {
-
-    Column(
-        modifier = Modifier.animateContentSize()
-    ) {
-
-        Text(
-            modifier = Modifier.padding(horizontal = 12.dp),
-            text = "Запись изменений",
-            style = MaterialTheme.typography.titleLarge
-        )
-
-        Spacer(modifier = Modifier.height(20.dp))
-
-        when (state) {
-            is AccelerometerContract.State.Display.WriteState.DisplayPreview -> {
-
-                if(
-                    state.writeRequest.tx != null ||
-                    state.writeRequest.saveHistorySettings != null ||
-                    state.writeRequest.historyInterval != null ||
-                    state.writeRequest.readInterval != null
-                ) {
-
-                    state.writeRequest.tx?.let {
-
-                        BleMenuItem(
-                            shapeType = ShapeType.Singleton,
-                            title = "Мощность",
-                            subtitle = "${it.localizedName} db",
-                        )
-
-                    }
-
-                    state.writeRequest.saveHistorySettings?.let {
-
-                        BleMenuItem(
-                            shapeType = ShapeType.Singleton,
-                            title = "Сохранять историю измерений",
-                            subtitle = when(it){
-                                Ble.Accelerometer.HistorySettings.Disabled -> "Выключено"
-                                is Ble.Accelerometer.HistorySettings.Enabled -> "Включено"
-                            },
-                        )
-
-                    }
-
-                    state.writeRequest.historyInterval?.let {
-
-                        val hours = it / millisInHour
-                        val minutes = (it - (hours * millisInHour)) / millisInMinute
-                        val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
-
-                        BleMenuItem(
-                            shapeType = ShapeType.Singleton,
-                            title = "Интервал измерений",
-                            subtitle = "$hours ч. $minutes мин. $seconds сек."
-                        )
-
-                    }
-
-                    state.writeRequest.readInterval?.let {
-
-                        val hours = it / millisInHour
-                        val minutes = (it - (hours * millisInHour)) / millisInMinute
-                        val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
-
-                        BleMenuItem(
-                            shapeType = ShapeType.Singleton,
-                            title = "Интервал чтения",
-                            subtitle = "$hours ч. $minutes мин. $seconds сек."
-                        )
-
-                    }
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    PrimaryButton(
-                        label = "Записать"
-                    ) {
-                        onEvent(AccelerometerContract.Event.OnWriteBle)
-                    }
-
-                    SecondaryButton(
-                        label = "Отменить"
-                    ) {
-                        //onEvent(AccelerometerContract.Event.OnHideWriteBlePreview)
-                    }
-
-                } else {
-
-                    Spacer(modifier = Modifier.height(38.dp))
-
-                    Text(
-                        text = "Нет изменений",
-                        modifier = Modifier
-                            .align(Alignment.CenterHorizontally)
-                    )
-
-                    Spacer(modifier = Modifier.height(64.dp))
-
-                    PrimaryButton(
-                        label = "Ок"
-                    ) {
-                        //onEvent(AccelerometerContract.Event.OnHideWriteBlePreview)
-                    }
-
-                }
-
-            }
-            is AccelerometerContract.State.Display.WriteState.Writing -> {
-
-                Box {
-
-                    Column {
-
-                        Spacer(modifier = Modifier.height(28.dp))
-
-                        CircularProgressIndicator(
-                            strokeCap = StrokeCap.Round,
-                            modifier = Modifier
-                                .align(Alignment.CenterHorizontally)
-                        )
-
-                        Spacer(modifier = Modifier.height(48.dp))
-
-                        SecondaryButton(
-                            label = "Отменить"
-                        ) {
-                            //onEvent(AccelerometerContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            AccelerometerContract.State.Display.WriteState.Success -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(R.drawable.ic_done),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Успешно завершено"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            //onEvent(AccelerometerContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            AccelerometerContract.State.Display.WriteState.Failure -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(R.drawable.ic_error),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Ошибка записи"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            //onEvent(AccelerometerContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelContract.kt
index 4fcb244..ecad5dd 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelContract.kt
@@ -4,33 +4,54 @@ import llc.arma.ble.app.ui.common.ViewEvent
 import llc.arma.ble.app.ui.common.ViewSideEffect
 import llc.arma.ble.app.ui.common.ViewState
 import llc.arma.ble.domain.model.Ble
-import llc.arma.ble.domain.usecase.AccelScale
 import llc.arma.ble.domain.usecase.AccelViewMode
-import llc.arma.ble.domain.usecase.FftAxis
-import llc.arma.ble.domain.usecase.FftFrequency
-import llc.arma.ble.domain.usecase.FftViewMode
 
 class AccelerometerAccelContract {
 
     sealed class Event : ViewEvent {
 
+        data object OnNavigateUp : Event()
+
         data object OnRefresh : Event()
 
     }
 
     sealed class State : ViewState {
 
-        data class Display(
-            val mode: AccelViewMode,
-            val measureHistory : List<Ble.Accelerometer.RealtimePoint>
+        data class Loading(
+            val attempt: Int?
         ) : State()
 
-        data object Exception : State()
+        data class DisplayCommon(
+            val mode: AccelViewMode,
+            val measureHistory : List<Ble.Accelerometer.RealtimePoint.Common>
+        ) : State()
+
+        data class DisplayAngle(
+            val mode: AccelViewMode,
+            val measureHistory : List<Ble.Accelerometer.RealtimePoint.Angle>
+        ) : State()
+
+        data class DisplayRotation(
+            val mode: AccelViewMode,
+            val measureHistory : List<Ble.Accelerometer.RealtimePoint.Rotation>
+        ) : State()
+
+        data class DisplayVibration(
+            val mode: AccelViewMode,
+            val measureHistory : List<Ble.Accelerometer.RealtimePoint.Vibration>
+        ) : State()
 
     }
 
     sealed class Effect : ViewSideEffect {
 
+        sealed class Navigation : Effect() {
+
+            data object Up : Navigation()
+
+        }
+
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelViewModel.kt
index 10cf6e0..dd96bad 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerAccelViewModel.kt
@@ -9,11 +9,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
-import llc.arma.ble.domain.usecase.AccelScale
+import llc.arma.ble.app.ui.common.retryUntilNotNull
+import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
+import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.usecase.AccelViewMode
-import llc.arma.ble.domain.usecase.FftAxis
 import llc.arma.ble.domain.usecase.FftFrequency
-import llc.arma.ble.domain.usecase.FftViewMode
 import llc.arma.ble.domain.usecase.GetAccelerometerMeasureBySerialFlow
 import javax.inject.Inject
 
@@ -26,17 +26,15 @@ class AccelerometerAccelViewModel @Inject constructor(
     private var measureJob: Job? = null
 
     init {
-        startReadMeasure(false)
+        startReadMeasure()
     }
 
-    override fun setInitialState() = AccelerometerAccelContract.State.Display(
-        mode = AccelViewMode.ACCELERATION,
-        measureHistory = emptyList()
-    )
+    override fun setInitialState() = AccelerometerAccelContract.State.Loading(null)
 
     override fun handleEvents(event: AccelerometerAccelContract.Event) {
         when(event){
             is AccelerometerAccelContract.Event.OnRefresh -> reduce(viewState.value, event)
+            is AccelerometerAccelContract.Event.OnNavigateUp -> reduce(viewState.value, event)
         }
     }
 
@@ -44,26 +42,36 @@ class AccelerometerAccelViewModel @Inject constructor(
         state: AccelerometerAccelContract.State,
         event: AccelerometerAccelContract.Event.OnRefresh
     ) {
-        startReadMeasure(true)
+        startReadMeasure()
     }
 
-    private fun startReadMeasure(
-        restartJob: Boolean
-    ){
+    private fun reduce(
+        state: AccelerometerAccelContract.State,
+        event: AccelerometerAccelContract.Event.OnNavigateUp
+    ) {
+
+        setEffect { AccelerometerAccelContract.Effect.Navigation.Up }
+
+    }
+
+    private fun startReadMeasure() {
 
         val params = AccelerometerRealtimeDestination.argsFrom(savedStateHandle)
 
-        if(restartJob || measureJob == null) {
-            measureJob?.cancel()
-            measureJob = null
-            measureJob = viewModelScope.launch {
+        setState {
+            AccelerometerAccelContract.State.Loading(null)
+        }
 
-                setState {
-                    AccelerometerAccelContract.State.Display(
-                        mode = AccelViewMode.ACCELERATION,
-                        measureHistory = emptyList()
-                    )
+        measureJob?.cancel()
+        measureJob = viewModelScope.launch {
+
+            val flow = retryUntilNotNull(
+                onNewAttempt = {
+                    setState {
+                        AccelerometerAccelContract.State.Loading(it)
+                    }
                 }
+            ) {
 
                 getAccelerometerMeasureBySerialFlow(
                     params.bleSerial,
@@ -71,44 +79,73 @@ class AccelerometerAccelViewModel @Inject constructor(
                     params.accelMode,
                     params.fftAxis,
                     params.fftMode,
-                    params.frequency
-                ).onEach {
-                    it.fold(
-                        onSuccess = {
-                            setState {
-                                when (this) {
-                                    is AccelerometerAccelContract.State.Display -> {
-                                        var dataList = this.measureHistory.toMutableList().apply {
-                                            add(it)
-                                        }
-                                        if(params.accelMode != AccelViewMode.ANGLE) {
-                                            dataList = dataList.takeLast(100).toMutableList()
-                                        }
-                                        AccelerometerAccelContract.State.Display(
-                                            params.accelMode,
-                                            dataList
-                                        )
-                                    }
-
-                                    AccelerometerAccelContract.State.Exception -> {
-                                        AccelerometerAccelContract.State.Display(
-                                            params.accelMode,
-                                            listOf(it)
-                                        )
-                                    }
-                                }
-                            }
-                        },
-                        onFailure = {
-                            setState {
-                                AccelerometerAccelContract.State.Exception
-                            }
-                        }
-                    )
-                }.launchIn(this)
+                    FftFrequency.F_400
+                ).getOrNull()
 
             }
+
+            flow.onEach {
+
+                val state = viewState.value
+
+                val newState = when (it) {
+                    is Ble.Accelerometer.RealtimePoint.Angle -> {
+                        if (state is AccelerometerAccelContract.State.DisplayAngle) {
+                            state.copy(
+                                measureHistory = (state.measureHistory + it).takeLast(100)
+                            )
+                        } else {
+                            AccelerometerAccelContract.State.DisplayAngle(
+                                params.accelMode,
+                                listOf(it)
+                            )
+                        }
+                    }
+
+                    is Ble.Accelerometer.RealtimePoint.Common -> {
+                        if (state is AccelerometerAccelContract.State.DisplayCommon) {
+                            state.copy(
+                                measureHistory = (state.measureHistory + it).takeLast(100)
+                            )
+                        } else {
+                            AccelerometerAccelContract.State.DisplayCommon(
+                                params.accelMode,
+                                listOf(it)
+                            )
+                        }
+                    }
+
+                    is Ble.Accelerometer.RealtimePoint.Rotation -> {
+                        if (state is AccelerometerAccelContract.State.DisplayRotation) {
+                            state.copy(
+                                measureHistory = (state.measureHistory + it).takeLast(100)
+                            )
+                        } else {
+                            AccelerometerAccelContract.State.DisplayRotation(
+                                params.accelMode,
+                                listOf(it)
+                            )
+                        }
+                    }
+
+                    is Ble.Accelerometer.RealtimePoint.Vibration -> {
+                        if (state is AccelerometerAccelContract.State.DisplayVibration) {
+                            state.copy(
+                                measureHistory = (state.measureHistory + it).takeLast(100)
+                            )
+                        } else {
+                            AccelerometerAccelContract.State.DisplayVibration(
+                                params.accelMode,
+                                listOf(it)
+                            )
+                        }
+                    }
+                }
+                setState { newState }
+            }.launchIn(this)
+
         }
+
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AcceleromterAccel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AcceleromterAccel.kt
index 851ca0e..8682203 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AcceleromterAccel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AcceleromterAccel.kt
@@ -1,5 +1,6 @@
 package llc.arma.ble.app.ui.screen.inspection.accelerometer.rt
 
+import android.graphics.Color
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -13,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material.icons.rounded.Refresh
@@ -26,7 +28,9 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
@@ -44,6 +48,8 @@ import com.patrykandpatrick.vico.compose.component.textComponent
 import com.patrykandpatrick.vico.core.chart.decoration.ThresholdLine
 import com.patrykandpatrick.vico.core.chart.scale.AutoScaleUp
 import com.patrykandpatrick.vico.core.component.marker.MarkerComponent
+import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
+import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
 import com.patrykandpatrick.vico.core.entry.FloatEntry
 import com.patrykandpatrick.vico.core.scroll.AutoScrollCondition
@@ -51,9 +57,10 @@ import com.patrykandpatrick.vico.core.scroll.InitialScroll
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import llc.arma.ble.app.ui.common.RetryingLoadingTemplate
+import llc.arma.ble.app.ui.screen.ShapeType
 import llc.arma.ble.app.ui.screen.locale.localized
 import llc.arma.ble.domain.model.Ble
-import llc.arma.ble.domain.model.BleInfo
 import llc.arma.ble.domain.usecase.AccelScale
 import llc.arma.ble.domain.usecase.AccelViewMode
 import llc.arma.ble.domain.usecase.FftAxis
@@ -76,6 +83,15 @@ fun AccelerometerRealtime(
     val viewModel = hiltViewModel<AccelerometerAccelViewModel>()
     val state = viewModel.viewState.value
 
+    LaunchedEffect(Unit) {
+        viewModel.effect.collect {
+            when (it) {
+                AccelerometerAccelContract.Effect.Navigation.Up ->
+                    navigator.navigateUp()
+            }
+        }
+    }
+
     Scaffold(
         topBar = {
             TopAppBar(
@@ -96,38 +112,226 @@ fun AccelerometerRealtime(
                     )
                 },
                 actions = {
-                    IconButton(
-                        onClick = {
-                            viewModel.setEvent(AccelerometerAccelContract.Event.OnRefresh)
-                        },
-                        enabled = true
-                    ) {
-                        Icon(
-                            imageVector = Icons.Rounded.Refresh,
-                            contentDescription = null
-                        )
+
+                    if((state is AccelerometerAccelContract.State.Loading).not()) {
+
+                        IconButton(
+                            onClick = {
+                                viewModel.setEvent(AccelerometerAccelContract.Event.OnRefresh)
+                            },
+                            enabled = true
+                        ) {
+                            Icon(
+                                imageVector = Icons.Rounded.Refresh,
+                                contentDescription = null
+                            )
+                        }
+
                     }
 
                 }
             )
         }
     ) {
-        Box(modifier = Modifier.padding(it)) {
+        Box(
+            modifier = Modifier.padding(it)
+        ) {
 
             when (state) {
-                is AccelerometerAccelContract.State.Display -> DisplayState(state = state)
-                is AccelerometerAccelContract.State.Exception -> ExceptionState()
+                is AccelerometerAccelContract.State.DisplayAngle -> DisplayAngleState(state)
+                is AccelerometerAccelContract.State.DisplayCommon -> DisplayCommonState(state)
+                is AccelerometerAccelContract.State.DisplayRotation -> DisplayRotationState(state)
+                is AccelerometerAccelContract.State.DisplayVibration -> DisplayVibrationState(state)
+                is AccelerometerAccelContract.State.Loading -> LoadingState(viewModel, state)
             }
 
         }
     }
 
 }
-    
 
 @Composable
-private fun DisplayState(
-    state: AccelerometerAccelContract.State.Display
+private fun DisplayCommonState(
+    state: AccelerometerAccelContract.State.DisplayCommon
+) {
+
+    Column(
+        verticalArrangement = Arrangement.spacedBy(2.dp),
+        modifier = Modifier
+            .padding(horizontal = 16.dp)
+            .padding(bottom = 16.dp)
+            .fillMaxSize()
+    ) {
+
+        val xProducer = remember {
+            ChartEntryModelProducer(listOf<FloatEntry>())
+        }
+
+        val yProducer = remember {
+            ChartEntryModelProducer(listOf<FloatEntry>())
+        }
+
+        val zProducer = remember {
+            ChartEntryModelProducer(listOf<FloatEntry>())
+        }
+
+        xProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
+            FloatEntry(index.toFloat(), measurePoint.x)
+        })
+
+        yProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
+            FloatEntry(index.toFloat(), measurePoint.y)
+        })
+
+        zProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
+            FloatEntry(index.toFloat(), measurePoint.z)
+        })
+
+        val lineChart = lineChart(
+            decorations = listOf(
+                ThresholdLine(
+                    lineComponent = ShapeComponent(color = Color.TRANSPARENT),
+                    thresholdValue = 0f
+                )
+            ),
+            persistentMarkers = mapOf(
+                xProducer.getModel().maxX to MarkerComponent(
+                    label = textComponent(),
+                    indicator = null,
+                    guideline = axisGuidelineComponent()
+                )
+            ),
+        )
+
+        val marker = MarkerComponent(
+            label = textComponent(),
+            indicator = null,
+            guideline = axisGuidelineComponent()
+        )
+
+        Surface(
+            shape = ShapeType.Start.shape,
+            color = MaterialTheme.colorScheme.surfaceContainer,
+            modifier = Modifier.weight(1f)
+        ) {
+
+            Column(
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .padding(top = 8.dp)
+            ) {
+
+                Text(
+                    text = "Ось X",
+                    style = MaterialTheme.typography.titleSmall
+                )
+
+                Chart(
+                    marker = marker,
+                    chart = lineChart,
+                    chartModelProducer = xProducer,
+                    startAxis = startAxis(),
+                    bottomAxis = bottomAxis(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f),
+                    autoScaleUp = AutoScaleUp.None,
+                    diffAnimationSpec = tween(0),
+                    chartScrollSpec = rememberChartScrollSpec(
+                        initialScroll = InitialScroll.End,
+                        autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
+                        autoScrollAnimationSpec = tween(0)
+                    )
+                )
+
+            }
+
+        }
+
+        Surface(
+            shape = ShapeType.Middle.shape,
+            color = MaterialTheme.colorScheme.surfaceContainer,
+            modifier = Modifier.weight(1f)
+        ) {
+
+            Column(
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+            ) {
+
+                Text(
+                    text = "Ось Y",
+                    style = MaterialTheme.typography.titleSmall
+                )
+
+                Chart(
+                    marker = marker,
+                    chart = lineChart,
+                    chartModelProducer = yProducer,
+                    startAxis = startAxis(),
+                    bottomAxis = bottomAxis(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f),
+                    autoScaleUp = AutoScaleUp.None,
+                    diffAnimationSpec = tween(0),
+                    chartScrollSpec = rememberChartScrollSpec(
+                        initialScroll = InitialScroll.End,
+                        autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
+                        autoScrollAnimationSpec = tween(0)
+                    )
+                )
+
+            }
+
+        }
+
+        Surface(
+            shape = ShapeType.End.shape,
+            color = MaterialTheme.colorScheme.surfaceContainer,
+            modifier = Modifier.weight(1f)
+        ) {
+
+            Column(
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .padding(bottom = 8.dp)
+            ) {
+
+                Text(
+                    text = "Ось Z",
+                    style = MaterialTheme.typography.titleSmall
+                )
+
+                Chart(
+                    marker = marker,
+                    chart = lineChart,
+                    chartModelProducer = zProducer,
+                    startAxis = startAxis(),
+                    bottomAxis = bottomAxis(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f),
+                    autoScaleUp = AutoScaleUp.None,
+                    diffAnimationSpec = tween(0),
+                    chartScrollSpec = rememberChartScrollSpec(
+                        initialScroll = InitialScroll.End,
+                        autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
+                        autoScrollAnimationSpec = tween(0)
+                    )
+                )
+
+            }
+
+        }
+
+    }
+
+}
+
+@Composable
+private fun DisplayAngleState(
+    state: AccelerometerAccelContract.State.DisplayAngle
 ) {
 
     Box(modifier = Modifier
@@ -159,42 +363,123 @@ private fun DisplayState(
             }
 
             xProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
-                when(measurePoint){
-                    is Ble.Accelerometer.RealtimePoint.Common ->
-                        FloatEntry(index.toFloat(), measurePoint.x )
-                    is Ble.Accelerometer.RealtimePoint.Vibration ->
-                        FloatEntry(index.toFloat(), measurePoint.value)
-                    is Ble.Accelerometer.RealtimePoint.Angle ->
-                        FloatEntry(index.toFloat(), measurePoint.x )
-                    is Ble.Accelerometer.RealtimePoint.Rotation ->
-                        FloatEntry(index.toFloat(), measurePoint.angle )
-                }
+                FloatEntry(index.toFloat(), measurePoint.x )
             })
 
             yProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
-                when(measurePoint){
-                    is Ble.Accelerometer.RealtimePoint.Common ->
-                        FloatEntry(index.toFloat(), measurePoint.y )
-                    is Ble.Accelerometer.RealtimePoint.Vibration ->
-                        FloatEntry(index.toFloat(), measurePoint.value)
-                    is Ble.Accelerometer.RealtimePoint.Angle ->
-                        FloatEntry(index.toFloat(), measurePoint.y)
-                    is Ble.Accelerometer.RealtimePoint.Rotation ->
-                        FloatEntry(index.toFloat(), measurePoint.tmp)
-                }
+                FloatEntry(index.toFloat(), measurePoint.y)
             })
 
             zProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
-                when(measurePoint){
-                    is Ble.Accelerometer.RealtimePoint.Common ->
-                        FloatEntry(index.toFloat(), measurePoint.z)
-                    is Ble.Accelerometer.RealtimePoint.Vibration ->
-                        FloatEntry(index.toFloat(), measurePoint.value)
-                    is Ble.Accelerometer.RealtimePoint.Angle ->
-                        FloatEntry(index.toFloat(), measurePoint.z)
-                    is Ble.Accelerometer.RealtimePoint.Rotation ->
-                        FloatEntry(index.toFloat(), measurePoint.turnovers.toFloat())
+                FloatEntry(index.toFloat(), measurePoint.z)
+            })
+
+
+            val lastMeasure = state.measureHistory.last()
+
+            Column(
+                verticalArrangement = Arrangement.spacedBy(16.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+
+                Column(
+                    modifier = Modifier.weight(1f),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+
+                    Text(text = "Ось X: ${lastMeasure.x}")
+
+                    Spacer(modifier = Modifier.height(8.dp))
+
+                    Angle(
+                        angle = lastMeasure.x,
+                        modifier = Modifier.weight(1f),
+                    )
+
                 }
+
+                Column(
+                    modifier = Modifier.weight(1f),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+
+                    Text(text = "Ось Y: ${lastMeasure.y}")
+
+                    Spacer(modifier = Modifier.height(8.dp))
+
+                    Angle(
+                        modifier = Modifier.weight(1f),
+                        angle = lastMeasure.y
+                    )
+
+                }
+
+                Column(
+                    modifier = Modifier.weight(1f),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+
+                    Text(text = "Ось Z: ${lastMeasure.z}")
+
+                    Spacer(modifier = Modifier.height(8.dp))
+
+                    Angle(
+                        modifier = Modifier.weight(1f),
+                        angle = lastMeasure.z
+                    )
+
+                }
+
+            }
+
+        }
+
+    }
+}
+
+@Composable
+private fun DisplayRotationState(
+    state: AccelerometerAccelContract.State.DisplayRotation
+) {
+
+    Box(modifier = Modifier
+        .padding(8.dp)
+        .fillMaxSize()
+    ) {
+
+
+        if (state.measureHistory.isEmpty()) {
+
+            CircularProgressIndicator(
+                modifier = Modifier.align(Alignment.Center),
+                strokeCap = StrokeCap.Round
+            )
+
+        } else {
+
+
+            val xProducer = remember {
+                ChartEntryModelProducer(listOf<FloatEntry>())
+            }
+
+            val yProducer = remember {
+                ChartEntryModelProducer(listOf<FloatEntry>())
+            }
+
+            val zProducer = remember {
+                ChartEntryModelProducer(listOf<FloatEntry>())
+            }
+
+            xProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
+                FloatEntry(index.toFloat(), measurePoint.angle )
+            })
+
+            yProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
+                FloatEntry(index.toFloat(), measurePoint.tmp)
+            })
+
+            zProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
+                FloatEntry(index.toFloat(), measurePoint.turnovers.toFloat())
             })
 
             val lineChart = lineChart(
@@ -216,217 +501,67 @@ private fun DisplayState(
                 guideline = axisGuidelineComponent()
             )
 
-            val lastMeasure = state.measureHistory.lastOrNull()
+            val lastMeasure = state.measureHistory.last()
 
+            Column(
+                verticalArrangement = Arrangement.spacedBy(16.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
 
-            when(lastMeasure){
-                is Ble.Accelerometer.RealtimePoint.Angle -> {
-                    Column(
-                        verticalArrangement = Arrangement.spacedBy(16.dp),
-                        horizontalAlignment = Alignment.CenterHorizontally
-                    ) {
+                Column(
+                    modifier = Modifier.weight(1f),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
 
-                        Column(
-                            modifier = Modifier.weight(1f),
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
+                    Text(text = "Положение: ${lastMeasure.angle}")
 
-                            Text(text = "Ось X: ${lastMeasure.x}")
+                    Spacer(modifier = Modifier.height(8.dp))
 
-                            Spacer(modifier = Modifier.height(8.dp))
+                    Angle(
+                        angle = lastMeasure.angle,
+                        modifier = Modifier.weight(1f),
+                    )
 
-                            Angle(
-                                angle = lastMeasure.x,
-                                modifier = Modifier.weight(1f),
-                            )
-
-                        }
-
-                        Column(
-                            modifier = Modifier.weight(1f),
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
-
-                            Text(text = "Ось Y: ${lastMeasure.y}")
-
-                            Spacer(modifier = Modifier.height(8.dp))
-
-                            Angle(
-                                modifier = Modifier.weight(1f),
-                                angle = lastMeasure.y
-                            )
-
-                        }
-
-                        Column(
-                            modifier = Modifier.weight(1f),
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
-
-                            Text(text = "Ось Z: ${lastMeasure.z}")
-
-                            Spacer(modifier = Modifier.height(8.dp))
-
-                            Angle(
-                                modifier = Modifier.weight(1f),
-                                angle = lastMeasure.z
-                            )
-
-                        }
-
-                    }
                 }
-                is Ble.Accelerometer.RealtimePoint.Rotation -> {
-                    Column(
-                        verticalArrangement = Arrangement.spacedBy(16.dp),
-                        horizontalAlignment = Alignment.CenterHorizontally
-                    ) {
 
-                        Column(
-                            modifier = Modifier.weight(1f),
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
+                Text(text = "Скорость:")
+                Chart(
+                    marker = marker,
+                    chart = lineChart,
+                    chartModelProducer = yProducer,
+                    startAxis = startAxis(),
+                    bottomAxis = bottomAxis(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f),
+                    autoScaleUp = AutoScaleUp.None,
+                    diffAnimationSpec = tween(0),
+                    chartScrollSpec = rememberChartScrollSpec(
+                        initialScroll = InitialScroll.End,
+                        autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
+                        autoScrollAnimationSpec = tween(0)
+                    )
+                )
 
-                            Text(text = "Положение: ${lastMeasure.angle}")
+                Text(text = "Обороты:")
+                Chart(
+                    marker = marker,
+                    chart = lineChart,
+                    chartModelProducer = zProducer,
+                    startAxis = startAxis(),
+                    bottomAxis = bottomAxis(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f),
+                    autoScaleUp = AutoScaleUp.None,
+                    diffAnimationSpec = tween(0),
+                    chartScrollSpec = rememberChartScrollSpec(
+                        initialScroll = InitialScroll.End,
+                        autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
+                        autoScrollAnimationSpec = tween(0)
+                    )
+                )
 
-                            Spacer(modifier = Modifier.height(8.dp))
-
-                            Angle(
-                                angle = lastMeasure.angle,
-                                modifier = Modifier.weight(1f),
-                            )
-
-                        }
-
-                        Text(text = "Скорость:")
-                        Chart(
-                            marker = marker,
-                            chart = lineChart,
-                            chartModelProducer = yProducer,
-                            startAxis = startAxis(),
-                            bottomAxis = bottomAxis(),
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .weight(1f),
-                            autoScaleUp = AutoScaleUp.None,
-                            diffAnimationSpec = tween(0),
-                            chartScrollSpec = rememberChartScrollSpec(
-                                initialScroll = InitialScroll.End,
-                                autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
-                                autoScrollAnimationSpec = tween(0)
-                            )
-                        )
-
-                        Text(text = "Обороты:")
-                        Chart(
-                            marker = marker,
-                            chart = lineChart,
-                            chartModelProducer = zProducer,
-                            startAxis = startAxis(),
-                            bottomAxis = bottomAxis(),
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .weight(1f),
-                            autoScaleUp = AutoScaleUp.None,
-                            diffAnimationSpec = tween(0),
-                            chartScrollSpec = rememberChartScrollSpec(
-                                initialScroll = InitialScroll.End,
-                                autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
-                                autoScrollAnimationSpec = tween(0)
-                            )
-                        )
-
-                    }
-                }
-                is Ble.Accelerometer.RealtimePoint.Vibration -> {
-                    Column {
-
-                        Text(text = "Вибрация:")
-
-                        Chart(
-                            marker = marker,
-                            chart = lineChart,
-                            chartModelProducer = xProducer,
-                            startAxis = startAxis(),
-                            bottomAxis = bottomAxis(),
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .weight(1f),
-                            autoScaleUp = AutoScaleUp.None,
-                            diffAnimationSpec = tween(0),
-                            chartScrollSpec = rememberChartScrollSpec(
-                                initialScroll = InitialScroll.End,
-                                autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
-                                autoScrollAnimationSpec = tween(0)
-                            )
-                        )
-
-                    }
-                }
-                is Ble.Accelerometer.RealtimePoint.Common -> {
-                    Column {
-
-                        Text(text = "Ось X:")
-
-                        Chart(
-                            marker = marker,
-                            chart = lineChart,
-                            chartModelProducer = xProducer,
-                            startAxis = startAxis(),
-                            bottomAxis = bottomAxis(),
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .weight(1f),
-                            autoScaleUp = AutoScaleUp.None,
-                            diffAnimationSpec = tween(0),
-                            chartScrollSpec = rememberChartScrollSpec(
-                                initialScroll = InitialScroll.End,
-                                autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
-                                autoScrollAnimationSpec = tween(0)
-                            )
-                        )
-
-                        Text(text = "Ось Y:")
-                        Chart(
-                            marker = marker,
-                            chart = lineChart,
-                            chartModelProducer = yProducer,
-                            startAxis = startAxis(),
-                            bottomAxis = bottomAxis(),
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .weight(1f),
-                            autoScaleUp = AutoScaleUp.None,
-                            diffAnimationSpec = tween(0),
-                            chartScrollSpec = rememberChartScrollSpec(
-                                initialScroll = InitialScroll.End,
-                                autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
-                                autoScrollAnimationSpec = tween(0)
-                            )
-                        )
-
-                        Text(text = "Ось Z:")
-                        Chart(
-                            marker = marker,
-                            chart = lineChart,
-                            chartModelProducer = zProducer,
-                            startAxis = startAxis(),
-                            bottomAxis = bottomAxis(),
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .weight(1f),
-                            autoScaleUp = AutoScaleUp.None,
-                            diffAnimationSpec = tween(0),
-                            chartScrollSpec = rememberChartScrollSpec(
-                                initialScroll = InitialScroll.End,
-                                autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
-                                autoScrollAnimationSpec = tween(0)
-                            )
-                        )
-
-                    }
-                }
-                null -> {}
             }
 
         }
@@ -434,6 +569,70 @@ private fun DisplayState(
     }
 }
 
+@Composable
+private fun DisplayVibrationState(
+    state: AccelerometerAccelContract.State.DisplayVibration
+) {
+
+    Box(
+        modifier = Modifier
+            .padding(16.dp)
+            .fillMaxSize()
+    ) {
+
+
+        val xProducer = remember {
+            ChartEntryModelProducer(listOf<FloatEntry>())
+        }
+
+        xProducer.setEntries(state.measureHistory.mapIndexed { index, measurePoint ->
+            FloatEntry(index.toFloat(), measurePoint.value)
+        })
+
+        val lineChart = lineChart(
+            decorations = listOf(
+                ThresholdLine(
+                    labelComponent = textComponent(color = androidx.compose.ui.graphics.Color.Transparent),
+                    lineComponent = ShapeComponent(color = Color.TRANSPARENT),
+                    thresholdValue = 0f
+                )
+            ),
+            persistentMarkers = mapOf(
+                xProducer.getModel().maxX to MarkerComponent(
+                    label = textComponent(),
+                    indicator = null,
+                    guideline = axisGuidelineComponent()
+                )
+            ),
+        )
+
+        val marker = MarkerComponent(
+            label = textComponent(),
+            indicator = null,
+            guideline = axisGuidelineComponent()
+        )
+
+        Chart(
+            marker = marker,
+            chart = lineChart,
+            chartModelProducer = xProducer,
+            startAxis = startAxis(),
+            bottomAxis = bottomAxis(),
+            modifier = Modifier.fillMaxSize(),
+            autoScaleUp = AutoScaleUp.None,
+            diffAnimationSpec = tween(0),
+            chartScrollSpec = rememberChartScrollSpec(
+                initialScroll = InitialScroll.End,
+                autoScrollCondition = AutoScrollCondition.OnModelSizeIncreased,
+                autoScrollAnimationSpec = tween(0)
+            )
+        )
+
+
+    }
+
+}
+
 @Composable
 fun Angle(
     modifier: Modifier = Modifier,
@@ -504,21 +703,21 @@ fun Angle(
 }
 
 @Composable
-private fun ExceptionState(
-
+private fun LoadingState(
+    viewModel: AccelerometerAccelViewModel,
+    state: AccelerometerAccelContract.State.Loading
 ) {
     Box(
+        contentAlignment = Alignment.Center,
         modifier = Modifier
-            .padding(8.dp)
-            .fillMaxWidth()
-            .aspectRatio(2f),
+            .fillMaxSize(),
     ){
 
-        Text(
-            textAlign = TextAlign.Center,
-            text = "Во время загрузки произошла ошибка",
-            modifier = Modifier.align(Alignment.Center)
-        )
+        RetryingLoadingTemplate(
+            attempt = state.attempt
+        ) {
+            viewModel.setEvent(AccelerometerAccelContract.Event.OnRefresh)
+        }
 
     }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerRealtimeForm.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/form/AccelerometerRealtimeForm.kt
similarity index 96%
rename from app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerRealtimeForm.kt
rename to app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/form/AccelerometerRealtimeForm.kt
index ce2132b..aae8336 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/AccelerometerRealtimeForm.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/rt/form/AccelerometerRealtimeForm.kt
@@ -1,4 +1,4 @@
-package llc.arma.ble.app.ui.screen.inspection.accelerometer.rt
+package llc.arma.ble.app.ui.screen.inspection.accelerometer.rt.form
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,15 +9,12 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.input.TextFieldLineLimits
 import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.Sort
 import androidx.compose.material3.Button
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExposedDropdownMenuAnchorType
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.ExposedDropdownMenuDefaults
-import androidx.compose.material3.Icon
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Surface
@@ -36,16 +33,10 @@ import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.generated.destinations.AccelerometerRealtimeDestination
 import com.ramcosta.composedestinations.generated.destinations.AccelerometerSpectreDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import com.ramcosta.composedestinations.result.ResultBackNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.app.ui.screen.filter.BleFilterContract
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
 import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.RealtimeViewMode
 import llc.arma.ble.app.ui.screen.locale.localized
-import llc.arma.ble.domain.model.BleFilter
 import llc.arma.ble.domain.usecase.AccelScale
 import llc.arma.ble.domain.usecase.AccelViewMode
 import llc.arma.ble.domain.usecase.FftAxis
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/spectre/AccelerometerSpectre.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/spectre/AccelerometerSpectre.kt
index 5cc1ca6..6b5abe4 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/spectre/AccelerometerSpectre.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/spectre/AccelerometerSpectre.kt
@@ -4,14 +4,10 @@ import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
@@ -25,7 +21,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
@@ -50,7 +49,6 @@ import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import llc.arma.ble.app.ui.screen.locale.localized
 import llc.arma.ble.domain.common.ProgressState
-import llc.arma.ble.domain.model.BleInfo
 import llc.arma.ble.domain.usecase.AccelScale
 import llc.arma.ble.domain.usecase.AccelViewMode
 import llc.arma.ble.domain.usecase.FftAxis
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteScreen.kt
new file mode 100644
index 0000000..09e7bae
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteScreen.kt
@@ -0,0 +1,62 @@
+package llc.arma.ble.app.ui.screen.inspection.accelerometer.write
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import llc.arma.ble.app.ui.common.WriteFlow
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.screen.inspection.thermometer.write.ThermometerWriteViewModel
+import llc.arma.ble.domain.model.Ble
+
+@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
+@Composable
+fun AccelerometerWriteScreen(
+    bleSerial: String,
+    writeRequest: Ble.Accelerometer.WriteRequest,
+    navigator: ResultBackNavigator<Boolean>
+) {
+
+    val viewModel = hiltViewModel<AccelerometerWriteViewModel>()
+    val state = viewModel.viewState.value
+
+    LaunchedEffect(Unit) {
+        viewModel.effect.collect {
+            when(it){
+                WriteFlowContract.Effect.Navigation.Up ->
+                    navigator.navigateBack()
+
+                WriteFlowContract.Effect.Navigation.UpSuccess ->
+                    navigator.navigateBack(true)
+            }
+        }
+    }
+
+    Surface(
+        shape = RoundedCornerShape(20.dp)
+    ) {
+
+        Box(
+            modifier = Modifier.padding(20.dp)
+        ) {
+
+            WriteFlow(
+                state = state,
+                onEvent = viewModel::setEvent
+            )
+
+        }
+
+    }
+
+}
+
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteViewModel.kt
new file mode 100644
index 0000000..c4d9f71
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/accelerometer/write/AccelerometerWriteViewModel.kt
@@ -0,0 +1,149 @@
+package llc.arma.ble.app.ui.screen.inspection.accelerometer.write
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.ramcosta.composedestinations.generated.destinations.AccelerometerWriteScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.BeaconWriteScreenDestination
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.common.WriteItemData
+import llc.arma.ble.app.ui.screen.ShapeType
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
+import llc.arma.ble.app.ui.screen.inspection.thermometer.main.BleMenuItem
+import llc.arma.ble.app.ui.screen.locale.localizedName
+import llc.arma.ble.domain.model.Ble
+import llc.arma.ble.domain.usecase.WriteBle
+import javax.inject.Inject
+
+@HiltViewModel
+class AccelerometerWriteViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle,
+    private val writeBle: WriteBle
+) : BaseViewModel<WriteFlowContract.State, WriteFlowContract.Event, WriteFlowContract.Effect>() {
+
+    init {
+
+        val params = AccelerometerWriteScreenDestination.argsFrom(savedStateHandle)
+
+        val items = mutableListOf<WriteItemData>()
+
+        params.writeRequest.tx?.let {
+            items.add(WriteItemData("Мощность", "${it.localizedName} db"))
+        }
+
+        params.writeRequest.saveHistorySettings?.let {
+
+            items.add(
+                WriteItemData(
+                    title = "Сохранять историю измерений",
+                    subtitle = when(it){
+                        Ble.Accelerometer.HistorySettings.Disabled -> "Выключено"
+                        is Ble.Accelerometer.HistorySettings.Enabled -> "Включено"
+                    },
+                )
+            )
+
+        }
+
+        params.writeRequest.historyInterval?.let {
+
+            val hours = it / millisInHour
+            val minutes = (it - (hours * millisInHour)) / millisInMinute
+            val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
+
+            items.add(
+                WriteItemData(
+                    title = "Интервал измерений",
+                    subtitle = "$hours ч. $minutes мин. $seconds сек."
+                )
+            )
+
+        }
+
+        params.writeRequest.readInterval?.let {
+
+            val hours = it / millisInHour
+            val minutes = (it - (hours * millisInHour)) / millisInMinute
+            val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
+
+            items.add(
+                WriteItemData(
+                    title = "Интервал чтения",
+                    subtitle = "$hours ч. $minutes мин. $seconds сек."
+                )
+            )
+
+        }
+
+        setState {
+            WriteFlowContract.State.Display(
+                items
+            )
+        }
+
+    }
+
+    override fun setInitialState() = WriteFlowContract.State.Loading
+
+    override fun handleEvents(event: WriteFlowContract.Event) {
+        when(event){
+            is WriteFlowContract.Event.OnNavigateUp -> reduce(viewState.value, event)
+            is WriteFlowContract.Event.OnWrite -> reduce(viewState.value, event)
+        }
+    }
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnNavigateUp
+    ){
+
+        setEffect {
+            when(state){
+                is WriteFlowContract.State.Display,
+                WriteFlowContract.State.Error,
+                WriteFlowContract.State.Loading,
+                WriteFlowContract.State.Writing -> WriteFlowContract.Effect.Navigation.Up
+                WriteFlowContract.State.Success -> WriteFlowContract.Effect.Navigation.UpSuccess
+            }
+
+        }
+
+    }
+
+    private var writeJob: Job? = null
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnWrite
+    ){
+
+        val params = AccelerometerWriteScreenDestination.argsFrom(savedStateHandle)
+
+        setState {
+            WriteFlowContract.State.Writing
+        }
+
+        writeJob?.cancel()
+        writeJob = viewModelScope.launch {
+            writeBle(params.bleSerial, params.writeRequest).fold(
+                onSuccess = {
+                    setState {
+                        WriteFlowContract.State.Success
+                    }
+                },
+                onFailure = {
+                    setState {
+                        WriteFlowContract.State.Error
+                    }
+                }
+            )
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconContract.kt
index 51acdb6..9b3957c 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconContract.kt
@@ -3,7 +3,6 @@ package llc.arma.ble.app.ui.screen.inspection.beacon
 import llc.arma.ble.app.ui.common.ViewEvent
 import llc.arma.ble.app.ui.common.ViewSideEffect
 import llc.arma.ble.app.ui.common.ViewState
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.app.ui.screen.inspection.thermometer.main.ThermometerContract.Effect.Navigation
 import llc.arma.ble.domain.model.Ble
 
@@ -13,11 +12,7 @@ class BeaconContract {
 
         data object OnNavigateUp : Event()
 
-        object OnWriteBle : Event()
-
-        object OnHideWriteBlePreview : Event()
-
-        object OnShowWriteBlePreview : Event()
+        data object OnShowWriteBlePreview : Event()
 
         data object OnPowerEdit : Event()
 
@@ -25,56 +20,36 @@ class BeaconContract {
             val ble: Ble.Beacon
         ) : Event()
 
-        data class OnPowerChanged(
-            val tx: BleView.BleState.TX
+        data class OnTxChanged(
+            val tx: Ble.BleState.TX
         ) : Event()
 
-        data class OnTxChanged(val tx: BleView.BleState.TX) : Event()
-
-        object OnNavigateUpClicked : Event()
-
-        object OnChangePassword : Event()
+        data object OnChangePassword : Event()
 
     }
 
     sealed class State : ViewState {
 
-        data object Loading : State()
+        data class Loading(
+            val attempt: Int?
+        ) : State()
 
         data class Display(
             val origin: Ble.Beacon,
-            val beacon: BleView.Beacon,
-            val writeState: WriteState?
-        ) : State() {
-
-            sealed class WriteState {
-
-                data class DisplayPreview(
-                    val writeRequest: Ble.Beacon.WriteRequest
-                ) : WriteState()
-
-                data class Writing(
-                    val writeRequest: Ble.Beacon.WriteRequest
-                ) : WriteState()
-
-                data object Success : WriteState()
-
-                data object Failure : WriteState()
-
-            }
-
-        }
+            val beacon: Ble.Beacon
+        ) : State()
 
     }
 
     sealed class Effect : ViewSideEffect {
 
-        data object HideWriteBlePreview : Effect()
-
-        data object ShowWriteBlePreview : Effect()
-
         sealed class Navigation : Effect() {
 
+            data class Write(
+                val bleSerial: String,
+                val writeRequest: Ble.Beacon.WriteRequest
+            ) : Navigation()
+
             data object Up : Navigation()
 
             data class PasswordForm(
@@ -82,7 +57,7 @@ class BeaconContract {
             ) : Navigation()
 
             data class TxSelector(
-                val tx: BleView.BleState.TX?
+                val tx: Ble.BleState.TX?
             ) : Navigation()
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconScreen.kt
index 48bf4f0..34150d5 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconScreen.kt
@@ -1,12 +1,10 @@
 package llc.arma.ble.app.ui.screen.inspection.beacon
 
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ContainedLoadingIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -17,53 +15,39 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.generated.destinations.BeaconWriteScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.ChangePasswordScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.TxPowerSelectorScreenDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.ResultRecipient
 import com.ramcosta.composedestinations.result.onResult
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import llc.arma.ble.app.ui.common.rememberBottomDialogState
-import llc.arma.ble.app.ui.model.BleView
+import llc.arma.ble.app.ui.common.RetryingLoadingTemplate
 import llc.arma.ble.app.ui.screen.inspection.beacon.view.DisplayState
-import llc.arma.ble.app.ui.screen.inspection.beacon.view.Write
+import llc.arma.ble.app.ui.screen.inspection.gate.main.GateContract
+import llc.arma.ble.app.ui.screen.inspection.gate.main.GateViewModel
 import llc.arma.ble.app.ui.screen.locale.localized
+import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.model.BleInfo
 
-enum class SheetPage {
-    WRITE
-}
-
 @Destination<RootGraph>
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BeaconScreen(
     bleSerial: String,
-    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, BleView.BleState.TX>,
+    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, Ble.BleState.TX>,
     navigator: DestinationsNavigator
 ) {
 
     val viewModel = hiltViewModel<BeaconViewModel>()
     val state = viewModel.viewState.value
 
-    var sheetPage by rememberSaveable {
-        mutableStateOf<SheetPage?>(null)
-    }
-
-    val bottomDialog = rememberBottomDialogState()
-
     txSelectResult.onResult {
         viewModel.setEvent(BeaconContract.Event.OnTxChanged(it))
     }
@@ -72,15 +56,6 @@ fun BeaconScreen(
         viewModel.effect.onEach {
             when(it){
 
-                BeaconContract.Effect.HideWriteBlePreview -> launch {
-                    sheetPage = null
-                }
-                BeaconContract.Effect.ShowWriteBlePreview -> launch {
-                    sheetPage = null
-                    delay(100)
-                    sheetPage = SheetPage.WRITE
-                }
-
                 is BeaconContract.Effect.Navigation.PasswordForm ->
                     navigator.navigate(ChangePasswordScreenDestination(it.bleSerial))
 
@@ -88,35 +63,14 @@ fun BeaconScreen(
                     navigator.navigate(TxPowerSelectorScreenDestination(it.tx))
 
                 BeaconContract.Effect.Navigation.Up ->
-                    navigator.popBackStack()
+                    navigator.navigateUp()
+
+                is BeaconContract.Effect.Navigation.Write ->
+                    navigator.navigate(BeaconWriteScreenDestination(it.bleSerial, it.writeRequest))
             }
         }.launchIn(this)
     }
 
-    LaunchedEffect(sheetPage){
-        when(sheetPage){
-            SheetPage.WRITE -> bottomDialog.show {
-
-                val currentState = viewModel.viewState.value
-
-                if(currentState is BeaconContract.State.Display && currentState.writeState != null) {
-
-                    Write(
-                        state = currentState.writeState,
-                        onEvent = {
-                            viewModel.setEvent(it)
-                        }
-                    )
-
-                }
-
-            }
-            else -> {
-                bottomDialog.hide()
-            }
-        }
-    }
-
     Scaffold(
         topBar = {
             TopAppBar(
@@ -144,34 +98,30 @@ fun BeaconScreen(
         ) {
 
             when(state){
-                is BeaconContract.State.Display -> DisplayState(
-                    onEvent = {
-                        viewModel.setEvent(it)
-                    },
-                    ble = state.beacon,
-                    origin = state.origin
-                )
-                is BeaconContract.State.Loading -> LoadingState()
+                is BeaconContract.State.Display -> DisplayState(viewModel, state)
+                is BeaconContract.State.Loading -> LoadingState(viewModel, state)
             }
 
         }
 
     }
-
-
     
 }
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
-private fun LoadingState(){
+private fun LoadingState(
+    viewModel: BeaconViewModel,
+    state: BeaconContract.State.Loading,
+){
 
     Box(
         contentAlignment = Alignment.Center,
         modifier = Modifier.fillMaxSize()
     ){
 
-        ContainedLoadingIndicator()
+        RetryingLoadingTemplate(state.attempt){
+            viewModel.setEvent(BeaconContract.Event.OnNavigateUp)
+        }
 
     }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconViewModel.kt
index 620a9f6..3389940 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/BeaconViewModel.kt
@@ -2,22 +2,14 @@ package llc.arma.ble.app.ui.screen.inspection.beacon
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.toRoute
 import com.ramcosta.composedestinations.generated.destinations.BeaconScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
-import llc.arma.ble.app.ui.mapper.BleMapper
-import llc.arma.ble.app.ui.mapper.BleViewMapper
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.AccelerometerContract
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.RealtimeViewMode
+import llc.arma.ble.app.ui.common.retryUntilNotNull
+import llc.arma.ble.app.ui.screen.inspection.gate.main.GateContract
 import llc.arma.ble.domain.model.Ble
-import llc.arma.ble.domain.usecase.AccelScale
-import llc.arma.ble.domain.usecase.AccelViewMode
-import llc.arma.ble.domain.usecase.FftAxis
-import llc.arma.ble.domain.usecase.FftFrequency
-import llc.arma.ble.domain.usecase.FftViewMode
 import llc.arma.ble.domain.usecase.GetBleBySerial
 import llc.arma.ble.domain.usecase.WriteBle
 import javax.inject.Inject
@@ -26,9 +18,6 @@ import javax.inject.Inject
 class BeaconViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle,
     getBleBySerial: GetBleBySerial,
-    private val bleMapper: BleMapper,
-    private val writeBle: WriteBle,
-    private val bleViewMapper: BleViewMapper
 ) : BaseViewModel<BeaconContract.State, BeaconContract.Event, BeaconContract.Effect>() {
 
     init {
@@ -37,12 +26,17 @@ class BeaconViewModel @Inject constructor(
 
         viewModelScope.launch {
 
-            val ble = getBleBySerial.invoke(params.bleSerial, this).fold(
-                onSuccess = { it },
-                onFailure = { null }
-            )
+            val ble = retryUntilNotNull(
+                onNewAttempt = {
+                    setState {
+                        BeaconContract.State.Loading(it)
+                    }
+                }
+            ){
+                getBleBySerial.invoke(params.bleSerial, this).getOrNull()
+            }
 
-            if(ble != null && ble is Ble.Beacon){
+            if(ble is Ble.Beacon){
                 setState {
 
                     when(this){
@@ -54,11 +48,10 @@ class BeaconViewModel @Inject constructor(
                                 )
                             )
                         }
-                        BeaconContract.State.Loading -> {
+                        is BeaconContract.State.Loading -> {
                             BeaconContract.State.Display(
                                 origin = ble,
-                                beacon = bleMapper.map(ble) as BleView.Beacon,
-                                writeState = null
+                                beacon = ble
                             )
                         }
                     }
@@ -69,36 +62,19 @@ class BeaconViewModel @Inject constructor(
 
     }
 
-    override fun setInitialState() = BeaconContract.State.Loading
+    override fun setInitialState() = BeaconContract.State.Loading(null)
 
     override fun handleEvents(event: BeaconContract.Event) {
         when(event){
-            is BeaconContract.Event.OnNavigateUpClicked -> reduce(viewState.value, event)
             is BeaconContract.Event.OnTxChanged -> reduce(viewState.value, event)
             is BeaconContract.Event.OnBleChanged -> reduce(viewState.value, event)
             is BeaconContract.Event.OnChangePassword -> reduce(viewState.value, event)
-            is BeaconContract.Event.OnHideWriteBlePreview -> reduce(viewState.value, event)
             is BeaconContract.Event.OnShowWriteBlePreview -> reduce(viewState.value, event)
-            is BeaconContract.Event.OnWriteBle -> reduce(viewState.value, event)
-            is BeaconContract.Event.OnPowerChanged -> reduce(viewState.value, event)
             is BeaconContract.Event.OnPowerEdit -> reduce(viewState.value, event)
             is BeaconContract.Event.OnNavigateUp -> reduce(viewState.value, event)
         }
     }
 
-    private fun reduce(
-        state: BeaconContract.State,
-        event: BeaconContract.Event.OnPowerChanged
-    ) {
-
-        if(state is BeaconContract.State.Display) {
-
-            state.beacon.state.tx = event.tx
-
-        }
-
-    }
-
     private fun reduce(
         state: BeaconContract.State,
         event: BeaconContract.Event.OnNavigateUp
@@ -124,19 +100,21 @@ class BeaconViewModel @Inject constructor(
 
     }
 
-
-    private fun reduce(
-        state: BeaconContract.State,
-        event: BeaconContract.Event.OnNavigateUpClicked
-    ) {
-        setEffect { BeaconContract.Effect.Navigation.Up }
-    }
-
     private fun reduce(
         state: BeaconContract.State,
         event: BeaconContract.Event.OnTxChanged
     ) {
-
+        if(state is BeaconContract.State.Display){
+            setState {
+                state.copy(
+                    beacon = state.beacon.copy(
+                        state = state.beacon.state.copy(
+                            tx = event.tx
+                        )
+                    )
+                )
+            }
+        }
     }
 
     private fun reduce(
@@ -159,8 +137,7 @@ class BeaconViewModel @Inject constructor(
                 setState {
                     BeaconContract.State.Display(
                         origin = event.ble,
-                        beacon = bleMapper.map(event.ble) as BleView.Beacon,
-                        writeState = null
+                        beacon = event.ble
                     )
                 }
             }
@@ -181,15 +158,6 @@ class BeaconViewModel @Inject constructor(
 
     }
 
-    private fun reduce(
-        state: BeaconContract.State,
-        event: BeaconContract.Event.OnHideWriteBlePreview
-    ) {
-        setEffect {
-            BeaconContract.Effect.HideWriteBlePreview
-        }
-    }
-
     private fun reduce(
         state: BeaconContract.State,
         event: BeaconContract.Event.OnShowWriteBlePreview
@@ -197,83 +165,16 @@ class BeaconViewModel @Inject constructor(
 
         if(state is BeaconContract.State.Display){
 
-            val newBle = bleViewMapper.map(state.beacon) as Ble.Beacon
+            val params = BeaconScreenDestination.argsFrom(savedStateHandle)
+
+            val newBle = state.beacon
 
             val writeRequest = Ble.Beacon.WriteRequest(
                 tx = if(newBle.state.tx == state.origin.state.tx) null else newBle.state.tx
             )
 
-            setState {
-                state.copy(
-                    writeState = BeaconContract.State.Display.WriteState.DisplayPreview(
-                        writeRequest
-                    )
-                )
-            }
-
             setEffect {
-                BeaconContract.Effect.ShowWriteBlePreview
-            }
-
-        }
-
-    }
-
-    private fun reduce(
-        state: BeaconContract.State,
-        event: BeaconContract.Event.OnWriteBle
-    ) {
-
-        if(state is BeaconContract.State.Display){
-
-            state.writeState?.let { request ->
-
-                if(request is BeaconContract.State.Display.WriteState.DisplayPreview) {
-
-                    viewModelScope.launch {
-
-                        setState {
-                            state.copy(
-                                writeState = BeaconContract.State.Display.WriteState.Writing(request.writeRequest)
-                            )
-                        }
-
-                        val currentState = viewState.value
-
-                        if(currentState is BeaconContract.State.Display) {
-
-                            val newBleObject = Ble.Beacon(
-                                info = currentState.origin.info,
-                                state = currentState.origin.state.copy(
-                                    tx = request.writeRequest.tx ?: state.origin.state.tx
-                                )
-                            )
-
-                            writeBle(state.beacon.info.serial, request.writeRequest).fold(
-                                onSuccess = {
-                                    setState {
-                                        currentState.copy(
-                                            origin = newBleObject,
-                                            beacon = bleMapper.map(newBleObject) as BleView.Beacon,
-                                            writeState = BeaconContract.State.Display.WriteState.Success
-                                        )
-                                    }
-                                },
-                                onFailure = {
-                                    setState {
-                                        state.copy(
-                                            writeState = BeaconContract.State.Display.WriteState.Failure
-                                        )
-                                    }
-                                }
-                            )
-
-                        }
-
-                    }
-
-                }
-
+                BeaconContract.Effect.Navigation.Write(params.bleSerial, writeRequest)
             }
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/DisplayState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/DisplayState.kt
index 58a8523..fd4c741 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/DisplayState.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/DisplayState.kt
@@ -1,95 +1,110 @@
 package llc.arma.ble.app.ui.screen.inspection.beacon.view
 
-import androidx.compose.foundation.background
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
 import androidx.compose.material.icons.rounded.KeyboardArrowDown
-import androidx.compose.material.icons.rounded.KeyboardArrowRight
 import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.unit.dp
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.app.ui.screen.BleInfoView
 import llc.arma.ble.app.ui.screen.ShapeType
 import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconContract
+import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconViewModel
 import llc.arma.ble.app.ui.screen.inspection.thermometer.main.BleMenuItem
-import llc.arma.ble.domain.model.Ble
+import llc.arma.ble.app.ui.screen.locale.value
 
 @Composable
 fun DisplayState(
-    onEvent: (BeaconContract.Event) -> Unit,
-    origin: Ble.Beacon,
-    ble: BleView.Beacon
+    viewModel: BeaconViewModel,
+    state: BeaconContract.State.Display
 ) {
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = Modifier
-            .padding(horizontal = 16.dp)
-            .verticalScroll(rememberScrollState())
-    ) {
-
-        BleInfoView(
-            bleInfo = origin.info,
-            version = origin.state.version
-        )
+    Column {
 
         Column(
-            verticalArrangement = Arrangement.spacedBy(2.dp)
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier
+                .weight(1f)
+                .padding(horizontal = 16.dp)
+                .verticalScroll(rememberScrollState())
         ) {
 
-            BleMenuItem(
-                shapeType = ShapeType.Start,
-                title = "Мощность",
-                subtitle = "${ble.state.tx.value} db",
-                icon = {
-                    Icon(
-                        imageVector = Icons.Rounded.KeyboardArrowDown,
-                        contentDescription = null
-                    )
-                }
-            ) {
-                onEvent(BeaconContract.Event.OnPowerEdit)
-            }
+            BleInfoView(
+                bleInfo = state.origin.info,
+                version = state.origin.state.version
+            )
 
-            BleMenuItem(
-                shapeType = ShapeType.End,
-                title = "Изменить пароль",
-                icon = {
-                    Icon(
-                        imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
-                        contentDescription = null
-                    )
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp)
+            ) {
+
+                BleMenuItem(
+                    shapeType = ShapeType.Start,
+                    title = "Мощность",
+                    subtitle = "${state.beacon.state.tx.value} db",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Rounded.KeyboardArrowDown,
+                            contentDescription = null
+                        )
+                    }
+                ) {
+                    viewModel.setEvent(BeaconContract.Event.OnPowerEdit)
+                }
+
+                BleMenuItem(
+                    shapeType = ShapeType.End,
+                    title = "Изменить пароль",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
+                            contentDescription = null
+                        )
+                    }
+
+                ) {
+                    viewModel.setEvent(BeaconContract.Event.OnChangePassword)
                 }
 
-            ) {
-                onEvent(BeaconContract.Event.OnChangePassword)
             }
 
         }
 
-        Button (
-            onClick = {
-                onEvent(BeaconContract.Event.OnShowWriteBlePreview)
-            },
-            modifier = Modifier.fillMaxWidth()
+        Box(
+            modifier = Modifier.fillMaxWidth().animateContentSize()
         ) {
 
-            Text(
-                text = "Сохранить"
-            )
+            if(state.origin != state.beacon) {
+
+                Button(
+                    onClick = {
+                        viewModel.setEvent(BeaconContract.Event.OnShowWriteBlePreview)
+                    },
+                    modifier = Modifier
+                        .padding(16.dp)
+                        .fillMaxWidth()
+                        .height(48.dp)
+                ) {
+
+                    Text(
+                        text = "Сохранить"
+                    )
+
+                }
+
+            }
 
         }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/Write.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/Write.kt
deleted file mode 100644
index e2694e3..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/view/Write.kt
+++ /dev/null
@@ -1,239 +0,0 @@
-package llc.arma.ble.app.ui.screen.inspection.beacon.view
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import llc.arma.ble.R
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.common.SecondaryButton
-import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconContract
-import llc.arma.ble.app.ui.screen.locale.localizedName
-
-@Composable
-fun Write(
-    state: BeaconContract.State.Display.WriteState,
-    onEvent: (BeaconContract.Event) -> Unit
-) {
-
-    Column(
-        modifier = Modifier.animateContentSize()
-    ) {
-
-        Text(
-            modifier = Modifier.padding(horizontal = 12.dp),
-            text = "Запись изменений",
-            style = MaterialTheme.typography.titleLarge
-        )
-
-        Spacer(modifier = Modifier.height(20.dp))
-
-        when (state) {
-            is BeaconContract.State.Display.WriteState.DisplayPreview -> {
-
-                if(state.writeRequest.tx != null) {
-
-                    state.writeRequest.tx.let {
-                        Box(
-                            modifier = Modifier.padding(
-                                vertical = 0.dp,
-                                horizontal = 8.dp
-                            )
-                        ) {
-
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .clip(RoundedCornerShape(16.dp))
-                                    .padding(8.dp)
-                            ) {
-
-                                Column(
-                                    modifier = Modifier.weight(1f)
-                                ) {
-
-                                    Text(
-                                        text = "Мощность"
-                                    )
-                                    Text(
-                                        color = MaterialTheme.colorScheme.secondary,
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        text = "${it.localizedName} db"
-                                    )
-
-                                }
-
-                            }
-
-                        }
-                    }
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    PrimaryButton(
-                        label = "Записать"
-                    ) {
-                        onEvent(BeaconContract.Event.OnWriteBle)
-                    }
-
-                    SecondaryButton(
-                        label = "Отменить"
-                    ) {
-                        onEvent(BeaconContract.Event.OnHideWriteBlePreview)
-                    }
-
-                } else {
-
-                    Spacer(modifier = Modifier.height(38.dp))
-
-                    Text(
-                        text = "Нет изменений",
-                        modifier = Modifier
-                            .align(Alignment.CenterHorizontally)
-                    )
-
-                    Spacer(modifier = Modifier.height(64.dp))
-
-                    PrimaryButton(
-                        label = "Ок"
-                    ) {
-                        onEvent(BeaconContract.Event.OnHideWriteBlePreview)
-                    }
-
-                }
-
-
-            }
-            is BeaconContract.State.Display.WriteState.Writing -> {
-
-                Box {
-
-                    Column {
-
-                        Spacer(modifier = Modifier.height(28.dp))
-
-                        CircularProgressIndicator(
-                            strokeCap = StrokeCap.Round,
-                            modifier = Modifier
-                                .align(Alignment.CenterHorizontally)
-                        )
-
-                        Spacer(modifier = Modifier.height(48.dp))
-
-                        SecondaryButton(
-                            label = "Отменить"
-                        ) {
-                            onEvent(BeaconContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            BeaconContract.State.Display.WriteState.Success -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(R.drawable.ic_done),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Успешно завершено"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            onEvent(BeaconContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            BeaconContract.State.Display.WriteState.Failure -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(R.drawable.ic_error),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Ошибка записи"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            onEvent(BeaconContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteScreen.kt
new file mode 100644
index 0000000..7223bf5
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteScreen.kt
@@ -0,0 +1,62 @@
+package llc.arma.ble.app.ui.screen.inspection.beacon.write
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import llc.arma.ble.app.ui.common.WriteFlow
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.screen.inspection.gate.table.write.BleTableWriteViewModel
+import llc.arma.ble.domain.model.Ble
+
+@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
+@Composable
+fun BeaconWriteScreen(
+    bleSerial: String,
+    writeRequest: Ble.Beacon.WriteRequest,
+    navigator: ResultBackNavigator<Boolean>
+) {
+
+    val viewModel = hiltViewModel<BeaconWriteViewModel>()
+    val state = viewModel.viewState.value
+
+    LaunchedEffect(Unit) {
+        viewModel.effect.collect {
+            when(it){
+                WriteFlowContract.Effect.Navigation.Up ->
+                    navigator.navigateBack()
+
+                WriteFlowContract.Effect.Navigation.UpSuccess ->
+                    navigator.navigateBack(true)
+            }
+        }
+    }
+
+    Surface(
+        shape = RoundedCornerShape(20.dp)
+    ) {
+
+        Box(
+            modifier = Modifier.padding(20.dp)
+        ) {
+
+            WriteFlow(
+                state = state,
+                onEvent = viewModel::setEvent
+            )
+
+        }
+
+    }
+
+}
+
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteViewModel.kt
new file mode 100644
index 0000000..ce7649e
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/beacon/write/BeaconWriteViewModel.kt
@@ -0,0 +1,102 @@
+package llc.arma.ble.app.ui.screen.inspection.beacon.write
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.ramcosta.composedestinations.generated.destinations.BeaconWriteScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.GateWriteScreenDestination
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.common.WriteItemData
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
+import llc.arma.ble.app.ui.screen.locale.localizedName
+import llc.arma.ble.domain.usecase.WriteBle
+import javax.inject.Inject
+
+@HiltViewModel
+class BeaconWriteViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle,
+    private val writeBle: WriteBle
+) : BaseViewModel<WriteFlowContract.State, WriteFlowContract.Event, WriteFlowContract.Effect>() {
+
+    init {
+
+        val params = BeaconWriteScreenDestination.argsFrom(savedStateHandle)
+
+        val items = mutableListOf<WriteItemData>()
+
+        params.writeRequest.tx?.let {
+            items.add(WriteItemData("Мощность", "${it.localizedName} db"))
+        }
+
+        setState {
+            WriteFlowContract.State.Display(
+                items
+            )
+        }
+
+    }
+
+    override fun setInitialState() = WriteFlowContract.State.Loading
+
+    override fun handleEvents(event: WriteFlowContract.Event) {
+        when(event){
+            is WriteFlowContract.Event.OnNavigateUp -> reduce(viewState.value, event)
+            is WriteFlowContract.Event.OnWrite -> reduce(viewState.value, event)
+        }
+    }
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnNavigateUp
+    ){
+
+        setEffect {
+            when(state){
+                is WriteFlowContract.State.Display,
+                WriteFlowContract.State.Error,
+                WriteFlowContract.State.Loading,
+                WriteFlowContract.State.Writing -> WriteFlowContract.Effect.Navigation.Up
+                WriteFlowContract.State.Success -> WriteFlowContract.Effect.Navigation.UpSuccess
+            }
+
+        }
+
+    }
+
+    private var writeJob: Job? = null
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnWrite
+    ){
+
+        val params = BeaconWriteScreenDestination.argsFrom(savedStateHandle)
+
+        setState {
+            WriteFlowContract.State.Writing
+        }
+
+        writeJob?.cancel()
+        writeJob = viewModelScope.launch {
+            writeBle(params.bleSerial, params.writeRequest).fold(
+                onSuccess = {
+                    setState {
+                        WriteFlowContract.State.Success
+                    }
+                },
+                onFailure = {
+                    setState {
+                        WriteFlowContract.State.Error
+                    }
+                }
+            )
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryScreen.kt
index 2ce7e39..96c861c 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryScreen.kt
@@ -37,8 +37,13 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.VerticalDivider
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -244,7 +249,7 @@ private fun LoadingState(
 
         if(state.progress == null){
             ContainedLoadingIndicator()
-        }else{
+        } else {
             ContainedLoadingIndicator(
                 progress = { state.progress }
             )
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryViewModel.kt
index feb7264..53573a8 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/history/GateHistoryViewModel.kt
@@ -2,7 +2,6 @@ package llc.arma.ble.app.ui.screen.inspection.gate.history
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.toRoute
 import com.ramcosta.composedestinations.generated.destinations.GateHistoryScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateContract.kt
index a4d24d9..2ae5c35 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateContract.kt
@@ -3,7 +3,6 @@ package llc.arma.ble.app.ui.screen.inspection.gate.main
 import llc.arma.ble.app.ui.common.ViewEvent
 import llc.arma.ble.app.ui.common.ViewSideEffect
 import llc.arma.ble.app.ui.common.ViewState
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.model.BleInfo
 
@@ -11,16 +10,14 @@ class GateContract {
 
     sealed class Event : ViewEvent {
 
+        data object OnReload : Event()
+
         data object OnWriteBle : Event()
 
-        data object OnHideWriteBlePreview : Event()
-
-        data object OnShowWriteBlePreview : Event()
-
         data object OnTxSelect : Event()
 
         data class OnPowerChanged(
-            val tx: BleView.BleState.TX
+            val tx: Ble.BleState.TX
         ) : Event()
 
         data object OnHistoryIntervalSelect : Event()
@@ -53,7 +50,7 @@ class GateContract {
 
         data class Display(
             val origin: Ble.Gate,
-            val gate: BleView.Gate,
+            val gate: Ble.Gate,
             val writeState: WriteState?
         ) : State() {
 
@@ -79,10 +76,13 @@ class GateContract {
 
     sealed class Effect : ViewSideEffect {
 
-        data object ShowWriteBlePreview : Effect()
-
         sealed class Navigation : Effect() {
 
+            data class GateWrite(
+                val serial: String,
+                val request: Ble.Gate.WriteRequest
+            ) : Navigation()
+
             data class ChangePassword(
                 val serial: String,
             ) : Navigation()
@@ -98,7 +98,7 @@ class GateContract {
             ) : Navigation()
 
             data class TxSelector(
-                val tx: BleView.BleState.TX?
+                val tx: Ble.BleState.TX?
             ) : Navigation()
 
             data class ReadIntervalSelector(
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateScreen.kt
index 7c8bd43..6631a0d 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateScreen.kt
@@ -9,24 +9,19 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
-import androidx.compose.material.icons.rounded.ArrowBack
-import androidx.compose.material3.Button
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBar
+import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material3.ContainedLoadingIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
@@ -38,25 +33,20 @@ import com.ramcosta.composedestinations.generated.destinations.ChangePasswordScr
 import com.ramcosta.composedestinations.generated.destinations.DurationSelectorScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.GateBleTableScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.GateHistoryScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.GateWriteScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.TxPowerSelectorScreenDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.ResultRecipient
 import com.ramcosta.composedestinations.result.onResult
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import llc.arma.ble.app.ui.common.rememberBottomDialogState
-import llc.arma.ble.app.ui.model.BleView
+import llc.arma.ble.app.ui.common.RetryingLoadingTemplate
 import llc.arma.ble.app.ui.screen.inspection.gate.main.view.DisplayState
-import llc.arma.ble.app.ui.screen.inspection.gate.main.view.Write
 import llc.arma.ble.app.ui.screen.inspection.selector.duration.DurationSelectResult
 import llc.arma.ble.app.ui.screen.locale.localized
+import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.model.BleInfo
 
-enum class SheetPage {
-    WRITE
-}
 
 @Destination<RootGraph>
 @OptIn(ExperimentalMaterial3Api::class)
@@ -64,19 +54,18 @@ enum class SheetPage {
 fun GateScreen(
     bleSerial: String,
     readDurationSelectResult: ResultRecipient<DurationSelectorScreenDestination, DurationSelectResult>,
-    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, BleView.BleState.TX>,
+    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, Ble.BleState.TX>,
+    writeResult: ResultRecipient<GateWriteScreenDestination, Boolean>,
     navigator: DestinationsNavigator
 ) {
 
     val viewModel = hiltViewModel<GateViewModel>()
     val state = viewModel.viewState.value
 
-    var sheetPage by rememberSaveable {
-        mutableStateOf<SheetPage?>(null)
+    writeResult.onResult {
+        if(it) viewModel.setEvent(GateContract.Event.OnReload)
     }
 
-    val bottomDialog = rememberBottomDialogState()
-
     txSelectResult.onResult {
         viewModel.setEvent(GateContract.Event.OnPowerChanged(it))
     }
@@ -96,11 +85,6 @@ fun GateScreen(
     LaunchedEffect(Unit){
         viewModel.effect.onEach {
             when(it){
-                GateContract.Effect.ShowWriteBlePreview -> launch {
-                    sheetPage = null
-                    delay(100)
-                    sheetPage = SheetPage.WRITE
-                }
 
                 is GateContract.Effect.Navigation.BleTable ->
                     navigator.navigate(GateBleTableScreenDestination(it.serial))
@@ -131,35 +115,13 @@ fun GateScreen(
                         maximum = 10 * 24 * 60 * 60 * 1000
                     ))
 
+                is GateContract.Effect.Navigation.GateWrite ->
+                    navigator.navigate(GateWriteScreenDestination(it.serial, it.request))
+
             }
         }.launchIn(this)
     }
 
-    LaunchedEffect(sheetPage){
-        when(sheetPage){
-            SheetPage.WRITE -> bottomDialog.show {
-
-                val currentState = viewModel.viewState.value
-
-                if(currentState is GateContract.State.Display && currentState.writeState != null) {
-
-                    Write(
-                        state = currentState.writeState,
-                        onEvent = {
-                            viewModel.setEvent(it)
-                        }
-                    )
-
-                }
-
-            }
-
-            else -> {
-                bottomDialog.hide()
-            }
-        }
-    }
-
     Scaffold(
         topBar = {
             TopAppBar(
@@ -179,6 +141,20 @@ fun GateScreen(
                     Text(
                         text = BleInfo.Type.HOST.localized
                     )
+                },
+                actions = {
+                    if(state is GateContract.State.Display){
+                        IconButton(
+                            onClick = {
+                                viewModel.setEvent(GateContract.Event.OnReload)
+                            }
+                        ) {
+                            Icon(
+                                imageVector = Icons.Rounded.Refresh,
+                                contentDescription = null
+                            )
+                        }
+                    }
                 }
             )
         }
@@ -199,11 +175,10 @@ fun GateScreen(
     
 }
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 private fun LoadingState(
     viewModel: GateViewModel,
-    state: GateContract.State.Loading
+    state: GateContract.State.Loading,
 ){
 
     Box(
@@ -211,43 +186,8 @@ private fun LoadingState(
         modifier = Modifier.fillMaxSize()
     ){
 
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.widthIn(max = 230.dp)
-        ) {
-
-            ContainedLoadingIndicator()
-
-            state.attempt?.let {
-
-                Spacer(Modifier.height(16.dp))
-
-                Text(
-                    text = "Повторная попытка ${it}"
-                )
-
-                Text(
-                    text = "Во время загрузки произошла ошибка",
-                    textAlign = TextAlign.Center,
-                    style = MaterialTheme.typography.bodySmall
-                )
-
-                Spacer(Modifier.height(8.dp))
-
-                TextButton(
-                    onClick = {
-                        viewModel.setEvent(GateContract.Event.OnNavigateUp)
-                    }
-                ) {
-
-                    Text(
-                        text = "Отмена"
-                    )
-
-                }
-
-            }
-
+        RetryingLoadingTemplate(state.attempt){
+            viewModel.setEvent(GateContract.Event.OnNavigateUp)
         }
 
     }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateViewModel.kt
index fcdfcb4..636ec15 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/GateViewModel.kt
@@ -5,12 +5,11 @@ import androidx.lifecycle.viewModelScope
 import com.ramcosta.composedestinations.generated.destinations.GateScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
-import llc.arma.ble.app.ui.mapper.BleMapper
-import llc.arma.ble.app.ui.mapper.BleViewMapper
-import llc.arma.ble.app.ui.model.BleView
+import llc.arma.ble.app.ui.common.retryUntilNotNull
+import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconContract
 import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.usecase.GetBleBySerial
 import llc.arma.ble.domain.usecase.WriteBle
@@ -20,68 +19,12 @@ import javax.inject.Inject
 class GateViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle,
     private val getBleBySerial: GetBleBySerial,
-    private val bleMapper: BleMapper,
     private val writeBle: WriteBle,
-    private val bleViewMapper: BleViewMapper
 ) : BaseViewModel<GateContract.State, GateContract.Event, GateContract.Effect>() {
 
     init {
 
-        val params = GateScreenDestination.argsFrom(savedStateHandle)
-
-        viewModelScope.launch {
-
-            var attempt = 0
-
-            var ble: Ble? = null
-
-            while (ble == null) {
-
-                ble = getBleBySerial.invoke(params.bleSerial, this).fold(
-                    onSuccess = { return@fold it },
-                    onFailure = { return@fold null }
-                )
-
-                if(ble == null) {
-
-                    setState {
-                        attempt++
-                        GateContract.State.Loading(attempt)
-                    }
-
-                }
-
-            }
-
-            if (ble is Ble.Gate) {
-
-                setState {
-
-                    when (this) {
-                        is GateContract.State.Display -> {
-                            copy(
-                                origin = Ble.Gate(
-                                    info = ble.info,
-                                    state = origin.state,
-                                    gateState = origin.gateState
-                                )
-                            )
-                        }
-
-                        is GateContract.State.Loading -> {
-                            GateContract.State.Display(
-                                origin = ble,
-                                gate = bleMapper.map(ble) as BleView.Gate,
-                                writeState = null
-                            )
-                        }
-
-                    }
-
-                }
-            }
-
-        }
+        loadData()
 
     }
 
@@ -91,8 +34,6 @@ class GateViewModel @Inject constructor(
         when(event){
             is GateContract.Event.OnNavigateUp -> reduce(viewState.value, event)
             is GateContract.Event.OnChangePassword -> reduce(viewState.value, event)
-            is GateContract.Event.OnHideWriteBlePreview -> reduce(viewState.value, event)
-            is GateContract.Event.OnShowWriteBlePreview -> reduce(viewState.value, event)
             is GateContract.Event.OnWriteBle -> reduce(viewState.value, event)
             is GateContract.Event.OnPowerChanged -> reduce(viewState.value, event)
             is GateContract.Event.OnTxSelect -> reduce(viewState.value, event)
@@ -102,6 +43,7 @@ class GateViewModel @Inject constructor(
             is GateContract.Event.OnHistoryIntervalSelect -> reduce(viewState.value, event)
             is GateContract.Event.OnSaveReadIntervalChanged -> reduce(viewState.value, event)
             is GateContract.Event.OnShowReadIntervalEdit -> reduce(viewState.value, event)
+            is GateContract.Event.OnReload -> reduce(viewState.value, event)
         }
     }
 
@@ -112,7 +54,17 @@ class GateViewModel @Inject constructor(
 
         if(state is GateContract.State.Display) {
 
-            state.gate.hostState.readInterval = event.interval
+            setState {
+
+                state.copy(
+                    gate = state.gate.copy(
+                        gateState = state.gate.gateState.copy(
+                            readInterval = event.interval
+                        )
+                    )
+                )
+
+            }
 
         }
 
@@ -126,7 +78,7 @@ class GateViewModel @Inject constructor(
         if(state is GateContract.State.Display) {
 
             setEffect {
-                GateContract.Effect.Navigation.ReadIntervalSelector(state.gate.hostState.readInterval.toInt())
+                GateContract.Effect.Navigation.ReadIntervalSelector(state.gate.gateState.readInterval.toInt())
             }
 
         }
@@ -140,7 +92,16 @@ class GateViewModel @Inject constructor(
 
         if(state is GateContract.State.Display) {
 
-            state.gate.hostState.historyInterval = event.interval
+            setState {
+                state.copy(
+                    gate = state.gate.copy(
+                        gateState = state.gate.gateState.copy(
+                            historyInterval = event.interval
+                        )
+                    )
+                )
+            }
+
 
         }
 
@@ -154,7 +115,7 @@ class GateViewModel @Inject constructor(
         if(state is GateContract.State.Display) {
 
             setEffect {
-                GateContract.Effect.Navigation.HistoryIntervalSelector(state.gate.hostState.historyInterval.toInt())
+                GateContract.Effect.Navigation.HistoryIntervalSelector(state.gate.gateState.historyInterval.toInt())
             }
 
         }
@@ -198,7 +159,15 @@ class GateViewModel @Inject constructor(
 
         if(state is GateContract.State.Display) {
 
-            state.gate.state.tx = event.tx
+            setState {
+                state.copy(
+                    gate = state.gate.copy(
+                        state = state.gate.state.copy(
+                            tx = event.tx
+                        )
+                    )
+                )
+            }
 
         }
 
@@ -212,7 +181,11 @@ class GateViewModel @Inject constructor(
 
         if(state is GateContract.State.Display) {
 
-            setEffect { GateContract.Effect.Navigation.TxSelector(state.gate.state.tx) }
+            setEffect {
+                GateContract.Effect.Navigation.TxSelector(
+                    state.gate.state.tx
+                )
+            }
 
         }
 
@@ -243,21 +216,12 @@ class GateViewModel @Inject constructor(
 
     private fun reduce(
         state: GateContract.State,
-        event: GateContract.Event.OnHideWriteBlePreview
-    ) {
-
-
-
-    }
-
-    private fun reduce(
-        state: GateContract.State,
-        event: GateContract.Event.OnShowWriteBlePreview
+        event: GateContract.Event.OnWriteBle
     ) {
 
         if(state is GateContract.State.Display){
 
-            val newBle = bleViewMapper.map(state.gate) as Ble.Gate
+            val newBle = state.gate
 
             val writeRequest = Ble.Gate.WriteRequest(
                 tx = if(newBle.state.tx == state.origin.state.tx) null else newBle.state.tx,
@@ -274,7 +238,7 @@ class GateViewModel @Inject constructor(
             }
 
             setEffect {
-                GateContract.Effect.ShowWriteBlePreview
+                GateContract.Effect.Navigation.GateWrite(state.gate.info.serial, writeRequest)
             }
 
         }
@@ -283,63 +247,61 @@ class GateViewModel @Inject constructor(
 
     private fun reduce(
         state: GateContract.State,
-        event: GateContract.Event.OnWriteBle
+        event: GateContract.Event.OnReload
     ) {
 
-        if(state is GateContract.State.Display){
+        loadData()
 
-            state.writeState?.let { request ->
+    }
 
-                if(request is GateContract.State.Display.WriteState.DisplayPreview) {
+    private var loadJob: Job? = null
 
-                    viewModelScope.launch {
+    private fun loadData(){
 
-                        setState {
-                            state.copy(
-                                writeState = GateContract.State.Display.WriteState.Writing(request.writeRequest)
+        val params = GateScreenDestination.argsFrom(savedStateHandle)
+        loadJob?.cancel()
+        loadJob = viewModelScope.launch {
+
+            setState {
+                GateContract.State.Loading(null)
+            }
+
+            val ble = retryUntilNotNull(
+                onNewAttempt = {
+                    setState {
+                        GateContract.State.Loading(it)
+                    }
+                }
+            ){
+                getBleBySerial.invoke(params.bleSerial, this).getOrNull()
+            }
+
+            if (ble is Ble.Gate) {
+
+                setState {
+
+                    when (this) {
+                        is GateContract.State.Display -> {
+                            copy(
+                                origin = Ble.Gate(
+                                    info = ble.info,
+                                    state = origin.state,
+                                    gateState = origin.gateState
+                                )
                             )
                         }
 
-                        val currentState = viewState.value
-
-                        if(currentState is GateContract.State.Display) {
-
-                            val newBleObject = Ble.Gate(
-                                info = currentState.origin.info,
-                                state = currentState.origin.state.copy(
-                                    tx = request.writeRequest.tx ?: state.origin.state.tx
-                                ),
-                                gateState = currentState.origin.gateState.copy(
-                                    historyInterval = request.writeRequest.interval
-                                        ?: currentState.origin.gateState.historyInterval
-                                )
+                        is GateContract.State.Loading -> {
+                            GateContract.State.Display(
+                                origin = ble,
+                                gate = ble,
+                                writeState = null
                             )
-
-                            writeBle(state.gate.info.serial, request.writeRequest).fold(
-                                onSuccess = {
-                                    setState {
-                                        currentState.copy(
-                                            origin = newBleObject,
-                                            gate = bleMapper.map(newBleObject) as BleView.Gate,
-                                            writeState = GateContract.State.Display.WriteState.Success
-                                        )
-                                    }
-                                },
-                                onFailure = {
-                                    setState {
-                                        state.copy(
-                                            writeState = GateContract.State.Display.WriteState.Failure
-                                        )
-                                    }
-                                }
-                            )
-
                         }
 
                     }
 
                 }
-
             }
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/DisplayState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/DisplayState.kt
index 27ba487..0547b76 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/DisplayState.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/DisplayState.kt
@@ -1,6 +1,8 @@
 package llc.arma.ble.app.ui.screen.inspection.gate.main.view
 
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -16,16 +18,12 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.app.ui.screen.BleInfoView
 import llc.arma.ble.app.ui.screen.ShapeType
 import llc.arma.ble.app.ui.screen.inspection.gate.main.GateContract
 import llc.arma.ble.app.ui.screen.inspection.gate.main.GateViewModel
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
 import llc.arma.ble.app.ui.screen.inspection.thermometer.main.BleMenuItem
-import llc.arma.ble.domain.model.Ble
+import llc.arma.ble.app.ui.screen.locale.value
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
@@ -37,120 +35,142 @@ fun DisplayState(
 
     val scrollState = rememberScrollState()
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = Modifier
-            .verticalScroll(scrollState)
-            .padding(horizontal = 16.dp)
-    ) {
-
-        BleInfoView(
-            bleInfo = state.origin.info,
-            version = state.origin.state.version
-        )
+    Column {
 
         Column(
-            verticalArrangement = Arrangement.spacedBy(2.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier
+                .weight(1f)
+                .verticalScroll(scrollState)
+                .padding(horizontal = 16.dp)
         ) {
 
-            BleMenuItem(
-                shapeType = ShapeType.Start,
-                title = "Мощность",
-                subtitle = "${state.gate.state.tx.value} db",
-                icon = {
-                    Icon(
-                        imageVector = Icons.Rounded.KeyboardArrowDown,
-                        contentDescription = null
-                    )
-                }
-            ) {
-                viewModel.setEvent(GateContract.Event.OnTxSelect)
-            }
+            BleInfoView(
+                bleInfo = state.origin.info,
+                version = state.origin.state.version
+            )
 
-            BleMenuItem(
-                shapeType = ShapeType.Middle,
-                title = "Интервал измерений",
-                subtitle = state.gate.hostState.historyInterval
-                    .toDuration(DurationUnit.MILLISECONDS)
-                    .toComponents { hours, minutes, seconds, _ ->
-                        "$hours ч. $minutes мин. $seconds сек." },
-                icon = {
-                    Icon(
-                        imageVector = Icons.Rounded.KeyboardArrowDown,
-                        contentDescription = null
-                    )
-                }
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp),
             ) {
-                viewModel.setEvent(GateContract.Event.OnHistoryIntervalSelect)
-            }
 
-            BleMenuItem(
-                shapeType = ShapeType.Middle,
-                title = "Интервал чтения",
-                subtitle = state.gate.hostState.readInterval
-                    .toDuration(DurationUnit.MILLISECONDS)
-                    .toComponents { hours, minutes, seconds, _ ->
-                        "$hours ч. $minutes мин. $seconds сек." },
-                icon = {
-                    Icon(
-                        imageVector = Icons.Rounded.KeyboardArrowDown,
-                        contentDescription = null
-                    )
+                BleMenuItem(
+                    shapeType = ShapeType.Start,
+                    title = "Мощность",
+                    subtitle = "${state.gate.state.tx.value} db",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Rounded.KeyboardArrowDown,
+                            contentDescription = null
+                        )
+                    }
+                ) {
+                    viewModel.setEvent(GateContract.Event.OnTxSelect)
                 }
-            ) {
-                viewModel.setEvent(GateContract.Event.OnShowReadIntervalEdit)
-            }
 
-            BleMenuItem(
-                shapeType = ShapeType.Middle,
-                title = "График измерений",
-                icon = {
-                    Icon(
-                        imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
-                        contentDescription = null
-                    )
+                BleMenuItem(
+                    shapeType = ShapeType.Middle,
+                    title = "Интервал измерений",
+                    subtitle = state.gate.gateState.historyInterval
+                        .toDuration(DurationUnit.MILLISECONDS)
+                        .toComponents { hours, minutes, seconds, _ ->
+                            "$hours ч. $minutes мин. $seconds сек."
+                        },
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Rounded.KeyboardArrowDown,
+                            contentDescription = null
+                        )
+                    }
+                ) {
+                    viewModel.setEvent(GateContract.Event.OnHistoryIntervalSelect)
                 }
-            ) {
-                viewModel.setEvent(GateContract.Event.OnShowHostHistory)
-            }
 
-            BleMenuItem(
-                shapeType = ShapeType.Middle,
-                title = "Таблица BLE ID",
-                icon = {
-                    Icon(
-                        imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
-                        contentDescription = null
-                    )
+                BleMenuItem(
+                    shapeType = ShapeType.Middle,
+                    title = "Интервал чтения",
+                    subtitle = state.gate.gateState.readInterval
+                        .toDuration(DurationUnit.MILLISECONDS)
+                        .toComponents { hours, minutes, seconds, _ ->
+                            "$hours ч. $minutes мин. $seconds сек."
+                        },
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Rounded.KeyboardArrowDown,
+                            contentDescription = null
+                        )
+                    }
+                ) {
+                    viewModel.setEvent(GateContract.Event.OnShowReadIntervalEdit)
                 }
-            ) {
-                viewModel.setEvent(GateContract.Event.OnShowHostBleTable)
-            }
 
-            BleMenuItem(
-                shapeType = ShapeType.End,
-                title = "Изменить пароль",
-                icon = {
-                    Icon(
-                        imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
-                        contentDescription = null
-                    )
+                BleMenuItem(
+                    shapeType = ShapeType.Middle,
+                    title = "График измерений",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
+                            contentDescription = null
+                        )
+                    }
+                ) {
+                    viewModel.setEvent(GateContract.Event.OnShowHostHistory)
                 }
-            ) {
-                viewModel.setEvent(GateContract.Event.OnChangePassword)
+
+                BleMenuItem(
+                    shapeType = ShapeType.Middle,
+                    title = "Таблица BLE ID",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
+                            contentDescription = null
+                        )
+                    }
+                ) {
+                    viewModel.setEvent(GateContract.Event.OnShowHostBleTable)
+                }
+
+                BleMenuItem(
+                    shapeType = ShapeType.End,
+                    title = "Изменить пароль",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
+                            contentDescription = null
+                        )
+                    }
+                ) {
+                    viewModel.setEvent(GateContract.Event.OnChangePassword)
+                }
+
             }
 
         }
 
-        Button(
-            onClick = {
-                viewModel.setEvent(GateContract.Event.OnShowWriteBlePreview)
-            },
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(48.dp)
+        Box(
+            modifier = Modifier.fillMaxWidth().animateContentSize()
         ) {
-            Text(text = "Сохранить")
+
+            if(state.origin != state.gate) {
+
+                Button(
+                    onClick = {
+                        viewModel.setEvent(GateContract.Event.OnWriteBle)
+                    },
+                    modifier = Modifier
+                        .padding(16.dp)
+                        .fillMaxWidth()
+                        .height(48.dp)
+                ) {
+
+                    Text(
+                        text = "Сохранить"
+                    )
+
+                }
+
+            }
+
         }
 
     }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/Write.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/Write.kt
deleted file mode 100644
index 3d41111..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/main/view/Write.kt
+++ /dev/null
@@ -1,326 +0,0 @@
-package llc.arma.ble.app.ui.screen.inspection.gate.main.view
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import llc.arma.ble.R
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.common.SecondaryButton
-import llc.arma.ble.app.ui.screen.inspection.gate.main.GateContract
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
-import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
-import llc.arma.ble.app.ui.screen.locale.localizedName
-
-@Composable
-fun Write(
-    state: GateContract.State.Display.WriteState,
-    onEvent: (GateContract.Event) -> Unit
-) {
-
-    Column(
-        modifier = Modifier.animateContentSize()
-    ) {
-
-        Text(
-            modifier = Modifier.padding(horizontal = 12.dp),
-            text = "Запись изменений",
-            style = MaterialTheme.typography.titleLarge
-        )
-
-        Spacer(modifier = Modifier.height(20.dp))
-
-        when (state) {
-            is GateContract.State.Display.WriteState.DisplayPreview -> {
-
-                if(state.writeRequest.tx != null || state.writeRequest.interval != null || state.writeRequest.readInterval !== null) {
-
-                    state.writeRequest.tx?.let {
-                        Box(
-                            modifier = Modifier.padding(
-                                vertical = 0.dp,
-                                horizontal = 8.dp
-                            )
-                        ) {
-
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .clip(RoundedCornerShape(16.dp))
-                                    .padding(8.dp)
-                            ) {
-
-                                Column(
-                                    modifier = Modifier.weight(1f)
-                                ) {
-
-                                    Text(
-                                        text = "Мощность"
-                                    )
-                                    Text(
-                                        color = MaterialTheme.colorScheme.secondary,
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        text = "${it.localizedName} db"
-                                    )
-
-                                }
-
-                            }
-
-                        }
-                    }
-
-                    state.writeRequest.interval?.let {
-
-                        Box(
-                            modifier = Modifier.padding(
-                                vertical = 0.dp,
-                                horizontal = 8.dp
-                            )
-                        ) {
-
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .clip(RoundedCornerShape(16.dp))
-                                    .padding(8.dp)
-                            ) {
-
-                                Column(
-                                    modifier = Modifier.weight(1f)
-                                ) {
-
-                                    Text(
-                                        text = "Интервал измерений"
-                                    )
-
-                                    val hours = it / millisInHour
-                                    val minutes = (it - (hours * millisInHour)) / millisInMinute
-                                    val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
-
-                                    Text(
-                                        color = MaterialTheme.colorScheme.secondary,
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        text = "$hours ч. $minutes мин. $seconds сек."
-                                    )
-
-                                }
-
-                            }
-
-                        }
-
-                    }
-
-                    state.writeRequest.readInterval?.let {
-
-                        Box(
-                            modifier = Modifier.padding(
-                                vertical = 0.dp,
-                                horizontal = 8.dp
-                            )
-                        ) {
-
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .clip(RoundedCornerShape(16.dp))
-                                    .padding(8.dp)
-                            ) {
-
-                                Column(
-                                    modifier = Modifier.weight(1f)
-                                ) {
-
-                                    Text(
-                                        text = "Интервал чтения"
-                                    )
-
-                                    val hours = it / millisInHour
-                                    val minutes = (it - (hours * millisInHour)) / millisInMinute
-                                    val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
-
-                                    Text(
-                                        color = MaterialTheme.colorScheme.secondary,
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        text = "$hours ч. $minutes мин. $seconds сек."
-                                    )
-
-                                }
-
-                            }
-
-                        }
-
-                    }
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    PrimaryButton(
-                        label = "Записать"
-                    ) {
-                        onEvent(GateContract.Event.OnWriteBle)
-                    }
-
-                    SecondaryButton(
-                        label = "Отменить"
-                    ) {
-                        onEvent(GateContract.Event.OnHideWriteBlePreview)
-                    }
-
-                } else {
-
-                    Spacer(modifier = Modifier.height(38.dp))
-
-                    Text(
-                        text = "Нет изменений",
-                        modifier = Modifier
-                            .align(Alignment.CenterHorizontally)
-                    )
-
-                    Spacer(modifier = Modifier.height(64.dp))
-
-                    PrimaryButton(
-                        label = "Ок"
-                    ) {
-                        onEvent(GateContract.Event.OnHideWriteBlePreview)
-                    }
-
-                }
-
-
-            }
-            is GateContract.State.Display.WriteState.Writing -> {
-
-                Box {
-
-                    Column {
-
-                        Spacer(modifier = Modifier.height(28.dp))
-
-                        CircularProgressIndicator(
-                            strokeCap = StrokeCap.Round,
-                            modifier = Modifier
-                                .align(Alignment.CenterHorizontally)
-                        )
-
-                        Spacer(modifier = Modifier.height(48.dp))
-
-                        SecondaryButton(
-                            label = "Отменить"
-                        ) {
-                            onEvent(GateContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            GateContract.State.Display.WriteState.Success -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(R.drawable.ic_done),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Успешно завершено"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            onEvent(GateContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            GateContract.State.Display.WriteState.Failure -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(R.drawable.ic_error),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Ошибка записи"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            onEvent(GateContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableContract.kt
index 7d5b144..ee95e6a 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableContract.kt
@@ -10,14 +10,16 @@ class GateBleTableContract {
 
     sealed class Event : ViewEvent {
 
-        data object OnHideWritePreview: Event()
-
-        data object OnWritePreview: Event()
-
-        data object OnWrite: Event()
+        data object OnWriteTable: Event()
 
         data object OnRestart : Event()
 
+        data object OnSelectBle : Event()
+
+        data class OnBleSelected(
+            val bleSerials: List<BleName>
+        ) : Event()
+
         data class OnAddBle(
             val ble: BleName
         ) : Event()
@@ -26,34 +28,14 @@ class GateBleTableContract {
 
     sealed class State : ViewState {
 
-        data object Loading : State()
-
-        data object Error : State()
+        data class Loading(
+            val attempt: Int?
+        ) : State()
 
         data class Display(
-            val bleAround: List<BleInfo>,
             val newTable: List<BleName>,
             val savedBleTable: List<BleName>,
-            val writeState: WriteState?
-        ) : State() {
-
-            sealed class WriteState {
-
-                data class DisplayPreview(
-                    val writeRequest: List<BleName>
-                ) : WriteState()
-
-                data class Writing(
-                    val writeRequest: List<BleName>
-                ) : WriteState()
-
-                data object Success : WriteState()
-
-                data object Failure : WriteState()
-
-            }
-
-        }
+        ) : State()
 
     }
 
@@ -61,6 +43,14 @@ class GateBleTableContract {
 
         sealed class Navigation : Effect() {
 
+            data class WriteTable(
+                val table: List<BleName>
+            ) : Navigation()
+
+            data class BleSelector(
+                val selected: List<BleName>
+            ) : Navigation()
+
             data object Up : Navigation()
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableScreen.kt
index c167826..e7337da 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableScreen.kt
@@ -1,24 +1,24 @@
 package llc.arma.ble.app.ui.screen.inspection.gate.table
 
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.clickable
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Scaffold
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material.icons.rounded.Add
 import androidx.compose.material.icons.rounded.RemoveCircleOutline
+import androidx.compose.material3.Button
 import androidx.compose.material3.Checkbox
-import androidx.compose.material3.ContainedLoadingIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
@@ -33,34 +33,33 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.generated.destinations.BleSelectorScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.BleTableWriteScreenDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
+import com.ramcosta.composedestinations.result.ResultRecipient
+import com.ramcosta.composedestinations.result.onResult
 import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.common.rememberBottomDialogState
+import llc.arma.ble.app.ui.common.RetryingLoadingTemplate
 import llc.arma.ble.app.ui.screen.ShapeType
 import llc.arma.ble.app.ui.screen.ShapeType.Companion.takeShapeType
-import llc.arma.ble.app.ui.screen.ble.BleItem
-import llc.arma.ble.domain.model.BleInfo
 import llc.arma.ble.domain.model.BleName
 
 @Destination<RootGraph>
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun GateBleTableScreen(
     bleSerial: String,
-    navigator: DestinationsNavigator
+    navigator: DestinationsNavigator,
+    resultRecipient: ResultRecipient<BleSelectorScreenDestination, Array<BleName>>,
+    writeResult: ResultRecipient<BleTableWriteScreenDestination, Boolean>
 ) {
 
     val viewModel = hiltViewModel<GateBleTableViewModel>()
@@ -71,385 +70,262 @@ fun GateBleTableScreen(
             when(it){
                 GateBleTableContract.Effect.Navigation.Up ->
                     navigator.navigateUp()
+
+                is GateBleTableContract.Effect.Navigation.BleSelector ->
+                    navigator.navigate(BleSelectorScreenDestination(it.selected.toTypedArray()))
+
+                is GateBleTableContract.Effect.Navigation.WriteTable ->
+                    navigator.navigate(BleTableWriteScreenDestination(bleSerial, it.table.toTypedArray()))
             }
         }
     }
 
-    var showSelector by remember {
-        mutableStateOf(false)
+    writeResult.onResult {
+        if(it) viewModel.setEvent(GateBleTableContract.Event.OnRestart)
     }
 
-    BackHandler(showSelector) {
-        showSelector = false
+    resultRecipient.onResult {
+        viewModel.setEvent(GateBleTableContract.Event.OnBleSelected(it.toList()))
     }
 
-    val scope = rememberCoroutineScope()
-    val bottomDialog = rememberBottomDialogState()
-
-    BackHandler(bottomDialog.sheetState?.isVisible == true) {
-        scope.launch {
-            bottomDialog.hide()
-        }
-
-    }
-
-    Column(
-        modifier = Modifier.fillMaxSize()
-    ) {
-
-        TopAppBar(
-            navigationIcon = {
-                IconButton(onClick = {
-                    if(showSelector){
-                        showSelector = false
-                    } else {
-                        navigator.popBackStack()
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(
+                        onClick = navigator::popBackStack
+                    ) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
+                            contentDescription = null
+                        )
                     }
-                }) {
-                    Icon(
-                        imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
-                        contentDescription = null
+                },
+                title = {
+                    Text(
+                        text = "Таблица BLE",
+                        style = MaterialTheme.typography.titleLarge
                     )
-                }
-            },
-            title = {
-                Text(
-                    modifier = Modifier.weight(1f),
-                    text = if(showSelector){
-                        "Выберите BLE"
-                    } else {
-                        "Таблица BLE ID"
-                    },
-                    style = MaterialTheme.typography.titleLarge
-                )
-            },
-            actions = {
-                if(showSelector.not()){
+                },
+                actions = {
+
                     IconButton(
                         enabled = state is GateBleTableContract.State.Display,
-                        onClick = { showSelector=true }
+                        onClick = {
+                            viewModel.setEvent(GateBleTableContract.Event.OnSelectBle)
+                        }
                     ) {
                         Icon(
                             imageVector = Icons.Rounded.Add,
                             contentDescription = null
                         )
                     }
+
                 }
-            }
-
-        )
-
-        if(state is GateBleTableContract.State.Loading){
-
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier.fillMaxSize()
-            ){
-
-                ContainedLoadingIndicator()
+            )
+        }
+    ) {
+        Column(
+            modifier = Modifier.padding(it)
+        ) {
 
+            when(state){
+                is GateBleTableContract.State.Display -> DisplayState(viewModel, state)
+                is GateBleTableContract.State.Loading -> LoadingState(navigator, viewModel, state)
             }
 
         }
-
-        if(state is GateBleTableContract.State.Error){
-
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier.fillMaxSize()
-            ){
-
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                    modifier = Modifier.widthIn(max = 200.dp)
-                ) {
-
-                    Text(
-                        textAlign = TextAlign.Center,
-                        text = "Во время загрузки произошла ошибка",
-                    )
-
-                    PrimaryButton(
-                        label = "Повторить"
-                    ) {
-                        viewModel.setEvent(GateBleTableContract.Event.OnRestart)
-                    }
-
-                }
-
-            }
-
-        }
-
-        if (state is GateBleTableContract.State.Display) {
-
-            if(showSelector) {
-
-                BleSelectorScreen(
-                    saved = state.savedBleTable.map { it.serial },
-                    selected = state.newTable.map { it.serial },
-                    bleList = state.bleAround,
-                    onClose = {
-                        showSelector = false
-                    }
-                ) {
-                    viewModel.setEvent(
-                        GateBleTableContract.Event.OnAddBle(
-                            BleName(
-                                serial = it.serial,
-                                name = it.name
-                            )
-                        )
-                    )
-                }
-
-            } else {
-
-                var editBle by remember {
-                    mutableStateOf<BleName?>(null)
-                }
-
-                LazyColumn(
-                    verticalArrangement = Arrangement.spacedBy(2.dp),
-                    modifier = Modifier
-                        .weight(1f)
-                        .padding(horizontal = 16.dp)
-                ) {
-
-                    val savedBleSerials =  state.savedBleTable.map { it.serial }
-                    val newBle = state.newTable.filterNot { ble -> savedBleSerials.contains(ble.serial) }
-
-                    if (newBle.isNotEmpty()) {
-
-                        item {
-                            Text(
-                                text = "Новые BLE",
-                                modifier = Modifier
-                                    .padding(
-                                        horizontal = 12.dp,
-                                        vertical = 8.dp
-                                    )
-                            )
-                        }
-
-                        items(items = newBle) {
-
-                            SelectBleItem(
-                                ble = it,
-                                onClick = {
-                                    editBle = it
-                                    viewModel.setEvent(GateBleTableContract.Event.OnAddBle(it))
-                                },
-                                shapeType = if(newBle.size == 1){
-                                    ShapeType.Singleton
-                                } else {
-                                    if(newBle.indexOf(it) == 0){
-                                        ShapeType.Start
-                                    } else {
-                                        if(newBle.indexOf(it) == newBle.size - 1){
-                                            ShapeType.End
-                                        } else {
-                                            ShapeType.Middle
-                                        }
-                                    }
-                                }
-                            ) {
-                                viewModel.setEvent(GateBleTableContract.Event.OnAddBle(it))
-                            }
-                        }
-
-                    }
-
-                    item {
-
-                        Text(
-                            text = "Сохраненные BLE",
-                            modifier = Modifier
-                                .padding(
-                                    horizontal = 12.dp,
-                                    vertical = 8.dp
-                                )
-                        )
-
-                    }
-
-                    items(items = state.savedBleTable) { ble ->
-                        SavedBleItem(
-                            checked = state.newTable.any { it.serial == ble.serial},
-                            ble = ble,
-                            shapeType = if(state.savedBleTable.size == 1){
-                                ShapeType.Singleton
-                            } else {
-                                if(state.savedBleTable.indexOf(ble) == 0){
-                                    ShapeType.Start
-                                } else {
-                                    if(state.savedBleTable.indexOf(ble) == state.savedBleTable.size - 1){
-                                        ShapeType.End
-                                    } else {
-                                        ShapeType.Middle
-                                    }
-                                }
-                            }
-                        ){
-                            viewModel.setEvent(GateBleTableContract.Event.OnAddBle(ble))
-                        }
-                    }
-
-                }
-
-                PrimaryButton(
-                    label = "Записать"
-                ) {
-                    viewModel.setEvent(GateBleTableContract.Event.OnWritePreview)
-                }
-
-                if(editBle != null){
-
-                    Dialog(
-                        onDismissRequest = {
-                            viewModel.setEvent(GateBleTableContract.Event.OnAddBle(ble = editBle!!.copy()))
-                            editBle = null
-                        }
-                    ) {
-
-                        Surface(
-                            shape = RoundedCornerShape(24.dp)
-                        ) {
-
-                            Column(
-                                verticalArrangement = Arrangement.spacedBy(12.dp),
-                                modifier = Modifier.padding(24.dp)
-                            ) {
-
-                                var name by remember(editBle) {
-                                    mutableStateOf(editBle?.name ?: "")
-                                }
-
-                                Text(
-                                    style = MaterialTheme.typography.titleLarge,
-                                    text = "Введите название"
-                                )
-                                
-                                OutlinedTextField(
-                                    value = name,
-                                    singleLine = true,
-                                    onValueChange = {
-                                        name = it
-                                    }
-                                )
-
-                                PrimaryButton(
-                                    label = "Сохранить"
-                                ) {
-                                    viewModel.setEvent(
-                                        GateBleTableContract.Event.OnAddBle(
-                                            ble = editBle!!.copy(name = name)
-                                        )
-                                    )
-                                    editBle = null
-                                }
-
-                            }
-
-                        }
-
-                    }
-
-                }
-
-                LaunchedEffect(key1 = bottomDialog.sheetState?.isVisible) {
-                    if (bottomDialog.sheetState?.isVisible?.not() == true) {
-                        viewModel.setEvent(GateBleTableContract.Event.OnHideWritePreview)
-                    }
-                }
-
-                LaunchedEffect(key1 = state.writeState) {
-
-                    if (state.writeState == null) {
-                        bottomDialog.hide()
-                    } else {
-                        bottomDialog.show {
-                            Write(
-                                state = state.writeState,
-                                onEvent = {
-                                    viewModel.setEvent(it)
-                                }
-                            )
-                        }
-                    }
-
-                }
-
-            }
-
-        }
-
     }
 
 }
 
 @Composable
-private fun DisplayState(){
+private fun LoadingState(
+    navigator: DestinationsNavigator,
+    viewModel: GateBleTableViewModel,
+    state: GateBleTableContract.State.Loading
+){
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = Modifier.fillMaxSize()
+    ){
 
+        RetryingLoadingTemplate(state.attempt) {
+            navigator.navigateUp()
+        }
+
+    }
 }
 
 @Composable
-fun BleSelectorScreen(
-    saved: List<String>,
-    selected: List<String>,
-    bleList: List<BleInfo>,
-    onClose: () -> Unit,
-    onAddBle: (BleInfo) -> Unit
-) {
+private fun DisplayState(
+    viewModel: GateBleTableViewModel,
+    state: GateBleTableContract.State.Display
+){
 
-    Column(
-        modifier = Modifier.fillMaxSize()
-    ) {
+    var editBle by remember {
+        mutableStateOf<BleName?>(null)
+    }
+
+    Column {
 
         LazyColumn(
             verticalArrangement = Arrangement.spacedBy(2.dp),
-            modifier = Modifier.weight(1f)
+            modifier = Modifier
+                .weight(1f)
+                .padding(horizontal = 16.dp)
         ) {
 
-            items(items = bleList.filterNot { saved.contains(it.serial) }) { ble ->
+            val savedBleSerials = state.savedBleTable.map { it.serial }
+            val newBle =
+                state.newTable.filterNot { ble -> savedBleSerials.contains(ble.serial) }
 
-                Row(
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    verticalAlignment = Alignment.CenterVertically,
+            if (newBle.isNotEmpty()) {
+
+                item {
+                    Text(
+                        text = "Новые BLE",
+                        modifier = Modifier
+                            .padding(
+                                horizontal = 12.dp,
+                                vertical = 8.dp
+                            )
+                    )
+                }
+
+                items(items = newBle) {
+
+                    SelectBleItem(
+                        ble = it,
+                        onClick = {
+                            editBle = it
+                            viewModel.setEvent(GateBleTableContract.Event.OnAddBle(it))
+                        },
+                        shapeType = newBle.takeShapeType(it)
+                    ) {
+                        viewModel.setEvent(GateBleTableContract.Event.OnAddBle(it))
+                    }
+                }
+
+            }
+
+            item {
+
+                Text(
+                    text = "Сохраненные BLE",
                     modifier = Modifier
-                        .padding(horizontal = 8.dp)
-                        .clickable {
-                            onAddBle(ble)
+                        .padding(
+                            horizontal = 12.dp,
+                            vertical = 8.dp
+                        )
+                )
+
+            }
+
+            items(items = state.savedBleTable) { ble ->
+                SavedBleItem(
+                    checked = state.newTable.any { it.serial == ble.serial },
+                    ble = ble,
+                    shapeType = if (state.savedBleTable.size == 1) {
+                        ShapeType.Singleton
+                    } else {
+                        if (state.savedBleTable.indexOf(ble) == 0) {
+                            ShapeType.Start
+                        } else {
+                            if (state.savedBleTable.indexOf(ble) == state.savedBleTable.size - 1) {
+                                ShapeType.End
+                            } else {
+                                ShapeType.Middle
+                            }
                         }
+                    }
+                ) {
+                    viewModel.setEvent(GateBleTableContract.Event.OnAddBle(ble))
+                }
+            }
+
+        }
+
+        Box(
+            modifier = Modifier.fillMaxWidth().animateContentSize()
+        ) {
+
+            if (state.savedBleTable.sortedBy { it.serial } != state.newTable.sortedBy { it.serial }) {
+
+                Button(
+                    onClick = {
+                        viewModel.setEvent(GateBleTableContract.Event.OnWriteTable)
+                    },
+                    modifier = Modifier
+                        .padding(16.dp)
+                        .fillMaxWidth()
+                        .height(48.dp)
+                ) {
+                    Text(
+                        text = "Сохранить"
+                    )
+                }
+
+            }
+
+        }
+
+    }
+
+    if (editBle != null) {
+
+        Dialog(
+            onDismissRequest = {
+                viewModel.setEvent(GateBleTableContract.Event.OnAddBle(ble = editBle!!.copy()))
+                editBle = null
+            }
+        ) {
+
+            Surface(
+                shape = RoundedCornerShape(24.dp)
+            ) {
+
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(12.dp),
+                    modifier = Modifier.padding(24.dp)
                 ) {
 
-                    Checkbox(
-                        checked = selected.any { it == ble.serial },
-                        onCheckedChange = null
+                    var name by remember(editBle) {
+                        mutableStateOf(editBle?.name ?: "")
+                    }
+
+                    Text(
+                        style = MaterialTheme.typography.titleLarge,
+                        text = "Введите название"
                     )
 
-                    BleItem(
-                        shapeType =  bleList.filterNot { saved.contains(it.serial) }.takeShapeType(ble),
-                        ble = ble
+                    OutlinedTextField(
+                        value = name,
+                        singleLine = true,
+                        onValueChange = {
+                            name = it
+                        }
+                    )
+
+                    PrimaryButton(
+                        label = "Сохранить"
                     ) {
-                        onAddBle(ble)
+                        viewModel.setEvent(
+                            GateBleTableContract.Event.OnAddBle(
+                                ble = editBle!!.copy(name = name)
+                            )
+                        )
+                        editBle = null
                     }
 
                 }
 
             }
 
-
         }
 
-        PrimaryButton(
-            label = "Сохранить",
-            onClick = onClose
-        )
-
     }
-    
+
 }
 
 @Composable
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableViewModel.kt
index 821f212..a9eaa36 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/GateBleTableViewModel.kt
@@ -2,13 +2,14 @@ package llc.arma.ble.app.ui.screen.inspection.gate.table
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.toRoute
 import com.ramcosta.composedestinations.generated.destinations.GateBleTableScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.app.ui.common.retryUntilNotNull
 import llc.arma.ble.domain.model.BleName
 import llc.arma.ble.domain.usecase.AddBleToHostTable
 import llc.arma.ble.domain.usecase.GetBleNamesFlow
@@ -18,10 +19,8 @@ import javax.inject.Inject
 
 @HiltViewModel
 class GateBleTableViewModel @Inject constructor(
-    private val getFoundBle: GetFoundBle,
     private val savedStateHandle: SavedStateHandle,
     private val getBleNamesFlow: GetBleNamesFlow,
-    private val addBleToHostTable: AddBleToHostTable,
     private val getHostBleTableBySerial: GetHostBleTableBySerial
 ) : BaseViewModel<GateBleTableContract.State, GateBleTableContract.Event, GateBleTableContract.Effect>() {
 
@@ -29,110 +28,66 @@ class GateBleTableViewModel @Inject constructor(
 
         setEvent(GateBleTableContract.Event.OnRestart)
 
-        viewModelScope.launch {
-
-            while (true){
-
-                val state = viewState.value
-
-                if(state is GateBleTableContract.State.Display) {
-
-                    setState {
-                        state.copy(bleAround = getFoundBle())
-                    }
-
-                }
-
-                delay(1_000)
-
-            }
-
-        }
-
     }
 
-    override fun setInitialState() = GateBleTableContract.State.Loading
+    override fun setInitialState() = GateBleTableContract.State.Loading(null)
 
     override fun handleEvents(event: GateBleTableContract.Event) {
         when(event){
             is GateBleTableContract.Event.OnRestart -> reduce(viewState.value, event)
             is GateBleTableContract.Event.OnAddBle -> reduce(viewState.value, event)
-            is GateBleTableContract.Event.OnWritePreview -> reduce(viewState.value, event)
-            is GateBleTableContract.Event.OnHideWritePreview -> reduce(viewState.value, event)
-            is GateBleTableContract.Event.OnWrite -> reduce(viewState.value, event)
+            is GateBleTableContract.Event.OnWriteTable -> reduce(viewState.value, event)
+            is GateBleTableContract.Event.OnSelectBle -> reduce(viewState.value, event)
+            is GateBleTableContract.Event.OnBleSelected -> reduce(viewState.value, event)
         }
     }
 
     private fun reduce(
         state: GateBleTableContract.State,
-        event: GateBleTableContract.Event.OnWrite
-    ) {
-
-        val params = GateBleTableScreenDestination.argsFrom(savedStateHandle)
-
-        if(state is GateBleTableContract.State.Display) {
-
-            viewModelScope.launch {
-
-                setState {
-                    state.copy(
-                        writeState = GateBleTableContract.State.Display.WriteState.Writing(state.newTable)
-                    )
-                }
-
-                addBleToHostTable.invoke(
-                    serial = params.bleSerial,
-                    ble = state.newTable
-                ).fold(
-                    onSuccess = {
-                        setState {
-                            state.copy(
-                                writeState = GateBleTableContract.State.Display.WriteState.Success
-                            )
-                        }
-                        setEvent(GateBleTableContract.Event.OnRestart)
-                    },
-                    onFailure = {
-                        setState {
-                            state.copy(
-                                writeState = GateBleTableContract.State.Display.WriteState.Failure
-                            )
-                        }
-                    }
-                )
-
-            }
-
-        }
-
-    }
-
-    private fun reduce(
-        state: GateBleTableContract.State,
-        event: GateBleTableContract.Event.OnHideWritePreview
+        event: GateBleTableContract.Event.OnSelectBle
     ) {
 
         if(state is GateBleTableContract.State.Display) {
 
-            setState {
-                state.copy(writeState = null)
-            }
-
-        }
-
-    }
-
-    private fun reduce(
-        state: GateBleTableContract.State,
-        event: GateBleTableContract.Event.OnWritePreview
-    ) {
-
-        if(state is GateBleTableContract.State.Display) {
-
-            setState {
-                state.copy(writeState = GateBleTableContract.State.Display.WriteState.DisplayPreview(
+            setEffect {
+                GateBleTableContract.Effect.Navigation.BleSelector(
                     state.newTable
                 )
+            }
+
+        }
+
+    }
+
+    private fun reduce(
+        state: GateBleTableContract.State,
+        event: GateBleTableContract.Event.OnBleSelected
+    ) {
+
+        if(state is GateBleTableContract.State.Display) {
+
+            setState {
+
+                state.copy(
+                    newTable = event.bleSerials
+                )
+
+            }
+
+        }
+
+    }
+
+    private fun reduce(
+        state: GateBleTableContract.State,
+        event: GateBleTableContract.Event.OnWriteTable
+    ) {
+
+        if(state is GateBleTableContract.State.Display) {
+
+            setEffect {
+                GateBleTableContract.Effect.Navigation.WriteTable(
+                    state.newTable
                 )
             }
 
@@ -150,7 +105,7 @@ class GateBleTableViewModel @Inject constructor(
             if(state.newTable.any { it.serial == event.ble.serial}){
 
                 setState {
-                    state.copy(newTable = state.newTable.filter { it.serial != event.ble.serial})
+                    state.copy(newTable = state.newTable.filter { it.serial != event.ble.serial })
                 }
 
             } else {
@@ -165,6 +120,8 @@ class GateBleTableViewModel @Inject constructor(
 
     }
 
+    private var loadJob: Job? = null
+
     private fun reduce(
         state: GateBleTableContract.State,
         event: GateBleTableContract.Event.OnRestart
@@ -174,36 +131,34 @@ class GateBleTableViewModel @Inject constructor(
         val params = GateBleTableScreenDestination.argsFrom(savedStateHandle)
 
         setState {
-            GateBleTableContract.State.Loading
+            GateBleTableContract.State.Loading(null)
         }
 
-        viewModelScope.launch {
+        loadJob?.cancel()
+        loadJob = viewModelScope.launch {
 
             val names = getBleNamesFlow.invoke().first()
 
-            getHostBleTableBySerial(params.bleSerial).fold(
-                onSuccess = {
-
-                    val savedBle = it.map { ble -> BleName(
-                        name = names.firstOrNull { it.serial == ble }?.name ?: "Безымянный",
-                        serial = ble) }
-
+            val table = retryUntilNotNull(
+                onNewAttempt = {
                     setState {
-                        GateBleTableContract.State.Display(
-                            bleAround = emptyList(),
-                            newTable = savedBle,
-                            savedBleTable = savedBle,
-                            writeState = null
-                        )
-                    }
-
-                },
-                onFailure = {
-                    setState {
-                        GateBleTableContract.State.Error
+                        GateBleTableContract.State.Loading(it)
                     }
                 }
-            )
+            ){
+                getHostBleTableBySerial(params.bleSerial).getOrNull()
+            }
+
+            val savedBle = table.map { ble -> BleName(
+                name = names.firstOrNull { it.serial == ble }?.name ?: "Безымянный",
+                serial = ble) }
+
+            setState {
+                GateBleTableContract.State.Display(
+                    newTable = savedBle,
+                    savedBleTable = savedBle
+                )
+            }
 
         }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/Write.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/Write.kt
deleted file mode 100644
index 6da5292..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/Write.kt
+++ /dev/null
@@ -1,205 +0,0 @@
-package llc.arma.ble.app.ui.screen.inspection.gate.table
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import llc.arma.ble.R
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.common.SecondaryButton
-import llc.arma.ble.app.ui.screen.ShapeType
-
-@Composable
-fun Write(
-    state: GateBleTableContract.State.Display.WriteState,
-    onEvent: (GateBleTableContract.Event) -> Unit
-) {
-
-    Column(
-        modifier = Modifier.animateContentSize()
-    ) {
-
-        Text(
-            modifier = Modifier.padding(horizontal = 12.dp),
-            text = "Запись изменений",
-            style = MaterialTheme.typography.titleLarge
-        )
-
-        Spacer(modifier = Modifier.height(20.dp))
-
-        when (state) {
-            is GateBleTableContract.State.Display.WriteState.DisplayPreview -> {
-
-                Box(
-                    modifier = Modifier
-                        .weight(1f)
-                        .padding(vertical = 0.dp, horizontal = 8.dp)
-                ) {
-
-                    LazyColumn(
-                        modifier = Modifier
-                            .padding(horizontal = 12.dp)
-                    ) {
-
-                        item {
-                            Text(
-                                style = MaterialTheme.typography.titleLarge,
-                                textAlign = TextAlign.Center,
-                                text = "Новая таблица BLE",
-                            )
-                        }
-
-                        items(items = state.writeRequest) {
-                            SelectBleItem(ShapeType.Singleton, it)
-                        }
-
-                        if(state.writeRequest.isEmpty()){
-                            item {
-                                Text(
-                                    textAlign = TextAlign.Center,
-                                    text = "Пусто",
-                                    modifier = Modifier.padding(48.dp).fillMaxWidth()
-                                )
-                            }
-                        }
-
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(20.dp))
-
-                PrimaryButton(
-                    label = "Записать"
-                ) {
-                    onEvent(GateBleTableContract.Event.OnWrite)
-                }
-
-                SecondaryButton (
-                    label = "Отменить"
-                ) {
-                    onEvent(GateBleTableContract.Event.OnHideWritePreview)
-                }
-
-
-            }
-            is GateBleTableContract.State.Display.WriteState.Writing -> {
-
-                Column {
-
-                    Spacer(modifier = Modifier.height(28.dp))
-
-                    CircularProgressIndicator(
-                        strokeCap = StrokeCap.Round,
-                        modifier = Modifier
-                            .align(Alignment.CenterHorizontally)
-                    )
-
-                    Spacer(modifier = Modifier.height(48.dp))
-
-                    SecondaryButton (
-                        label = "Отменить"
-                    ) {
-                        onEvent(GateBleTableContract.Event.OnHideWritePreview)
-                    }
-
-                }
-
-            }
-            GateBleTableContract.State.Display.WriteState.Success -> {
-
-                Column {
-
-                    Box(
-                        modifier = Modifier
-                            .padding(8.dp)
-                            .fillMaxWidth()
-                    ) {
-
-                        Image(
-                            modifier = Modifier
-                                .size(125.dp)
-                                .align(Alignment.Center),
-                            painter = painterResource(R.drawable.ic_done),
-                            contentDescription = null
-                        )
-
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        modifier = Modifier.align(Alignment.CenterHorizontally),
-                        text = "Успешно завершено"
-                    )
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    PrimaryButton(
-                        label = "Ok"
-                    ) {
-                        onEvent(GateBleTableContract.Event.OnHideWritePreview)
-                    }
-
-                }
-
-            }
-            GateBleTableContract.State.Display.WriteState.Failure -> {
-
-                Column {
-
-                    Box(
-                        modifier = Modifier
-                            .padding(8.dp)
-                            .fillMaxWidth()
-                    ) {
-
-                        Image(
-                            modifier = Modifier
-                                .size(125.dp)
-                                .align(Alignment.Center),
-                            painter = painterResource(R.drawable.ic_error),
-                            contentDescription = null
-                        )
-
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        modifier = Modifier.align(Alignment.CenterHorizontally),
-                        text = "Ошибка записи"
-                    )
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    PrimaryButton(
-                        label = "Ok"
-                    ) {
-                        onEvent(GateBleTableContract.Event.OnHideWritePreview)
-                    }
-
-                }
-
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteScreen.kt
new file mode 100644
index 0000000..b5b1a57
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteScreen.kt
@@ -0,0 +1,62 @@
+package llc.arma.ble.app.ui.screen.inspection.gate.table.write
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import llc.arma.ble.app.ui.common.WriteFlow
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.domain.model.Ble
+import llc.arma.ble.domain.model.BleName
+
+@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
+@Composable
+fun BleTableWriteScreen(
+    bleSerial: String,
+    items: Array<BleName>,
+    navigator: ResultBackNavigator<Boolean>
+) {
+
+    val viewModel = hiltViewModel<BleTableWriteViewModel>()
+    val state = viewModel.viewState.value
+
+    LaunchedEffect(Unit) {
+        viewModel.effect.collect {
+            when(it){
+                WriteFlowContract.Effect.Navigation.Up ->
+                    navigator.navigateBack()
+
+                WriteFlowContract.Effect.Navigation.UpSuccess ->
+                    navigator.navigateBack(true)
+            }
+        }
+    }
+
+    Surface(
+        shape = RoundedCornerShape(20.dp)
+    ) {
+
+        Box(
+            modifier = Modifier.padding(20.dp)
+        ) {
+
+            WriteFlow(
+                state = state,
+                onEvent = viewModel::setEvent
+            )
+
+        }
+
+    }
+
+}
+
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteViewModel.kt
new file mode 100644
index 0000000..25b7243
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/table/write/BleTableWriteViewModel.kt
@@ -0,0 +1,103 @@
+package llc.arma.ble.app.ui.screen.inspection.gate.table.write
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.ramcosta.composedestinations.generated.destinations.BleTableWriteScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.GateWriteScreenDestination
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.common.WriteItemData
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
+import llc.arma.ble.app.ui.screen.locale.localizedName
+import llc.arma.ble.domain.usecase.AddBleToHostTable
+import llc.arma.ble.domain.usecase.WriteBle
+import javax.inject.Inject
+
+@HiltViewModel
+class BleTableWriteViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle,
+    private val writeBle: WriteBle,
+    private val addBleToHostTable: AddBleToHostTable
+) : BaseViewModel<WriteFlowContract.State, WriteFlowContract.Event, WriteFlowContract.Effect>() {
+
+    init {
+
+        val params = BleTableWriteScreenDestination.argsFrom(savedStateHandle)
+
+        setState {
+            WriteFlowContract.State.Display(
+                params.items.map {
+                    WriteItemData(it.name, it.serial)
+                }
+            )
+        }
+
+    }
+
+    override fun setInitialState() = WriteFlowContract.State.Loading
+
+    override fun handleEvents(event: WriteFlowContract.Event) {
+        when(event){
+            is WriteFlowContract.Event.OnNavigateUp -> reduce(viewState.value, event)
+            is WriteFlowContract.Event.OnWrite -> reduce(viewState.value, event)
+        }
+    }
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnNavigateUp
+    ){
+
+        setEffect {
+            when(state){
+                is WriteFlowContract.State.Display,
+                WriteFlowContract.State.Error,
+                WriteFlowContract.State.Loading,
+                WriteFlowContract.State.Writing -> WriteFlowContract.Effect.Navigation.Up
+                WriteFlowContract.State.Success -> WriteFlowContract.Effect.Navigation.UpSuccess
+            }
+
+        }
+
+    }
+
+    private var writeJob: Job? = null
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnWrite
+    ){
+
+        val params = BleTableWriteScreenDestination.argsFrom(savedStateHandle)
+
+        setState {
+            WriteFlowContract.State.Writing
+        }
+
+        writeJob?.cancel()
+        writeJob = viewModelScope.launch {
+            addBleToHostTable.invoke(
+                serial = params.bleSerial,
+                ble = params.items.toList()
+            ).fold(
+                onSuccess = {
+                    setState {
+                        WriteFlowContract.State.Success
+                    }
+                },
+                onFailure = {
+                    setState {
+                        WriteFlowContract.State.Error
+                    }
+                }
+            )
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteScreen.kt
new file mode 100644
index 0000000..e85a088
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteScreen.kt
@@ -0,0 +1,62 @@
+package llc.arma.ble.app.ui.screen.inspection.gate.write
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import llc.arma.ble.app.ui.common.WriteFlow
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.screen.inspection.gate.table.write.BleTableWriteViewModel
+import llc.arma.ble.domain.model.Ble
+
+@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
+@Composable
+fun GateWriteScreen(
+    bleSerial: String,
+    writeRequest: Ble.Gate.WriteRequest,
+    navigator: ResultBackNavigator<Boolean>
+) {
+
+    val viewModel = hiltViewModel<BleTableWriteViewModel>()
+    val state = viewModel.viewState.value
+
+    LaunchedEffect(Unit) {
+        viewModel.effect.collect {
+            when(it){
+                WriteFlowContract.Effect.Navigation.Up ->
+                    navigator.navigateBack()
+
+                WriteFlowContract.Effect.Navigation.UpSuccess ->
+                    navigator.navigateBack(true)
+            }
+        }
+    }
+
+    Surface(
+        shape = RoundedCornerShape(20.dp)
+    ) {
+
+        Box(
+            modifier = Modifier.padding(20.dp)
+        ) {
+
+            WriteFlow(
+                state = state,
+                onEvent = viewModel::setEvent
+            )
+
+        }
+
+    }
+
+}
+
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteViewModel.kt
new file mode 100644
index 0000000..30dcd34
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/gate/write/GateWriteViewModel.kt
@@ -0,0 +1,113 @@
+package llc.arma.ble.app.ui.screen.inspection.gate.write
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.ramcosta.composedestinations.generated.destinations.GateWriteScreenDestination
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.common.WriteItemData
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
+import llc.arma.ble.app.ui.screen.locale.localizedName
+import llc.arma.ble.domain.usecase.WriteBle
+import javax.inject.Inject
+
+@HiltViewModel
+class GateWriteViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle,
+    private val writeBle: WriteBle
+) : BaseViewModel<WriteFlowContract.State, WriteFlowContract.Event, WriteFlowContract.Effect>() {
+
+    init {
+
+        val params = GateWriteScreenDestination.argsFrom(savedStateHandle)
+
+        val items = mutableListOf<WriteItemData>()
+
+        params.writeRequest.tx?.let {
+            items.add(WriteItemData("Мощность", "${it.localizedName} db"))
+        }
+        params.writeRequest.interval?.let {
+            val hours = it / millisInHour
+            val minutes = (it - (hours * millisInHour)) / millisInMinute
+            val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
+            items.add(WriteItemData("Интервал измерений", "$hours ч. $minutes мин. $seconds сек."))
+        }
+        params.writeRequest.readInterval?.let {
+            val hours = it / millisInHour
+            val minutes = (it - (hours * millisInHour)) / millisInMinute
+            val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
+            items.add(WriteItemData("Интервал чтения", "$hours ч. $minutes мин. $seconds сек."))
+        }
+
+        setState {
+            WriteFlowContract.State.Display(
+                items
+            )
+        }
+
+    }
+
+    override fun setInitialState() = WriteFlowContract.State.Loading
+
+    override fun handleEvents(event: WriteFlowContract.Event) {
+        when(event){
+            is WriteFlowContract.Event.OnNavigateUp -> reduce(viewState.value, event)
+            is WriteFlowContract.Event.OnWrite -> reduce(viewState.value, event)
+        }
+    }
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnNavigateUp
+    ){
+
+        setEffect {
+            when(state){
+                is WriteFlowContract.State.Display,
+                WriteFlowContract.State.Error,
+                WriteFlowContract.State.Loading,
+                WriteFlowContract.State.Writing -> WriteFlowContract.Effect.Navigation.Up
+                WriteFlowContract.State.Success -> WriteFlowContract.Effect.Navigation.UpSuccess
+            }
+
+        }
+
+    }
+
+    private var writeJob: Job? = null
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnWrite
+    ){
+
+        val params = GateWriteScreenDestination.argsFrom(savedStateHandle)
+
+        setState {
+            WriteFlowContract.State.Writing
+        }
+
+        writeJob?.cancel()
+        writeJob = viewModelScope.launch {
+            writeBle(params.bleSerial, params.writeRequest).fold(
+                onSuccess = {
+                    setState {
+                        WriteFlowContract.State.Success
+                    }
+                },
+                onFailure = {
+                    setState {
+                        WriteFlowContract.State.Error
+                    }
+                }
+            )
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorContract.kt
new file mode 100644
index 0000000..4208ed5
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorContract.kt
@@ -0,0 +1,26 @@
+package llc.arma.ble.app.ui.screen.inspection.selector.ble
+
+import llc.arma.ble.app.ui.common.ViewEvent
+import llc.arma.ble.app.ui.common.ViewSideEffect
+import llc.arma.ble.app.ui.common.ViewState
+import llc.arma.ble.domain.model.BleInfo
+import llc.arma.ble.domain.model.BleName
+
+class BleSelectorContract {
+
+    sealed class Event : ViewEvent {
+
+        data class OnSelect(
+            val ble: BleName
+        ) : Event()
+
+    }
+
+    data class State(
+        val selected: List<BleName>,
+        val ble: List<BleInfo>
+    ) : ViewState
+
+    sealed class Effect : ViewSideEffect
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorScreen.kt
new file mode 100644
index 0000000..590848c
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorScreen.kt
@@ -0,0 +1,152 @@
+package llc.arma.ble.app.ui.screen.inspection.selector.ble
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import llc.arma.ble.app.ui.screen.ShapeType.Companion.takeShapeType
+import llc.arma.ble.app.ui.screen.ble.BleItem
+import llc.arma.ble.app.ui.screen.locale.localized
+import llc.arma.ble.domain.model.BleInfo
+import llc.arma.ble.domain.model.BleName
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Destination<RootGraph>
+@Composable
+fun BleSelectorScreen(
+    selected: Array<BleName>,
+    resultNavigator: ResultBackNavigator<Array<BleName>>
+) {
+
+    val viewModel = hiltViewModel<BleSelectorViewModel>()
+    val state = viewModel.viewState.value
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(
+                        onClick = {
+                            resultNavigator.navigateBack()
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
+                            contentDescription = null
+                        )
+                    }
+                },
+                title = {
+                    Text(
+                        text = BleInfo.Type.HOST.localized
+                    )
+                }
+            )
+        }
+    ) {
+
+        Column(
+            modifier = Modifier.padding(it)
+        ) {
+
+            DisplayState(viewModel, state, resultNavigator)
+
+        }
+
+    }
+
+}
+
+@Composable
+private fun DisplayState(
+    viewModel: BleSelectorViewModel,
+    state: BleSelectorContract.State,
+    resultNavigator: ResultBackNavigator<Array<BleName>>
+){
+
+    Column(
+        modifier = Modifier
+    ) {
+
+        if(state.ble.isEmpty()){
+            LinearProgressIndicator(
+                modifier = Modifier.fillMaxWidth()
+            )
+        }
+
+        LazyColumn(
+            contentPadding = PaddingValues(horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(2.dp),
+            modifier = Modifier.weight(1f)
+        ) {
+
+            items(
+                items = state.ble
+            ) { ble ->
+
+                val checked = state.selected.map { it.serial }.contains(ble.serial)
+
+                BleItem(
+                    checked = checked,
+                    shapeType = state.ble.takeShapeType(ble),
+                    ble = ble
+                ) {
+                    viewModel.setEvent(BleSelectorContract.Event.OnSelect(
+                        BleName(ble.serial, ble.name)
+                    ))
+                }
+
+            }
+
+
+        }
+
+        Box(
+            modifier = Modifier.fillMaxWidth().animateContentSize()
+        ) {
+
+            Button(
+                onClick = {
+                    resultNavigator.navigateBack(state.selected.toTypedArray())
+                },
+                modifier = Modifier
+                    .padding(16.dp)
+                    .fillMaxWidth()
+                    .height(48.dp)
+            ) {
+
+                Text(
+                    text = "Выбрать"
+                )
+
+            }
+
+        }
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorViewModel.kt
new file mode 100644
index 0000000..d3ca2be
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/ble/BleSelectorViewModel.kt
@@ -0,0 +1,64 @@
+package llc.arma.ble.app.ui.screen.inspection.selector.ble
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.ramcosta.composedestinations.generated.destinations.BleSelectorScreenDestination
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.domain.usecase.GetBleAroundFlow
+import javax.inject.Inject
+
+@HiltViewModel
+class BleSelectorViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    getBleAroundFlow: GetBleAroundFlow
+) : BaseViewModel<BleSelectorContract.State, BleSelectorContract.Event, BleSelectorContract.Effect>() {
+
+    init {
+        val params = BleSelectorScreenDestination.argsFrom(savedStateHandle)
+
+        setState {
+            BleSelectorContract.State(
+                params.selected.toList(),
+                emptyList()
+            )
+        }
+
+        getBleAroundFlow.invoke().onEach {
+            setState {
+                copy(ble = it)
+            }
+        }.launchIn(viewModelScope)
+
+    }
+
+    override fun setInitialState() = BleSelectorContract.State(emptyList(), emptyList())
+
+    override fun handleEvents(event: BleSelectorContract.Event) {
+        when(event){
+            is BleSelectorContract.Event.OnSelect -> reduce(viewState.value, event)
+        }
+    }
+
+    private fun reduce(
+        state: BleSelectorContract.State,
+        event: BleSelectorContract.Event.OnSelect,
+    ) {
+
+        val selected = if(state.selected.map { it.serial }.contains(event.ble.serial)){
+            val copy = state.selected.toMutableList()
+            copy.removeIf { it.serial == event.ble.serial }
+            copy
+        } else {
+            state.selected.toMutableList() + event.ble
+        }
+
+        setState {
+            copy(selected = selected.toMutableList())
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorScreen.kt
index f2c98a2..aef4d11 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -14,24 +15,17 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.KeyboardArrowDown
 import androidx.compose.material.icons.rounded.KeyboardArrowUp
 import androidx.compose.material3.Button
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.FilledIconButton
+import androidx.compose.material3.FilledTonalIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-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
@@ -40,11 +34,7 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.bottomsheet.spec.DestinationStyleBottomSheet
 import com.ramcosta.composedestinations.result.ResultBackNavigator
-import com.ramcosta.composedestinations.spec.DestinationStyle
 import kotlinx.serialization.Serializable
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.app.ui.screen.inspection.gate.main.GateContract
 
 @Serializable
 data class DurationSelectResult(
@@ -58,7 +48,7 @@ fun DurationSelectorScreen(
     qualifier: String? = null,
     duration: Int?,
     minimum: Int = 10_000,
-    maximum: Int = 10 * 24 * 60 * 60 * 1000,
+    maximum: Int = 864_000_000,
     daysComponent: Boolean = true,
     hoursComponent: Boolean = true,
     minutesComponent: Boolean = true,
@@ -82,17 +72,16 @@ fun DurationSelectorScreen(
     }
 
     Column(
-        modifier = Modifier.padding(16.dp).fillMaxWidth()
+        verticalArrangement = Arrangement.spacedBy(20.dp),
+        modifier = Modifier.padding(20.dp).fillMaxWidth()
     ) {
 
         Text(
-            modifier = Modifier.padding(horizontal = 12.dp),
+            modifier = Modifier,
             text = "Интервал измерений",
             style = MaterialTheme.typography.titleLarge
         )
 
-        Spacer(modifier = Modifier.height(16.dp))
-
         DurationPicker(
             minInterval = minimum,
             maxInterval = maximum,
@@ -106,17 +95,31 @@ fun DurationSelectorScreen(
             viewModel.setEvent(DurationSelectorContract.Event.OnDurationChanged(it))
         }
 
-        Spacer(modifier = Modifier.height(16.dp))
-
-        Button(
-            onClick = {
-                viewModel.setEvent(DurationSelectorContract.Event.OnSave)
-            },
-            modifier = Modifier.fillMaxWidth()
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.align(Alignment.End)
         ) {
-            Text(
-                text = "Применить"
-            )
+
+            OutlinedButton(
+                onClick = {
+                    resultNavigator.navigateBack()
+                },
+            ) {
+                Text(
+                    text = "Отмена"
+                )
+            }
+
+            Button(
+                onClick = {
+                    viewModel.setEvent(DurationSelectorContract.Event.OnSave)
+                }
+            ) {
+                Text(
+                    text = "Применить"
+                )
+
+            }
 
         }
 
@@ -127,7 +130,7 @@ fun DurationSelectorScreen(
 @Composable
 fun DurationPicker(
     modifier: Modifier,
-    maxInterval: Int = 10 * 24 * 60 * 60 * 1000,
+    maxInterval: Int = 864_000_000,
     minInterval: Int = 10_000,
     seconds: Boolean = true,
     minutes: Boolean = true,
@@ -137,12 +140,14 @@ fun DurationPicker(
     onChanged: (duration: Int) -> Unit
 ){
 
-    if(value > maxInterval){
-        onChanged(maxInterval)
-    }
+    LaunchedEffect(value, maxInterval, minInterval) {
+        if(value > maxInterval){
+            onChanged(maxInterval)
+        }
 
-    if(value < minInterval){
-        onChanged(minInterval)
+        if(value < minInterval){
+            onChanged(minInterval)
+        }
     }
 
     val maxSeconds = maxInterval / millisInSecond
@@ -155,78 +160,99 @@ fun DurationPicker(
     val minutesValue = (value - (dayValue * millisInDay) - (hourValue * millisInHour)) / millisInMinute
     val secondsValue = (value - (dayValue * millisInDay) - (hourValue * millisInHour) - (minutesValue * millisInMinute)) / millisInSecond
 
+    println("${maxInterval} ${minInterval} ${maxDays} ${maxHours} ${maxMinutes} ${maxSeconds}")
+
     Row(
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
         verticalAlignment = Alignment.CenterVertically,
         modifier = modifier
     ) {
 
         if(days) {
 
-            NumberPicker(
-                range = -1..maxDays,
-                value = dayValue,
-                onValueChanged = {
-                    onChanged((it * millisInDay) + (hourValue * millisInHour) + (minutesValue * millisInMinute) + (secondsValue * millisInSecond))
-                }
-            )
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
 
-            Spacer(modifier = Modifier.width(8.dp))
+                NumberPicker(
+                    range = -1..maxDays,
+                    value = dayValue,
+                    onValueChanged = {
+                        onChanged((it * millisInDay) + (hourValue * millisInHour) + (minutesValue * millisInMinute) + (secondsValue * millisInSecond))
+                    }
+                )
 
-            Text(text = "Д.")
+                Spacer(modifier = Modifier.width(4.dp))
+
+                Text(text = "Д.")
+
+            }
 
         }
 
         if(hours) {
 
-            Spacer(modifier = Modifier.width(16.dp))
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
 
-            NumberPicker(
-                range = -1..maxHours,
-                value = hourValue,
-                onValueChanged = {
-                    onChanged((it * millisInHour) + (dayValue * millisInDay) + (minutesValue * millisInMinute) + (secondsValue * millisInSecond))
-                }
-            )
+                NumberPicker(
+                    range = -1..maxHours,
+                    value = hourValue,
+                    onValueChanged = {
+                        onChanged((it * millisInHour) + (dayValue * millisInDay) + (minutesValue * millisInMinute) + (secondsValue * millisInSecond))
+                    }
+                )
 
-            Spacer(modifier = Modifier.width(8.dp))
+                Spacer(modifier = Modifier.width(4.dp))
 
-            Text(text = "Ч.")
+                Text(text = "Ч.")
+
+            }
 
         }
 
         if(minutes) {
 
-            Spacer(modifier = Modifier.width(16.dp))
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
 
-            NumberPicker(
-                range = -1..maxMinutes,
-                value = minutesValue,
-                onValueChanged = {
-                    onChanged((secondsValue * millisInSecond) + (it * millisInMinute) + (dayValue * millisInDay) + (hourValue * millisInHour))
-                }
-            )
+                NumberPicker(
+                    range = -1..maxMinutes,
+                    value = minutesValue,
+                    onValueChanged = {
+                        onChanged((secondsValue * millisInSecond) + (it * millisInMinute) + (dayValue * millisInDay) + (hourValue * millisInHour))
+                    }
+                )
 
-            Spacer(modifier = Modifier.width(8.dp))
+                Spacer(modifier = Modifier.width(4.dp))
 
-            Text(text = "М.")
+                Text(text = "М.")
+
+            }
 
         }
 
         if(seconds) {
 
-            Spacer(modifier = Modifier.width(16.dp))
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
 
-            NumberPicker(
-                range = -1..maxSeconds,
-                value = secondsValue,
-                onValueChanged = {
-                    onChanged((it * millisInSecond) + (minutesValue * millisInMinute) + (dayValue * millisInDay) + (hourValue * millisInHour))
-                }
-            )
+                NumberPicker(
+                    range = -1..maxSeconds,
+                    value = secondsValue,
+                    onValueChanged = {
+                        onChanged((it * millisInSecond) + (minutesValue * millisInMinute) + (dayValue * millisInDay) + (hourValue * millisInHour))
+                    }
+                )
 
-            Spacer(modifier = Modifier.width(8.dp))
+                Spacer(modifier = Modifier.width(4.dp))
 
-            Text(text = "С.")
+                Text(text = "С.")
+
+            }
 
         }
 
@@ -250,6 +276,7 @@ fun NumberPicker(
 
     LaunchedEffect(range){
 
+
         if(value > range.last){
 
             onValueChanged(range.last)
@@ -264,12 +291,14 @@ fun NumberPicker(
 
     }
 
+    println(value)
+
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
     ){
 
-        FilledIconButton(
+        FilledTonalIconButton(
             onClick = {
                 if(value < range.last) onValueChanged(value + 1)
             }
@@ -304,7 +333,7 @@ fun NumberPicker(
 
         Spacer(modifier = Modifier.height(36.dp))
 
-        FilledIconButton(
+        FilledTonalIconButton(
             onClick = {
                 if(value > range.first) onValueChanged(value - 1)
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorViewModel.kt
index 09bb972..02a9328 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/duration/DurationSelectorViewModel.kt
@@ -1,7 +1,6 @@
 package llc.arma.ble.app.ui.screen.inspection.selector.duration
 
 import androidx.lifecycle.SavedStateHandle
-import androidx.navigation.toRoute
 import com.ramcosta.composedestinations.generated.destinations.DurationSelectorScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
 import llc.arma.ble.app.ui.common.BaseViewModel
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorContract.kt
index 8272cfa..ea6aa4b 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorContract.kt
@@ -3,7 +3,7 @@ package llc.arma.ble.app.ui.screen.inspection.selector.power
 import llc.arma.ble.app.ui.common.ViewEvent
 import llc.arma.ble.app.ui.common.ViewSideEffect
 import llc.arma.ble.app.ui.common.ViewState
-import llc.arma.ble.app.ui.model.BleView
+import llc.arma.ble.domain.model.Ble
 
 class TxPowerSelectorContract {
 
@@ -12,7 +12,7 @@ class TxPowerSelectorContract {
         data object OnNavigateUp : Event()
 
         data class OnSelected(
-            val tx: BleView.BleState.TX
+            val tx: Ble.BleState.TX
         ) : Event()
 
         data object OnSave : Event()
@@ -20,7 +20,7 @@ class TxPowerSelectorContract {
     }
 
     data class State(
-        val tx: BleView.BleState.TX?
+        val tx: Ble.BleState.TX?
     ) : ViewState
 
     sealed class Effect : ViewSideEffect {
@@ -30,7 +30,7 @@ class TxPowerSelectorContract {
             data object NavigateUp : Navigation()
 
             data class NavigateUpWithResult(
-                val tx: BleView.BleState.TX
+                val tx: Ble.BleState.TX
             ) : Navigation()
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorScreen.kt
index 73c9cd5..12f4534 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorScreen.kt
@@ -1,37 +1,41 @@
 package llc.arma.ble.app.ui.screen.inspection.selector.power
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
-import com.ramcosta.composedestinations.bottomsheet.spec.DestinationStyleBottomSheet
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.ResultBackNavigator
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.model.BleView
-import llc.arma.ble.app.ui.screen.inspection.accelerometer.main.view.SelectorItem
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import llc.arma.ble.app.ui.screen.ShapeType
+import llc.arma.ble.app.ui.screen.ShapeType.Companion.takeShapeType
+import llc.arma.ble.app.ui.screen.locale.powerPercentage
+import llc.arma.ble.app.ui.screen.locale.value
+import llc.arma.ble.domain.model.Ble
 
-@Destination<RootGraph>(style = DestinationStyleBottomSheet::class)
+@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
 @Composable
 fun TxPowerSelectorScreen(
-    tx: BleView.BleState.TX?,
-    resultNavigator: ResultBackNavigator<BleView.BleState.TX>
+    tx: Ble.BleState.TX?,
+    resultNavigator: ResultBackNavigator<Ble.BleState.TX>
 ) {
 
     val viewModel = hiltViewModel<TxPowerSelectorViewModel>()
@@ -48,32 +52,101 @@ fun TxPowerSelectorScreen(
         }
     }
 
-    Column {
+    Surface(
+        shape = RoundedCornerShape(20.dp),
+        modifier = Modifier.fillMaxWidth(),
+    ) {
 
-        Text(
-            text = "Мощность",
-            style = MaterialTheme.typography.titleLarge
-        )
+        Column(
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier.padding(20.dp)
+        ) {
 
-        BleView.BleState.TX.entries.forEach {
+            Text(
+                text = "Мощность",
+                style = MaterialTheme.typography.titleLarge
+            )
+
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp),
+                modifier = Modifier.verticalScroll(rememberScrollState())
+            ) {
+
+                Ble.BleState.TX.entries.forEach {
+
+                    SelectorItem(
+                        shapeType = Ble.BleState.TX.entries.takeShapeType(it),
+                        label = "${it.value} dBb (${it.powerPercentage} %)",
+                        selected = it == state.tx
+                    ) {
+                        viewModel.setEvent(TxPowerSelectorContract.Event.OnSelected(it))
+                    }
+
+                }
+
+            }
+
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.align(Alignment.End)
+            ) {
+
+                OutlinedButton(
+                    onClick = {
+                        viewModel.setEvent(TxPowerSelectorContract.Event.OnNavigateUp)
+                    }
+                ) {
+                    Text(
+                        text = "Отмена"
+                    )
+                }
+
+                Button(
+                    onClick = {
+                        viewModel.setEvent(TxPowerSelectorContract.Event.OnSave)
+                    }
+                ) {
+                    Text(
+                        text = "Применить"
+                    )
+                }
 
-            SelectorItem(
-                label = "${it.value} dBb (${it.powerPercentage} %)",
-                selected = it == state.tx
-            ){
-                viewModel.setEvent(TxPowerSelectorContract.Event.OnSelected(it))
             }
 
         }
 
-        Spacer(modifier = Modifier.height(16.dp))
-
-        PrimaryButton(
-            label = "Применить"
-        ) {
-            viewModel.setEvent(TxPowerSelectorContract.Event.OnSave)
-        }
-
     }
 
+}
+
+@Composable
+fun SelectorItem(
+    shapeType: ShapeType,
+    label: String,
+    selected: Boolean,
+    onClick: () -> Unit
+){
+
+    Surface(
+        shape = shapeType.shape,
+        color = MaterialTheme.colorScheme.surfaceContainer
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable { onClick() }
+                .padding(horizontal = 12.dp, vertical = 10.dp)
+        ) {
+
+            RadioButton(
+                selected = selected,
+                onClick = null
+            )
+
+            Text(text = label)
+
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorViewModel.kt
index 65eaa70..013456e 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/selector/power/TxPowerSelectorViewModel.kt
@@ -1,7 +1,6 @@
 package llc.arma.ble.app.ui.screen.inspection.selector.power
 
 import androidx.lifecycle.SavedStateHandle
-import androidx.navigation.toRoute
 import com.ramcosta.composedestinations.generated.destinations.TxPowerSelectorScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
 import llc.arma.ble.app.ui.common.BaseViewModel
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryContract.kt
index 14e330f..1f44783 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryContract.kt
@@ -18,8 +18,13 @@ class ThermometerHistoryContract {
 
     sealed class State : ViewState {
 
+        data class Loading(
+            val attempt: Int?,
+            val progress: Float?
+        ) : State()
+
         data class Display(
-            val loadingHistoryState : ProgressState<List<Ble.Thermometer.HistoryPoint>>
+            val history : List<Ble.Thermometer.HistoryPoint>
         ) : State()
 
         data object Exception : State()
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryScreen.kt
index bc9c2bd..306a9ba 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryScreen.kt
@@ -23,7 +23,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
@@ -33,14 +36,17 @@ import com.patrykandpatrick.vico.compose.axis.horizontal.bottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.startAxis
 import com.patrykandpatrick.vico.compose.chart.Chart
 import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollSpec
 import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollState
 import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter
 import com.patrykandpatrick.vico.core.entry.ChartEntry
 import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.scroll.InitialScroll
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import llc.arma.ble.app.ui.common.RetryingLoadingTemplate
 import llc.arma.ble.domain.common.ProgressState
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -96,13 +102,9 @@ fun ThermometerHistoryScreen(
                 title = {
                     val title = when(state){
                         is ThermometerHistoryContract.State.Display -> {
-                            when (state.loadingHistoryState) {
-                                is ProgressState.Finished -> "История (${state.loadingHistoryState.data.size})"
-                                is ProgressState.Indeterminate -> "История"
-                                is ProgressState.Progress -> "История"
-                            }
+                            "История (${state.history.size})"
                         }
-                        ThermometerHistoryContract.State.Exception -> "История"
+                        else -> "История"
                     }
 
                     Text(
@@ -116,10 +118,7 @@ fun ThermometerHistoryScreen(
                         onClick = {
                             viewModel.setEvent(ThermometerHistoryContract.Event.OnRefresh)
                         },
-                        enabled = when(state){
-                            is ThermometerHistoryContract.State.Display -> state.loadingHistoryState is ProgressState.Finished
-                            ThermometerHistoryContract.State.Exception -> true
-                        }
+                        enabled = state is ThermometerHistoryContract.State.Display
                     ) {
                         Icon(
                             imageVector = Icons.Rounded.Refresh,
@@ -138,6 +137,7 @@ fun ThermometerHistoryScreen(
             when (state) {
                 is ThermometerHistoryContract.State.Display -> DisplayState(state = state)
                 ThermometerHistoryContract.State.Exception -> ExceptionState()
+                is ThermometerHistoryContract.State.Loading -> LoadingState(viewModel, state)
             }
 
         }
@@ -145,97 +145,97 @@ fun ThermometerHistoryScreen(
     }
 
 }
-    
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun LoadingState(
+    viewModel: ThermometerHistoryViewModel,
+    state: ThermometerHistoryContract.State.Loading
+){
+
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = Modifier.fillMaxSize()
+    ){
+
+        RetryingLoadingTemplate(
+            state.attempt
+        ) {
+            viewModel.setEvent(ThermometerHistoryContract.Event.OnNavigateUp)
+        }
+
+    }
+
+    /*val progressAnimDuration = 1500
+    val progressAnimation by animateFloatAsState(
+        targetValue = state.loadingHistoryState.value,
+        animationSpec = tween(
+            durationMillis = progressAnimDuration,
+            easing = FastOutSlowInEasing
+        ), label = ""
+    )
+
+    LoadingIndicator(
+        progress = { progressAnimation },
+        modifier = Modifier.align(Alignment.Center)
+    )*/
+
+}
+
 @Composable
 private fun DisplayState(
     state: ThermometerHistoryContract.State.Display
 ) {
 
-    Box(modifier = Modifier
+    Box(
+        modifier = Modifier
         .padding(8.dp)
         .fillMaxSize()
     ) {
 
-        when (state.loadingHistoryState) {
+        if(state.history.isEmpty()){
 
-            is ProgressState.Finished -> {
+            Text(
+                modifier = Modifier.align(Alignment.Center),
+                text = "Нет данных"
+            )
 
-                if(state.loadingHistoryState.data.isEmpty()){
+        } else {
 
-                    Text(
-                        modifier = Modifier.align(Alignment.Center),
-                        text = "Нет данных"
-                    )
-
-                } else {
-
-                    val producer = remember(state.loadingHistoryState.data) {
-                        state.loadingHistoryState.data.mapIndexed { index, measurePoint ->
-                            TemperatureEntry(measurePoint.date, index.toFloat(), measurePoint.value)
-                        }.let {
-                            ChartEntryModelProducer(it)
-                        }
-                    }
-
-                    val axisValueFormatter =
-                        AxisValueFormatter<AxisPosition.Horizontal.Bottom> { value, chartValues ->
-                            (chartValues.chartEntryModel.entries.firstOrNull()
-                                ?.getOrNull(value.toInt()) as? TemperatureEntry)
-                                ?.localDate
-                                ?.let { formatter.format(Date(it)) }
-                                .orEmpty()
-                        }
-
-                    val lineChart = lineChart()
-
-                    val scrollState = rememberChartScrollState()
-
-                    Chart(
-                        chartScrollState = scrollState,
-                        chart = lineChart,
-                        chartModelProducer = producer,
-                        startAxis = startAxis(),
-                        bottomAxis = bottomAxis(
-                            tickLength = 0.dp,
-                            valueFormatter = axisValueFormatter,
-                            labelRotationDegrees = -90f,
-                        ),
-                        modifier = Modifier.fillMaxSize(),
-                    )
-
-                    LaunchedEffect(scrollState.maxValue) {
-                        scrollState.scrollBy(scrollState.maxValue)
-                    }
+            val producer = remember(state.history) {
+                state.history.mapIndexed { index, measurePoint ->
+                    TemperatureEntry(measurePoint.date, index.toFloat(), measurePoint.value)
+                }.let {
+                    ChartEntryModelProducer(it)
+                }
+            }
 
+            val axisValueFormatter =
+                AxisValueFormatter<AxisPosition.Horizontal.Bottom> { value, chartValues ->
+                    (chartValues.chartEntryModel.entries.firstOrNull()
+                        ?.getOrNull(value.toInt()) as? TemperatureEntry)
+                        ?.localDate
+                        ?.let { formatter.format(Date(it)) }
+                        .orEmpty()
                 }
 
-            }
-            is ProgressState.Indeterminate -> {
+            val lineChart = lineChart()
 
-                ContainedLoadingIndicator(
-                    modifier = Modifier.align(Alignment.Center)
-                )
+            val scrollState = rememberChartScrollState()
 
-            }
-            is ProgressState.Progress -> {
-
-                val progressAnimDuration = 1500
-                val progressAnimation by animateFloatAsState(
-                    targetValue = state.loadingHistoryState.value,
-                    animationSpec = tween(
-                        durationMillis = progressAnimDuration,
-                        easing = FastOutSlowInEasing
-                    ), label = ""
-                )
-
-                LoadingIndicator(
-                    progress = { progressAnimation },
-                    modifier = Modifier.align(Alignment.Center)
-                )
-
-            }
+            Chart(
+                chartScrollState = scrollState,
+                chartScrollSpec = rememberChartScrollSpec(initialScroll = InitialScroll.End),
+                chart = lineChart,
+                chartModelProducer = producer,
+                startAxis = startAxis(),
+                runInitialAnimation = false,
+                bottomAxis = bottomAxis(
+                    tickLength = 0.dp,
+                    valueFormatter = axisValueFormatter,
+                    labelRotationDegrees = -90f,
+                ),
+                modifier = Modifier.fillMaxSize(),
+            )
 
         }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryViewModel.kt
index 823a926..a9f3622 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/history/ThermometerHistoryViewModel.kt
@@ -2,13 +2,13 @@ package llc.arma.ble.app.ui.screen.inspection.thermometer.history
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.toRoute
 import com.ramcosta.composedestinations.generated.destinations.ThermometerHistoryScreenDestination
-import com.ramcosta.composedestinations.generated.destinations.ThermometerScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.app.ui.common.retryUntilNotNull
 import llc.arma.ble.domain.common.ProgressState
+import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.usecase.GetTemperatureHistoryBySerial
 import javax.inject.Inject
 
@@ -24,8 +24,8 @@ class ThermometerHistoryViewModel @Inject constructor(
 
     }
 
-    override fun setInitialState() = ThermometerHistoryContract.State.Display(
-        ProgressState.Indeterminate
+    override fun setInitialState() = ThermometerHistoryContract.State.Loading(
+        null, null
     )
 
     override fun handleEvents(event: ThermometerHistoryContract.Event) {
@@ -60,22 +60,21 @@ class ThermometerHistoryViewModel @Inject constructor(
         val params = ThermometerHistoryScreenDestination.argsFrom(savedStateHandle)
 
         setState {
-            ThermometerHistoryContract.State.Display(ProgressState.Indeterminate)
+            ThermometerHistoryContract.State.Loading(null, null)
         }
 
-        getTemperatureHistoryBySerial(params.bleSerial).collect {
-            it.fold(
-                onSuccess = {
-                    setState {
-                        ThermometerHistoryContract.State.Display(it)
-                    }
-                },
-                onFailure = {
-                    setState {
-                        ThermometerHistoryContract.State.Exception
-                    }
+        val history = retryUntilNotNull(
+            onNewAttempt = {
+                setState {
+                    ThermometerHistoryContract.State.Loading(it, null)
                 }
-            )
+            }
+        ){
+            getTemperatureHistoryBySerial(params.bleSerial).getOrNull()
+        }
+
+        setState {
+            ThermometerHistoryContract.State.Display(history)
         }
 
     }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/DisplayState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/DisplayState.kt
index 14d92d1..21aba33 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/DisplayState.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/DisplayState.kt
@@ -1,6 +1,6 @@
 package llc.arma.ble.app.ui.screen.inspection.thermometer.main
 
-import androidx.compose.foundation.background
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -21,13 +21,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.unit.dp
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.app.ui.screen.BleInfoView
 import llc.arma.ble.app.ui.screen.ShapeType
-import llc.arma.ble.domain.model.Ble
+import llc.arma.ble.app.ui.screen.locale.value
 
 @Composable
 fun DisplayState(
@@ -35,111 +32,128 @@ fun DisplayState(
     state: ThermometerContract.State.Display
 ) {
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = Modifier
-            .verticalScroll(rememberScrollState())
-            .padding(horizontal = 16.dp)
-    ) {
-
-        BleInfoView(
-            bleInfo = state.origin.info,
-            version = state.origin.state.version
-        )
+    Column {
 
         Column(
-            verticalArrangement = Arrangement.spacedBy(2.dp),
-            content = {
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier
+                .weight(1f)
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = 16.dp)
+        ) {
 
-                BleMenuItem(
-                    shapeType = ShapeType.Start,
-                    title = "Мощность",
-                    subtitle = "${state.thermometer.state.tx.value} db",
-                    onClick = {
-                        viewModel.setEvent(ThermometerContract.Event.OnTxSelect)
-                    },
-                    icon = {
-                        Icon(
-                            imageVector = Icons.Rounded.KeyboardArrowDown,
-                            contentDescription = null
-                        )
-                    }
-                )
+            BleInfoView(
+                bleInfo = state.origin.info,
+                version = state.origin.state.version
+            )
 
-                BleMenuItem(
-                    shapeType = ShapeType.Middle,
-                    title = "Температура",
-                    subtitle = "${state.thermometer.thermometerState.temperature.value} °C",
-                    onClick = {
-                        //onEvent(ThermometerContract.Event.OnPowerEdit)
-                    }
-                )
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp),
+                content = {
 
-                BleMenuItem(
-                    shapeType = ShapeType.Middle,
-                    title = "Сохранять измерения",
-                    onClick = {
-                        //onEvent(ThermometerContract.Event.OnPowerEdit)
-                    },
-                    icon = {
-                        Switch(
-                            checked = state.thermometer.thermometerState.saveHistory,
-                            onCheckedChange = {
-                                viewModel.setEvent(ThermometerContract.Event.OnSaveHistoryChanged(it))
+                    BleMenuItem(
+                        shapeType = ShapeType.Start,
+                        title = "Мощность",
+                        subtitle = "${state.thermometer.state.tx.value} db",
+                        onClick = {
+                            viewModel.setEvent(ThermometerContract.Event.OnTxSelect)
+                        },
+                        icon = {
+                            Icon(
+                                imageVector = Icons.Rounded.KeyboardArrowDown,
+                                contentDescription = null
+                            )
+                        }
+                    )
+
+                    BleMenuItem(
+                        shapeType = ShapeType.Middle,
+                        title = "Температура",
+                        subtitle = "${state.thermometer.thermometerState.temperature} °C"
+                    )
+
+                    BleMenuItem(
+                        shapeType = ShapeType.Middle,
+                        title = "Сохранять измерения",
+                        icon = {
+                            Switch(
+                                checked = state.thermometer.thermometerState.saveHistory,
+                                onCheckedChange = {
+                                    viewModel.setEvent(
+                                        ThermometerContract.Event.OnSaveHistoryChanged(it)
+                                    )
+                                }
+                            )
+                        }
+                    )
+
+                    if(state.thermometer.thermometerState.saveHistory) {
+
+                        val hours =
+                            state.thermometer.thermometerState.historyInterval / 1000 / 60 / 60
+                        val minutes =
+                            (state.thermometer.thermometerState.historyInterval - (hours * 1000 * 60 * 60)) / 1000 / 60
+
+                        BleMenuItem(
+                            shapeType = ShapeType.Middle,
+                            title = "Интервал измерений",
+                            subtitle = "$hours ч. $minutes мин.",
+                            onClick = {
+                                viewModel.setEvent(ThermometerContract.Event.OnSaveIntervalEdit)
+                            },
+                            icon = {
+                                Icon(
+                                    imageVector = Icons.Rounded.KeyboardArrowDown,
+                                    contentDescription = null
+                                )
                             }
                         )
+
                     }
-                )
 
-                val hours = state.thermometer.thermometerState.historyInterval / 1000 / 60 / 60
-                val minutes =
-                    (state.thermometer.thermometerState.historyInterval - (hours * 1000 * 60 * 60)) / 1000 / 60
+                    BleMenuItem(
+                        shapeType = ShapeType.Middle,
+                        title = "График измерений",
+                        onClick = {
+                            viewModel.setEvent(ThermometerContract.Event.OnShowTemperatureHistory)
+                        }
+                    )
 
-                BleMenuItem(
-                    shapeType = ShapeType.Middle,
-                    title = "Интервал измерений",
-                    subtitle = "$hours ч. $minutes мин.",
+                    BleMenuItem(
+                        shapeType = ShapeType.End,
+                        title = "Изменить пароль",
+                        onClick = {
+                            viewModel.setEvent(ThermometerContract.Event.OnChangePassword)
+                        }
+                    )
+
+                }
+            )
+
+        }
+
+        Box(
+            modifier = Modifier.fillMaxWidth().animateContentSize()
+        ) {
+
+            if(state.origin != state.thermometer) {
+
+                Button(
                     onClick = {
-                        viewModel.setEvent(ThermometerContract.Event.OnSaveIntervalEdit)
+                        viewModel.setEvent(ThermometerContract.Event.OnShowWriteBlePreview)
                     },
-                    icon = {
-                        Icon(
-                            imageVector = Icons.Rounded.KeyboardArrowDown,
-                            contentDescription = null
-                        )
-                    }
-                )
-
-                BleMenuItem(
-                    shapeType = ShapeType.Middle,
-                    title = "График измерений",
-                    onClick = {
-                        viewModel.setEvent(ThermometerContract.Event.OnShowTemperatureHistory)
-                    }
-                )
-
-                BleMenuItem(
-                    shapeType = ShapeType.End,
-                    title = "Изменить пароль",
-                    onClick = {
-                        viewModel.setEvent(ThermometerContract.Event.OnChangePassword)
-                    }
-                )
+                    modifier = Modifier
+                        .padding(16.dp)
+                        .fillMaxWidth()
+                        .height(48.dp)
+                ) {
+                    Text(
+                        text = "Сохранить"
+                    )
+                }
 
             }
-        )
 
-        Button(
-            onClick = {
-                viewModel.setEvent(ThermometerContract.Event.OnShowWriteBlePreview)
-            },
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(48.dp)
-        ) {
-            Text(
-                text = "Сохранить"
-            )
         }
 
     }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/LoadingState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/LoadingState.kt
index ff5febf..3a0581a 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/LoadingState.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/LoadingState.kt
@@ -2,23 +2,29 @@ package llc.arma.ble.app.ui.screen.inspection.thermometer.main
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ContainedLoadingIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import llc.arma.ble.app.ui.common.RetryingLoadingTemplate
+import llc.arma.ble.app.ui.screen.inspection.gate.main.GateContract
+import llc.arma.ble.app.ui.screen.inspection.gate.main.GateViewModel
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
-fun LoadingState(){
+fun LoadingState(
+    viewModel: ThermometerViewModel,
+    state: ThermometerContract.State.Loading,
+){
 
     Box(
         contentAlignment = Alignment.Center,
         modifier = Modifier.fillMaxSize()
-    ) {
+    ){
 
-        ContainedLoadingIndicator()
+        RetryingLoadingTemplate(state.attempt){
+            viewModel.setEvent(ThermometerContract.Event.OnNavigateUp)
+        }
 
     }
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerContract.kt
index ae1dc79..aff341a 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerContract.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerContract.kt
@@ -3,19 +3,16 @@ package llc.arma.ble.app.ui.screen.inspection.thermometer.main
 import llc.arma.ble.app.ui.common.ViewEvent
 import llc.arma.ble.app.ui.common.ViewSideEffect
 import llc.arma.ble.app.ui.common.ViewState
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.domain.model.Ble
 
 class ThermometerContract {
 
     sealed class Event : ViewEvent {
 
+        data object OnRestart : Event()
+
         data object OnTxSelect : Event()
 
-        data object OnWriteBle : Event()
-
-        data object OnHideWriteBlePreview : Event()
-
         data object OnShowWriteBlePreview : Event()
 
         data object OnShowTemperatureHistory : Event()
@@ -27,7 +24,7 @@ class ThermometerContract {
         ) : Event()
 
         data class OnPowerChanged(
-            val tx: BleView.BleState.TX
+            val tx: Ble.BleState.TX
         ) : Event()
 
         data object OnSaveIntervalEdit : Event()
@@ -42,42 +39,26 @@ class ThermometerContract {
 
     sealed class State : ViewState {
 
-        data object Loading : State()
+        data class Loading(
+            val attempt: Int?
+        ) : State()
 
         data class Display(
             val origin: Ble.Thermometer,
-            val thermometer: BleView.Thermometer,
-            val writeState: WriteState?
-        ) : State() {
-
-            sealed class WriteState {
-
-                data class DisplayPreview(
-                    val writeRequest: Ble.Thermometer.WriteRequest
-                ) : WriteState()
-
-                data class Writing(
-                    val writeRequest: Ble.Thermometer.WriteRequest
-                ) : WriteState()
-
-                data object Success : WriteState()
-
-                data object Failure : WriteState()
-
-            }
-
-        }
+            val thermometer: Ble.Thermometer
+        ) : State()
 
     }
 
     sealed class Effect : ViewSideEffect {
 
-        object ShowWriteBle : Effect()
-
-        object HideWriteBle : Effect()
-
         sealed class Navigation : Effect() {
 
+            data class Write(
+                val bleSerial: String,
+                val writeRequest: Ble.Thermometer.WriteRequest
+            ) : Navigation()
+
             data object Up : Navigation()
 
             data class DurationSelector(
@@ -85,7 +66,7 @@ class ThermometerContract {
             ) : Navigation()
 
             data class TxSelector(
-                val tx: BleView.BleState.TX?
+                val tx: Ble.BleState.TX?
             ) : Navigation()
 
             data class ChangePassword(
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerScreen.kt
index e23ccd9..4f3b169 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerScreen.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -23,54 +24,32 @@ import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.generated.destinations.ChangePasswordScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.DurationSelectorScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.ThermometerHistoryScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.ThermometerWriteScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.TxPowerSelectorScreenDestination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.result.ResultRecipient
 import com.ramcosta.composedestinations.result.onResult
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import llc.arma.ble.app.ui.common.rememberBottomDialogState
-import llc.arma.ble.app.ui.model.BleView
 import llc.arma.ble.app.ui.screen.inspection.selector.duration.DurationSelectResult
 import llc.arma.ble.app.ui.screen.locale.localized
+import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.model.BleInfo
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
-
-enum class SheetPage {
-    WRITE
-}
-
-val Boolean.localizedName: String
-    get() {
-        return if(this){
-            "Включено"
-        } else {
-            "Выключено"
-        }
-    }
 
 @Destination<RootGraph>
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ThermometerScreen(
     bleSerial: String,
-    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, BleView.BleState.TX>,
+    txSelectResult: ResultRecipient<TxPowerSelectorScreenDestination, Ble.BleState.TX>,
     durationSelectResult: ResultRecipient<DurationSelectorScreenDestination, DurationSelectResult>,
+    writeResult: ResultRecipient<ThermometerWriteScreenDestination, Boolean>,
     navigator: DestinationsNavigator
 ) {
 
-    var sheetPage by rememberSaveable {
-        mutableStateOf<SheetPage?>(null)
-    }
-
     val viewModel = hiltViewModel<ThermometerViewModel>()
     val state = viewModel.viewState.value
 
-    val bottomDialog = rememberBottomDialogState()
-
     txSelectResult.onResult {
         viewModel.setEvent(ThermometerContract.Event.OnPowerChanged(it))
     }
@@ -79,44 +58,13 @@ fun ThermometerScreen(
         viewModel.setEvent(ThermometerContract.Event.OnSaveIntervalChanged(it.duration.toLong()))
     }
 
-    LaunchedEffect(sheetPage){
-        when(sheetPage){
-            SheetPage.WRITE -> bottomDialog.show {
-
-                val currentState = viewModel.viewState.value
-
-                if (currentState is ThermometerContract.State.Display) {
-
-                    currentState.writeState?.let {
-
-                        Write(
-                            state = it,
-                            onEvent = viewModel::setEvent
-                        )
-
-                    }
-
-                }
-            }
-            else -> {
-                bottomDialog.hide()
-            }
-        }
+    writeResult.onResult {
+        if(it) viewModel.setEvent(ThermometerContract.Event.OnRestart)
     }
 
     LaunchedEffect(Unit){
         viewModel.effect.onEach {
             when(it){
-                is ThermometerContract.Effect.HideWriteBle -> {
-                    sheetPage = null
-                    delay(100)
-                }
-                is ThermometerContract.Effect.ShowWriteBle -> {
-                    sheetPage = null
-                    delay(100)
-                    sheetPage = SheetPage.WRITE
-                }
-
                 is ThermometerContract.Effect.Navigation.ChangePassword ->
                     navigator.navigate(ChangePasswordScreenDestination(it.bleSerial))
 
@@ -136,8 +84,12 @@ fun ThermometerScreen(
                     ))
 
                 ThermometerContract.Effect.Navigation.Up ->
-                    navigator.popBackStack()
+                    navigator.navigateUp()
 
+                is ThermometerContract.Effect.Navigation.Write ->
+                    navigator.navigate(ThermometerWriteScreenDestination(
+                        it.bleSerial, it.writeRequest
+                    ))
 
             }
         }.launchIn(this)
@@ -161,6 +113,20 @@ fun ThermometerScreen(
                 },
                 title = {
                     Text(text = BleInfo.Type.THERMOMETER.localized)
+                },
+                actions = {
+                    if(state is ThermometerContract.State.Display){
+                        IconButton(
+                            onClick = {
+                                viewModel.setEvent(ThermometerContract.Event.OnRestart)
+                            }
+                        ) {
+                            Icon(
+                                imageVector = Icons.Rounded.Refresh,
+                                contentDescription = null
+                            )
+                        }
+                    }
                 }
             )
         }
@@ -172,7 +138,7 @@ fun ThermometerScreen(
 
             when(state){
                 is ThermometerContract.State.Display -> DisplayState(viewModel, state)
-                is ThermometerContract.State.Loading -> LoadingState()
+                is ThermometerContract.State.Loading -> LoadingState(viewModel, state)
             }
 
         }
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerViewModel.kt
index 5c5605c..24babd2 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/ThermometerViewModel.kt
@@ -2,69 +2,30 @@ package llc.arma.ble.app.ui.screen.inspection.thermometer.main
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.toRoute
 import com.ramcosta.composedestinations.generated.destinations.ThermometerScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
-import llc.arma.ble.app.ui.mapper.BleMapper
-import llc.arma.ble.app.ui.mapper.BleViewMapper
-import llc.arma.ble.app.ui.model.BleView
+import llc.arma.ble.app.ui.common.retryUntilNotNull
 import llc.arma.ble.app.ui.screen.inspection.beacon.BeaconContract
 import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.usecase.GetBleBySerial
-import llc.arma.ble.domain.usecase.WriteBle
 import javax.inject.Inject
 
 @HiltViewModel
 class ThermometerViewModel @Inject constructor(
     private val getBleBySerial: GetBleBySerial,
     private val savedStateHandle: SavedStateHandle,
-    private val bleMapper: BleMapper,
-    private val bleViewMapper: BleViewMapper,
-    private val writeBle: WriteBle
 ) : BaseViewModel<ThermometerContract.State, ThermometerContract.Event, ThermometerContract.Effect>() {
 
     init {
 
-        val params = ThermometerScreenDestination.argsFrom(savedStateHandle)
-
-        viewModelScope.launch {
-
-            val ble = getBleBySerial.invoke(params.bleSerial, this).fold(
-                onSuccess = { it },
-                onFailure = { null }
-            )
-
-            if(ble != null && ble is Ble.Thermometer){
-                setState {
-
-                    when(this){
-                        is ThermometerContract.State.Display -> {
-                            copy(
-                                origin = Ble.Thermometer(
-                                    info = ble.info,
-                                    state = origin.state,
-                                    thermometerState = origin.thermometerState
-                                )
-                            )
-                        }
-                        ThermometerContract.State.Loading -> {
-                            ThermometerContract.State.Display(
-                                origin = ble,
-                                thermometer = bleMapper.map(ble) as BleView.Thermometer,
-                                writeState = null
-                            )
-                        }
-                    }
-                }
-            }
-
-        }
+        loadData()
 
     }
 
-    override fun setInitialState() = ThermometerContract.State.Loading
+    override fun setInitialState() = ThermometerContract.State.Loading(null)
 
     override fun handleEvents(event: ThermometerContract.Event) {
         when(event){
@@ -75,13 +36,21 @@ class ThermometerViewModel @Inject constructor(
             is ThermometerContract.Event.OnSaveHistoryChanged -> reduce(viewState.value, event)
             is ThermometerContract.Event.OnShowTemperatureHistory -> reduce(viewState.value, event)
             is ThermometerContract.Event.OnShowWriteBlePreview -> reduce(viewState.value, event)
-            is ThermometerContract.Event.OnHideWriteBlePreview -> reduce(viewState.value, event)
-            is ThermometerContract.Event.OnWriteBle -> reduce(viewState.value, event)
             is ThermometerContract.Event.OnChangePassword -> reduce(viewState.value, event)
             is ThermometerContract.Event.OnTxSelect -> reduce(viewState.value, event)
+            is ThermometerContract.Event.OnRestart -> reduce(viewState.value, event)
         }
     }
 
+    private fun reduce(
+        state: ThermometerContract.State,
+        event: ThermometerContract.Event.OnRestart
+    ) {
+
+        loadData()
+
+    }
+
     private fun reduce(
         state: ThermometerContract.State,
         event: ThermometerContract.Event.OnTxSelect
@@ -102,32 +71,6 @@ class ThermometerViewModel @Inject constructor(
         setEffect { ThermometerContract.Effect.Navigation.Up }
     }
 
-    /*private fun reduce(
-        state: ThermometerContract.State,
-        event: ThermometerContract.Event.OnBleChanged
-    ) {
-
-        when(state){
-            is ThermometerContract.State.Display -> setState {
-                state.copy(
-                    origin = Ble.Thermometer(
-                        info = event.ble.info,
-                        state = state.origin.state,
-                        thermometerState = state.origin.thermometerState
-                    )
-                )
-            }
-            is ThermometerContract.State.Loading -> setState {
-                ThermometerContract.State.Display(
-                    origin = event.ble,
-                    thermometer = bleMapper.map(event.ble) as BleView.Thermometer,
-                    writeState = null
-                )
-            }
-        }
-
-    }*/
-
     private fun reduce(
         state: ThermometerContract.State,
         event: ThermometerContract.Event.OnSaveIntervalEdit
@@ -146,7 +89,17 @@ class ThermometerViewModel @Inject constructor(
 
         if(state is ThermometerContract.State.Display) {
 
-            state.thermometer.thermometerState.historyInterval = event.interval
+            setState {
+
+                state.copy(
+                    thermometer = state.thermometer.copy(
+                        thermometerState = state.thermometer.thermometerState.copy(
+                            historyInterval = event.interval
+                        )
+                    )
+                )
+
+            }
 
         }
 
@@ -159,7 +112,17 @@ class ThermometerViewModel @Inject constructor(
 
         if(state is ThermometerContract.State.Display) {
 
-            state.thermometer.state.tx = event.tx
+            setState {
+
+                state.copy(
+                    thermometer = state.thermometer.copy(
+                        state = state.thermometer.state.copy(
+                            tx = event.tx
+                        )
+                    )
+                )
+
+            }
 
         }
 
@@ -171,7 +134,17 @@ class ThermometerViewModel @Inject constructor(
     ) {
         if(state is ThermometerContract.State.Display) {
 
-            state.thermometer.thermometerState.saveHistory = event.saveHistory
+            setState {
+
+                state.copy(
+                    thermometer = state.thermometer.copy(
+                        thermometerState = state.thermometer.thermometerState.copy(
+                            saveHistory = event.saveHistory
+                        )
+                    )
+                )
+
+            }
 
         }
 
@@ -201,7 +174,7 @@ class ThermometerViewModel @Inject constructor(
 
         if(state is ThermometerContract.State.Display){
 
-            val newBle = bleViewMapper.map(state.thermometer) as Ble.Thermometer
+            val newBle = state.thermometer
 
             val writeRequest = Ble.Thermometer.WriteRequest(
                 tx = if(newBle.state.tx == state.origin.state.tx) null else newBle.state.tx,
@@ -209,112 +182,15 @@ class ThermometerViewModel @Inject constructor(
                 historyInterval = if(newBle.thermometerState.historyInterval == state.origin.thermometerState.historyInterval) null else newBle.thermometerState.historyInterval,
             )
 
-            setState {
-                state.copy(
-                    writeState = ThermometerContract.State.Display.WriteState.DisplayPreview(
-                        writeRequest
-                    )
-                )
-            }
-
             setEffect {
-                ThermometerContract.Effect.ShowWriteBle
-            }
-
-        }
-
-    }
-
-    private fun reduce(
-        state: ThermometerContract.State,
-        event: ThermometerContract.Event.OnWriteBle
-    ) {
-
-        if(state is ThermometerContract.State.Display){
-
-            state.writeState?.let { request ->
-
-                if(request is ThermometerContract.State.Display.WriteState.DisplayPreview) {
-
-                    viewModelScope.launch {
-
-                        setState {
-                            state.copy(
-                                writeState = ThermometerContract.State.Display.WriteState.Writing(
-                                    request.writeRequest
-                                )
-                            )
-                        }
-
-                        writeBle(state.thermometer.info.serial, request.writeRequest).fold(
-                            onSuccess = {
-
-                                val currentState = viewState.value
-
-                                if(currentState is ThermometerContract.State.Display) {
-
-                                    val newBleObject = Ble.Thermometer(
-                                        info = currentState.origin.info,
-                                        state = currentState.origin.state.copy(
-                                            tx = request.writeRequest.tx ?: state.origin.state.tx
-                                        ),
-                                        thermometerState = currentState.origin.thermometerState.copy(
-                                            saveHistory = request.writeRequest.saveHistory
-                                                ?: currentState.origin.thermometerState.saveHistory,
-                                            historyInterval = request.writeRequest.historyInterval
-                                                ?: currentState.origin.thermometerState.historyInterval,
-                                        )
-                                    )
-
-                                    setState {
-                                        currentState.copy(
-                                            origin = newBleObject,
-                                            thermometer = bleMapper.map(newBleObject) as BleView.Thermometer,
-                                            writeState = ThermometerContract.State.Display.WriteState.Success
-                                        )
-                                    }
-
-                                }
-
-                            },
-                            onFailure = {
-                                setState {
-                                    state.copy(
-                                        writeState = ThermometerContract.State.Display.WriteState.Failure
-                                    )
-                                }
-                            }
-                        )
-
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-    private fun reduce(
-        state: ThermometerContract.State,
-        event: ThermometerContract.Event.OnHideWriteBlePreview
-    ) {
-
-        if(state is ThermometerContract.State.Display){
-
-            setState {
-                state.copy(
-                    writeState = null
+                ThermometerContract.Effect.Navigation.Write(
+                    state.thermometer.info.serial,
+                    writeRequest
                 )
             }
 
         }
 
-        setEffect {
-            ThermometerContract.Effect.HideWriteBle
-        }
-
     }
 
     private fun reduce(
@@ -332,4 +208,56 @@ class ThermometerViewModel @Inject constructor(
 
     }
 
+    private var loadJob: Job? = null
+
+
+
+    private fun loadData(){
+
+        val params = ThermometerScreenDestination.argsFrom(savedStateHandle)
+
+        loadJob?.cancel()
+        loadJob = viewModelScope.launch {
+
+            setState {
+                ThermometerContract.State.Loading(null)
+            }
+
+            val ble = retryUntilNotNull(
+                onNewAttempt = {
+                    setState {
+                        ThermometerContract.State.Loading(it)
+                    }
+                }
+            ){
+                getBleBySerial.invoke(params.bleSerial, this).getOrNull()
+            }
+
+            if(ble is Ble.Thermometer){
+                setState {
+
+                    when(this){
+                        is ThermometerContract.State.Display -> {
+                            copy(
+                                origin = Ble.Thermometer(
+                                    info = ble.info,
+                                    state = origin.state,
+                                    thermometerState = origin.thermometerState
+                                )
+                            )
+                        }
+                        is ThermometerContract.State.Loading -> {
+                            ThermometerContract.State.Display(
+                                origin = ble,
+                                thermometer = ble
+                            )
+                        }
+                    }
+                }
+            }
+
+        }
+
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/Write.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/Write.kt
deleted file mode 100644
index e470714..0000000
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/main/Write.kt
+++ /dev/null
@@ -1,234 +0,0 @@
-package llc.arma.ble.app.ui.screen.inspection.thermometer.main
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import llc.arma.ble.R
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.common.SecondaryButton
-import llc.arma.ble.app.ui.screen.ShapeType
-import llc.arma.ble.app.ui.screen.locale.localizedName
-
-@Composable
-fun Write(
-    state: ThermometerContract.State.Display.WriteState,
-    onEvent: (ThermometerContract.Event) -> Unit
-) {
-
-    Column(
-        modifier = Modifier.animateContentSize()
-    ) {
-
-        Text(
-            modifier = Modifier.padding(horizontal = 12.dp),
-            text = "Запись изменений",
-            style = MaterialTheme.typography.titleLarge
-        )
-
-        Spacer(modifier = Modifier.height(20.dp))
-
-        when (state) {
-            is ThermometerContract.State.Display.WriteState.DisplayPreview -> {
-
-                if(state.writeRequest.tx != null || state.writeRequest.saveHistory != null || state.writeRequest.historyInterval != null) {
-
-                    state.writeRequest.tx?.let {
-
-                        BleMenuItem(
-                            shapeType = ShapeType.Singleton,
-                            title = "Мощность",
-                            subtitle = "${it.localizedName} db"
-                        )
-
-                    }
-
-                    state.writeRequest.saveHistory?.let {
-
-                        BleMenuItem(
-                            shapeType = ShapeType.Singleton,
-                            title = "Сохранять историю измерений",
-                            subtitle = it.localizedName
-                        )
-
-                    }
-
-                    state.writeRequest.historyInterval?.let {
-
-                        val hours = it / 1000 / 60 / 60
-                        val minutes = (it - ( hours * 1000 * 60 * 60 )) / 1000 / 60
-
-                        BleMenuItem(
-                            shapeType = ShapeType.Singleton,
-                            title = "Интервал измерений",
-                            subtitle = "$hours ч. $minutes мин."
-                        )
-
-                    }
-
-                    Spacer(modifier = Modifier.height(20.dp))
-
-                    PrimaryButton(
-                        label = "Записать"
-                    ) {
-                        onEvent(ThermometerContract.Event.OnWriteBle)
-                    }
-
-                    SecondaryButton(
-                        label = "Отменить"
-                    ) {
-                        onEvent(ThermometerContract.Event.OnHideWriteBlePreview)
-                    }
-
-                } else {
-
-                    Spacer(modifier = Modifier.height(38.dp))
-
-                    Text(
-                        text = "Нет изменений",
-                        modifier = Modifier
-                            .align(Alignment.CenterHorizontally)
-                    )
-
-                    Spacer(modifier = Modifier.height(64.dp))
-
-                    PrimaryButton(
-                        label = "Ок"
-                    ) {
-                        onEvent(ThermometerContract.Event.OnHideWriteBlePreview)
-                    }
-
-                }
-
-
-            }
-            is ThermometerContract.State.Display.WriteState.Writing -> {
-
-                Box {
-
-                    Column {
-
-                        Spacer(modifier = Modifier.height(28.dp))
-
-                        CircularProgressIndicator(
-                            strokeCap = StrokeCap.Round,
-                            modifier = Modifier
-                                .align(Alignment.CenterHorizontally)
-                        )
-
-                        Spacer(modifier = Modifier.height(48.dp))
-
-                        SecondaryButton(
-                            label = "Отменить"
-                        ) {
-                            onEvent(ThermometerContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            ThermometerContract.State.Display.WriteState.Success -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(llc.arma.ble.R.drawable.ic_done),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Успешно завершено"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            onEvent(ThermometerContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-            ThermometerContract.State.Display.WriteState.Failure -> {
-
-                Box {
-
-                    Column {
-
-                        Box(
-                            modifier = Modifier
-                                .padding(8.dp)
-                                .fillMaxWidth()
-                        ) {
-
-                            Image(
-                                modifier = Modifier
-                                    .size(125.dp)
-                                    .align(Alignment.Center),
-                                painter = painterResource(R.drawable.ic_error),
-                                contentDescription = null
-                            )
-
-                        }
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        Text(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            text = "Ошибка записи"
-                        )
-
-                        Spacer(modifier = Modifier.height(20.dp))
-
-                        PrimaryButton(
-                            label = "Ок"
-                        ) {
-                            onEvent(ThermometerContract.Event.OnHideWriteBlePreview)
-                        }
-
-                    }
-
-                }
-
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteScreen.kt
new file mode 100644
index 0000000..7a43558
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteScreen.kt
@@ -0,0 +1,61 @@
+package llc.arma.ble.app.ui.screen.inspection.thermometer.write
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import llc.arma.ble.app.ui.common.WriteFlow
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.domain.model.Ble
+
+@Destination<RootGraph>(style = DestinationStyle.Dialog::class)
+@Composable
+fun ThermometerWriteScreen(
+    bleSerial: String,
+    writeRequest: Ble.Thermometer.WriteRequest,
+    navigator: ResultBackNavigator<Boolean>
+) {
+
+    val viewModel = hiltViewModel<ThermometerWriteViewModel>()
+    val state = viewModel.viewState.value
+
+    LaunchedEffect(Unit) {
+        viewModel.effect.collect {
+            when(it){
+                WriteFlowContract.Effect.Navigation.Up ->
+                    navigator.navigateBack()
+
+                WriteFlowContract.Effect.Navigation.UpSuccess ->
+                    navigator.navigateBack(true)
+            }
+        }
+    }
+
+    Surface(
+        shape = RoundedCornerShape(20.dp)
+    ) {
+
+        Box(
+            modifier = Modifier.padding(20.dp)
+        ) {
+
+            WriteFlow(
+                state = state,
+                onEvent = viewModel::setEvent
+            )
+
+        }
+
+    }
+
+}
+
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteViewModel.kt
new file mode 100644
index 0000000..dca087b
--- /dev/null
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/inspection/thermometer/write/ThermometerWriteViewModel.kt
@@ -0,0 +1,132 @@
+package llc.arma.ble.app.ui.screen.inspection.thermometer.write
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.ramcosta.composedestinations.generated.destinations.AccelerometerWriteScreenDestination
+import com.ramcosta.composedestinations.generated.destinations.ThermometerWriteScreenDestination
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import llc.arma.ble.app.ui.common.BaseViewModel
+import llc.arma.ble.app.ui.common.WriteFlowContract
+import llc.arma.ble.app.ui.common.WriteItemData
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInHour
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInMinute
+import llc.arma.ble.app.ui.screen.inspection.selector.duration.millisInSecond
+import llc.arma.ble.app.ui.screen.locale.localizedName
+import llc.arma.ble.domain.model.Ble
+import llc.arma.ble.domain.usecase.WriteBle
+import javax.inject.Inject
+
+@HiltViewModel
+class ThermometerWriteViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle,
+    private val writeBle: WriteBle
+) : BaseViewModel<WriteFlowContract.State, WriteFlowContract.Event, WriteFlowContract.Effect>() {
+
+    init {
+
+        val params = ThermometerWriteScreenDestination.argsFrom(savedStateHandle)
+
+        val items = mutableListOf<WriteItemData>()
+
+        params.writeRequest.tx?.let {
+            items.add(WriteItemData("Мощность", "${it.localizedName} db"))
+        }
+
+        params.writeRequest.saveHistory?.let {
+
+            items.add(
+                WriteItemData(
+                    title = "Сохранять историю измерений",
+                    subtitle = when(it){
+                        true -> "Включено"
+                        false -> "Выключено"
+                    },
+                )
+            )
+
+        }
+
+        params.writeRequest.historyInterval?.let {
+
+            val hours = it / millisInHour
+            val minutes = (it - (hours * millisInHour)) / millisInMinute
+            val seconds = (it - (hours * millisInHour) - (minutes * millisInMinute)) / millisInSecond
+
+            items.add(
+                WriteItemData(
+                    title = "Интервал измерений",
+                    subtitle = "$hours ч. $minutes мин. $seconds сек."
+                )
+            )
+
+        }
+
+        setState {
+            WriteFlowContract.State.Display(
+                items
+            )
+        }
+
+    }
+
+    override fun setInitialState() = WriteFlowContract.State.Loading
+
+    override fun handleEvents(event: WriteFlowContract.Event) {
+        when(event){
+            is WriteFlowContract.Event.OnNavigateUp -> reduce(viewState.value, event)
+            is WriteFlowContract.Event.OnWrite -> reduce(viewState.value, event)
+        }
+    }
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnNavigateUp
+    ){
+
+        setEffect {
+            when(state){
+                is WriteFlowContract.State.Display,
+                WriteFlowContract.State.Error,
+                WriteFlowContract.State.Loading,
+                WriteFlowContract.State.Writing -> WriteFlowContract.Effect.Navigation.Up
+                WriteFlowContract.State.Success -> WriteFlowContract.Effect.Navigation.UpSuccess
+            }
+
+        }
+
+    }
+
+    private var writeJob: Job? = null
+
+    private fun reduce(
+        state: WriteFlowContract.State,
+        event: WriteFlowContract.Event.OnWrite
+    ){
+
+        val params = ThermometerWriteScreenDestination.argsFrom(savedStateHandle)
+
+        setState {
+            WriteFlowContract.State.Writing
+        }
+
+        writeJob?.cancel()
+        writeJob = viewModelScope.launch {
+            writeBle(params.bleSerial, params.writeRequest).fold(
+                onSuccess = {
+                    setState {
+                        WriteFlowContract.State.Success
+                    }
+                },
+                onFailure = {
+                    setState {
+                        WriteFlowContract.State.Error
+                    }
+                }
+            )
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/locale/Locale.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/locale/Locale.kt
index c10199b..d81613c 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/locale/Locale.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/locale/Locale.kt
@@ -23,6 +23,38 @@ import llc.arma.ble.domain.usecase.FftAxis
 import llc.arma.ble.domain.usecase.FftFrequency
 import llc.arma.ble.domain.usecase.FftViewMode
 
+val Ble.BleState.TX.powerPercentage: Int
+    get() {
+        return when(this){
+            Ble.BleState.TX.MINUS_40 -> 1
+            Ble.BleState.TX.MINUS_20 -> 5
+            Ble.BleState.TX.MINUS_16 -> 7
+            Ble.BleState.TX.MINUS_12 -> 10
+            Ble.BleState.TX.MINUS_8 -> 16
+            Ble.BleState.TX.MINUS_4 -> 20
+            Ble.BleState.TX.ZERO -> 40
+            Ble.BleState.TX.PLUS_3 -> 80
+            Ble.BleState.TX.PLUS_4 -> 100
+        }
+
+    }
+
+val Ble.BleState.TX.value: Int
+    get() {
+        return when(this){
+            Ble.BleState.TX.MINUS_40 -> -40
+            Ble.BleState.TX.MINUS_20 -> -20
+            Ble.BleState.TX.MINUS_16 -> -16
+            Ble.BleState.TX.MINUS_12 -> -12
+            Ble.BleState.TX.MINUS_8 -> -8
+            Ble.BleState.TX.MINUS_4 -> -4
+            Ble.BleState.TX.ZERO -> 0
+            Ble.BleState.TX.PLUS_3 -> 3
+            Ble.BleState.TX.PLUS_4 -> 4
+        }
+
+    }
+
 val Ble.BleState.TX.localizedName: String
     get() {
         return when(this){
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt
index 51874b5..4887a50 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt
@@ -13,8 +13,8 @@ import com.ramcosta.composedestinations.generated.NavGraphs
 fun MainScreen() {
 
     val navController = rememberNavController()
-
     val bottomSheetNavigator = rememberBottomSheetNavigator()
+
     navController.navigatorProvider.addNavigator(bottomSheetNavigator)
 
     ModalBottomSheetLayout(
@@ -27,351 +27,4 @@ fun MainScreen() {
         )
     }
 
-    //DestinationsNavHost(navGraph = NavGraphs.root)
-
-    /*val controller = rememberNavController()
-
-    NavHost(
-        navController = controller,
-        startDestination = BleListRoute,
-        builder = {
-
-            dialog<PasswordFormRoute> {
-
-                ChangePasswordScreen(
-                    onNavigationEvent = {
-                        when(it){
-                            ChangePasswordContract.Effect.Navigation.Up ->
-                                controller.popBackStack()
-                        }
-                    }
-                )
-
-            }
-
-            dialog<DurationSelectorRoute> {
-
-                val params = it.savedStateHandle.toRoute<DurationSelectorRoute>()
-
-                println(params.requestId)
-
-                ModalBottomSheet(
-                    onDismissRequest = controller::popBackStack
-                ) {
-
-                    DurationSelectorScreen(
-                        onNavigationEvent = {
-                            when(it){
-                                DurationSelectorContract.Effect.Navigation.Up ->
-                                    controller.popBackStack()
-
-                                is DurationSelectorContract.Effect.Navigation.UpWithResult -> {
-                                    controller.previousBackStackEntry?.savedStateHandle?.set(
-                                        params.requestId,
-                                        it.duration
-                                    )
-                                    controller.popBackStack()
-                                }
-                            }
-                        }
-                    )
-
-                }
-
-            }
-
-            composable<BeaconRoute> {
-
-                val txSelectResult = controller.currentBackStackEntry
-                    ?.savedStateHandle
-                    ?.getStateFlow<BleView.BleState.TX?>("txSelectResult", null)
-                    ?.collectAsState()?.value
-                
-                BeaconScreen(
-                    txSelectResult = txSelectResult,
-                    onNavigationEvent = {
-                        when(it){
-                            is BeaconContract.Effect.Navigation.PasswordForm ->
-                                controller.navigate(PasswordFormRoute(it.bleSerial))
-
-                            BeaconContract.Effect.Navigation.Up ->
-                                controller.popBackStack()
-
-                            is BeaconContract.Effect.Navigation.TxSelector ->
-                                controller.navigate(TxPowerSelectorRoute(it.tx))
-                        }
-                    }
-                )
-            }
-
-            composable<AccelerometerRoute> {
-
-                val txSelectResult = controller.currentBackStackEntry
-                    ?.savedStateHandle
-                    ?.getStateFlow<BleView.BleState.TX?>("txSelectResult", null)
-                    ?.collectAsState()?.value
-
-                AccelerometerScreen (
-                    onNavigationEvent = {
-                        when(it){
-                            is AccelerometerContract.Effect.Navigation.AccelHistory -> TODO()
-                            is AccelerometerContract.Effect.Navigation.AccelRealtime -> TODO()
-                            is AccelerometerContract.Effect.Navigation.AccelSpectre -> TODO()
-                            is AccelerometerContract.Effect.Navigation.ChangePassword ->
-                                controller.navigate(PasswordFormRoute(it.serial))
-
-                            is AccelerometerContract.Effect.Navigation.TxPowerSelector ->
-                                controller.navigate(TxPowerSelectorRoute(it.tx))
-                        }
-                    }
-                )
-            }
-
-            composable<GateHistoryRoute> {
-                GateHistoryScreen(
-                    onNavigationEvent = {
-                        when(it){
-                            GateHistoryContract.Effect.Navigation.NavigateUp ->
-                                controller.popBackStack()
-                        }
-                    }
-                )
-            }
-
-            composable<GateBleTableRoute> {
-
-                GateBleTableScreen(
-                    onEvent = {
-                        when(it){
-                            GateBleTableContract.Effect.Navigation.NavigateUp ->
-                                controller.popBackStack()
-                        }
-                    }
-                )
-
-            }
-
-            composable<GateRoute> {
-
-                val savedState = remember {
-                    controller.currentBackStackEntry
-                        ?.savedStateHandle
-                }
-
-                val txSelectResult = savedState
-                    ?.getStateFlow<BleView.BleState.TX?>("txSelectResult", null)
-                    ?.collectAsState()?.value
-
-                val readDurationSelectResult = savedState
-                    ?.getStateFlow<Int?>("GateReadDuration", null)
-                    ?.collectAsState()?.value
-
-                GateScreen(
-                    readDurationSelectResult = readDurationSelectResult,
-                    txSelectResult = txSelectResult,
-                    onNavigationEvent = {
-                        when(it){
-                            is GateContract.Effect.Navigation.BleTable ->
-                                controller.navigate(GateBleTableRoute(it.serial))
-
-                            is GateContract.Effect.Navigation.ChangePassword ->
-                                controller.navigate(PasswordFormRoute(it.serial))
-
-                            is GateContract.Effect.Navigation.GateHistory ->
-                                controller.navigate(GateHistoryRoute(it.ble.serial))
-
-                            is GateContract.Effect.Navigation.Up ->
-                                controller.popBackStack()
-
-                            is GateContract.Effect.Navigation.TxSelector ->
-                                controller.navigate(TxPowerSelectorRoute(it.tx))
-
-                            is GateContract.Effect.Navigation.ReadIntervalSelector ->
-                                controller.navigate(DurationSelectorRoute(
-                                    "GateReadDuration",
-                                    it.interval
-                                ))
-                        }
-                    }
-                )
-
-                controller.currentBackStackEntry
-                    ?.savedStateHandle
-                    ?.remove<BleView.BleState.TX?>("txSelectResult")
-
-                controller.currentBackStackEntry
-                    ?.savedStateHandle
-                    ?.remove<Int?>("GateReadDuration")
-
-            }
-
-            composable<ThermometerRoute> {
-
-                val txSelectResult = controller.currentBackStackEntry
-                    ?.savedStateHandle
-                    ?.getStateFlow<BleView.BleState.TX?>("txSelectResult", null)
-                    ?.collectAsState()?.value
-
-                ThermometerScreen(
-                    txSelectResult = txSelectResult,
-                    onNavigationEvent = {
-                        when(it){
-                            ThermometerContract.Effect.Navigation.ChangePassword -> TODO()
-
-                            is ThermometerContract.Effect.Navigation.ThermometerHistory ->
-                                controller.navigate(ThermometerHistoryRoute(it.bleSerial))
-
-                            ThermometerContract.Effect.Navigation.Up ->
-                                controller.popBackStack()
-
-                            is ThermometerContract.Effect.Navigation.TxSelector ->
-                                controller.navigate(TxPowerSelectorRoute(it.tx))
-                        }
-                    }
-                )
-
-                controller.currentBackStackEntry
-                    ?.savedStateHandle
-                    ?.remove<BleView.BleState.TX?>("txSelectResult")
-
-            }
-
-            composable<TxPowerSelectorRoute> {
-
-                TxPowerSelectorScreen(
-                    onNavigationEvent = {
-                        when(it){
-                            is TxPowerSelectorContract.Effect.Navigation.NavigateUp ->
-                                controller.popBackStack()
-                            is TxPowerSelectorContract.Effect.Navigation.NavigateUpWithResult -> {
-
-                                controller.previousBackStackEntry?.savedStateHandle?.set(
-                                    "txSelectResult",
-                                    it.tx
-                                )
-
-                                controller.popBackStack()
-                            }
-                        }
-                    }
-                )
-
-            }
-
-            composable<BleFilterRoute> {
-
-                BleFilterScreen {
-                    when(it){
-                        BleFilterContract.Effect.Navigation.NavigateUp ->
-                            controller.popBackStack()
-                    }
-                }
-
-            }
-
-            composable<ThermometerHistoryRoute> {
-                ThermometerHistoryScreen(
-                    onNavigationEvent = {
-                        when(it){
-                            ThermometerHistoryContract.Effect.Navigation.NavigateUp ->
-                                controller.popBackStack()
-                        }
-                    }
-                )
-            }
-
-            composable<BleListRoute> {
-
-                BleListScreen(
-                    onNavigationEvent = {
-                        when (it) {
-                            is BleListContract.Effect.Navigation.BleFilter ->
-                                controller.navigate(BleFilterRoute)
-
-                            is BleListContract.Effect.Navigation.Thermometer ->
-                                controller.navigate(ThermometerRoute(it.serial))
-
-                            is BleListContract.Effect.Navigation.Gate ->
-                                controller.navigate(GateRoute(it.serial))
-
-                            is BleListContract.Effect.Navigation.Beacon ->
-                                controller.navigate(BeaconRoute(it.serial))
-
-                            is BleListContract.Effect.Navigation.Accelerometer ->
-                                controller.navigate(AccelerometerRoute(it.serial))
-                        }
-                    }
-                )
-
-            }
-
-
-            composable(
-                route = "connection/{serial}",
-                content = {
-
-                    ConnectionScreen(
-                        onNavigationEvent = {
-                            when(it){
-                                ConnectionContract.Effect.Navigation.NavigateUp -> controller.navigateUp()
-                                is ConnectionContract.Effect.Navigation.NavigateToChangePassword ->
-                                    controller.navigate("change_password/${it.serial}")
-                                is ConnectionContract.Effect.Navigation.NavigateToRotationsStatistic ->
-                                    controller.navigate("rotation_statistic/${it.serial}")
-
-                                is ConnectionContract.Effect.Navigation.NavigateToThermometerHistory ->
-                                    controller.navigate(ThermometerHistoryRoute(it.bleSerial))
-                            }
-                        }
-                    )
-
-                }
-            )
-
-            composable(
-                route = "rotation_statistic/{serial}",
-                content = {
-
-                    RotationStatisticScreen {
-                        when(it){
-                            is RotationStatisticContract.Effect.Navigation.NavigateToDelete -> {
-                                controller.navigate("rotation_delete/${it.serial}")
-                            }
-                            RotationStatisticContract.Effect.Navigation.NavigateUp -> {
-                                controller.navigateUp()
-                            }
-                        }
-                    }
-
-                }
-            )
-
-            dialog(
-                route = "rotation_delete/{serial}",
-                dialogProperties = DialogProperties(usePlatformDefaultWidth = false),
-                content = {
-                    RotationDeleteScreen {
-                        when(it){
-                            RotationDeleteContract.Effect.Navigation.NavigateUp -> controller.navigateUp()
-                        }
-                    }
-                }
-            )
-
-            dialog(
-                route = "change_password/{serial}",
-                dialogProperties = DialogProperties(usePlatformDefaultWidth = false),
-                content = {
-                    ChangePasswordScreen {
-                        when(it){
-                            is ChangePasswordContract.Effect.Navigation.Up -> controller.navigateUp()
-                        }
-                    }
-                }
-            )
-
-        }
-
-    )*/
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt
index 2b19ba4..626fb95 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt
@@ -33,18 +33,14 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
-import com.ramcosta.composedestinations.generated.navgraphs.RootNavGraph
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import llc.arma.ble.app.ui.common.PrimaryButton
-import llc.arma.ble.app.ui.common.SecondaryButton
 import llc.arma.ble.app.ui.screen.password.view.Loading
 import llc.arma.ble.app.ui.screen.password.view.Result
 
diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt
index b89af79..5aa27c0 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt
@@ -2,6 +2,7 @@ package llc.arma.ble.app.ui.screen.password
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
+import com.ramcosta.composedestinations.generated.destinations.ChangePasswordScreenDestination
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import llc.arma.ble.app.ui.common.BaseViewModel
@@ -56,6 +57,8 @@ class ChangePasswordViewModel @Inject constructor(
         event: ChangePasswordContract.Event.OnChange
     ) {
 
+        val params = ChangePasswordScreenDestination.argsFrom(savedStateHandle)
+
         if(state.password.length != 6 || state.rePassword.length != 6){
             setState {
                 state.copy(
@@ -83,7 +86,7 @@ class ChangePasswordViewModel @Inject constructor(
 
                     changeBlePassword.invoke(
                         state.password,
-                        savedStateHandle.get<String>("serial")!!
+                        params.bleSerial
                     ).fold(
                         onSuccess = {
                             setState {
diff --git a/app/src/main/java/llc/arma/ble/app/ui/theme/Theme.kt b/app/src/main/java/llc/arma/ble/app/ui/theme/Theme.kt
index 9d626a1..c4af5f2 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/theme/Theme.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/theme/Theme.kt
@@ -1,6 +1,5 @@
 package llc.arma.ble.app.ui.theme
 
-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -9,12 +8,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
 
 /*val LightColorScheme = lightColorScheme(
     primary = Color(0xFF1B1B1F),
diff --git a/app/src/main/java/llc/arma/ble/app/ui/theme/Type.kt b/app/src/main/java/llc/arma/ble/app/ui/theme/Type.kt
index bc9a5a9..030b6ea 100644
--- a/app/src/main/java/llc/arma/ble/app/ui/theme/Type.kt
+++ b/app/src/main/java/llc/arma/ble/app/ui/theme/Type.kt
@@ -3,12 +3,10 @@ package llc.arma.ble.app.ui.theme
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Shapes
 import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import llc.arma.ble.R
 
 val font = FontFamily(
diff --git a/app/src/main/java/llc/arma/ble/data/repository/BleRepositoryImpl.kt b/app/src/main/java/llc/arma/ble/data/repository/BleRepositoryImpl.kt
index 4ba5a1e..ee3ead6 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/BleRepositoryImpl.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/BleRepositoryImpl.kt
@@ -2,6 +2,7 @@ package llc.arma.ble.data.repository
 
 import android.Manifest
 import android.app.Application
+import android.content.Context
 import android.util.Log
 import androidx.annotation.RequiresPermission
 import kotlinx.coroutines.CoroutineScope
@@ -9,13 +10,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.withTimeoutOrNull
 import llc.arma.ble.data.db.RotationsDao
 import llc.arma.ble.data.repository.extensions.checkPermission
 import llc.arma.ble.data.repository.extensions.fromByte
@@ -35,19 +39,13 @@ import llc.arma.ble.domain.usecase.AccelViewMode
 import llc.arma.ble.domain.usecase.FftAxis
 import llc.arma.ble.domain.usecase.FftFrequency
 import llc.arma.ble.domain.usecase.FftViewMode
-import no.nordicsemi.android.common.core.DataByteArray
-import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
-import no.nordicsemi.android.kotlin.ble.client.main.service.ClientBleGattCharacteristic
-import no.nordicsemi.android.kotlin.ble.core.data.BleGattConnectOptions
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleNumOfMatches
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanMode
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerCallbackType
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerMatchMode
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerSettings
-import no.nordicsemi.android.kotlin.ble.scanner.BleScanner
+import no.nordicsemi.kotlin.ble.client.RemoteCharacteristic
+import no.nordicsemi.kotlin.ble.client.RemoteService
 import no.nordicsemi.kotlin.ble.client.android.CentralManager
 import no.nordicsemi.kotlin.ble.client.android.Peripheral
 import no.nordicsemi.kotlin.ble.client.android.native
+import no.nordicsemi.kotlin.ble.core.WriteType
+import java.lang.RuntimeException
 import java.util.Collections
 import java.util.Timer
 import java.util.TimerTask
@@ -56,8 +54,63 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.PI
 import kotlin.math.atan
+import kotlin.random.Random
 import kotlin.uuid.ExperimentalUuidApi
 
+suspend fun CentralManager.Factory.connectPeripheral(
+    serial: String,
+    context: Context,
+    scope: CoroutineScope
+): Peripheral? {
+    val centralManager = CentralManager.Factory.native(context, scope)
+    return centralManager.connectPeripheral(serial)
+}
+
+suspend fun CentralManager.connectPeripheral(serial: String): Peripheral?{
+
+    CentralManager.Factory
+
+    val peripheral = getPeripheralById(serial)
+
+    return if(peripheral == null) {
+
+        null
+
+    } else {
+        withTimeoutOrNull(
+            timeMillis = 10000,
+            block = {
+                connect(
+                    peripheral,
+                    options = CentralManager.ConnectionOptions.AutoConnect,
+                )
+                return@withTimeoutOrNull peripheral
+            },
+        )
+    }
+}
+
+suspend fun RemoteCharacteristic.write(
+    data: ByteArray
+) = write(data, WriteType.WITH_RESPONSE)
+
+suspend fun StateFlow<List<RemoteService>>.firstNotEmptyOrNull() =
+    filter { it.isNotEmpty() }.firstOrNull()
+
+@OptIn(ExperimentalUuidApi::class)
+suspend fun Peripheral.discoverServices() = services().firstNotEmptyOrNull()
+
+@OptIn(ExperimentalUuidApi::class)
+fun List<RemoteService>.findService(uuid: UUID) =
+    firstOrNull { it.uuid.toString() == uuid.toString() }
+
+@OptIn(ExperimentalUuidApi::class)
+fun RemoteService.findCharacteristic(uuid: UUID) =
+    characteristics.firstOrNull { it.uuid.toString() == uuid.toString() }
+
+@OptIn(ExperimentalUuidApi::class)
+fun RemoteCharacteristic.findDescriptor(uuid: UUID) =
+    descriptors.firstOrNull { it.uuid.toString() == uuid.toString() }
 
 val versionServiceUUID: UUID = UUID.fromString("0000180a-0000-1000-8000-00805f9b34fb")
 val firmwareVersionUUID: UUID = UUID.fromString("00002a26-0000-1000-8000-00805f9b34fb")
@@ -89,25 +142,20 @@ class BleRepositoryImpl @Inject constructor(
     }
 
     @RequiresPermission(allOf = [
-        android.Manifest.permission.BLUETOOTH_SCAN,
-        android.Manifest.permission.BLUETOOTH_CONNECT
+        Manifest.permission.BLUETOOTH_SCAN,
+        Manifest.permission.BLUETOOTH_CONNECT
     ])
     override fun getBleAroundFlow() = callbackFlow  {
 
-        val job = BleScanner(app)
-            .scan(
-                settings = BleScannerSettings(
-                    includeStoredBondedDevices = false,
-                    scanMode = BleScanMode.SCAN_MODE_LOW_LATENCY,
-                    callbackType = BleScannerCallbackType.CALLBACK_TYPE_ALL_MATCHES,
-                    matchMode = BleScannerMatchMode.MATCH_MODE_AGGRESSIVE,
-                    numOfMatches = BleNumOfMatches.MATCH_NUM_ONE_ADVERTISEMENT,
-                    reportDelay = 0L
-                )
-            ).filter { it.device.name?.contains("ArmA") == true }
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.IO))
+        val job = centralManager.scan {
+                ManufacturerData(0x0059)
+            }
+            .filter { it.peripheral.name?.contains("ArmA") == true }
             .onEach {
-                resultList[it.device.address] = it.info
-            }.launchIn(CoroutineScope(Dispatchers.IO))
+                resultList[it.peripheral.address] = it.info
+            }
+            .launchIn(CoroutineScope(Dispatchers.IO))
 
         val timer = Timer().apply {
             schedule(object : TimerTask() {
@@ -158,6 +206,7 @@ class BleRepositoryImpl @Inject constructor(
 
     }
 
+
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     override suspend fun getBleBySerial(
         serial: String,
@@ -172,35 +221,13 @@ class BleRepositoryImpl @Inject constructor(
 
         } else {
 
-            println("Start")
-
             val centralManager = CentralManager.Factory.native(app, scope)
-            val peripheral = centralManager.getPeripheralById(serial)
-
-            if(peripheral!= null) {
-
-                withTimeout(10000) {
-                    centralManager.connect(
-                        peripheral,
-                        options = CentralManager.ConnectionOptions.AutoConnect,
-                    )
-                }
-
-                val version = peripheral.readVersion()
-
-                println("connected ${version}")
-
-            }
-
-            println("End")
-
-            var connection: ClientBleGatt? = null
+            val peripheral = centralManager.connectPeripheral(serial)
+                ?: return Result.failure(BleException.UnexpectedResponse)
 
             try {
 
-                connection = ClientBleGatt.connect(app, serial, scope, BleGattConnectOptions(false))
-
-                val version = connection.readVersion()
+                val version = peripheral.readVersion()
 
                 fun BleInfo.updateState(): Ble.BleState {
                     return Ble.BleState(
@@ -216,7 +243,7 @@ class BleRepositoryImpl @Inject constructor(
                             Ble.Gate(
                                 info = initialBle,
                                 state = initialBle.updateState(),
-                                gateState = connection.readHostState().fold(
+                                gateState = peripheral.readHostState().fold(
                                     onFailure = { return Result.failure(it) },
                                     onSuccess = { it }
                                 )
@@ -236,7 +263,7 @@ class BleRepositoryImpl @Inject constructor(
                             Ble.Thermometer(
                                 info = initialBle,
                                 state = initialBle.updateState(),
-                                thermometerState = connection.readThermometerState(
+                                thermometerState = peripheral.readThermometerState(
                                     initialBle.tableStatus
                                 ).fold(
                                     onFailure = { return Result.failure(it) },
@@ -251,7 +278,7 @@ class BleRepositoryImpl @Inject constructor(
                             Ble.Accelerometer(
                                 info = initialBle,
                                 state = initialBle.updateState(),
-                                accelerometerState = connection.readAccelState(
+                                accelerometerState = peripheral.readAccelState(
                                     initialBle.tableStatus,
                                     version
                                 ).fold(
@@ -270,7 +297,7 @@ class BleRepositoryImpl @Inject constructor(
                 return Result.failure(BleException.UnexpectedResponse)
             } finally {
 
-                connection?.close()
+                peripheral.disconnect()
 
             }
 
@@ -280,21 +307,21 @@ class BleRepositoryImpl @Inject constructor(
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     @OptIn(ExperimentalUnsignedTypes::class)
-    private suspend fun ClientBleGatt.readThermometerState(
+    private suspend fun Peripheral.readThermometerState(
         timer: BleInfo.HistoryTableStatus
     ): Result<Ble.Thermometer.ThermometerState, BleException> {
 
-        val service = discoverServices().findService(serviceUUID)
+        val service = discoverServices()?.findService(serviceUUID)
             ?: return Result.failure(BleException.UnexpectedResponse)
 
         var characteristic = service.findCharacteristic(temperatureReadUUID)
             ?: return Result.failure(BleException.UnexpectedResponse)
 
-        characteristic.write(DataByteArray.from(1, 1))
+        characteristic.write(byteArrayOf(1, 1))
 
         delay(2_000)
 
-        val temperature = characteristic.read().value.toUByteArray().toTemperature()
+        val temperature = characteristic.read().toUByteArray().toTemperature()
 
         characteristic = service.findCharacteristic(intervalReadUUID)
             ?: return Result.failure(BleException.UnexpectedResponse)
@@ -312,11 +339,11 @@ class BleRepositoryImpl @Inject constructor(
     }
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
-    private suspend fun ClientBleGatt.readHostState(
+    private suspend fun Peripheral.readHostState(
 
     ): Result<Ble.Gate.HostState, BleException> {
 
-        val service = discoverServices().findService(serviceUUID)
+        val service = discoverServices()?.findService(serviceUUID)
             ?: return Result.failure(BleException.UnexpectedResponse)
 
         val characteristic = service.findCharacteristic(intervalReadUUID)
@@ -335,11 +362,11 @@ class BleRepositoryImpl @Inject constructor(
     }
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
-    private suspend fun ClientBleGattCharacteristic.readWriteInterval(): Long {
+    private suspend fun RemoteCharacteristic.readWriteInterval(): Long {
 
-        write(DataByteArray.from(3, 0, 0, 0))
+        write(byteArrayOf(3, 0, 0, 0))
 
-        return read().value.let {
+        return read().let {
             if(it.size == 4){
                 it.get4byteUIntAt(0).toLong()
             } else {
@@ -350,11 +377,11 @@ class BleRepositoryImpl @Inject constructor(
     }
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
-    private suspend fun ClientBleGattCharacteristic.readTimeoutInterval(): Long {
+    private suspend fun RemoteCharacteristic.readTimeoutInterval(): Long {
 
-        write(DataByteArray.from(8, 0, 0, 0))
+        write(byteArrayOf(8, 0, 0, 0))
 
-        return read().value.let {
+        return read().let {
             if (it.size == 4) {
                 it.get4byteUIntAt(0).toLong()
             } else {
@@ -420,15 +447,12 @@ class BleRepositoryImpl @Inject constructor(
 
     }
 
-
-
-    @OptIn(ExperimentalUuidApi::class)
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     private suspend fun Peripheral.readVersion(): Version {
 
-        return services().filter { it.isNotEmpty() }.firstOrNull()
-            ?.firstOrNull { it.uuid.toString() == versionServiceUUID.toString() }
-            ?.characteristics?.firstOrNull {  it.uuid.toString() == firmwareVersionUUID.toString() }
+        return discoverServices()
+            ?.findService(versionServiceUUID)
+            ?.findCharacteristic(firmwareVersionUUID)
             ?.read()?.decodeToString()?.let {
                 Version.fromString(it)
             } ?: Version.fromString("0.0.0-0")
@@ -436,23 +460,13 @@ class BleRepositoryImpl @Inject constructor(
     }
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
-    private suspend fun ClientBleGatt.readVersion(): Version {
-
-        return discoverServices().findService(versionServiceUUID)
-            ?.findCharacteristic(firmwareVersionUUID)?.read()?.value?.decodeToString()?.let {
-                Version.fromString(it)
-            } ?: Version.fromString("0.0.0-0")
-
-    }
-
-    @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
-    private suspend fun ClientBleGatt.readAccelState(
+    private suspend fun Peripheral.readAccelState(
         timer: BleInfo.HistoryTableStatus,
         version: Version
     ): Result<Ble.Accelerometer.AccelerometerState, BleException> {
 
         val services = discoverServices()
-        val service = services.findService(serviceUUID)
+        val service = services?.findService(serviceUUID)
             ?: return Result.failure(BleException.UnexpectedResponse)
 
         var characteristic = service.findCharacteristic(intervalReadUUID)
@@ -473,10 +487,8 @@ class BleRepositoryImpl @Inject constructor(
                 characteristic = service.findCharacteristic(accelerometerReadUUID)
                     ?: return Result.failure(BleException.UnexpectedResponse)
 
-                characteristic.write(DataByteArray.from(4))
-                characteristic.read().let {
-
-                    val data = it.value
+                characteristic.write(byteArrayOf(4))
+                characteristic.read().let { data ->
 
                     val scale = AccelScale.fromByte(data[1]) ?: return Result.failure(
                         BleException.UnexpectedResponse
@@ -521,7 +533,7 @@ class BleRepositoryImpl @Inject constructor(
 
     override suspend fun getTemperatureHistoryBySerial(
         serial: String
-    ): Flow<Result<ProgressState<List<Ble.Thermometer.HistoryPoint>>, BleException>> {
+    ): Result<List<Ble.Thermometer.HistoryPoint>, BleException> {
 
         return readThermometerHistory(serial, app)
 
@@ -553,73 +565,62 @@ class BleRepositoryImpl @Inject constructor(
 
     }
 
+    @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     override suspend fun writeBle(
         serial: String,
         request: Ble.Thermometer.WriteRequest
     ): Result<Unit, BleException> {
 
-        return if(app.checkPermission()) {
 
-            val connection =
-                ClientBleGatt.connect(app, serial, CoroutineScope(Dispatchers.Default))
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.IO))
+        val peripheral = centralManager.connectPeripheral(serial)
+            ?: return Result.failure(BleException.UnexpectedResponse)
 
-            try {
+        return try {
 
-                val services = connection.discoverServices()
-                val service = services.findService(serviceUUID) ?: return Result.failure(BleException.UnexpectedResponse)
+            val services = peripheral.discoverServices()
+            val service = services?.findService(serviceUUID)
+                ?: return Result.failure(BleException.UnexpectedResponse)
 
-                request.tx?.let {
-                    service.findCharacteristic(txWriteUUID)!!.write(
-                        DataByteArray.from(it.sendData)
-                    )
-                }
+            request.tx?.let {
+                service.findCharacteristic(txWriteUUID)
+                    ?.write(byteArrayOf(it.sendData))
+                    ?: return Result.failure(BleException.UnexpectedResponse)
+            }
 
-                request.saveHistory?.let {
+            request.saveHistory?.let {
 
-                    service.findCharacteristic(saveEnabledWriteUUID)!!.write(
-                        DataByteArray.from(
-                            *mutableListOf<Byte>(4).apply {
-                                add(if (it) 1 else 0)
-                            }.toByteArray()
-                        )
-                    )
-
-                }
-
-                request.historyInterval?.let {
-
-                    service.findCharacteristic(intervalWriteUUID)!!.write(
-                        DataByteArray.from(
-                            *mutableListOf<Byte>(3).apply {
-                                addAll((it).toUInt().to4ByteArrayInLittleEndian().reversed().toList())
-                            }.toByteArray()
-                        )
-                    )
-
-                }
-
-                service.findCharacteristic(flashWriteUUID)!!.write(
-                    DataByteArray.from(9)
+                service.findCharacteristic(saveEnabledWriteUUID)!!.write(
+                    mutableListOf<Byte>(4).apply {
+                        add(if (it) 1 else 0)
+                    }.toByteArray()
                 )
 
-                connection.close()
-
-                Result.success(Unit)
-
-            } catch (err: Throwable){
-
-                err.printStackTrace()
-                Result.failure(BleException.UnexpectedResponse)
-
-            } finally {
-
-                connection.close()
-
             }
 
-        } else {
+            request.historyInterval?.let {
 
-            Result.failure(BleException.PermissionDenied)
+                service.findCharacteristic(intervalWriteUUID)!!.write(
+                    mutableListOf<Byte>(3).apply {
+                        addAll((it).toUInt().to4ByteArrayInLittleEndian().reversed().toList())
+                    }.toByteArray()
+                )
+
+            }
+
+            service.findCharacteristic(flashWriteUUID)!!.write(byteArrayOf(9))
+
+            peripheral.disconnect()
+            Result.success(Unit)
+
+        } catch (err: Throwable) {
+
+            err.printStackTrace()
+            Result.failure(BleException.UnexpectedResponse)
+
+        } finally {
+
+            peripheral.disconnect()
 
         }
 
@@ -630,49 +631,43 @@ class BleRepositoryImpl @Inject constructor(
         request: Ble.Beacon.WriteRequest
     ): Result<Unit, BleException> {
 
-        return if(app.checkPermission()) {
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.IO))
+        val peripheral = centralManager.connectPeripheral(serial)
+            ?: return Result.failure(BleException.UnexpectedResponse)
 
-            val connection = ClientBleGatt.connect(app, serial, CoroutineScope(Dispatchers.Default))
+        return try {
 
-            try {
+            request.tx?.let {
 
-                request.tx?.let {
-
-                    connection.discoverServices().findService(serviceUUID)?.findCharacteristic(
-                        txWriteUUID
-                    )?.write(
-                        DataByteArray.from(it.sendData)
-                    ) ?: return Result.failure(BleException.UnexpectedResponse)
-
-                }
-
-                connection.discoverServices().findService(serviceUUID)?.findCharacteristic(
-                    flashWriteUUID
-                )!!.write(
-                    DataByteArray.from(9)
-                )
-
-                connection.close()
-
-                Result.success(Unit)
-
-            } catch (err: Throwable){
-
-                err.printStackTrace()
-                Result.failure(BleException.UnexpectedResponse)
-
-            } finally {
-
-                connection.close()
+                peripheral.discoverServices()
+                    ?.findService(serviceUUID)
+                    ?.findCharacteristic(txWriteUUID)
+                    ?.write(byteArrayOf(it.sendData)
+                ) ?: return Result.failure(BleException.UnexpectedResponse)
 
             }
 
-        } else {
+            peripheral.discoverServices()
+                ?.findService(serviceUUID)
+                ?.findCharacteristic(flashWriteUUID)!!
+                .write(byteArrayOf(9))
 
-            Result.failure(BleException.PermissionDenied)
+            peripheral.disconnect()
+
+            Result.success(Unit)
+
+        } catch (err: Throwable) {
+
+            err.printStackTrace()
+            Result.failure(BleException.UnexpectedResponse)
+
+        } finally {
+
+            peripheral.disconnect()
 
         }
 
+
     }
 
     override suspend fun writeBle(
@@ -680,78 +675,65 @@ class BleRepositoryImpl @Inject constructor(
         request: Ble.Gate.WriteRequest
     ): Result<Unit, BleException> {
 
-        return if(app.checkPermission()) {
 
-            val connection = ClientBleGatt.connect(app, serial, CoroutineScope(Dispatchers.Default))
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.IO))
+        val peripheral = centralManager.connectPeripheral(serial)
+            ?: return Result.failure(BleException.UnexpectedResponse)
 
-            try {
+        return try {
 
-                val services = connection.discoverServices()
-                val service = services.findService(serviceUUID) ?: return Result.failure(
-                    BleException.UnexpectedResponse
-                )
+            val services = peripheral.discoverServices()
+            val service = services?.findService(serviceUUID) ?: return Result.failure(
+                BleException.UnexpectedResponse
+            )
 
-                request.tx?.let {
-
-                    service.findCharacteristic(
-                        txWriteUUID
-                    )?.write(
-                        DataByteArray.from(it.sendData)
-                    ) ?: return Result.failure(BleException.UnexpectedResponse)
-
-                }
-
-                request.interval?.let {
-
-                    service.findCharacteristic(intervalWriteUUID)!!.write(
-                        DataByteArray.from(
-                            *mutableListOf<Byte>(3).apply {
-                                addAll(
-                                    (it).toUInt().to4ByteArrayInLittleEndian().reversed().toList()
-                                )
-                            }.toByteArray()
-                        )
-                    )
-
-                }
-
-                request.readInterval?.let {
-
-                    service.findCharacteristic(intervalWriteUUID)!!.write(
-                        DataByteArray.from(
-                            *mutableListOf<Byte>(2).apply {
-                                addAll(
-                                    (it / 1000).toUInt().to4ByteArrayInLittleEndian().reversed().toList()
-                                )
-                            }.toByteArray()
-                        )
-                    )
-
-                }
+            request.tx?.let {
 
                 service.findCharacteristic(
-                    flashWriteUUID
-                )!!.write(
-                    DataByteArray.from(9)
-                )
-
-                connection.close()
-
-                Result.success(Unit)
-
-            } catch (err: Throwable){
-                err.printStackTrace()
-                Result.failure(BleException.UnexpectedResponse)
-
-            } finally {
-
-                connection.close()
+                    txWriteUUID
+                )?.write(
+                    byteArrayOf(it.sendData)
+                ) ?: return Result.failure(BleException.UnexpectedResponse)
 
             }
 
-        } else {
+            request.interval?.let {
 
-            Result.failure(BleException.PermissionDenied)
+                service.findCharacteristic(intervalWriteUUID)!!.write(
+                    mutableListOf<Byte>(3).apply {
+                        addAll((it).toUInt().to4ByteArrayInLittleEndian().reversed().toList())
+                    }.toByteArray()
+                )
+
+            }
+
+            request.readInterval?.let {
+
+                service.findCharacteristic(intervalWriteUUID)!!.write(
+                    mutableListOf<Byte>(2).apply {
+                        addAll((it / 1000).toUInt().to4ByteArrayInLittleEndian().reversed().toList())
+                    }.toByteArray()
+                )
+
+            }
+
+            service.findCharacteristic(
+                flashWriteUUID
+            )!!.write(
+                byteArrayOf(9)
+            )
+
+            peripheral.disconnect()
+
+            Result.success(Unit)
+
+        } catch (err: Throwable) {
+            err.printStackTrace()
+            Result.failure(BleException.UnexpectedResponse)
+
+        } finally {
+
+            peripheral.disconnect()
 
         }
 
@@ -764,90 +746,73 @@ class BleRepositoryImpl @Inject constructor(
 
         rotationsDao.deleteBySerial(serial)
 
-        return if(app.checkPermission()) {
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.IO))
+        val peripheral = centralManager.connectPeripheral(serial)
+            ?: return Result.failure(BleException.UnexpectedResponse)
 
-            val connection =
-                ClientBleGatt.connect(app, serial, CoroutineScope(Dispatchers.Default))
+        return try {
 
-            try {
+            val service = peripheral.discoverServices()?.findService(serviceUUID)
+                ?: return Result.failure(BleException.UnexpectedResponse)
 
-                val services = connection.discoverServices()
+            Log.d("write", request.toString())
 
-                val service = services.findService(serviceUUID)
-                    ?: return Result.failure(BleException.UnexpectedResponse)
-
-                Log.d("write", request.toString())
-
-                request.tx?.let {
-                    service.findCharacteristic(txWriteUUID)!!.write(
-                        DataByteArray.from(it.sendData)
-                    )
-                }
-
-                request.saveHistorySettings?.let {
-
-                    service.findCharacteristic(saveEnabledWriteUUID)!!.write(
-                        DataByteArray.from(
-                            *mutableListOf<Byte>(4).apply {
-                                add(if (it is Ble.Accelerometer.HistorySettings.Enabled) 1 else 0)
-                                if (it is Ble.Accelerometer.HistorySettings.Enabled) {
-                                    add(it.mode.sendData)
-                                    add(it.scale.sendData)
-                                }
-                            }.toByteArray()
-                        )
-                    )
-
-                }
-
-                request.historyInterval?.let {
-
-                    service.findCharacteristic(intervalWriteUUID)!!.write(
-                        DataByteArray.from(
-                            *mutableListOf<Byte>(3).apply {
-                                addAll(
-                                    (it).toUInt().to4ByteArrayInLittleEndian().reversed().toList()
-                                )
-                            }.toByteArray()
-                        )
-                    )
-
-                }
-
-                request.readInterval?.let {
-
-                    service.findCharacteristic(intervalWriteUUID)!!.write(
-                        DataByteArray.from(
-                            *mutableListOf<Byte>(2).apply {
-                                addAll(
-                                    (it).toUInt().to4ByteArrayInLittleEndian().reversed().toList()
-                                )
-                            }.toByteArray()
-                        )
-                    )
-
-                }
-
-                service.findCharacteristic(flashWriteUUID)!!.write(
-                    DataByteArray.from(9)
+            request.tx?.let {
+                service.findCharacteristic(txWriteUUID)!!.write(
+                    byteArrayOf(it.sendData)
                 )
+            }
 
-                Result.success(Unit)
+            request.saveHistorySettings?.let {
 
-            } catch (err: Throwable){
-
-                err.printStackTrace()
-                Result.failure(BleException.UnexpectedResponse)
-
-            } finally {
-
-                connection.close()
+                service.findCharacteristic(saveEnabledWriteUUID)!!.write(
+                    mutableListOf<Byte>(4).apply {
+                        add(if (it is Ble.Accelerometer.HistorySettings.Enabled) 1 else 0)
+                        if (it is Ble.Accelerometer.HistorySettings.Enabled) {
+                            add(it.mode.sendData)
+                            add(it.scale.sendData)
+                        }
+                    }.toByteArray()
+                )
 
             }
 
-        } else {
+            request.historyInterval?.let {
 
-            Result.failure(BleException.PermissionDenied)
+                service.findCharacteristic(intervalWriteUUID)!!.write(
+                    mutableListOf<Byte>(3).apply {
+                        addAll(
+                            (it).toUInt().to4ByteArrayInLittleEndian().reversed().toList()
+                        )
+                    }.toByteArray()
+                )
+
+            }
+
+            request.readInterval?.let {
+
+                service.findCharacteristic(intervalWriteUUID)!!.write(
+                    mutableListOf<Byte>(2).apply {
+                        addAll((it).toUInt().to4ByteArrayInLittleEndian().reversed().toList())
+                    }.toByteArray()
+                )
+
+            }
+
+            service.findCharacteristic(flashWriteUUID)!!.write(
+                byteArrayOf(9)
+            )
+
+            Result.success(Unit)
+
+        } catch (err: Throwable) {
+
+            err.printStackTrace()
+            Result.failure(BleException.UnexpectedResponse)
+
+        } finally {
+
+            peripheral.disconnect()
 
         }
 
@@ -858,54 +823,48 @@ class BleRepositoryImpl @Inject constructor(
         serial: String
     ): Result<Unit, BleException> {
 
-        return if(app.checkPermission()) {
 
-            val connection =
-                ClientBleGatt.connect(app, serial, CoroutineScope(Dispatchers.Default))
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.IO))
+        val peripheral = centralManager.connectPeripheral(serial)
+            ?: return Result.failure(BleException.UnexpectedResponse)
 
-            try {
+        return try {
 
-                val services = connection.discoverServices()
-                val service = services.findService(serviceUUID)
-                    ?: return Result.failure(BleException.UnexpectedResponse)
+            val services = peripheral.discoverServices()
+            val service = services?.findService(serviceUUID)
+                ?: return Result.failure(BleException.UnexpectedResponse)
 
-                service.findCharacteristic(passwordWriteUUID)?.write(
-                    DataByteArray(
-                        mutableListOf(8.toByte()).apply {
-                            addAll(password.toByteArray(Charsets.US_ASCII).toList())
-                        }.toByteArray()
-                    )
-                ) ?: return Result.failure(BleException.UnexpectedResponse)
+            service.findCharacteristic(passwordWriteUUID)?.write(
+                mutableListOf(8.toByte()).apply {
+                    addAll(password.toByteArray(Charsets.US_ASCII).toList())
+                }.toByteArray()
+            ) ?: return Result.failure(BleException.UnexpectedResponse)
 
-                connection.close()
+            peripheral.disconnect()
 
-                Result.success(Unit)
+            Result.success(Unit)
 
-            } catch (err: Throwable) {
+        } catch (err: Throwable) {
 
-                err.printStackTrace()
-                Result.failure(BleException.UnexpectedResponse)
+            err.printStackTrace()
+            Result.failure(BleException.UnexpectedResponse)
 
-            } finally {
+        } finally {
 
-                connection.close()
+            peripheral.disconnect()
 
-            }
-
-        } else {
-            Result.failure(BleException.PermissionDenied)
         }
 
     }
 
-    override fun getAccelerometerMeasureBySerialFlow(
+    override suspend fun getAccelerometerMeasureBySerialFlow(
         serial: String,
         accelScale: AccelScale,
         accelMode: AccelViewMode,
         fftAxis: FftAxis,
         fftMode: FftViewMode,
         frequency: FftFrequency,
-    ): Flow<Result<Ble.Accelerometer.RealtimePoint, BleException>> {
+    ) : Result<Flow<Ble.Accelerometer.RealtimePoint>, BleException> {
 
         return getAccelerometerRealtimeData(app, serial, accelScale, accelMode, fftAxis, fftMode, frequency)
 
diff --git a/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerHistory.kt b/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerHistory.kt
index 1a85f21..9110085 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerHistory.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerHistory.kt
@@ -17,8 +17,8 @@ import llc.arma.ble.domain.common.ProgressState
 import llc.arma.ble.domain.model.Ble
 import llc.arma.ble.domain.usecase.AccelScale
 import llc.arma.ble.domain.usecase.AccelViewMode
-import no.nordicsemi.android.common.core.DataByteArray
-import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
+import no.nordicsemi.kotlin.ble.client.android.native
 
 
 @OptIn(ExperimentalUnsignedTypes::class)
@@ -41,188 +41,188 @@ fun getAccelerometerHistory(
 
         var expectedDataSize: Int? = null
 
-        if(app.checkPermission()) {
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.Default))
+        val peripheral = centralManager.connectPeripheral(address) ?: throw IllegalStateException()
 
-            val connection =
-                ClientBleGatt.connect(app, address, CoroutineScope(Dispatchers.Default))
+        try {
 
-            try {
+            val specData = peripheral.discoverServices()
+                ?.findService(serviceUUID)
+                ?.findCharacteristic(accelerometerReadUUID)
+                ?.let {
+                    it.write(byteArrayOf(4))
+                    it.read()
+                } ?: throw IllegalStateException()
 
-                val specData = connection.discoverServices()
-                    .findService(serviceUUID)
-                    ?.findCharacteristic(accelerometerReadUUID)
-                    ?.let {
-                        it.write(DataByteArray.from(4))
-                        it.read()
-                    } ?: throw IllegalStateException()
+            val scale = AccelScale.fromByte(specData[1]) ?: throw IllegalStateException()
+            val mode = AccelViewMode.fromByte(specData[0]) ?: throw IllegalStateException()
 
-                val scale = AccelScale.fromByte(specData.value[1]) ?: throw IllegalStateException()
-                val mode = AccelViewMode.fromByte(specData.value[0]) ?: throw IllegalStateException()
+            val characteristic = peripheral.discoverServices()
+                ?.findService(serviceUUID)
+                ?.findCharacteristic(accelerometerHistoryReadUUID)
 
-                val characteristic = connection.discoverServices()
-                    .findService(serviceUUID)
-                    ?.findCharacteristic(accelerometerHistoryReadUUID)
+            if (characteristic != null) {
 
-                if(characteristic != null) {
+                characteristic.write(byteArrayOf(2))
 
-                    characteristic.write(DataByteArray.from(2))
+                var value = characteristic.read()
 
-                    var value = characteristic.read().value
-
-                    if (value.contentEquals(byteArrayOf(0, 0))) {
-
-                        emit(Result.success(ProgressState.Finished(emptyList())))
-
-                    } else {
-
-                        var nextPackageDataCount = value.get2byteUIntAt(0)
-
-                        val writeData = mutableListOf(
-                            1.toByte(),
-                            0.toByte(),
-                            0.toByte()
-                        ).apply {
-                            addAll(value.toList().take(2))
-                        }.toByteArray()
-
-                        characteristic.write(DataByteArray(writeData))
-                        value = characteristic.read().value
-
-
-                        while (nextPackageDataCount.toInt() != 0) {
-
-                            Log.d("dataTable", "next package fata size $nextPackageDataCount")
-
-                            val packageDataArray = if (value[0] == 250.toByte()) {
-
-                                bleMeasureInterval = value.get4byteUIntAt(4).toLong()
-                                bleLastMeasureTime = value.get4byteUIntAt(8).toLong()
-                                bleRealTime = value.get4byteUIntAt(12).toLong()
-
-                                lastMeasureSystemTime =
-                                    System.currentTimeMillis() - ((bleRealTime - bleLastMeasureTime) * 1_000)
-
-                                Log.d("dataTable",
-                                    "bleMeasureInterval $bleMeasureInterval " +
-                                            "bleLastMeasureTime $bleLastMeasureTime " +
-                                            "bleRealTime $bleRealTime " +
-                                            "lastMeasureSystemTime $lastMeasureSystemTime " +
-                                            "data size ${value.toUByteArray().asList().subList(16, value.size).size}"
-                                )
-
-                                value.toUByteArray().asList().subList(16, value.size)
-
-                            } else {
-
-                                value.toUByteArray().asList().subList(4, value.size)
-
-                            }
-
-                            result.add(value.toUByteArray().toList())
-                            nextPackageDataCount = value.get2byteUIntAt(2)
-
-                            resultPackage.addAll(
-                                packageDataArray.chunked(2).map {
-                                    it.toUByteArray().toByteArray().get2byteShortAt().toFloat()
-                                }.toMutableList()
-                            )
-
-                            expectedDataSize =
-                                nextPackageDataCount.toInt() + resultPackage.size
-
-                            emit(Result.success(ProgressState.Progress(0f / expectedDataSize.toFloat())))
-                            emit(Result.success(ProgressState.Progress(resultPackage.size.toFloat() / expectedDataSize.toFloat())))
-
-                            characteristic.write(DataByteArray.from(5))
-                            value = characteristic.read().value
-
-                        }
-
-                        emit(
-                            Result.success(
-                                ProgressState.Finished(
-                                    when (mode) {
-                                        AccelViewMode.ROTATIONS -> {
-                                            resultPackage.withIndex().map {
-                                                Ble.Accelerometer.HistoryPoint.Rotation(
-                                                    date = lastMeasureSystemTime!! - (((resultPackage.size - 1) - it.index) * bleMeasureInterval!!),
-                                                    value = it.value.toLong()
-                                                )
-                                            }
-                                        }
-                                        AccelViewMode.ACCELERATION,
-                                        AccelViewMode.PEAK_ACCELERATION,
-                                        AccelViewMode.RMS -> {
-                                            resultPackage.chunked(3).withIndex().map {
-                                                Ble.Accelerometer.HistoryPoint.Angle(
-                                                    date = lastMeasureSystemTime!! - (((resultPackage.size / 3 - 1) - it.index) * bleMeasureInterval!!),
-                                                    x = (it.value[0] * scale.k) / Short.MAX_VALUE,
-                                                    y = (it.value[1] * scale.k) / Short.MAX_VALUE,
-                                                    z = (it.value[2] * scale.k) / Short.MAX_VALUE
-                                                )
-                                            }.apply {
-                                                Log.d("dataTable", "start with ${last().date}")
-                                            }
-                                        }
-
-                                        AccelViewMode.ANGLE -> {
-                                            resultPackage.chunked(3).withIndex().map {
-                                                Ble.Accelerometer.HistoryPoint.Angle(
-                                                    date = lastMeasureSystemTime!! - (((resultPackage.size / 3 - 1) - it.index) * bleMeasureInterval!!),
-                                                    x = calculateAngle(
-                                                        it.value[2],
-                                                        it.value[1]
-                                                    ),
-                                                    y = calculateAngle(
-                                                        it.value[2],
-                                                        it.value[0]
-                                                    ),
-                                                    z = calculateAngle(
-                                                        it.value[0],
-                                                        it.value[1]
-                                                    )
-                                                )
-                                            }
-                                        }
-
-                                        AccelViewMode.VIBRATION -> {
-                                            resultPackage.withIndex().map {
-                                                Ble.Accelerometer.HistoryPoint.Vibration(
-                                                    date = lastMeasureSystemTime!! - (((resultPackage.size - 1) - it.index) * bleMeasureInterval!!),
-                                                    value = (it.value * scale.k) / Short.MAX_VALUE
-                                                )
-                                            }
-                                        }
-                                    }
-                                )
-                            )
-
-                        )
-
-                    }
+                if (value.contentEquals(byteArrayOf(0, 0))) {
 
+                    emit(Result.success(ProgressState.Finished(emptyList())))
 
                 } else {
 
-                    emit(Result.failure(BleException.UnexpectedResponse))
+                    var nextPackageDataCount = value.get2byteUIntAt(0)
+
+                    val writeData = mutableListOf(
+                        1.toByte(),
+                        0.toByte(),
+                        0.toByte()
+                    ).apply {
+                        addAll(value.toList().take(2))
+                    }.toByteArray()
+
+                    characteristic.write(writeData)
+                    value = characteristic.read()
+
+
+                    while (nextPackageDataCount.toInt() != 0) {
+
+                        Log.d("dataTable", "next package fata size $nextPackageDataCount")
+
+                        val packageDataArray = if (value[0] == 250.toByte()) {
+
+                            bleMeasureInterval = value.get4byteUIntAt(4).toLong()
+                            bleLastMeasureTime = value.get4byteUIntAt(8).toLong()
+                            bleRealTime = value.get4byteUIntAt(12).toLong()
+
+                            lastMeasureSystemTime =
+                                System.currentTimeMillis() - ((bleRealTime - bleLastMeasureTime) * 1_000)
+
+                            Log.d(
+                                "dataTable",
+                                "bleMeasureInterval $bleMeasureInterval " +
+                                        "bleLastMeasureTime $bleLastMeasureTime " +
+                                        "bleRealTime $bleRealTime " +
+                                        "lastMeasureSystemTime $lastMeasureSystemTime " +
+                                        "data size ${
+                                            value.toUByteArray().asList()
+                                                .subList(16, value.size).size
+                                        }"
+                            )
+
+                            value.toUByteArray().asList().subList(16, value.size)
+
+                        } else {
+
+                            value.toUByteArray().asList().subList(4, value.size)
+
+                        }
+
+                        result.add(value.toUByteArray().toList())
+                        nextPackageDataCount = value.get2byteUIntAt(2)
+
+                        resultPackage.addAll(
+                            packageDataArray.chunked(2).map {
+                                it.toUByteArray().toByteArray().get2byteShortAt().toFloat()
+                            }.toMutableList()
+                        )
+
+                        expectedDataSize =
+                            nextPackageDataCount.toInt() + resultPackage.size
+
+                        emit(Result.success(ProgressState.Progress(0f / expectedDataSize.toFloat())))
+                        emit(Result.success(ProgressState.Progress(resultPackage.size.toFloat() / expectedDataSize.toFloat())))
+
+                        characteristic.write(byteArrayOf(5))
+                        value = characteristic.read()
+
+                    }
+
+                    emit(
+                        Result.success(
+                            ProgressState.Finished(
+                                when (mode) {
+                                    AccelViewMode.ROTATIONS -> {
+                                        resultPackage.withIndex().map {
+                                            Ble.Accelerometer.HistoryPoint.Rotation(
+                                                date = lastMeasureSystemTime!! - (((resultPackage.size - 1) - it.index) * bleMeasureInterval!!),
+                                                value = it.value.toLong()
+                                            )
+                                        }
+                                    }
+
+                                    AccelViewMode.ACCELERATION,
+                                    AccelViewMode.PEAK_ACCELERATION,
+                                    AccelViewMode.RMS
+                                        -> {
+                                        resultPackage.chunked(3).withIndex().map {
+                                            Ble.Accelerometer.HistoryPoint.Angle(
+                                                date = lastMeasureSystemTime!! - (((resultPackage.size / 3 - 1) - it.index) * bleMeasureInterval!!),
+                                                x = (it.value[0] * scale.k) / Short.MAX_VALUE,
+                                                y = (it.value[1] * scale.k) / Short.MAX_VALUE,
+                                                z = (it.value[2] * scale.k) / Short.MAX_VALUE
+                                            )
+                                        }.apply {
+                                            Log.d("dataTable", "start with ${last().date}")
+                                        }
+                                    }
+
+                                    AccelViewMode.ANGLE -> {
+                                        resultPackage.chunked(3).withIndex().map {
+                                            Ble.Accelerometer.HistoryPoint.Angle(
+                                                date = lastMeasureSystemTime!! - (((resultPackage.size / 3 - 1) - it.index) * bleMeasureInterval!!),
+                                                x = calculateAngle(
+                                                    it.value[2],
+                                                    it.value[1]
+                                                ),
+                                                y = calculateAngle(
+                                                    it.value[2],
+                                                    it.value[0]
+                                                ),
+                                                z = calculateAngle(
+                                                    it.value[0],
+                                                    it.value[1]
+                                                )
+                                            )
+                                        }
+                                    }
+
+                                    AccelViewMode.VIBRATION -> {
+                                        resultPackage.withIndex().map {
+                                            Ble.Accelerometer.HistoryPoint.Vibration(
+                                                date = lastMeasureSystemTime!! - (((resultPackage.size - 1) - it.index) * bleMeasureInterval!!),
+                                                value = (it.value * scale.k) / Short.MAX_VALUE
+                                            )
+                                        }
+                                    }
+                                }
+                            )
+                        )
+
+                    )
 
                 }
 
-            } catch (err: Throwable) {
-                err.printStackTrace()
+
+            } else {
+
                 emit(Result.failure(BleException.UnexpectedResponse))
 
-            } finally {
-
-                connection.close()
-
             }
 
-        } else {
-            emit(Result.failure(BleException.PermissionDenied))
+        } catch (err: Throwable) {
+            err.printStackTrace()
+            emit(Result.failure(BleException.UnexpectedResponse))
+
+        } finally {
+
+            peripheral.disconnect()
 
         }
 
+
     }
 
 
diff --git a/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerRealtimeData.kt b/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerRealtimeData.kt
index 731063e..a69616d 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerRealtimeData.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/GetAccelerometerRealtimeData.kt
@@ -5,6 +5,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onEmpty
 import llc.arma.ble.data.repository.extensions.checkPermission
 import llc.arma.ble.data.repository.extensions.get2byteShortAt
 import llc.arma.ble.data.repository.extensions.sendData
@@ -22,10 +27,10 @@ import llc.arma.ble.domain.usecase.AccelViewMode.VIBRATION
 import llc.arma.ble.domain.usecase.FftAxis
 import llc.arma.ble.domain.usecase.FftFrequency
 import llc.arma.ble.domain.usecase.FftViewMode
-import no.nordicsemi.android.common.core.DataByteArray
-import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
+import kotlin.uuid.ExperimentalUuidApi
 
-fun getAccelerometerRealtimeData(
+suspend fun getAccelerometerRealtimeData(
     app: Application,
     serial: String,
     accelScale: AccelScale,
@@ -33,108 +38,103 @@ fun getAccelerometerRealtimeData(
     fftAxis: FftAxis,
     fftMode: FftViewMode,
     frequency: FftFrequency,
-): Flow<Result<Ble.Accelerometer.RealtimePoint, BleException>> {
+): Result<Flow<Ble.Accelerometer.RealtimePoint>, BleException> {
 
-    return flow {
+    val peripheral = CentralManager.Factory.connectPeripheral(serial, app, CoroutineScope(Dispatchers.Default))
 
-        if(app.checkPermission()) {
+    return try {
 
-            val connection =
-                ClientBleGatt.connect(app, serial, CoroutineScope(Dispatchers.Default))
+        if (peripheral == null) throw IllegalStateException()
 
-            try {
+        val services = peripheral.discoverServices()
 
-                val services = connection.discoverServices()
+        val characteristic =
+            services?.findService(serviceUUID)
+                ?.findCharacteristic(accelerometerReadUUID)
+                ?: return Result.failure(BleException.UnexpectedResponse)
 
-                val characteristic =
-                    services.findService(serviceUUID)
-                        ?.findCharacteristic(accelerometerReadUUID)
-                        ?: throw IllegalStateException()
+        characteristic.write(
+            byteArrayOf(
+                4,
+                accelMode.sendData,
+                accelScale.sendData,
+                fftMode.sendData,
+                fftAxis.sendData,
+                frequency.sendData,
+                1
+            )
+        )
 
-                characteristic.write(
-                    DataByteArray.from(
-                        4,
-                        accelMode.sendData,
-                        accelScale.sendData,
-                        fftMode.sendData,
-                        fftAxis.sendData,
-                        frequency.sendData,
-                        1
-                    )
-                )
-
-                characteristic.getNotifications().collect {
-
-                    val value = it.value
-
-                    val data = value.toList().chunked(2).map {
-                        it.toByteArray().get2byteShortAt()
-                    }
-
-                    val result = when(accelMode){
-                        VIBRATION -> {
-                            Ble.Accelerometer.RealtimePoint.Vibration(
-                                (value.get2byteShortAt()
-                                    .toFloat() * accelScale.k) / Short.MAX_VALUE
-                            )
-                        }
-                        ANGLE -> {
-                            Ble.Accelerometer.RealtimePoint.Angle(
-                                x = calculateAngle(
-                                    data[2].toFloat(),
-                                    data[1].toFloat()
-                                ),
-                                y = calculateAngle(
-                                    data[2].toFloat(),
-                                    data[0].toFloat()
-                                ),
-                                z = calculateAngle(
-                                    data[0].toFloat(),
-                                    data[1].toFloat()
-                                )
-                            )
-                        }
-                        ROTATIONS -> {
-                            Ble.Accelerometer.RealtimePoint.Rotation(
-                                angle = ((360f / 8f) * ((data[0] / 100f) + 1f)) - 45f,
-                                tmp = data[1].toFloat(),
-                                turnovers = data[2]
-                            )
-                        }
-                        ACCELERATION,
-                        PEAK_ACCELERATION,
-                        RMS -> {
-                            Ble.Accelerometer.RealtimePoint.Common(
-                                x = (data[0].toFloat() * accelScale.k) / Short.MAX_VALUE,
-                                y = (data[1].toFloat() * accelScale.k) / Short.MAX_VALUE,
-                                z = (data[2].toFloat() * accelScale.k) / Short.MAX_VALUE,
-                            )
-                        }
-                    }
-
-                    emit(Result.success(result))
+        val flow = characteristic.subscribe()
+            .onCompletion {
+                println("disable notifying")
+                characteristic.setNotifying(false)
+                peripheral.disconnect()
+            }
+            .map { value ->
 
+                val data = value.toList().chunked(2).map {
+                    it.toByteArray().get2byteShortAt()
                 }
 
+                val result = when (accelMode) {
+                    VIBRATION -> {
+                        Ble.Accelerometer.RealtimePoint.Vibration(
+                            (value.get2byteShortAt()
+                                .toFloat() * accelScale.k) / Short.MAX_VALUE
+                        )
+                    }
 
-            } catch (err: Exception) {
+                    ANGLE -> {
+                        Ble.Accelerometer.RealtimePoint.Angle(
+                            x = calculateAngle(
+                                data[2].toFloat(),
+                                data[1].toFloat()
+                            ),
+                            y = calculateAngle(
+                                data[2].toFloat(),
+                                data[0].toFloat()
+                            ),
+                            z = calculateAngle(
+                                data[0].toFloat(),
+                                data[1].toFloat()
+                            )
+                        )
+                    }
 
-                err.printStackTrace()
+                    ROTATIONS -> {
+                        Ble.Accelerometer.RealtimePoint.Rotation(
+                            angle = ((360f / 8f) * ((data[0] / 100f) + 1f)) - 45f,
+                            tmp = data[1].toFloat(),
+                            turnovers = data[2]
+                        )
+                    }
 
-                emit(Result.failure(BleException.UnexpectedResponse))
+                    ACCELERATION,
+                    PEAK_ACCELERATION,
+                    RMS -> {
+                        Ble.Accelerometer.RealtimePoint.Common(
+                            x = (data[0].toFloat() * accelScale.k) / Short.MAX_VALUE,
+                            y = (data[1].toFloat() * accelScale.k) / Short.MAX_VALUE,
+                            z = (data[2].toFloat() * accelScale.k) / Short.MAX_VALUE,
+                        )
+                    }
+                }
 
-            } finally {
-
-                connection.disconnect()
-                connection.close()
+                result
 
             }
 
-        } else {
+        Result.success(flow)
 
-            emit(Result.failure(BleException.PermissionDenied))
 
-        }
+    } catch (err: Exception) {
+
+        peripheral?.disconnect()
+
+        err.printStackTrace()
+
+        Result.failure(BleException.UnexpectedResponse)
 
     }
 
diff --git a/app/src/main/java/llc/arma/ble/data/repository/ReadAccelerometerSpectre.kt b/app/src/main/java/llc/arma/ble/data/repository/ReadAccelerometerSpectre.kt
index 0e2ac31..a26f39e 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/ReadAccelerometerSpectre.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/ReadAccelerometerSpectre.kt
@@ -20,8 +20,7 @@ import llc.arma.ble.domain.usecase.AccelViewMode
 import llc.arma.ble.domain.usecase.FftAxis
 import llc.arma.ble.domain.usecase.FftFrequency
 import llc.arma.ble.domain.usecase.FftViewMode
-import no.nordicsemi.android.common.core.DataByteArray
-import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
 import java.util.UUID
 
 fun readAccelerometerSpectre(
@@ -36,119 +35,126 @@ fun readAccelerometerSpectre(
 
     return flow {
 
-        if(app.checkPermission()) {
+        val peripheral =
+            CentralManager.Factory.connectPeripheral(
+                address,
+                app,
+                CoroutineScope(Dispatchers.Default)
+            ) ?: throw IllegalStateException()
 
-            val connection =
-                ClientBleGatt.connect(app, address, CoroutineScope(Dispatchers.Default))
+        try {
 
-            try {
+            val service = peripheral.discoverServices()
+                ?.findService(serviceUUID) ?: throw IllegalStateException()
 
-                val service = connection.discoverServices()
-                    .findService(serviceUUID) ?: throw IllegalStateException()
+            val characteristic = service.findCharacteristic(accelerometerReadUUID)
+                ?: throw IllegalStateException()
 
-                val characteristic = service.findCharacteristic(accelerometerReadUUID)
-                    ?: throw IllegalStateException()
+            val historyCharacteristic = service.findCharacteristic(accelerometerHistoryReadUUID)
+                ?: throw IllegalStateException()
 
-                val historyCharacteristic = service.findCharacteristic(accelerometerHistoryReadUUID)
-                    ?: throw IllegalStateException()
+            characteristic.setNotifying(true)
 
-                characteristic.findDescriptor(
-                    UUID.fromString("00002902-0000-1000-8000-00805f9b34fb")
-                )?.write(DataByteArray(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE))
-                    ?: throw IllegalStateException()
+            /*characteristic.findDescriptor(
+                UUID.fromString("00002902-0000-1000-8000-00805f9b34fb")
+            )?.write(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE)
+                ?: throw IllegalStateException()*/
 
-                characteristic.write(
-                    DataByteArray(byteArrayOf(
-                        4,
-                        accelMode.sendData,
-                        accelScale.sendData,
-                        fftMode.sendData,
-                        fftAxis.sendData,
-                        frequency.sendData,
-                        2
-                    ))
+            characteristic.write(
+                byteArrayOf(
+                    4,
+                    accelMode.sendData,
+                    accelScale.sendData,
+                    fftMode.sendData,
+                    fftAxis.sendData,
+                    frequency.sendData,
+                    2
                 )
 
-                characteristic.getNotifications().collect {
+            )
 
-                    var initialValue: Long? = null
-                    var frequencyInterval: Long? = null
+            characteristic.subscribe().collect {
 
-                    val resultAccelerometerPackage: MutableList<Float> = mutableListOf()
+                var initialValue: Long? = null
+                var frequencyInterval: Long? = null
 
-                    var expectedDataSize: Int? = null
+                val resultAccelerometerPackage: MutableList<Float> = mutableListOf()
 
-                    historyCharacteristic.write(DataByteArray.from(2))
+                var expectedDataSize: Int? = null
 
-                    var value = historyCharacteristic.read().value
+                historyCharacteristic.write(byteArrayOf(2))
 
-                    if (value.contentEquals(byteArrayOf(0, 0))) {
+                var value = historyCharacteristic.read()
 
-                        emit(Result.success(ProgressState.Finished(emptyList())))
+                if (value.contentEquals(byteArrayOf(0, 0))) {
 
-                    } else {
+                    emit(Result.success(ProgressState.Finished(emptyList())))
 
-                        var nextPackageDataCount = value.get2byteUIntAt(0)
+                } else {
 
-                        val writeData = mutableListOf(
-                            1.toByte(),
-                            0.toByte(),
-                            0.toByte()
-                        ).apply {
-                            addAll(value.toList())
-                        }.toByteArray()
+                    var nextPackageDataCount = value.get2byteUIntAt(0)
 
-                        historyCharacteristic.write(DataByteArray(writeData))
-                        value = historyCharacteristic.read().value
+                    val writeData = mutableListOf(
+                        1.toByte(),
+                        0.toByte(),
+                        0.toByte()
+                    ).apply {
+                        addAll(value.toList())
+                    }.toByteArray()
+
+                    historyCharacteristic.write(writeData)
+                    value = historyCharacteristic.read()
 
 
-                        while (nextPackageDataCount.toInt() != 0) {
+                    while (nextPackageDataCount.toInt() != 0) {
 
-                            val accelerometerDataArray = if (value[0] == 250.toByte()) {
+                        val accelerometerDataArray = if (value[0] == 250.toByte()) {
 
-                                initialValue = value.get4byteUIntAt(8).toLong()
-                                frequencyInterval = value.get4byteUIntAt(4).toLong()
+                            initialValue = value.get4byteUIntAt(8).toLong()
+                            frequencyInterval = value.get4byteUIntAt(4).toLong()
 
-                                value.asList().subList(16, value.size)
+                            value.asList().subList(16, value.size)
 
-                            } else {
-                                value.asList().subList(4, value.size)
-
-                            }
-
-                            nextPackageDataCount = value.get2byteUIntAt(2)
-
-                            resultAccelerometerPackage.addAll(
-                                accelerometerDataArray.chunked(2).map {
-                                    it.toByteArray().get2byteShortAt().toFloat()
-                                }.toMutableList()
-                            )
-
-                            expectedDataSize = nextPackageDataCount.toInt() + resultAccelerometerPackage.size
-
-                            emit(Result.success(ProgressState.Progress(0f / expectedDataSize.toFloat())))
-                            emit(Result.success(ProgressState.Progress(resultAccelerometerPackage.size.toFloat() / expectedDataSize.toFloat())))
-
-                            historyCharacteristic.write(DataByteArray.from(5))
-                            value = historyCharacteristic.read().value
+                        } else {
+                            value.asList().subList(4, value.size)
 
                         }
 
-                        emit(
-                            Result.success(
-                                ProgressState.Finished(
-                                    resultAccelerometerPackage.withIndex().map {
-                                        Ble.Accelerometer.SpectrePoint(
-                                            frequency = frequencyInterval!! * it.index + initialValue!!,
-                                            value = (it.value * accelScale.k) / Short.MAX_VALUE
-                                        )
-                                    }
-                                )
-                            )
+                        nextPackageDataCount = value.get2byteUIntAt(2)
 
+                        resultAccelerometerPackage.addAll(
+                            accelerometerDataArray.chunked(2).map {
+                                it.toByteArray().get2byteShortAt().toFloat()
+                            }.toMutableList()
                         )
 
-                        characteristic.write(DataByteArray(byteArrayOf(
+                        expectedDataSize =
+                            nextPackageDataCount.toInt() + resultAccelerometerPackage.size
+
+                        emit(Result.success(ProgressState.Progress(0f / expectedDataSize.toFloat())))
+                        emit(Result.success(ProgressState.Progress(resultAccelerometerPackage.size.toFloat() / expectedDataSize.toFloat())))
+
+                        historyCharacteristic.write(byteArrayOf(5))
+                        value = historyCharacteristic.read()
+
+                    }
+
+                    emit(
+                        Result.success(
+                            ProgressState.Finished(
+                                resultAccelerometerPackage.withIndex().map {
+                                    Ble.Accelerometer.SpectrePoint(
+                                        frequency = frequencyInterval!! * it.index + initialValue!!,
+                                        value = (it.value * accelScale.k) / Short.MAX_VALUE
+                                    )
+                                }
+                            )
+                        )
+
+                    )
+
+                    characteristic.write(
+                        byteArrayOf(
                             4,
                             accelMode.sendData,
                             accelScale.sendData,
@@ -156,32 +162,26 @@ fun readAccelerometerSpectre(
                             fftAxis.sendData,
                             frequency.sendData,
                             2
-                        )))
+                        )
 
-                    }
+                    )
 
                 }
 
-
-            } catch (err: Throwable) {
-
-                err.printStackTrace()
-                emit(Result.failure(BleException.UnexpectedResponse))
-
-            } finally {
-
-                connection.close()
-
             }
 
-        } else {
 
-            emit(Result.failure(BleException.PermissionDenied))
+        } catch (err: Throwable) {
+
+            err.printStackTrace()
+            emit(Result.failure(BleException.UnexpectedResponse))
+
+        } finally {
+
+            peripheral.disconnect()
 
         }
 
     }
 
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/data/repository/ReadHostHistory.kt b/app/src/main/java/llc/arma/ble/data/repository/ReadHostHistory.kt
index 2cbeea8..a95c83a 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/ReadHostHistory.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/ReadHostHistory.kt
@@ -2,35 +2,32 @@ package llc.arma.ble.data.repository
 
 import android.app.Application
 import android.util.Log
-import androidx.annotation.RequiresPermission
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import llc.arma.ble.data.repository.extensions.checkPermission
 import llc.arma.ble.data.repository.extensions.get2byteUIntAt
 import llc.arma.ble.data.repository.extensions.get4byteUIntAt
 import llc.arma.ble.domain.Result
 import llc.arma.ble.domain.common.BleException
 import llc.arma.ble.domain.common.ProgressState
 import llc.arma.ble.domain.model.Ble
-import no.nordicsemi.android.common.core.DataByteArray
-import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
-import no.nordicsemi.android.kotlin.ble.client.main.service.ClientBleGattCharacteristic
+import no.nordicsemi.kotlin.ble.client.RemoteCharacteristic
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
+import no.nordicsemi.kotlin.ble.client.android.native
 import java.nio.ByteBuffer
 import java.util.BitSet
 import java.util.Locale
 
-@RequiresPermission(allOf = ["android.permission.BLUETOOTH_CONNECT"])
 suspend fun readTable(
-    characteristic: ClientBleGattCharacteristic,
+    characteristic: RemoteCharacteristic,
     startRequest: ByteArray,
     nextRequestPayload: ByteArray
 ): List<Byte> {
 
-    characteristic.write(DataByteArray(startRequest))
-    var value = characteristic.read().value
+    characteristic.write(startRequest)
+    var value = characteristic.read()
     val tableResult = mutableListOf<Byte>()
 
     do {
@@ -44,8 +41,8 @@ suspend fun readTable(
 
             tableResult.addAll(value.asList().subList(4, value.size))
 
-            characteristic.write(DataByteArray(nextRequestPayload))
-            value = characteristic.read().value
+            characteristic.write(nextRequestPayload)
+            value = characteristic.read()
 
         }
 
@@ -63,217 +60,218 @@ fun readHostHistory(
 
     return flow {
 
-        if (app.checkPermission()) {
+        val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.Main))
 
-            val connection =
-                ClientBleGatt.connect(app, address, CoroutineScope(Dispatchers.Default))
+        val peripheral = centralManager.connectPeripheral(address)
+            ?: throw IllegalStateException()
 
-            try {
+        try {
 
-                val characteristic = connection.discoverServices()
-                    .findService(serviceUUID)
-                    ?.findCharacteristic(hostHistoryReadUUID)
-                    ?: throw IllegalStateException()
+            val characteristic = peripheral?.discoverServices()
+                ?.findService(serviceUUID)
+                ?.findCharacteristic(hostHistoryReadUUID)
+                ?: throw IllegalStateException()
 
-                characteristic.write(DataByteArray.from(2))
+            characteristic.write(byteArrayOf(2))
 
-                var value = characteristic.read().value
+            var value = characteristic.read()
 
-                if (value.contentEquals(byteArrayOf(0, 0))) {
+            if (value.contentEquals(byteArrayOf(0, 0))) {
 
-                    emit(Result.success(ProgressState.Finished(emptyList())))
+                emit(Result.success(ProgressState.Finished(emptyList())))
 
-                } else {
+            } else {
 
-                    val dataTablePackage: MutableList<Byte> = mutableListOf()
-                    val secondTablePackage: MutableList<Byte> = mutableListOf()
+                val dataTablePackage: MutableList<Byte> = mutableListOf()
+                val secondTablePackage: MutableList<Byte> = mutableListOf()
 
-                    var tableSize = value.get2byteUIntAt(0)
+                var tableSize = value.get2byteUIntAt(0)
 
-                    //Чтение без удаления
-                    characteristic.write(DataByteArray.from(1, 0, 0, -1, -1))
-                    val firstTableHeader = characteristic.read().value.asList()
-                    dataTablePackage.addAll(firstTableHeader.subList(4, firstTableHeader.size))
+                //Чтение без удаления
+                characteristic.write(byteArrayOf(1, 0, 0, -1, -1))
+                val firstTableHeader = characteristic.read().asList()
+                dataTablePackage.addAll(firstTableHeader.subList(4, firstTableHeader.size))
 
-                    secondTablePackage.addAll(
-                        readTable(characteristic, byteArrayOf(6), byteArrayOf(6))
+                secondTablePackage.addAll(
+                    readTable(characteristic, byteArrayOf(6), byteArrayOf(6))
+                )
+
+                dataTablePackage.addAll(
+                    readTable(
+                        characteristic,
+                        byteArrayOf(5),
+                        byteArrayOf(5)
                     )
+                )
 
-                    dataTablePackage.addAll(
-                        readTable(
-                            characteristic,
-                            byteArrayOf(5),
-                            byteArrayOf(5)
-                        )
-                    )
+                Log.d("table", dataTablePackage.joinToString { it.toString() })
 
-                    Log.d("table", dataTablePackage.joinToString { it.toString() })
+                val bleMeasureInterval = dataTablePackage.toByteArray().get4byteUIntAt(0).toLong()
+                val bleLastMeasureTime = dataTablePackage.toByteArray().get4byteUIntAt(4).toLong()
+                val bleRealTime = dataTablePackage.toByteArray().get4byteUIntAt(8).toLong()
+                val lastMeasureSystemTime =
+                    System.currentTimeMillis() - ((bleRealTime - bleLastMeasureTime) * 1_000)
 
-                    val bleMeasureInterval = dataTablePackage.toByteArray().get4byteUIntAt(0).toLong()
-                    val bleLastMeasureTime = dataTablePackage.toByteArray().get4byteUIntAt(4).toLong()
-                    val bleRealTime = dataTablePackage.toByteArray().get4byteUIntAt(8).toLong()
-                    val lastMeasureSystemTime = System.currentTimeMillis() - ((bleRealTime - bleLastMeasureTime) * 1_000)
+                Log.i(
+                    "BLEK-LOG",
+                    "Вермя последнего: ${bleLastMeasureTime} Реальное время: ${bleRealTime}"
+                )
 
-                    Log.i("BLEK-LOG", "Вермя последнего: ${bleLastMeasureTime} Реальное время: ${bleRealTime}")
+                fun getBleIdIndex(bytes: ByteArray): UInt {
 
-                    fun getBleIdIndex(bytes: ByteArray): UInt{
+                    val bits = BitSet.valueOf(bytes)
+                    bits.clear(12, 16)
 
-                        val bits = BitSet.valueOf(bytes)
-                        bits.clear(12, 16)
-
-                        val arr = bits.toByteArray()
-
-                        if(arr.isEmpty()){
-                            return 0x00.toUInt()
-                        }
-
-                        if(arr.size == 1){
-                            return arr[0].toUInt()
-                        }
-
-                        return arr.get2byteUIntAt(0)
+                    val arr = bits.toByteArray()
 
+                    if (arr.isEmpty()) {
+                        return 0x00.toUInt()
                     }
 
-                    fun getInnerIndex(byte: Byte): Int{
-
-                        var bits = BitSet.valueOf(byteArrayOf(byte))
-                        bits.clear(0, 4)
-                        bits = bits.get(4, 8)
-                        val arr = bits.toByteArray()
-
-                        if(arr.isEmpty()){
-                            return 0x00
-                        }
-
-                        return bits.toByteArray()[0].toInt()
-
+                    if (arr.size == 1) {
+                        return arr[0].toUInt()
                     }
 
-                    fun getDevType(byte: Byte): Int{
-
-                        val bits = BitSet.valueOf(byteArrayOf(byte))
-                        bits.clear(5, 9)
-                        val arr = bits.toByteArray()
-
-                        if(arr.isEmpty()){
-                            return 0x00
-                        }
-
-                        return bits.toByteArray()[0].toInt()
-
-                    }
-
-                    fun getDevDataSize(byte: Byte): Int{
-
-                        var bits = BitSet.valueOf(byteArrayOf(byte))
-                        bits.clear(0, 5)
-                        bits = bits.get(5, 8)
-                        val arr = bits.toByteArray()
-
-                        if(arr.isEmpty()){
-                            return 0x00
-                        }
-
-                        return bits.toByteArray()[0].toInt()
-
-                    }
-
-                    var bleTableOffset = 12
-                    var periods = mutableListOf<Pair<Boolean, List<String>>>()
-
-                    var periodBle = mutableListOf<String>()
-
-                    do {
-
-                        val bleIdTableCell =
-                            dataTablePackage.drop(bleTableOffset).take(2).toByteArray()
-
-                        val intervalEnd = "ff0f"
-                        val intervalEndAndHit = "fe0f"
-
-                        if (bleIdTableCell.contentEquals(intervalEnd.hexToByteArray())) {
-
-                            bleTableOffset += 2
-                            if(periodBle.isEmpty()) bleTableOffset += 2
-                            periods.add(Pair(false, periodBle))
-                            periodBle = mutableListOf()
-
-                            continue
-                        }
-
-                        if (bleIdTableCell.contentEquals(intervalEndAndHit.hexToByteArray())) {
-                            bleTableOffset += 2
-                            if(periodBle.isEmpty()) bleTableOffset += 2
-                            periods.add(Pair(true, periodBle))
-                            periodBle = mutableListOf()
-
-                            continue
-                        }
-
-                        val innerIndex = getInnerIndex(bleIdTableCell[1])
-
-                        val bleTableIndex = getBleIdIndex(bleIdTableCell) * 8u
-
-                        val serial =
-                            secondTablePackage.drop(bleTableIndex.toInt()).take(6).reversed()
-                                .joinToString(
-                                    separator = ":",
-                                    transform = { it.toHexString().padStart(2, '0') })
-                                .uppercase(Locale.getDefault())
-                        val devTypeByte = secondTablePackage.drop(bleTableIndex.toInt() + 6)[0]
-
-                        val devType = getDevType(devTypeByte)
-                        val devDataSize = getDevDataSize(devTypeByte)
-                        bleTableOffset += 2
-
-                        if(innerIndex == 0)
-                            bleTableOffset += 2
-
-                        if (devDataSize != 0) {
-                            val payload = //getBleIdIndex(
-                                dataTablePackage.drop(bleTableOffset).take(devDataSize)
-                                    .toByteArray()
-                            //)
-                            Log.d("payload", "${payload.joinToString(separator = " ")} ${payload.toHexString()}")
-                            bleTableOffset += devDataSize
-                        }
-
-                        periodBle.add(serial)
-
-                    } while (bleTableOffset < dataTablePackage.size)
-
-                    emit(
-                        Result.success(
-                            ProgressState.Finished(
-                                periods.withIndex().map {
-                                    Ble.Gate.HistoryPoint(
-                                        date = lastMeasureSystemTime - (((periods.size - 1) - it.index) * bleMeasureInterval),
-                                        hit = it.value.first,
-                                        value = it.value.second
-                                    )
-                                }
-                            )
-                        )
-
-                    )
+                    return arr.get2byteUIntAt(0)
 
                 }
 
+                fun getInnerIndex(byte: Byte): Int {
 
-            } catch (err: Throwable) {
-                err.printStackTrace()
-                emit(Result.failure(BleException.UnexpectedResponse))
+                    var bits = BitSet.valueOf(byteArrayOf(byte))
+                    bits.clear(0, 4)
+                    bits = bits.get(4, 8)
+                    val arr = bits.toByteArray()
 
-            } finally {
+                    if (arr.isEmpty()) {
+                        return 0x00
+                    }
 
-                connection.close()
+                    return bits.toByteArray()[0].toInt()
+
+                }
+
+                fun getDevType(byte: Byte): Int {
+
+                    val bits = BitSet.valueOf(byteArrayOf(byte))
+                    bits.clear(5, 9)
+                    val arr = bits.toByteArray()
+
+                    if (arr.isEmpty()) {
+                        return 0x00
+                    }
+
+                    return bits.toByteArray()[0].toInt()
+
+                }
+
+                fun getDevDataSize(byte: Byte): Int {
+
+                    var bits = BitSet.valueOf(byteArrayOf(byte))
+                    bits.clear(0, 5)
+                    bits = bits.get(5, 8)
+                    val arr = bits.toByteArray()
+
+                    if (arr.isEmpty()) {
+                        return 0x00
+                    }
+
+                    return bits.toByteArray()[0].toInt()
+
+                }
+
+                var bleTableOffset = 12
+                var periods = mutableListOf<Pair<Boolean, List<String>>>()
+
+                var periodBle = mutableListOf<String>()
+
+                do {
+
+                    val bleIdTableCell =
+                        dataTablePackage.drop(bleTableOffset).take(2).toByteArray()
+
+                    val intervalEnd = "ff0f"
+                    val intervalEndAndHit = "fe0f"
+
+                    if (bleIdTableCell.contentEquals(intervalEnd.hexToByteArray())) {
+
+                        bleTableOffset += 2
+                        if (periodBle.isEmpty()) bleTableOffset += 2
+                        periods.add(Pair(false, periodBle))
+                        periodBle = mutableListOf()
+
+                        continue
+                    }
+
+                    if (bleIdTableCell.contentEquals(intervalEndAndHit.hexToByteArray())) {
+                        bleTableOffset += 2
+                        if (periodBle.isEmpty()) bleTableOffset += 2
+                        periods.add(Pair(true, periodBle))
+                        periodBle = mutableListOf()
+
+                        continue
+                    }
+
+                    val innerIndex = getInnerIndex(bleIdTableCell[1])
+
+                    val bleTableIndex = getBleIdIndex(bleIdTableCell) * 8u
+
+                    val serial =
+                        secondTablePackage.drop(bleTableIndex.toInt()).take(6).reversed()
+                            .joinToString(
+                                separator = ":",
+                                transform = { it.toHexString().padStart(2, '0') })
+                            .uppercase(Locale.getDefault())
+                    val devTypeByte = secondTablePackage.drop(bleTableIndex.toInt() + 6)[0]
+
+                    val devType = getDevType(devTypeByte)
+                    val devDataSize = getDevDataSize(devTypeByte)
+                    bleTableOffset += 2
+
+                    if (innerIndex == 0)
+                        bleTableOffset += 2
+
+                    if (devDataSize != 0) {
+                        val payload = //getBleIdIndex(
+                            dataTablePackage.drop(bleTableOffset).take(devDataSize)
+                                .toByteArray()
+                        //)
+                        Log.d(
+                            "payload",
+                            "${payload.joinToString(separator = " ")} ${payload.toHexString()}"
+                        )
+                        bleTableOffset += devDataSize
+                    }
+
+                    periodBle.add(serial)
+
+                } while (bleTableOffset < dataTablePackage.size)
+
+                emit(
+                    Result.success(
+                        ProgressState.Finished(
+                            periods.withIndex().map {
+                                Ble.Gate.HistoryPoint(
+                                    date = lastMeasureSystemTime - (((periods.size - 1) - it.index) * bleMeasureInterval),
+                                    hit = it.value.first,
+                                    value = it.value.second
+                                )
+                            }
+                        )
+                    )
+
+                )
 
             }
 
-        } else {
 
-            emit(Result.failure(BleException.PermissionDenied))
+        } catch (err: Throwable) {
+            err.printStackTrace()
+            emit(Result.failure(BleException.UnexpectedResponse))
+
+        } finally {
+
+            peripheral.disconnect()
 
         }
 
@@ -287,68 +285,53 @@ suspend fun readHostBleTable(
     app: Application,
 ): Result<List<String>, BleException> {
 
-    return if (app.checkPermission()) {
+    val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.Main))
+    val peripheral = centralManager.connectPeripheral(address)
+        ?: return Result.failure(BleException.UnexpectedResponse)
 
-        val connection =
-            ClientBleGatt.connect(app, address, CoroutineScope(Dispatchers.Default))
+    return try {
 
-        try {
+        val characteristic = peripheral.discoverServices()
+            ?.findService(serviceUUID)
+            ?.findCharacteristic(hostHistoryReadUUID)
+            ?: throw IllegalStateException()
 
-            val characteristic = connection.discoverServices()
-                .findService(serviceUUID)
-                ?.findCharacteristic(hostHistoryReadUUID)
-                ?: throw IllegalStateException()
+        characteristic.write(byteArrayOf(7))
 
-            characteristic.write(DataByteArray.from(7))
+        var value = characteristic.read()
 
-            var value = characteristic.read().value
+        if (value.contentEquals(byteArrayOf(0, 0))) {
 
-            if (value.contentEquals(byteArrayOf(0, 0))) {
+            Result.success(emptyList())
 
-                Result.success(emptyList())
+        } else {
 
-            } else {
+            var tableSize = value.get2byteUIntAt(0)
 
-                var tableSize = value.get2byteUIntAt(0)
+            characteristic.write(byteArrayOf(1, 0, 0) + value)
+            value = characteristic.read()
 
-                val writeData = mutableListOf(
-                    1.toByte(),
-                    0.toByte(),
-                    0.toByte()
-                ).apply {
-                    addAll(value.toList())
-                }.toByteArray()
-
-                characteristic.write(DataByteArray(writeData))
-                value = characteristic.read().value
-
-                Result.success(
-                    readTable(characteristic, byteArrayOf(6), byteArrayOf(6)).chunked(8).map {
-                        it.take(6)
-                            .reversed()
-                            .joinToString(
-                                separator = ":",
-                                transform = { it.toHexString().padStart(2, '0') })
-                            .uppercase(Locale.getDefault())
-                    }
-                )
-
-            }
-
-
-        } catch (err: Throwable) {
-
-            Result.failure(BleException.UnexpectedResponse)
-
-        } finally {
-
-            connection.close()
+            Result.success(
+                readTable(characteristic, byteArrayOf(6), byteArrayOf(6)).chunked(8).map {
+                    it.take(6)
+                        .reversed()
+                        .joinToString(
+                            separator = ":",
+                            transform = { it.toHexString().padStart(2, '0') })
+                        .uppercase(Locale.getDefault())
+                }
+            )
 
         }
 
-    } else {
 
-        Result.failure(BleException.PermissionDenied)
+    } catch (err: Throwable) {
+
+        Result.failure(BleException.UnexpectedResponse)
+
+    } finally {
+
+        peripheral.disconnect()
 
     }
 
@@ -361,61 +344,54 @@ suspend fun editBleHostTable(
     app: Application,
 ): Result<Int, BleException> {
 
-    return if (app.checkPermission()) {
+    val centralManager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.Default))
+    val peripheral = centralManager.connectPeripheral(address) ?: throw IllegalStateException()
 
-        val connection =
-            ClientBleGatt.connect(app, address, CoroutineScope(Dispatchers.Default))
+    return try {
 
-        try {
+        val characteristic = peripheral.discoverServices()
+            ?.findService(serviceUUID)
+            ?.findCharacteristic(flashWriteUUID)
+            ?: throw IllegalStateException()
 
-            val characteristic = connection.discoverServices()
-                .findService(serviceUUID)
-                ?.findCharacteristic(flashWriteUUID)
-                ?: throw IllegalStateException()
+        characteristic.write(byteArrayOf(12, 1))
 
-            characteristic.write(DataByteArray.from(12, 1))
+        Log.i("ScanRecord", "write")
 
-            Log.i("ScanRecord", "write")
+        val writeCount = addBleAddress.chunked(20).sumOf { bleAddressBatch ->
 
-            val writeCount = addBleAddress.chunked(20).sumOf { bleAddressBatch ->
+            val countPayload =
+                ByteBuffer.allocate(2).putShort(bleAddressBatch.size.toShort()).array().reversed()
+                    .toByteArray()
 
-                val countPayload = ByteBuffer.allocate(2).putShort(bleAddressBatch.size.toShort()).array().reversed().toByteArray()
+            val command = "0b00".hexToByteArray()
 
-                val command = "0b00".hexToByteArray()
+            val serialPayload = bleAddressBatch.flatMap {
+                it.replace(":", "").lowercase(Locale.CANADA).hexToByteArray().reversed().toList()
+            }.toByteArray()
 
-                val serialPayload = bleAddressBatch.flatMap {
-                    it.replace(":", "").lowercase(Locale.CANADA).hexToByteArray().reversed().toList()
-                }.toByteArray()
-
-                characteristic.write(DataByteArray.from(*command, *countPayload, *serialPayload))
-                characteristic.read().value.get2byteUIntAt(0).toInt()
-
-            }
-
-            characteristic.write(
-                DataByteArray.from(9)
-            )
-
-            delay(10_000)
-
-            Result.success(writeCount)
-
-        } catch (err: Throwable) {
-
-            err.printStackTrace()
-
-            Result.failure(BleException.UnexpectedResponse)
-
-        } finally {
-
-            connection.close()
+            characteristic.write(byteArrayOf(*command, *countPayload, *serialPayload))
+            characteristic.read().get2byteUIntAt(0).toInt()
 
         }
 
-    } else {
+        characteristic.write(byteArrayOf(9))
 
-        Result.failure(BleException.PermissionDenied)
+        delay(10_000)
+
+        Result.success(writeCount)
+
+    } catch (err: Throwable) {
+
+        err.printStackTrace()
+
+        Result.failure(BleException.UnexpectedResponse)
+
+    } finally {
+
+        peripheral.disconnect()
 
     }
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/data/repository/ReadTemperatureHistory.kt b/app/src/main/java/llc/arma/ble/data/repository/ReadTemperatureHistory.kt
index a79a595..42659f4 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/ReadTemperatureHistory.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/ReadTemperatureHistory.kt
@@ -3,143 +3,126 @@ package llc.arma.ble.data.repository
 import android.app.Application
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import llc.arma.ble.data.repository.extensions.checkPermission
 import llc.arma.ble.data.repository.extensions.get2byteUIntAt
 import llc.arma.ble.data.repository.extensions.get4byteUIntAt
 import llc.arma.ble.data.repository.extensions.toTemperature
 import llc.arma.ble.domain.Result
 import llc.arma.ble.domain.common.BleException
-import llc.arma.ble.domain.common.ProgressState
 import llc.arma.ble.domain.model.Ble
-import no.nordicsemi.android.common.core.DataByteArray
-import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
 
 @OptIn(ExperimentalUnsignedTypes::class)
-fun readThermometerHistory(
+suspend fun readThermometerHistory(
     address: String,
     app: Application,
-): Flow<Result<ProgressState<List<Ble.Thermometer.HistoryPoint>>, BleException>> {
+): Result<List<Ble.Thermometer.HistoryPoint>, BleException> {
 
-    return flow {
+    var lastMeasureSystemTime: Long? = null
 
-        var lastMeasureSystemTime: Long? = null
+    var bleMeasureInterval: Long? = null
+    var bleRealTime: Long? = null
+    var bleLastMeasureTime: Long? = null
 
-        var bleMeasureInterval: Long? = null
-        var bleRealTime: Long? = null
-        var bleLastMeasureTime: Long? = null
+    val resultTemperaturePackage: MutableList<Float> = mutableListOf()
 
-        val resultTemperaturePackage: MutableList<Float> = mutableListOf()
+    var expectedDataSize: Int? = null
 
-        var expectedDataSize: Int? = null
+    val peripheral =
+        CentralManager.Factory.connectPeripheral(
+            address,
+            app,
+            CoroutineScope(Dispatchers.Default)
+        )
 
-        if (app.checkPermission()) {
+    return try {
 
-            val connection =
-                ClientBleGatt.connect(app, address, CoroutineScope(Dispatchers.Default))
+        val characteristic = peripheral?.discoverServices()
+            ?.findService(serviceUUID)
+            ?.findCharacteristic(temperatureHistoryReadUUID)
+            ?: throw IllegalStateException()
 
-            try {
+        characteristic.write(byteArrayOf(2))
 
-                val characteristic = connection.discoverServices()
-                    .findService(serviceUUID)
-                    ?.findCharacteristic(temperatureHistoryReadUUID)
-                    ?: throw IllegalStateException()
+        var value = characteristic.read()
 
-                characteristic.write(DataByteArray.from(2))
+        if (value.contentEquals(byteArrayOf(0, 0))) {
 
-                var value = characteristic.read().value
-
-                if (value.contentEquals(byteArrayOf(0, 0))) {
-
-                    emit(Result.success(ProgressState.Finished(emptyList())))
-
-                } else {
-
-                    var nextPackageDataCount = value.get2byteUIntAt(0)
-
-                    val writeData = mutableListOf(
-                        1.toByte(),
-                        0.toByte(),
-                        0.toByte()
-                    ).apply {
-                        addAll(value.toList())
-                    }.toByteArray()
-
-                    characteristic.write(DataByteArray(writeData))
-                    value = characteristic.read().value
-
-                    while (nextPackageDataCount.toInt() != 0) {
-
-                        val temperatureDataArray = if (value[0] == 250.toByte()) {
-
-                            bleMeasureInterval = value.get4byteUIntAt(4).toLong()
-                            bleLastMeasureTime = value.get4byteUIntAt(8).toLong()
-                            bleRealTime = value.get4byteUIntAt(12).toLong()
-
-                            lastMeasureSystemTime =
-                                System.currentTimeMillis() - ((bleRealTime - bleLastMeasureTime) * 1_000)
-
-                            value.toUByteArray().asList().subList(16, value.size)
-
-                        } else {
-
-                            value.toUByteArray().asList().subList(4, value.size)
-
-                        }
-
-                        nextPackageDataCount = value.get2byteUIntAt(2)
-
-                        resultTemperaturePackage.addAll(
-                            temperatureDataArray.chunked(2).map {
-                                it.toUByteArray().toTemperature()
-                            }.toMutableList()
-                        )
-
-                        expectedDataSize =
-                            nextPackageDataCount.toInt() + resultTemperaturePackage.size
-
-                        emit(Result.success(ProgressState.Progress(0f / expectedDataSize.toFloat())))
-                        emit(Result.success(ProgressState.Progress(resultTemperaturePackage.size.toFloat() / expectedDataSize.toFloat())))
-
-                        characteristic.write(DataByteArray.from(5))
-                        value = characteristic.read().value
-
-                    }
-
-                    emit(
-                        Result.success(
-                            ProgressState.Finished(
-                                resultTemperaturePackage.withIndex().map {
-                                    Ble.Thermometer.HistoryPoint(
-                                        date = lastMeasureSystemTime!! - (((resultTemperaturePackage.size - 1) - it.index) * bleMeasureInterval!!),
-                                        value = it.value
-                                    )
-                                }
-                            )
-                        )
-
-                    )
-
-                }
-
-
-            } catch (err: Throwable) {
-
-                emit(Result.failure(BleException.UnexpectedResponse))
-
-            } finally {
-
-                connection.close()
-
-            }
+            Result.success(emptyList())
 
         } else {
 
-            emit(Result.failure(BleException.PermissionDenied))
+            var nextPackageDataCount = value.get2byteUIntAt(0)
+
+            val writeData = mutableListOf(
+                1.toByte(),
+                0.toByte(),
+                0.toByte()
+            ).apply {
+                addAll(value.toList())
+            }.toByteArray()
+
+            characteristic.write(writeData)
+            value = characteristic.read()
+
+            while (nextPackageDataCount.toInt() != 0) {
+
+                val temperatureDataArray = if (value[0] == 250.toByte()) {
+
+                    bleMeasureInterval = value.get4byteUIntAt(4).toLong()
+                    bleLastMeasureTime = value.get4byteUIntAt(8).toLong()
+                    bleRealTime = value.get4byteUIntAt(12).toLong()
+
+                    lastMeasureSystemTime =
+                        System.currentTimeMillis() - ((bleRealTime - bleLastMeasureTime) * 1_000)
+
+                    value.toUByteArray().asList().subList(16, value.size)
+
+                } else {
+
+                    value.toUByteArray().asList().subList(4, value.size)
+
+                }
+
+                nextPackageDataCount = value.get2byteUIntAt(2)
+
+                resultTemperaturePackage.addAll(
+                    temperatureDataArray.chunked(2).map {
+                        it.toUByteArray().toTemperature()
+                    }.toMutableList()
+                )
+
+                expectedDataSize =
+                    nextPackageDataCount.toInt() + resultTemperaturePackage.size
+
+                characteristic.write(byteArrayOf(5))
+                value = characteristic.read()
+
+            }
+
+
+            Result.success(
+                resultTemperaturePackage.withIndex().map {
+                    Ble.Thermometer.HistoryPoint(
+                        date = lastMeasureSystemTime!! - (((resultTemperaturePackage.size - 1) - it.index) * bleMeasureInterval!!),
+                        value = it.value
+                    )
+                }
+            )
+
+
 
         }
 
+    } catch (err: Throwable) {
+
+        err.printStackTrace()
+
+        Result.failure(BleException.UnexpectedResponse)
+
+    } finally {
+
+        peripheral?.disconnect()
+
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/llc/arma/ble/data/repository/extensions/BleEnumExtensions.kt b/app/src/main/java/llc/arma/ble/data/repository/extensions/BleEnumExtensions.kt
index 8650e60..3a2a9db 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/extensions/BleEnumExtensions.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/extensions/BleEnumExtensions.kt
@@ -8,7 +8,7 @@ import llc.arma.ble.domain.usecase.FftFrequency
 import llc.arma.ble.domain.usecase.FftViewMode
 
 fun Ble.BleState.TX.Companion.fromByte(byte: Byte): Ble.BleState.TX? {
-    return Ble.BleState.TX.values().associateBy { it.sendData }[byte]
+    return Ble.BleState.TX.entries.associateBy { it.sendData }[byte]
 }
 
 val Ble.BleState.TX.sendData: Byte
@@ -63,7 +63,7 @@ val FftViewMode.sendData: Byte
     }
 
 fun AccelViewMode.Companion.fromByte(byte: Byte): AccelViewMode? {
-    return AccelViewMode.values().associateBy { it.sendData }[byte]
+    return AccelViewMode.entries.associateBy { it.sendData }[byte]
 }
 
 val AccelViewMode.sendData: Byte
@@ -79,7 +79,7 @@ val AccelViewMode.sendData: Byte
     }
 
 fun AccelScale.Companion.fromByte(byte: Byte): AccelScale? {
-    return AccelScale.values().associateBy { it.sendData }[byte]
+    return AccelScale.entries.associateBy { it.sendData }[byte]
 }
 
 val AccelScale.sendData: Byte
diff --git a/app/src/main/java/llc/arma/ble/data/repository/extensions/BleScanResultExtensions.kt b/app/src/main/java/llc/arma/ble/data/repository/extensions/BleScanResultExtensions.kt
index 2bed106..fca0eba 100644
--- a/app/src/main/java/llc/arma/ble/data/repository/extensions/BleScanResultExtensions.kt
+++ b/app/src/main/java/llc/arma/ble/data/repository/extensions/BleScanResultExtensions.kt
@@ -1,52 +1,46 @@
 package llc.arma.ble.data.repository.extensions
 
 import llc.arma.ble.domain.model.BleInfo
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResult
+import no.nordicsemi.kotlin.ble.client.android.ScanResult
 
-val BleScanResult.timerEnabled: BleInfo.HistoryTableStatus
+val ScanResult.timerEnabled: BleInfo.HistoryTableStatus
     get() {
-        return when(data?.scanRecord?.manufacturerSpecificData?.get(89)?.getByte(2)){
+
+        return when(advertisingData.manufacturerData[89]?.get(2)){
             1.toByte() -> BleInfo.HistoryTableStatus.NOT_EMPTY
             2.toByte() -> BleInfo.HistoryTableStatus.EMPTY
             else -> BleInfo.HistoryTableStatus.DISABLED
         }
     }
 
-val BleScanResult.info: BleInfo
+val ScanResult.info: BleInfo
     get() {
-        this.device.name
+        this.timestamp
         return BleInfo(
-            name = this.device.name ?: "",
-            serial = device.address,
+            name = peripheral.name ?: "",
+            serial = peripheral.address,
             batteryLevel = batteryLevel ?: 0,
-            rssi = data?.rssi,
+            rssi = rssi,
             type = type,
-            scanTime = (data?.timestampNanos ?: 0) / 1_000_000,
-            tx = data?.scanRecord?.txPowerLevel ?: 0,
+            scanTime = (timestamp ?: 0) / 1_000,
+            tx = advertisingData.txPowerLevel ?: 0,
             tableStatus = timerEnabled
         )
     }
 
-val BleScanResult.batteryLevel: Int?
+val ScanResult.batteryLevel: Int?
     get() {
 
-        val level = data?.scanRecord?.manufacturerSpecificData?.get(89)?.getByte(1)
+        val level = advertisingData.manufacturerData[89]?.get(1)
             ?.toUByte()?.toInt()
 
-        if(data?.scanRecord?.deviceName?.contains("N00051023") == true){
-
-            println(level)
-            println(data?.scanRecord?.manufacturerSpecificData?.get(89))
-
-        }
-
         return level
 
     }
 
-val BleScanResult.type: BleInfo.Type
+val ScanResult.type: BleInfo.Type
     get() {
-        return when(data?.scanRecord?.manufacturerSpecificData?.get(89)?.getByte(0)?.toUByte()?.toInt()){
+        return when(advertisingData.manufacturerData[89]?.get(0)?.toUByte()?.toInt()){
             4 -> BleInfo.Type.HOST
             1 -> BleInfo.Type.BEACON
             2 -> BleInfo.Type.THERMOMETER
diff --git a/app/src/main/java/llc/arma/ble/domain/model/Ble.kt b/app/src/main/java/llc/arma/ble/domain/model/Ble.kt
index e964dd7..7cb2c4e 100644
--- a/app/src/main/java/llc/arma/ble/domain/model/Ble.kt
+++ b/app/src/main/java/llc/arma/ble/domain/model/Ble.kt
@@ -1,6 +1,8 @@
 package llc.arma.ble.domain.model
 
+import kotlinx.serialization.Serializable
 import llc.arma.ble.data.repository.BleRepositoryImpl
+import llc.arma.ble.domain.model.Ble.Gate.HostState
 import llc.arma.ble.domain.usecase.AccelScale
 import llc.arma.ble.domain.usecase.AccelViewMode
 
@@ -15,18 +17,22 @@ sealed class Ble(
         val accelerometerState: AccelerometerState
     ): Ble(info, state) {
 
+        @Serializable
         sealed class HistorySettings {
 
+            @Serializable
             data class Enabled(
                 val scale: AccelScale,
                 val mode: AccelViewMode,
                 val detailed: Boolean
             ) : HistorySettings()
 
+            @Serializable
             data object Disabled : HistorySettings()
 
         }
 
+        @Serializable
         data class WriteRequest(
             val tx: BleState.TX?,
             val saveHistorySettings: HistorySettings?,
@@ -99,6 +105,26 @@ sealed class Ble(
             val readInterval: Long
         )
 
+        fun copy(
+            info: BleInfo = this.info,
+            state: BleState = this.state,
+            accelerometerState: AccelerometerState = this.accelerometerState
+        ): Accelerometer {
+            return Accelerometer(info, state, accelerometerState)
+        }
+
+        override fun equals(other: Any?): Boolean {
+            return if(other is Accelerometer){
+                info == other.info && state == other.state && accelerometerState == other.accelerometerState
+            }else{
+                false
+            }
+        }
+
+        override fun hashCode(): Int {
+            return javaClass.hashCode()
+        }
+
     }
 
     class Beacon(
@@ -106,10 +132,30 @@ sealed class Ble(
         state: BleState,
     ) : Ble(info, state){
 
+        @Serializable
         data class WriteRequest(
             val tx: BleState.TX?
         )
 
+        fun copy(
+            info: BleInfo = this.info,
+            state: BleState = this.state,
+        ): Beacon {
+            return Beacon(info, state)
+        }
+
+        override fun equals(other: Any?): Boolean {
+            return if(other is Beacon){
+                info == other.info && state == other.state
+            } else {
+                false
+            }
+        }
+
+        override fun hashCode(): Int {
+            return javaClass.hashCode()
+        }
+
     }
 
     class Gate(
@@ -129,12 +175,33 @@ sealed class Ble(
             val readInterval: Long
         )
 
+        @Serializable
         data class WriteRequest(
             val tx: BleState.TX?,
             val interval: Long?,
             val readInterval: Long?,
         )
 
+        fun copy(
+            info: BleInfo = this.info,
+            state: BleState = this.state,
+            gateState: HostState = this.gateState
+        ): Gate {
+            return Gate(info, state, gateState)
+        }
+
+        override fun equals(other: Any?): Boolean {
+            return if(other is Gate){
+                info == other.info && state == other.state && gateState == other.gateState
+            }else{
+                false
+            }
+        }
+
+        override fun hashCode(): Int {
+            return javaClass.hashCode()
+        }
+
     }
 
     class Thermometer(
@@ -154,12 +221,33 @@ sealed class Ble(
             val historyInterval: Long
         )
 
+        @Serializable
         data class WriteRequest(
             val tx: BleState.TX?,
             val saveHistory: Boolean?,
             val historyInterval: Long?
         )
 
+        fun copy(
+            info: BleInfo = this.info,
+            state: BleState = this.state,
+            thermometerState: ThermometerState = this.thermometerState
+        ): Thermometer {
+            return Thermometer(info, state, thermometerState)
+        }
+
+        override fun equals(other: Any?): Boolean {
+            return if(other is Thermometer){
+                info == other.info && state == other.state && thermometerState == other.thermometerState
+            }else{
+                false
+            }
+        }
+
+        override fun hashCode(): Int {
+            return javaClass.hashCode()
+        }
+
     }
 
     data class BleState(
diff --git a/app/src/main/java/llc/arma/ble/domain/model/BleName.kt b/app/src/main/java/llc/arma/ble/domain/model/BleName.kt
index a052f63..4ff4441 100644
--- a/app/src/main/java/llc/arma/ble/domain/model/BleName.kt
+++ b/app/src/main/java/llc/arma/ble/domain/model/BleName.kt
@@ -1,5 +1,8 @@
 package llc.arma.ble.domain.model
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 data class BleName(
     val serial: String,
     val name: String
diff --git a/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt b/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt
index 00850b5..0379127 100644
--- a/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt
+++ b/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt
@@ -30,7 +30,7 @@ interface BleRepository {
 
     suspend fun getTemperatureHistoryBySerial(
         serial: String
-    ): Flow<Result<ProgressState<List<Ble.Thermometer.HistoryPoint>>, BleException>>
+    ): Result<List<Ble.Thermometer.HistoryPoint>, BleException>
 
     suspend fun writeBle(
         serial: String,
@@ -57,14 +57,14 @@ interface BleRepository {
         serial: String
     ): Result<Unit, BleException>
 
-    fun getAccelerometerMeasureBySerialFlow(
+    suspend fun getAccelerometerMeasureBySerialFlow(
         serial: String,
         accelScale: AccelScale,
         accelMode: AccelViewMode,
         fftAxis: FftAxis,
         fftMode: FftViewMode,
         frequency: FftFrequency
-    ): Flow<Result<Ble.Accelerometer.RealtimePoint, BleException>>
+    ): Result<Flow<Ble.Accelerometer.RealtimePoint>, BleException>
 
     suspend fun getAccelerometerSpectreBySerial(
         serial: String,
diff --git a/app/src/main/java/llc/arma/ble/domain/usecase/GetAccelerometerMeasureBySerialFlow.kt b/app/src/main/java/llc/arma/ble/domain/usecase/GetAccelerometerMeasureBySerialFlow.kt
index 4352389..018910a 100644
--- a/app/src/main/java/llc/arma/ble/domain/usecase/GetAccelerometerMeasureBySerialFlow.kt
+++ b/app/src/main/java/llc/arma/ble/domain/usecase/GetAccelerometerMeasureBySerialFlow.kt
@@ -11,14 +11,14 @@ class GetAccelerometerMeasureBySerialFlow @Inject constructor(
     private val bleRepository: BleRepository
 ) {
 
-    operator fun invoke(
+    suspend operator fun invoke(
         serial: String,
         accelScale: AccelScale,
         accelMode: AccelViewMode,
         fftAxis: FftAxis,
         fftMode: FftViewMode,
         frequency: FftFrequency
-    ): Flow<Result<Ble.Accelerometer.RealtimePoint, BleException>> {
+    ): Result<Flow<Ble.Accelerometer.RealtimePoint>, BleException> {
 
         return bleRepository.getAccelerometerMeasureBySerialFlow(serial, accelScale, accelMode, fftAxis, fftMode, frequency)
 
diff --git a/app/src/main/java/llc/arma/ble/domain/usecase/GetTemperatureHistoryBySerial.kt b/app/src/main/java/llc/arma/ble/domain/usecase/GetTemperatureHistoryBySerial.kt
index 1230181..ae3525c 100644
--- a/app/src/main/java/llc/arma/ble/domain/usecase/GetTemperatureHistoryBySerial.kt
+++ b/app/src/main/java/llc/arma/ble/domain/usecase/GetTemperatureHistoryBySerial.kt
@@ -12,7 +12,9 @@ class GetTemperatureHistoryBySerial @Inject constructor(
     private val bleRepository: BleRepository
 ) {
 
-    suspend operator fun invoke(serial: String): Flow<Result<ProgressState<List<Ble.Thermometer.HistoryPoint>>, BleException>> {
+    suspend operator fun invoke(
+        serial: String
+    ): Result<List<Ble.Thermometer.HistoryPoint>, BleException> {
 
         return bleRepository.getTemperatureHistoryBySerial(serial)
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 011661c..b13db4c 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -45,4 +45,6 @@ dependencies {
     implementation(libs.scanner)
     implementation(libs.client)
 
+    implementation("no.nordicsemi.kotlin.ble:client-android:2.0.0-alpha02")
+
 }
\ No newline at end of file
diff --git a/common/src/main/java/llc/arma/common/ClearAccelerometerHistory.kt b/common/src/main/java/llc/arma/common/ClearAccelerometerHistory.kt
new file mode 100644
index 0000000..f142879
--- /dev/null
+++ b/common/src/main/java/llc/arma/common/ClearAccelerometerHistory.kt
@@ -0,0 +1,95 @@
+package llc.arma.common
+
+import android.Manifest
+import android.app.Application
+import android.util.Log
+import androidx.annotation.RequiresPermission
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.withTimeoutOrNull
+import llc.arma.common.domain.Ble
+import llc.arma.common.domain.ProgressState
+import llc.arma.common.domain.Result
+import llc.arma.common.extensions.fromByte
+import llc.arma.common.extensions.get2byteShortAt
+import llc.arma.common.extensions.get2byteUIntAt
+import llc.arma.common.extensions.get4byteUIntAt
+import llc.arma.common.extensions.to4ByteArrayInLittleEndian
+import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
+import no.nordicsemi.android.kotlin.ble.client.main.service.ClientBleGattCharacteristic
+import no.nordicsemi.android.kotlin.ble.core.data.util.DataByteArray
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
+import no.nordicsemi.kotlin.ble.client.android.native
+import no.nordicsemi.kotlin.ble.core.WriteType
+import java.util.concurrent.TimeoutException
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+import kotlin.uuid.ExperimentalUuidApi
+
+@OptIn(ExperimentalUuidApi::class)
+@RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
+suspend fun clearAccelerometerHistory(
+    address: String,
+    app: Application,
+): Result<Unit, BleException> {
+
+    val manager = CentralManager.Factory.native(app, CoroutineScope(Dispatchers.Default))
+
+    val peripheral = manager.getPeripheralById(address) ?: return Result.failure(BleException.UnexpectedResponse)
+
+    try {
+
+        withTimeoutOrNull(
+            timeMillis = 10000,
+            block = {
+                manager.connect(
+                    peripheral,
+                    options = CentralManager.ConnectionOptions.AutoConnect,
+                )
+                return@withTimeoutOrNull peripheral
+            },
+        )
+
+        val service = peripheral.services().filter { it.isNotEmpty() }.firstOrNull()?.firstOrNull { it.uuid.toString() == serviceUUID.toString() }
+            ?: return Result.failure(BleException.UnexpectedResponse)
+
+        service.characteristics.firstOrNull {  it.uuid.toString() == saveEnabledWriteUUID.toString() }?.write(
+            byteArrayOf(4, 1, 3, 0), WriteType.WITH_RESPONSE
+        ) ?: return Result.failure(BleException.UnexpectedResponse)
+
+        service.characteristics.firstOrNull {  it.uuid.toString() == intervalWriteUUID.toString() }?.write(
+            mutableListOf<Byte>(3).apply {
+                addAll(
+                    30_000.toUInt().to4ByteArrayInLittleEndian().reversed().toList()
+                )
+            }.toByteArray(), WriteType.WITH_RESPONSE
+        )
+
+        service.characteristics.firstOrNull {  it.uuid.toString() == flashWriteUUID.toString() }?.write(
+            byteArrayOf(9), WriteType.WITH_RESPONSE
+        ) ?: return Result.failure(BleException.UnexpectedResponse)
+
+        return Result.success(Unit)
+
+
+    } catch (err: Throwable) {
+
+        err.printStackTrace()
+        return Result.failure(BleException.UnexpectedResponse)
+
+    } finally {
+
+        peripheral.disconnect()
+
+    }
+
+}
\ No newline at end of file
diff --git a/common/src/main/java/llc/arma/common/GetAccelerometerHistory.kt b/common/src/main/java/llc/arma/common/GetAccelerometerHistory.kt
index 169c99f..8199db9 100644
--- a/common/src/main/java/llc/arma/common/GetAccelerometerHistory.kt
+++ b/common/src/main/java/llc/arma/common/GetAccelerometerHistory.kt
@@ -15,9 +15,10 @@ import llc.arma.common.extensions.fromByte
 import llc.arma.common.extensions.get2byteShortAt
 import llc.arma.common.extensions.get2byteUIntAt
 import llc.arma.common.extensions.get4byteUIntAt
-import no.nordicsemi.android.common.core.DataByteArray
 import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
 import no.nordicsemi.android.kotlin.ble.client.main.service.ClientBleGattCharacteristic
+import no.nordicsemi.android.kotlin.ble.core.data.BleWriteType
+import no.nordicsemi.android.kotlin.ble.core.data.util.DataByteArray
 
 sealed class BleCommand(
     val command: ByteArray
diff --git a/common/src/main/java/llc/arma/common/GetAccelerometerRealtimeData.kt b/common/src/main/java/llc/arma/common/GetAccelerometerRealtimeData.kt
index 689be11..a51c5c5 100644
--- a/common/src/main/java/llc/arma/common/GetAccelerometerRealtimeData.kt
+++ b/common/src/main/java/llc/arma/common/GetAccelerometerRealtimeData.kt
@@ -10,7 +10,7 @@ import llc.arma.common.domain.Ble
 import llc.arma.common.domain.Result
 import llc.arma.common.extensions.get2byteShortAt
 import llc.arma.common.extensions.sendData
-import no.nordicsemi.android.common.core.DataByteArray
+import no.nordicsemi.android.kotlin.ble.core.data.util.DataByteArray
 import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
 
 @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
diff --git a/common/src/main/java/llc/arma/common/GetBleBySerial.kt b/common/src/main/java/llc/arma/common/GetBleBySerial.kt
index 79668aa..c6cd9e9 100644
--- a/common/src/main/java/llc/arma/common/GetBleBySerial.kt
+++ b/common/src/main/java/llc/arma/common/GetBleBySerial.kt
@@ -15,7 +15,7 @@ import llc.arma.common.domain.Version
 import llc.arma.common.extensions.fromByte
 import llc.arma.common.extensions.get4byteUIntAt
 import llc.arma.common.extensions.toTemperature
-import no.nordicsemi.android.common.core.DataByteArray
+import no.nordicsemi.android.kotlin.ble.core.data.util.DataByteArray
 import no.nordicsemi.android.kotlin.ble.client.main.service.ClientBleGattCharacteristic
 
 @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
diff --git a/common/src/main/java/llc/arma/common/ReadAccelerometerSpectre.kt b/common/src/main/java/llc/arma/common/ReadAccelerometerSpectre.kt
index 54f4d75..a1798b4 100644
--- a/common/src/main/java/llc/arma/common/ReadAccelerometerSpectre.kt
+++ b/common/src/main/java/llc/arma/common/ReadAccelerometerSpectre.kt
@@ -14,7 +14,7 @@ import llc.arma.common.extensions.get2byteShortAt
 import llc.arma.common.extensions.get2byteUIntAt
 import llc.arma.common.extensions.get4byteUIntAt
 import llc.arma.common.extensions.sendData
-import no.nordicsemi.android.common.core.DataByteArray
+import no.nordicsemi.android.kotlin.ble.core.data.util.DataByteArray
 import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
 import java.util.UUID
 
diff --git a/common/src/main/java/llc/arma/common/ReadHostHistory.kt b/common/src/main/java/llc/arma/common/ReadHostHistory.kt
index e585a37..c2f80b6 100644
--- a/common/src/main/java/llc/arma/common/ReadHostHistory.kt
+++ b/common/src/main/java/llc/arma/common/ReadHostHistory.kt
@@ -13,7 +13,7 @@ import llc.arma.common.domain.ProgressState
 import llc.arma.common.domain.Result
 import llc.arma.common.extensions.get2byteUIntAt
 import llc.arma.common.extensions.get4byteUIntAt
-import no.nordicsemi.android.common.core.DataByteArray
+import no.nordicsemi.android.kotlin.ble.core.data.util.DataByteArray
 import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
 import no.nordicsemi.android.kotlin.ble.client.main.service.ClientBleGattCharacteristic
 import java.nio.ByteBuffer
diff --git a/common/src/main/java/llc/arma/common/ReadTemperatureHistory.kt b/common/src/main/java/llc/arma/common/ReadTemperatureHistory.kt
index b01feac..5e78d31 100644
--- a/common/src/main/java/llc/arma/common/ReadTemperatureHistory.kt
+++ b/common/src/main/java/llc/arma/common/ReadTemperatureHistory.kt
@@ -12,7 +12,7 @@ import llc.arma.common.domain.Result
 import llc.arma.common.extensions.get2byteUIntAt
 import llc.arma.common.extensions.get4byteUIntAt
 import llc.arma.common.extensions.toTemperature
-import no.nordicsemi.android.common.core.DataByteArray
+import no.nordicsemi.android.kotlin.ble.core.data.util.DataByteArray
 import no.nordicsemi.android.kotlin.ble.client.main.callback.ClientBleGatt
 
 @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d273147..321470a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanistPermissions = "0.37.2"
 activityCompose = "1.10.1"
 agp = "8.9.1"
-client = "1.0.14"
+client = "1.3.1"
 kotlinParcelizeRuntime = "2.1.20"
 vico-version = "1.7.1"
 composeBom = "2025.04.00"
@@ -22,7 +22,7 @@ material = "1.7.8"
 material3 = "1.4.0-alpha15"
 navigationCompose = "2.9.0-beta01"
 room-version = "2.7.0"
-scanner = "1.0.14"
+scanner = "1.3.1"
 ui = "1.7.8"
 uiTestJunit4 = "1.7.8"
 uiTestManifest = "1.7.8"
diff --git a/vgate/build.gradle.kts b/vgate/build.gradle.kts
index 2fba8be..20a5c59 100644
--- a/vgate/build.gradle.kts
+++ b/vgate/build.gradle.kts
@@ -20,8 +20,8 @@ android {
         applicationId = "llc.arma.vgate"
         minSdk = 26
         targetSdk = 35
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/vgate/src/main/ic_launcher-playstore.png b/vgate/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eddf5e7f9eac4dc3115499f21e2b3771c83ea4e
GIT binary patch
literal 36680
zcmeEu^;=Y7yY2+tE!{04-7s`Wha%k)ihy(uA>Bx)(jg$J<RB;@B1$Sbba(ez<G1(O
z=Q{tvxvt|cBl6B#Z#;3|_w&5Q=xVFt<51&(Kp=c|H6?uz2m<^S0>Z)oK2ChcuRtI;
zNL@+Z(AQ$8^G$%^`t<GnEkp3WL>+CVe(Tt%{uVD8mkF(gn-B2kaTw|B+#Hj51PuPE
zJz(<H!ibu~nI<F5&f)CJY^sewU9sW04#D~K$jf`e2qFb60or?=du#<PrU+kIVG!^y
z(cpJrM&J_<3m?Q3L1Y7S1OdM!f+|2^z$YaUH3%5o2mb{EzRZLXfdNN7gz^7>_5W|v
z|5GM0`}U;9Oo^jp*-44SRXYC5<;**Ae+jI1ZFH-#ly>8;W$Fyq?pX9(e(Tx=WzA<^
z6w4htvQN_jb!?||8nZs%Ne6mc_U8nNE&6PTin=W9BQ9Zi?d0!+Gj235|9ap@5S^o3
zLyS#81UE^6)a^7F&ASjAF%1<H2w7%}Hw`9%uG6bj>&^VK>3bqfxf0cOJGp%Qv+H8S
za;TvC)pWpef9*rP;wk4Qnr^6h`Hp<|Gt5V7*TFV;Pxjm2{a<f+pi)pzsxL@PkrswI
zvV^>UMABa;+f&d;_)$JUFq7lvFAbm7k0Vmb4&)<$?S-hbWuNz}10O2Jd}N%@pG8>)
z)O;J6d-Bc%^HmhQ?x|57`9({ySn$SD+!a)`=rB3KQ8qB{D%hNTzXx#{H8GM}$R%g0
zO-*1P7@sy(u(;LfHXA@vt&Ji0`Y1WqvM59%g6KgQu=WS++_GBecS2%eAN6os;#$n)
zyCpDxdyGF39u0fF+qHcVu-{z9xDb@?@1MzWyG0k&RDMaWVcBXLT9woFqJ5SLxqVuy
zcHLHGF_dmiB*eH-?a#q5Ojcv4qJUbz0Hw#5UrwX0c%$(>HK*$z_Yl1H`b()oDH($&
zAf{S8AbRmB$jdVcHXJ9{qW}E0L6-hJ6VZJ<4)xt{ON{9%7qHr6IyJoOJd3dS5RT^6
z&uF2STFA?R-h5S~JZ7Ey+xAK}-aJ@8Uo&sA_Szp-;*Wo1vLZ6*k~XD=<&F=yyF0O9
z<Lg5nLF`bb!!31_g0m=I$*O{Sw!#I+1NQWx%<`MMW{&H+4vQNl%lXtXbP1-5${Frq
ztQy5$d79teI|L_r9~p`>=%*}t?N3c0;mZe_LeOj;YSupcA~0h~Dkl%O{`bLQ)kq3T
zmSuhSLsv>|vw+xlxJmDq`{uZ#`1{YV5Zha+E*UQS;_jJeCW*+t364*`9EPRB4JERS
zb%?7gY^HQ5uo3AIWEbiMH!4<SXN4gVr<kv7N52bEcJ83%B>jo?zr8h_zpd6^*)!Mj
z81~pby?XV_Vu<22r>sUYoQ{K`qUl?Bx%*agV?uKB_izk&vIa9d7c^y>^sp*O?3c^8
z;3mq?TFr}_;g#iTIM@L{#o>bwwNzjh?Xyq?wN)4triRX}x<LG~QbV;C&3fT8EZ*Fm
z<b&!<)lP6QcX=&gUIFtacd`kFfYjJzUT^IfSln%qIIK7|-Q)P^v^9=MKM@El`toGt
z<V;*5j{~kc%f~&&DR?*P`gP2oR(i`gb&g?b>7;t%s~y@jpUq#?rqyxN-W1<s)Xe!P
za>+_4&ao({eMQYff?3)168(+Z(14!m{ODM>+c8_|bkJm#s3i8?m6a3O?JqyJvJbMw
zp8T8`Deg{N7K1Xjp^QwcxWE>!Mo15@t&lUa$<RFAi|Tzo<@MvQ8(1sS^-1cPgv60g
zKXZ3OYR8>Q`0ZPVIyu7q{3-WUi%)IOCHyX>i5W|1fuvdzpOS23Y+RzU_^sS-@tK`q
z3w?J|S0iCXi+B)GiRPBL^@FRQ(nWLC0nYRaff{9PQ6BtGP%N$hz}C2I?WXhX4Hgz3
z%Nw`fm*o^LyttqkXV_RLy5LM(nHQ#MQJ#DF`FRw-Op7b+3YxsacX}XEf6v;P4OHqY
zt;)W*U8gr3yAIxJ8)ZW3{bW1W*vp=k`V72bwSYw7I|XVmNZsfG83mJ0fPOmp=P7z6
zB=U{whNOL+N#3y{*ONni_QB570QPh3y?3*ZKbL#FTBUE~fhRYF0wy5{I~o`KtId6z
zWF8cT5q>jX)-_s#EX{komp`lcInzUDb^g0dMt~NUUl6buKP^^T^_iTL3%LYM{oa>b
z_<xErmID=`2j5czIL>wVN@oo|w|XS4T8u%6j;?^yKcXH;X<8{SHP&LEIW73i@Unkb
zSEp`t;nfO7_f-0Suj6~?oYz&Tciq^yOlE)%mY)~uRrokKvB~NAN%dKVHM6f3Wj;*q
zG=F2t(yQY@E#c|j;nbd2toO+AA1c^@3xIJ3To}JPW$r~<kEKXawro^TZ$GqkJq5@6
z%T)gEneL>MzOQ#Cmi7^%JRHovY7HkkBKgn!5Y&ZpQ@?$F$_rDq3^KXt**}y(-w<|x
zK;haIUv!{!J0p+fhmD#LdV|N&IO)a&CUMs1J=$rVKX2M@Ma9v0s$Lj1PMI`Oenbb7
z%<|T)n-?T4zn2Oe(SZYis}2YdWSs4GPeh*o_Wa{8rWr!Gu(pnq`UO!n-RWAJ4Zoz}
zx4HielTJXYgP7_dfW_9qU!0nTY*4UY<SF#Z)9#!8c9ym)mh}7UcLb)7V%u1tS5V_Z
z1)8@54sA_8X#3cnTOI#y-{LyS+^hb(ZHb*aiCFNjl^;qm{dkAqjZk7^VPZ>D4ExVI
zxY%q!c3K}aOVTpBsXHf;LoJCtF;$d<oexOsJ!g#4Q)ATC%E62)Z2#V{vPO;^KYec8
zaLVmJA`Rb{Sm+*Q+wXyYjzYHgGpxUQ!^qzayKf;@(0~Khq|e;@JkZ-*6-bY|<@=IG
z7v+R%hF>-G!KtyEV(Ud3L-j21<WWW7uyB*hHL~RyXw%~>t4FGe?-|-^>?XQ#)ijNF
zWw%kOm1o{xIl=Dd!1vX+Fa-@Tur2(sqq|l}vD=D1(bW%0IFM?Ks~!~Inak^AGM0l<
zaVS4tP~Je9iD|PVe(Xr!&ZuGimPfrQ`tf(f;I_`kJ0!1X-lriZEWKK$XB3`0-$`fv
zXg_4P(EiU*Uy_38%Ur&9>+wMqGp{-ok?+hD1(Vg;(OkuSX{>*9UA3kVy+=jT2X6Q3
zH6|wpt@r*<?%L~}Pc5Rf)4Xlh+Kzo`zc0cfI<Nr0)L>*|!Cd@UiGn8p640C3V7;#+
zlz!`?h9k6nx&RM-O}My|VAaQ-g9E{4`iTlOXsj1Q4Ta5^u2oNjvK2>q<Z7$=hXWuc
zN%N5(`u7&^#*FPDSpPMY9;4qD2+BX^-N5+b`wK6}9e=6t{PDz&;+J*ch9|G10w=av
z8)@VlQ@-N+S;dOK0Us2L-kBMQ0Jc#_buAEZ>nB2&OteG`%++(?$Gw79>NP|23EFhx
zTufox2M;Xaw=P>zd|g#6u=ttzM#2fK^^QOS3}z)l;4~!djx4oZWm{<5qX<a7-#sbx
zs+jEQXZodE%f&T*)7(!j((pH6%4>pzGWYGfkX&p5X}}pa27U}0xP)~2SUl~qWU%5q
zPkw=u*Rh3HD;JF@PWHW>(TrXMwn0f%(?(L^eVV|lF}CrYue06l8q=co2FMIsANT3|
z?7NrjeFuQ^zF$6Drp)Uij{o>jdufWknht`yN}oyx#>cpN*MAaZTz}c{KSPf?-FD;{
zD$4F}e=NzhPKfP3E%ILQI-qV<eChu79jsyW8ICkI6EH{d`sF_8j~QQVI*z@y4NI|%
zX|g}_re1EIxor=?I<~}QIYs|_r1w2<yeW_qRbDBcYS-NP_!ym<)RsZN`ywBnf03Zi
zA`(I^+PLEs2W7D;;bK+N4YEbLdu&vTW+4a+p6Ng;m$Nw~1&y*hUXH$G)S7Ikw;COV
z9HfHxJ1GE2wMeAPd7iq1m28suGtI~L;(akzoR(g1fiVs&o&a?W-~0-dmYH%79-mKC
zY$-#Ld#NU%%2h`J8(b7(#2m3nNiFC#0onKhA?)|>fVE)R%YX{I+TH>o@Tbd1Bm&s8
zWNPvFz>^#_`@bk}08jW>_1gu%rSMZ-ESP0^^rRaSL5Txci0~0E4sqt&7{}ep`k@sW
zVGw;40R4VF3kZqgla4i*lAuebqyffR34#P-sJ1F~A!zvU=NfI2chv3Bpyzamj}LWD
zx-tIiVID^~2jV=$gau#U-CmeiXh4xESKnPEf_J;9Pcbigo}YW6sj@Rk7F2?4G=Z6i
zz5xB`pDUs?BaBv>ahGxgNt>nOWOc34-ZY;}CFeq7<N>omV~4s$VIUr*8X}PBQ6G2z
z$mBWjf&@5$Gk{|t98(VwAq0O**k$?tc&guT!=jmh2!|#NQb`+!sL{dJ)!PMZhb73!
z$he7ZSb=wf@!`a5`Sc53NAlN)Qtmnd`^uyE3ekH1^{w<BY)1)?hk)toejnohb?;2H
z^bt5f2sNl!;|y(lubrTA%2N0Hz|XP&<5w)(>#o(m0q9ja9#4B)hrvXTf+*AtREgp6
zc&=>hUv?V~rRBux(K<g3y9v!6XiC%l+xjEi2}&e@ggtYbaxoCF)I^W~_<dZf;smUs
zWSobLViZg?5(z+e;|#F98&z^o^Y%EDww)v*`j24?I!RI#@T&yKt`k2S3yr$dvklR7
z3`7NW^NBe7Wx=<ED7}GUTUF5E3zUf@FVDx<n3dSC6<s%V3WG3=qGH;Ad3~qPYo~g@
z1;RSC`!^_ze-k`1!78-ma$;8O@x`*)e2<8gbHoS;-ny;({x2jw9>`nAsHqLExH10Q
zmiM+hv1yLtjx51@EjUJ<z9d$xK~9r537LlS$gyapGDvhkki(-BH(f?5pMjd2%H_)-
z@s%l$6RmGUP5(jTNUTF8)Vn`=&WM~8zQ#(3dhw-|u7fTNx_aphI1I+H9A39#Yf4s5
z={-499}93yO8wKft&d#4ay8L+nooc?!hxYxQz7AJcdrbp!+PHvB&Vm1d<OL`{~J61
zI@GxBmby)AE)K{>o>&BL*B{TH1BtZf;A=mM2P(WzP08=A1uZ@M7kqvsSiO)5CWNlh
zeF5;S1RCad@hxdT!ZW8xU2i2f9nhgLYP#;cjF2dPOzXZ>+l$g`=cpnWl`5~wi?3nB
znIBjG$n>$6Y=;<Oxx1jo9*PTt?+A+@*-ub;;nfi0yme<iW}Hq~hykcW#R9H^G&U+y
zNA#C5KVk*H7PC;A3*J7|x+cF!g@)pBWuv12#z|Hep%}diGq2E7{P?9Z*b+8svWo28
zgK|f?N%P7xAEm|(kYc-k2^^IM%V2){_UwIUr04F}?oB2Sek6kajn{_+{FFA-2|mTV
zdgss40;PT?=VO_W9&qEnb!8CIU*cxKc!&kem@D+SRZ*aSpV@yz5>DM|jB8~VG&T4j
ze4XK2eDk`S3}e`GXpHK=L^O*X+p}hS{>X2YYMiECemHsx6XQE&sxT}r#q_t|s4L1^
zfwWE5Km`9J0eI|Nn44#;B>KVJa@}-K38k*bmn$U9udAxXv=&F<p0)woG;v<pSCe~G
z&?5_n(G?ZJ*chur?TLS^wp(vV1Th3}ZB=W+WyN*BrIvtyF5vZy9VmH`z@pm$J5$3}
z<AAAn^VQB1Dt7<9)+=6jHryX@1r<NmSLo-%T(owh6+<U!1w1PG0pn|ADI{<_b=gtc
zw^$KY6ki${F8Y3~WbWW^koj;tW1l$?dREYXfplBmgBc4@0FIwgMhG*M$^DbtLo`JS
z`fum?LAoEp#mb@7h6~;&JxKujX+bP!GAuj!LiB|iPP;`TKB3ZM2RyF>(#K}c$jJjH
z4b)yLuYK6e2!mRAdgZoZwrkJ#&h_i5X%3FxPZKR20mpg-DVca2+i62O_R)DCf0yB|
zvx=^Ux*tko@>1nh|NG%gw+#hGh2pgT{erh)@82`8tgJ2ngLJ!9IRqC$&n^GiB#<<%
z2f|oT`pKSL%*6fo|GYw9<LDT75fCP3v}gM_Ryk@Ohl$e;WL3@ibV}mqd_I!~5Z43=
z7aunB9vZOnQYH3ohxIiUULnkY5n01@q#(2LTHp3R$D4LVuktyOuLe-*@d~t$-JUW3
zH8`3Eh0z|m-E5IIbJhPwCR~J8f)uNN7bQ4*dD;b1>kE0DbaO|1;z4Z>gxJ0ElbaNo
z%h`g`HMZ15n^hvVXc;THaNutNBS!zz;7@l?-w<WK0gmk{EYY7ugw$<mi}VEG9dh1>
zMvdT;p3tMf+i@@QHtjhVYU04vnEx5i$X^G;$7;J5#u#d`R9<+734~(yD3r-{O~hN?
zf`b950ChQEFkE}|Flsw2W*dcKA2PlS)jy=mPfjGAD)<7xon`@D23pRMOuUFx*JL1y
z^!@N!Cr-;sENOZ%K@N+4i29NXqq60B;kTuMQbtYlAc~L^%R0cg8Rh-DO6WW<mTV6~
zDBl3YV?sdTzsKwN*+9P7=({1muxK7gys;2EchPy12o5`XF{lo^#%`|<To<7o4}Oq3
z)^O6z7x9S<<v-xm<4$7AHxt*cHt+YHnjfjOK^)QIS^Vm9@n+(GKh~)*f&b~lOXs#>
z1GyWad>OjJ3ZuY4N9(WDH~=3LRCBolPQOaT$vHBCQkf2uwJ6(fSRn;pE8ppT_Cvq2
ze4t<kWIKiLlz)l$8)q1VCi7M2?zZW|&{i+E1nmiHXK|m7frT26Pr8{SJ^_g~;;n!_
zIQZ@fC!l4N#C|D}snNEi2D4O7RJ{D-d%?#yhiyO#!FE?hO~w`nCvM!JunB8VmJY6L
zT3f-P5R_ab{WRocp~x8==ySb1pGJ9GhsDH)q6Vu<Do^NZWukRCz>SlI{g$>Z#eWZm
zD<<bnHy?9^h9BYGPTJy2>P#2oDA?OIjf36zK<*-_*Kn*b+(f+9G$M6dwq`xc4~RAj
zxY27|r)H}qJ~JCMcFe~79eks`BYg_HmKo4R4~_Ulf?9`=Ac?4q&;vcd9Pbzv^3kG$
zw^}qlkleM=Wn%eN**$uDzUP946Q}A4aREoW02Zz$!NRh*iX|?>Vv3Jv;)Bf4KX<ww
zM`oD>O)gfqNaF*?z0-`b+^J)=@E7xdFd79X^eX`u*AG<-Euuw_d$QA!2&jQY6C1k~
z-wi-X<AmmczpZb)HP0ks@;UZ5L+G$74S^L^!dU4T4WP<`lD^l2*I7+R@zm6;PN67~
z@_gRq&?|r%qVvlqKk!%J1v_4j57GA7f}s}^`Wqe$)>_m~rbkedR;xRFQ|&8T8lBVq
zVH`jJ2wnYkGEbz?NWb5*zA2axAw_Y!;f?$!9CB38K6CRbso4W|t;WWJ9ww-A@w3=*
zLafVbjO|9mTZ$U*L~+={<<MZtsAB$ilsVLuvvT*MCA_r?9Z<2vnV0kdCw|7J_1{nE
z|Dw;Dm61|xf)UP==6>h!DA5x8%Z=6p0k?UkChAVD-P|cm%J0o=jr4tJYOSi}>g`64
zk-vxJX9;2dY|#u)f?iwgr;=wN^;tns^ylCQD6tTbTcQfvYWsjVY~=d4$^DmUGx7IL
zcun!@nf%n-4joiJe$ShUVu*I@YeM)iZWQV=!^6fC)G$8!+Mu^LJ501AaZDuJUS~W1
zEzWst7U385+iS}L02W#=3jsuzAjy<W-gkvmH0rAI{{Tag*yn4(ng_BmD@`v})*e*6
z*Hz%g1)e$!zX^lbIb=Jd+YQZjy$-FifT;`<jQ)UCr_3CvcAr*R6je=mut|{D8_YZy
z@{H9D%t4U8X-Jt>-P}ng&3jVZ!Ys&VMAgv|SO!sB1xzcNhS3Z1?604i#<2d7{m*&4
zZ-5ea@Yl<{6ibCiHd3~cphCJa4`;yrxKL4SafB)N7r+yR#|`W5F(w?0RnzboJlMG;
zZ$9)p-;4%{1n)GE$a$W9ZKcz!#PEwPW%Bh>uTmKm(~5fe?e_UctORvEI&g#`1>gm~
zSRQ#ipI66EUI0Q>&%HGn;DF;l6tJ`{0wU+0L+TF)=xU^VP4SsL%KT{ft;0r~;w`)(
zGS7EZGr0nq;mzo$m@g1@Ib6s;OH-Ly)o*h7ZBM&sd`VI&LTIon9|6XENaP5bRTKvG
z836#TFFZL%Pym9yHmRVO=z!Blsb>9-Rw9mPIr>y%ct8)``F-D8&F0}pd=k))>QufI
z+0pItdY^oyD5bP#zgEdiJqkK?!pnIL+Wq$8E5G@ZqMRw4oAP0Wz-bS#?5oZJrVG8H
z@jvT;s_6X9nKaQd=>0sQUlLZOBQOsp?UXCeQs%T#k#Hiq!dOJIab5>Si6&xc_`xIp
zL1NGBPtb1f(<d0n$JFq34IIIcovrFE0YGOjiO-}IR^X-v&RwlCIrj9&ju~sIJ(Dy$
zy1X^^r&CV-d@R~dvgm{;SDUYAkFz#{$Zj2W6{;7v543VWUsO%J2)tPL)Dk*yZ<M$w
zxs(o^{$fWI??_UTtUoOhve%+Nj4r->k4G53eA1em?14i0`p%l=U}fjGA9$Km_Rs_{
zJmTpJ^Flcm-Nl11!B2K2lis~<dFP+ISut(HJzptBuzw>!urHSPJ|3Yu?65qRaXg_O
zDhs1l7G(BaNwqa@o?>|JinjeqglQGUHdmTca-e_RC=2rv+mm|T6@<XmBBYPpzEPay
zHGxA;%;Fc?`TC|lJYO6u8#{C-l_35#ZigZ3B>Qx;F$4GT*+U6(<9PmQ9-~o|?wbek
z%x}O1aE|r*;Pn=LELJ5aYOn3X^6&;KVcG>`v}?>FGPv&QPQJ7x#Xk^V@cVziKzJCs
zh~O8B7Qn@v37+~lo;j8hQtR}qYCW$c>v_&A!tzT42S;WKZJ@r?vh9ODG_R~qBF>ZR
z*N?R_n7%s@P!+zXmyF}>NO+NMpIInfr&J$2zJ7L5^_R8d^7>I}$i1w>W~Yk5VQ3X;
zR-BG0k0CoEO$Sm!QRJ`s>Si{G?c0#A)$pTI2fHy)G7g{w5$V^e<-@apR4P167~8ix
zqw~>qMERs(CraD)$+D$LBzFw9ucDy~>-_l1lY9Z+x*ofZ1vhSBPb~AX0)P9*C^C9I
zAH1;7{_xBCi}njScZTZ`bY}iSCy>4XYPQ^H**c7sp?xc!d7saSNHg}nCjT`(tXqiW
zydA6R(YUXb&?G15GJO>$Nv`VzCKLiOtD`s3ekOnDZDEiL`OKYVhynx2IP%&p_LX|x
z+Vo$F)7&=CNb^3?!h0H9ID_t|gaapyaWA}7mw?$;7=R^+eUHyma)>FDxKBB%#^8ka
zc`-UU!+Of$9?Zx+t}uR)iJeZ0xw5?;fMf&W!iO!+Ph81w#s0mfSJ=1$>+%wPAaxA>
z7H>y-t#16&h>hW^V)P3P+k;oU7eh|)RZrxCNMt2xXsdJ56AlQ2a86k)x{(QD7$3ed
zlQ@6TIYli@)AdZt{B0P_8!h<=#cTDQR-AR(S|JMQWi@}2LWM+^lL~MT^m;$~mjA>u
za7Iq`JYiwvfY?A*l#nuB)K=WoH<}o@%^nNy6pUtgRZq2LE9QLY0IceE?^GiQw#mTa
z;zt=<dL-JXrV}2vdrT(rkYxcC{@FJSoes!Gx&CTCa2&R-3QQj=5>+(@N~f=o(I~|z
zd2>KIjP=Q7rpOa*AQ}lI6+<tOY0`qCp+XMzCnYsMARuG8V=twR5|d{_7IxQv`9~8v
zdl!TgZY6v(ZDB{4F*;s0j$^B}!qWZI4y>1{s`y}|5PhBtWg0F@PkzM%a}EX(Qme!T
zbm;^&LprcDI^!xj;CX#)$xE<Jl250P@T8I!5P1`-2d4dhFFFQ&JIq}^iQrr9QtPr?
zVcqfeMmQ(*&3JuVn!6%BEQqIZ6`T>)9T*;kjFS9u_~GrFFca!R$UOeOs3Q#W6N7OT
z#aH@D)rJQYlwOb|ns+3XK{KkpAh<`VkUv0w#xX0NLDmMtjDD~q=DhLMxRL#Q4~@8y
zP4_~qWe!z|paMwp5up4ME$IWaqEg@sVWG11*U7Q0y#S(apMvltn)se}FO>=cus!HU
zgAhiQmz(%}t&oZrZpVTnwXCc2G_1k|W6mlO&V!v=3kSgJ(wAML2qg{{vBE~M+Ft-y
zV7W`I#5~QweWSv$<nD;qmS7t9%2Z2_9XXt{mILCzfK8we5WS-wl@uSJ73DmJmQ~6t
zWE_6ED%y5VO@j*z=~OJjGWR2ygrsyr;;{T)qK=&}riMy1fk^x7Y_sZbmr;!IJ;?_Q
z;|w1(;lWSfAHcd*)~+;fr{Vsj2YPAGavV%s336i5=)&u&EBc!{bFjq|p%3VpxOgA)
zn%J<z-?9OwPn4;o4emo5sDaOfT8qDyA?jUs?Qi{1zSP-PT*Cp@E@j8o2rVkLM=f9K
z$uMEEdKiO<h!)8>rukF-d|8*@zV(HY=+V(y%HFQ@GZ6J`fTd!&``OtPHDU411mc98
znTI)lD0$@e))qNM1xl$j*VTq<&OwZ}bVMgGgmYai9@$w)?buX;|B_uOKDX2~4SIr)
z5&QV3Ze(<F1FEXKbfgw%<?ld{Xz36CTb)!i^r;z00u8|9a^VX+PT<Qwp45!J;p01S
zjI;?SM8DSaTn9|YQOw2fh7;Zo4*;2gQhcAtyO01ealHuG%kKqh1q&)5v*EqT`NqG#
zebx{-|J9FzIH~b2sotvBeSAmo!7FE-Q<8Dshi~XK;gq1)?N;tHMT0~GP6(+GO+)~G
z8FGvQH{I+bOxFSO!y<%!CUHSg)25B4<8hxkD&unwz_M@5$W~X2I5~PPjwE)w2d6#>
z>Jw2O2;-O%S}I=aRqJ*R3pa})oI!b6pmhw`Bz~>~Mu)kNw5+4F;%4KM42b-c00bo!
z0TqjSw_|%WRkliDkQjPu1IlVyiqPZV&+?Etloc`Z(qFp2^G+QZ3`whVkJ3LzART$;
zeMvgmFBdZj8f$tiwV^xOXn9nSZSh5U_UvK!MlZWQqxeiIJJyr!dI-QUmHXA(0UlA3
zLy$G16<UIaTEd)O|HT_l?g25(OGC0Uw)czzkjq2sfjArm3nfO6!a0Sr;-LY8Pw<)<
zjvdy*w0m|-7R!ers&}=4NnwV=w05j63sR(<o(Tw2TH>Sx%v!6P)Xs{j*Y7mY)lv!t
zK`lMq;}{4#+WA+)<ojX;kvb*=Rg21e0^(|0psxL$@D|(F>P@({09PI^>^m9?e$rvz
zNMv*Cu1C%*PR^wbh<Br_n|@<)zkSsA!!>e)>y$|12s484Ch1w>w%t`nU_#)BoBY1h
z-sXJ)@MifW)A6*$O6083CgdqB5>2_k9O(e#jQsI8F^MLzHy|Yb8_iEVcqyB%Hr5Ng
zP;(R5xyb$`P2CT89)@8HcJe!zWs7+tz(s6p7tk;0y2799sn?)0)}h23*Vxk-%K*s{
z9V}H>UpUU)=5sM-`-Q+h{@t)YelLk+PiP`euhHI_-@UP_yWjtuT9;Cn-c2gC&wnbD
z>Z7eX{hNHC>ou^q@5;tNujfEG$ETS_On{hM^;MoJ1v{%LP_D~W0=-a}`Z*oZNdpEf
zgqyKA!hZN5DkNtMGETXuQHxvg*X2VF!6&O@Hfg*>122$k@&_h9R6BxeEZXu8=6Z6l
z`@_^0Erpx!UD2lF^uLAfl*aocqko0@UKH^YPv5>I|Dz~*lcb24dfcVb_2e$`#{80A
zZ`p;}Un8iGcP~PzJ4J0?jv@OFGx>N$5-0Wj2{1*qgCTxSSfGdG&6%ajh&qiSH*$BH
z<?&OfRioNK%cBDZlY<B9G6<SxmC8l={mH_Ja~kch<-8PGQ+Q7ki7#p!`ArgMV-rbz
z7H5a8yl_(MCegR|37ASz*rc^*w&AI9k<9Hn6UPR%eiD!Bmz<txN(;JobMr8@{(CR1
zEqk`hyTx0%-#?UJvcAlZj(?r2=@c3k=%w{_H-cQ%;R&C%Ies5=cbc;(EL~0|9gyJ}
zObgE9v_gx)oT6B3>R~xly0#IeM!NctbSp^LkxAmd2q|MO<Q!mMD@{E15OKQX4sIYo
zegZ3#oE$gkWo5^A9Dr8PEEJ{>)76asG6*!9G6o{br_-+Gh)3_b=^#GOxJr)Yh^DvA
zhhG>f&b}v5JED1W(ilA8x0KXT(O<>~*`;1Jd5A+r<oWOs9w3YL9r#HdxC2<AdJ=2B
z5nO|Ta1c+{egd_UVM`u~!=`+<h93CGmtFRy?1Hqst}~STCzcu=`~~(+Z6hJ7DW?po
z!cpQb$>?Vf<OX+WtVe@xGHr3yNm_IHewGtHvB1ScUgZ5SlkU^E3e)#=DJ)&8I}m=>
z{epy9q}0~Gxu~N@V<(^X(43j8G(Q<TkiQl1ZJcy-L9`lPn3h(f*BiO>!i(?BZN=vw
z(SV-`+&qgzPjAt6JP7MG?mDLaxqxHzGW0+7;!j{<5KsyPVn-bcar0?ftB@R#GA9RH
zKeTZWRsI9lA=Zy|zKhK;OEb$gD>kb(YcvZ`_Sknv%XlgKVH(nX?b4QmTf~YU<oqki
zRV|qmY9#`hM7+|*6c<2$btg-*Kbad%NUil0J?x6nyx^)fEvX7UtNBhk><j6*8E7+}
zaRt@H()Z>am=h@S2!mEuQ9n*_a_fH$7A$xgyF)TbpmGxb4Qu=SBX=LJ>%C7D$ZT`8
zR=rlMR<BmXdY7oAa3SnVo~99{F>$B!#~7zi!E$IW=VnUzd$_S2P!oIVbJILX@_qVS
z*hj8M<XF>c4^EW7nnM-G&jT7K9h+^8MR9>#DQlb=Rl<VY_I~&as9L>{4#dpdi(uj#
z6p0ijJ_lMCh@L9qW}tI@bpDida;}<qjc*+!r=V7TKNhwdB7tF<`8%Z2<*iEsttE7@
z{dv_-_?Mj%905=RpSUzT_VviDe6Q@|8V(Q}73lFnNG;gS2Eu~@ySquU#Nc8%^v?hI
z9W8L&Gf}agPp6rt)j$h#*5~Zq*|fn)Yee!os!~y{XAIAS9}gVK!7uF1iDeIPC&Kqr
zb?*F~rYhFZ9j9o!YiI;t(JOc(zv4LI{}>!n^)O-oc`2t-F5q%#|9ZEw<L(a$KAf87
zMJ`FbI<E8xNX-Oc2jbxkR}?N57!{VO?_m{@y+~Vot@R=7Wk$v}vIqlu`|J5+Fsd@%
zjJ`%r2B=tEA}H6Q6kOprMcS~|(nMAWbTgI=$q~=i9#!31noKuGdfss`s{|(b?pvtM
zi;yZ`u6B2nsp)f=90VM&lGsx0s@z({9cooqehpoqJ@_C3K02ur0)H)sYHNmm1sOX-
zJV^`~IS5_>*e*?&)T-ctZXyQE8SH#w77ld4AOT^-&Tf@itnOx*;t&tzKg6*(_LVvq
zIAf$KO@4XQEu;b~E)kxAhgg<R)8ff8*c5*Y<uY3D>NdaA-6i1UzE@~g?GeaY3nKb}
zagB^>5qc~PYS|1;#e=_WN5<j7C8>UO-6brjBJ<mp$5&udq`CwuNSD8471?m0Ai9YB
zsv51Xrt0rddzV49L<VFyvxu;9al1L0H}Nh3#3E;65of;rZ_i(?fA_m5DKT%1XCv4>
zV}JkcK9TmB2(3Tin`f0*ndWN|${g0ccSDrTZerBxyl^(;w*4jvfDZuQ-NoYcbA`W@
zFY4?w?06O+Jb!81;eh7wSChaKZ>f&uFBvC#C_d)Pz7vu4`fE=RAdqgp!e-J2sseq=
z$zLU@o_e$Fo=7%F_cK+rRWe5g#nni0q#R#x<8T*=JQ5V8nn}8{jXeho(|wv1ILJ%~
z12SWx3c`?ukq**(kl_H4y?8At>+)HRmt++4pg})Bcw4~#FLupb2&owK;d6OXce#Jt
z?h*EiWxkcrX1!&y;BLVit7NaLex9MC1+kJpmi*vS?Y?0sukS6MS=*_S7RHXCE8YA}
zP(&*2aIPJ}ji^J>C*5B>_E;xep-k+X3GlyY8|`Rso4PsJk#hhFmM^Z%AvT7OnDQw-
z+b2q9lLy+T6h^47>$gv!fMQln2j;<K9YLj>2l7>`#q9T?(eI3gc|#I=#_8Cc;2WC>
zM6FG@9tCsb-8+IDC=nEWI^>GrN_#F|%q78)I|2MF<b@!#Q~>l<1oAZ!(PX51ml#;+
zb4M8kP*0Iz9L{BbP&W2~ZDzWo_<#;CPHM)$&aAW%rMj9rN+carvoLemcy2Zq9!)$!
zJb7#$;mO(kA()(3K*+}VJ^O@m*}eR!$xtH&<3lMzYrU9HZY)^6YkO`sARczank|P)
zk@&?-A;t!@+v4gcXiObJ<b^*<cM#mmb<y-S(2H94i5FNO6IH`;J~1hF2D9QH0NsO^
zc?4<&|GM<z@oonF{BbK)JGG!8tQYOJi<av8FGKHP7x0l}{~xLWAH<rcXv@0s?IUS}
z%1i7Qd(t@LO&jXaphano93kzV@L_d$TG2khxTesvv@uq$JD<6r$=(15?<`1K*qrJK
zw}pj}54KsUqXV^1BATSxo=a1vfx+P^pc$y<-xjPyVlr;85wq^+CF<^OE-=CUqgR>-
zH34MVpZwrXH-zSUeApLeyVaFNbz|u=Uj~3Asx0qL7t<!dxzRjbL58?iR8*j$1ID-&
zVHgHR=YpG{tSdV-oFe_NIy?`8B92bgBR1=Um{n}LqU?giusoEo&6XB)kEc(_C*PsN
zkj_7asjZ{uc;0F#U^N{xF+k8!f?9J)r@er-lBS?Toopl_O=AD`Y5yW`9QMVW8JVL2
z)Jgzyl?|@*AhF6}bd+L1yg;k@hImVmyqz-fr9lyywsuS#c3E8ksG>LX0lX#&)3FjX
ze2k)8iun*SGC^|KzYe|B!L}}j!Q5}muEC}e-j}V4$P==`XynD}TuQ@pf`+}kUkj0f
z9PCWwxRZs5b*(0jT@_Lzgb_Q^3m-nr6)Jo2fCfZEYQ>A!Bu97QlfdL`l{|>{gFEeG
zkEQcfOSo9@&Q=`p<3wg*Nh+soiGh)IPuLQw&puuA+vTvD@o%Vr!B%d|tps*K0pl|&
zTB&k2k|{#fZ|O2uGrDViY-QG$lZ_Ye=3WHOdE^X&2GUxGx!|^OML`;fw-lT`WPd0y
zOipr@MZw)@P{!0kwwGZ>TUz>?px@gqSl_weC6G4lzu~<P7?vHZSX1>IPg<i;?fl%i
zP0J67rP?K!Rc|ZG);FQ$<(wsBazr8@36?TERj#PyZeMb~2E>Su{^!c$yB{g#nhR||
zfa`NWG|wR2jbmU;Xpt0ly%e#V10;_Uv~6tN2n2-^No?Ql#il7)^!kd;`r)kZO%k9R
zB&puf6^Hd-N9SM(y~#hSAaFv{ns;q!67!ijjZ~<bYBce3>y=`5T5?{ZR{(#p^@9CH
z^H@iw5J;50=nrT^6P^#|yd*=&${=S!10yM(@OXj@e~=UD&HLePa*WB{R{HP<wBNq)
zW*)*s(brxZFn$Ci&14OB`w=sx#2c{nt*m!adUqYC(<{9F^B6%e*Y(<e-j^B*P^0&k
zR+i&?T?2f`+*mL#^`aHp3;S1~yb_28z>_M$b0DTpV%@^0(D2BmPJrUpz(*`z+gP0@
zqNJhx90K1xhk9y)x4Hc-Fntv0PuD#9NrlC5lU|AbD;yu*(NZtFUp)r`z{Do7Mi!P(
zF}jY(48<o^!f*qq?iY1<=LrVlGj_cY$h&7@l9r4HG;`R)K1dMS^OXZUyjCFrwrsN4
zA)0+$T($cIdHqxN!sUnej?_63@kcH-^^wU1b{i`okXPEJw!}|`g^-`m-8?lhN(DRG
zi-1Nk93L7yEEsUYLD1gp-oJQ-7AyBWjrtcqMV0lKsG|s^j1OcAwc^I3wb7P|M+BU5
zEcSjIJ5WFVTn9K(4-BZnilXz)1f#FJ%J!xKO^q*^F;K;A4ffx!$Q0Ud9^<Cc)7~ia
zIe>V279<&9`8XSRaGWE4QIIz~EQHxg6x1>YA-SQ$hq?bQ+Srw}J=kMdK3psm((Dbh
z_$aQs1_9cjAT)#vks+{%J5gfjzj{#GCns8kfR1n^fj(%XhaK@1559{Hi@`wfjIF;2
z@B9lg)`X`u!DTPHYrx4VJsvLsF{3X^%OR%>qb0)=F+>$w*#1G`yfQ%G<?u7wcG{9|
ztv<xRSjYM@_r)}rQ4v0UJ1pSlAIm)i!kfT@jeM<IusA703nV|G(}A9dfPZSqyZ`cG
zj}n#VMRw~MP~iQY#5Q&Y$3|gn;={e3z|UkBs)ST{Nx1h2I6JW~$~v9Yb#nz~J_3DR
z|FcC-*M<@2_v6ACe*iPsf^6`cgXEa(7o<_X^?eQ`E&$%LgDo&Sih|DGg!x0Q#+ZtP
zKu6~*{-uu&ipv^>Ngs^_k{~H}^3}IM!FydA!{|Vp2{%xyP07fv?l%8-BS(J_pc5Yo
zVtf6&_kWv%1Th(HR+6H#xn6^wpe%gZ3e;5Y$QDPOjC>^uO<Y5=CBV&J!aKpbJqv-{
zMRM5nkE#A-fzo2N;F3(gy5>_UE<SDUWJ+RRH0%oA{Q3F-x<>z{2RF(6&b#8yn;3N^
z2q@R-^rjStJShh`lh>yqH?eUxFG8lbZ_ou^n=tKOaHEztP74|aHBm0bNy>ch1&P<;
z{-ObmaUrT{K-(8cYQ^ypz3qtM>If~~uu>s#1NW!(lb}ByJM@WWHoPDJ|CEfX%XNa?
z<D{7V6?jGXo-&BbC^O~X$81#M6YbBDZmx@M|0i68dR^BR>2=#*d>9HeGU9Kb1e0HE
zXN7g$)TOeKA4s!UWpEQ1hImWkKca$|k|J3}tVAJYOE4~+rUgOA%RiEj)MQ_Y61<wC
zi}M-&8d|zblxzs=yrcQ``dhFOk=lRa^xA5^nwb#gN1@!xHxgHfO)i|xBb~k<&ar5_
z%?@UNOMyhC4bbq(0X}%a<Ac{xpSAJe5*srbuRs=7kl0m6$cq{D$I^6<F#Qak!mu$A
zWd;alFB07V)_E6k^uiW1IKK(M-#hG!s$GwpU-oQ3Z#2BCk)WukUQK<HgVgrlmZy0g
zKhkf}Qkh*Mz}nsF*@m}wg?=hEPiY9CXmDkiLZv8C0sP0UdGe<%jR!_UPTm->f+8*O
zLXDs>C_}jCHMBb%T<=6aP6aZebW}$-#z9-{c9PrPmHW0B4mdneC)#2Ka;KXsS_uK{
z3HtqXkO-=Os60g-D@I#In-Ay>Ax9;S?7XN4DZzoIlIU2wcNzbZWleZVf^CYsHH}BX
z?7w8mElV!+l)<QHp6nnlyxWMvKsSt-^Q9!rPD%*j?FvWpk7|Ms_aST~#30T|aOJg;
zXYueGnajTb!7S2*lVNmiu)^5U?tX_r&+>8mfc|$ijb&e}Vqhb_7rs|0eSc$?cI2V^
zHuuf@JWVo(=i=!%Vy7aX|CZHFMT7+&pK}WiDh^<`C7!&_O=cwpw|DOn0p{~gW?uPd
za&Vxd?ZIazpVQWNKR8E&#Zaw@6!{UG50ebrz`Acj>TE$TwBSEM1L`Q@1eq`Qt&&2X
z3-6}m^tc}*4qP$zN=B6abNDXDK8vh`K?rV)Jiu{R<0zVNg$#7FQX*#SK|nW6z(AW1
z2B6lYxZAgKW27O=pMEQ)8|Y|Z$QC1Tu?(U93tmroaH|wl_ug!nmW*N}Bz1<Fz5J07
zIn~rzWhm^Qjcp&lI}3iL5FD6w6~xI8Tst8qNsoRl7WU}Hylbx2tBeFDPHo&jXdyG>
z@Pro}Sh6~2<`9SMbu@8GFn|ixzm7rjDZ%-%QfQjM#f-72ke{AdSN=g`!EdV29YvgJ
z=->2hzhV-=5(bq7z61LL{j2ssLm@thiw+>}6Ui*M9kgT)<xFyCR1L0l%4HP43<&vD
zj?OC8j72~nk7pPiybY8RZpl+@L*)CS_qC`^@D~-kCQrz}VBTUbLh~K#&lVyLC%VpD
zPEVQtvhXiFbhhE0(54V-C0}}arZ}1rqbB_c5Bn(r<Lb|6D_^6EABkAB%Zd%Y)R0sZ
z68^07ig~_0(|g3k*N_`#5!b=)bU);`RW}Ob<mvv>Sn^iWtm_sp7_+YUx<qTs*UT`L
z*w<A9!N+^xp@O)a1qCP~tsn)qSZ@JsH?EIIt!<HR*9)kg;Q*kxy3ZfPh4q%Wr`yvK
zzgy8~+=`J4i}f2IbaznOfIJ$<N&PH*;r^*QQhRYF_$)--@1@?Ci|EQr*DUmxZF&=2
z<*Ex_O=k1l&s8mT(~Mp+VC`NeI*@h2PTu-Qn~qX_r1{2t^~aypY&vSTf`d~nR>8V9
zU{&<^3q!>){BWq9rRFJl6l|+Db&9!8-6FT++Y!601oZh$c)kC*y(j(t(@hLSB{nA}
zfNsGa3HoFg^2?k2W-L6tp&9$1B7yS3Au9s7ikYm>q&j|yO+0|#75-xzGdb8_MxTI3
zVRSM^%~(n)VESBN$4_rLM0I6=fk+nl`gG+feb6qG4Mg&eU!lD#rv9#w$wtXbDZVb@
z;O|SK&-J7vlZ2|H8Q5wv4Uo+TEzHN0#4B&+6)lvC?(9F4UFJBYG^tHjdPP${!Dq_9
z8<D2|gD-~Ga?QVcb^p{$WMD9%gWd1t5%o~+z$da7a^AQGL5W3QlZ~E0kydCt;Dt5Y
z?Iu_?EwuY9*+v|c4hMtnVv3ud((cl7s8Fkc49A2u4H75UB7)|v0^@H4CtJ&p(sND$
zB(j)Y=&<qy@r%_!9~f}eXG83o5xCv(t#W(hq&3x7957$Q6%G|<jsZ(_L#L;4*?$dz
z0#PL+|Kk^|zlKW0uuVwvCe%z%g)Oyv9(UDAa$UUIUB6A@GWNd9oUY)QBAr}^rgKM|
z{~?H>QLVO?()U4rC$oRf%zsr`m7J7gY#KoKD%;|z-(2s}+p~GKg%E(35eXH?RNW>|
zvDba<z>d+37)ivXeDoS~>(t^b5TIp%zA1}ekLEKJ1K+KIXYNwFJp#ZGLg1qN7n(61
z+=RL0_H)?|K4lE|Df?15P%#E1J%S#~lk_PMBivtseH1TbO@i~O`b2;{NI*uu=5nuF
zUi^rK>QZ1NndS@@5GxzoL|Q$O=JlgyEt>XF=8J#l`UPQkoSLQ@pe7TE)MD7I-@aMd
zHArrFE(#P147t^?RIN2=ahj(#xq06x`+eqAOE6IO5Tq9OIMLanABu^(JN?`?zSbRF
z$ms7J)OUTR_urPu$wTmZs!*x_BaLqH5OcHgNXe8C=;|#37at({6(i}6puBttu&8As
zrYJ<67^tliyg!~U@`ZHbsA$B_&dudI4djIVRuV25G*xK`T*qM77xXY&1@x3W)anM@
zyH`#d87vG9W=J{$s@_YbkL@47+l=WRlQRo&PoR|_Qdi0hsWiZ;tj#R{y+IYit=_4S
zaSuL~oCpLzg<U^wRcoiH{GcZFQG?t-WiS~2bFY;F_U-QbzUJ0DHs^z+ob{qL@wXv%
zpC6FD>3Qw_PGw5DV%oV(5+|h9;v=~J_81o^w_x!&L5>S8fwhcdk==_u$3WOXG(-3Z
zF4&>S9YaJ9=+B@TX^{hFRvXmr6?_~ma5S*CmkS2mnglK`(6D6EK6Qd`gHt#;ImZ{C
zEQJETX)_MbSJ+kOmDh3}YV$*jafxD7xsH;y`IU*~y$ZLacG4NG+J+e%)n*Tfw-SG@
z;+9eEbbU(oh?V0JRi+QqX|xy+a`c_>TQ#7LQ{4Uc9|5I%`G&%7PO_|xmK)-Cy(b+D
zTiBdAP;CEv@&3}Y5u9c99CX5tU^<wg2IW(^1wpMsm>DhkS;7}w#K{@N@&O#kQwe%T
z-f_O8nAb`59)pW`1fWPok7U&8MjR|=;@;+ur66Z?&<h4Wc2||J)zj}++;o|uGd)i=
z0Pi}PkO`DjaX*RA{!MxK(4WzIOuPi+ibdo^;D}AfJX-~J{TF>uVC#?c?g}+)4RuLD
znf=?^UKbC6L6Psx>^1ZiIQKx&LN6;rm+9P~>i(5WPsp)#h%nVgToR2=&ow^BGk_l;
zTXnFr@Zjo`BTnE2=AbFKVoH(LyP}skNaZp_$x=et*&5;*H-eqcN=jZg=tVY-l_+M*
z9Qf!mr$NQ{Z54L%7Z?@Ii$WaZGEsEz{05q_Cx!B&=TJ(Z)9^idt|R%2k|;S>3mT<_
ztKY?$qkl9;sYbOaB}!$N>gbde;BrTT`VU#H(j#ly%ai@Bh?g=wRg4*?7)V&BIA3OS
zVNz7N)Tw>3O>^IxX5pFfC-Cy;YsS7=bpp}4pljHI<^_kc!SyW!8Q(z0a-!%VLu%Gi
zP^*j^F^QgJDlo&HMDHRQvj1mS#n^NFtC9Jnnmp;-T{e0we7Jmy^lOVg#g)i;)$i}v
z)aC_@@F!y^?>>A#etc(kpVZEwQMFTQ#H*=^7%hl4lc03U^kLavL|^HDlNC8>$b9)*
zCxz6P%BlaUQ)qLXb0gmNX;<%d#fw3a!DjUX9jPw;_O-`b(+^Xxb>1U8mmw-VvvGw|
zd?*2{5(FUP4w&x!M=o?Ly+bs40}TZ0&<&^)%t>%3ih(#<pwmX99fNY?TOB_SvM##C
zhWq&!36T~BX?I1LtxHV@CHup5On)@~#HpCHMi1WD2?s9pEIm^qdA~H4TsUF~=TL-N
z>8|{d8@q>Z4QFWVMq4jrasMnuYBnEyzH|?9VykPsT_EN`4^Q3Nc!qws9m)JGVC&~(
zSk@Lvg;I%g7bl0J7Ph8LlcAPzJmuMk<?RZ)!P&3~qg$ijmOsa6wsIc6Us}j`>=Pzn
z^INuwp%FZBms5;>9YfG_Z;ubp$98i7ZEXz$d=M0L;Nt)~aVQ$cC_*DWsH5&Zh&+33
zmjD#;wENdTXyt=bF_KN-4!tc%)aB-2vV<MlGKe%#qz-2i`g3d>o^pGUQzfV~Elsc(
z-VJkX6*H9Uw1(WjCX?wDSjzBH{JvN^&=z9SEKgCwR`L5wdUH5znxZsIyP$TN!po2)
zz4t1}Ca06JTttwxXV8U<AzL%;rVAj4WB`%UD<}1MnLRDC<}ziXr&h+U6QGfvce)q{
z=DwKP?xeL8F4SuPyE#L448Ynts3O%12<t`W7m)a4u=EJp1{5GW_BmFA7)2Ks_n$G4
zVq^71Ax<IXvEB?-<Ao7AIU~L6qs)%7*cD<3Ler$V-aP}bn%48jMX1wx<e|7%VJ|fp
zuwEs59Q|$~EAqk^<6Qj4_LcOTvtUatN<-VoOfTi5y=Mb{9&_XU1-Yf&rQ~5Zvte(I
zSKi1e0ZI{2{fp1~{2?81!1iQ<`{e`4?^@IQF-@Tw0roo`qH2Go7^oijF!BrPn%gSR
z7k~M}T=IO4k&laR``q&DNInHpj@JR%tCD7P-!6M$iVvS#*K7v!R}lhw$akWR@NO;Z
zqPZQ=>!Q|y!5FyEvjjNV!81+xXFk{hIisK!F^?#;#T?8Ilo~)3_#!&ov~LJYW$HI+
z11CM+34*%Mj1y3IL3WNv0k!|>c6!Wn1*jEPtZr8RyS20D^U@`emwmkZwRglm7ybDS
z+)Yo()2U<3$LWDM%q(_N-~d_DDhG{<8e@~K+A*&mitPG(v$!u)DrsGq({)#$Bv49Z
z_i=J1Gzh<5tBjlcjFYpNtT!TvE$BXGY&R$Sj{Vli4%y1Mi>hY%l2OMg=l(<<JB%42
zTaB`5K<#ZHRjAeNC!kkM;K0;g2AdPm*e*MMqLCHi0j%7JQk-mGB<qDBc(|0_imPjT
z1-H&!s-_tv;fMa+kr<H85ugDOMfM5@ZUD&?z6g54;>7UlwfviK9j?k!MU(n8bEpSN
za+7_B2DaL51lrQ~M_^@izbY3Ner~L1KH7|@S^TL!nu<3KuFfm9Xsh)F`x#CTqHt~i
zrX9^>X*$L-DD}K*F!}HK2(ujDxLrKAby2EewPojn_oDasd7Y$%!r5C^pn~TZv_=iY
zzN&3#KQ_Ubo7zxXe0Xt<1Hu_6HoTjgpb4OxV<1UrQAsZAMixbV7FzB&+{^fvuGfd7
zs}dpP@nqbA(M;(@=ef!FRwKa!*C=LjLG@CIBSe~z8U$r@39vuV%F}t}wKF1pKcrqz
zWuI!*H?W`LA6V*C*qH^_sKTr-q7ZhPN<H4d85L$pZgS_baS$=kS+|!cdluI1siCA(
zStoj>j?4@~KRRCZsTNcp8tB<G@Oc#2W6?z0M$K?5fo?>tX_&UplbV#SVGr@dK(vVH
zT9Ot`J*Ea>l3J18C|^Nfk0lXK2V&KI)1cgu&21=8Vcn<|iR?=WhQemSQixLf2pST&
z#0&fn6R*XSF%^LOaAcL`<2z9glD+oHmMDA_#!Dot9OE#MtE{KQRYvs-{m!+WSs)2)
zU7gO)&(a;x#wFKIl$z_9u6z9KEas|38NWxWWFsl1>O^cD#GdZ@>DdPBRfZje-s@p7
zb?o<hr>Z9rD|YGSUfbQcovg@>v&vo4V?VrRa_?0up*5>%Q?XNOdJ$<@*GW=vh0b-A
z))9heq~!VItAcyyqFcOe6Ug{Ega%p^)}?h2;sh;{L-#Gf26URZJhZz}N{|tzRmwb;
z@ec&B1v71+A#8XaUi6Ac$AWJTHQ9;ZHd_^^8_?2h?1QA(lS?qF{CB&_ms?Paj|=C}
z1%oBnJ|x1W=kd#77t6@c)-3AHxOc6BU=I?;O^|^WoafWv<ic%ik96C!Z#xvL>y_p1
z0zp7YtxP*<razr4If!5|x1S|gS*P!((}xTRWu4mR<)1DsqAjQK)wd&A?Dx$|=qw^@
zwy&G^-8HW*Ml^M<r_cWvQC}SuRor!br(hVmLt-fDRzhl!lI}(r0RibyLTW%nLP`-4
z5Ku%=8c8Jvq!c9tB$WXa5Ri@`=es`d`##@)uEkp3JNN$1KKtym&$-s>nkRO`m(q=^
z1Q;yj0(WmH9^|*DY&>rAG&#3uAgCiYFXzV})(hFa@e3VGp~eZWD4*p2gy)bUlwOln
zz~b}SU~Q0^r&VJ3?`%01K;u5-qFxkE@2(tHk5UmHP5#UaDn1JR-4Hz;^unHdEV|2h
zFSnMbuS!Kj$GWHS&ZC_NWcblx=+zt6xqmzrS2$ials2zCGa6^C&@?S}GL~I*GKL;U
zzw&~<k~ZC_%>gd2wKI4@^Z7bp?4SB6TS}{>7QcnODs)QEI-|^Jy;CO&HF8w%G8R#O
zod+e!I5%8T8X$q*AENi%VwD%yohK6)ng1YikB}*PU7f+SHDSAU^_-155uXbylBYgT
z04v^5eR)9eIgRbTwvWhpRyM$3I8+*tl7_s05A+e7eE>H#e1~`1aMcZQHLoiUsg!;y
zleCpOzCGYvmlX%bOVXB-pfn7GvDHoL$j_D(?vI{#7N&#ELC?E$4GM=XnZMNZjX=Rh
zKNPc5#s0ceq2<|I%+O_FbCW+iV^s$#0y>@v(oEqaCiQcvm~nk!Mzrq}u%XDzvecL0
z>CE#cgg!CJ)Z~1pn|6Yzs}9bCBX~*VH*(gan0$3AKBjZA<i?S}PHv>rS(6LDX-PXg
z`~>GuaokAq_J@m;;hlOQF@~TjEV@etIk}AkY2qdp={5C=e4PqY%lQp%J@pECTMoAF
zK~81iT<ugC;@s}r!K8kByC=@*X#hW(VZK(R|5JH>J?+1R3o3}e6h>(;1*Ig$=aZs~
z$1|(daAr68$GN1}FLX=%i8uUv%kG;*(4O&U);~w-de<y8W8NE0zl<ZXO1QT_f`9^R
z=1)NJ@jb}!GvGndW*i71+NS<spAcgh_j~zMGnSp<Qpi*wrwR!fde0>XwS@++3I8;-
zqz!)?r_R2^c=?SaU*G8hU2|DorWgIXl{T~W>-A^%DjamjEiQ>T7sU51jy3ezwjOcj
z(%9dZa`@WYXY|@THb(ZRg2A~D^}(Q<1)Zl1wDBFF#bSZ=rqMS>WOc!_Kx@Do;IhWB
zK$JcH4MeyTu1FRg!HA845<KBq5YsonXtxGCtGIUT^@|($S!&iAk|UbILU!MuGSK4R
z9kN^Hg-5ABI{c!uKKq>pk|N5ZhlrYmO1)aoNm&0NWYn^wFP^q*DR3y&vK*{XfIUwb
zUAcVcLiBnwu&I#iQk}r^%mn6R=>zQ5sZ$S^6PfUK4{$B+cySqckH(zN`ysmrWOlt2
zGx=n;hH-anGa6X%);+KB&+=7|*47{uJWm4{(06SjRAptGtxb69c{(&ppk1yOM`9bi
z!$7n0{h+<VV)=;@?(4B(g+Je>8t{~r?U>mPi6$28kuS7G@bB-D{p!|5O9?uWBr_)j
z<Yl;CnCVRh{US>knoIfqapI-@Ov}a%VBHw%)CJhaMGJD^n$~ivmLH_042KP0G2By%
z1&5)>PZ55o+cDr+0q38d>;fO9<Me{>{k#}6=Hd)Lf8NMJ=fo?mWJwe0J4{7XnWdz*
z(#<!nqyyK}Evxb=V$q1DM1P)OOk=+fP;nVT?PCsGN-uH63piL1a#%pj6-j1PGN71z
zO)D+}eQ*h+Iipa}Rv|BewUe}Tq{V{ANCff$tSTYH?2sp9(t7^L{1A$q2M9fnkDwb8
zR9YG)qjtFc5IVd{m5-*K^`2?K2us&WLI&SC^f%XQ{yy7}O?r#I69s!Qn#<?Y2kp-P
zk@Tg)@p46ighh4QtnwS8$<XK6IgJ=Y2XM7PLiNWO`$1WDAcdmlELe#HV4iix0?Fz&
z#$*@|Xg-3pBMk&y53>K}h8Oiw41g{Bk%4lkCMla<0puiKKZQp!*HTWuJvx7(I(LW4
z(DMGutq&diMQahwQ%zT@j5gEcCJGl;&ycTP?TY-d(lZ|DDpBrKj25H=M=ZKS|FU{@
z#xzdf@IM@@{?nGg@<|%~IC&J3_8RX7_o2esft0AsO$M5M6|<axcRH@eU4KzzmyNF`
zO)?R`-hz1N;@cHX*&!D!2xte!tq*p_)Ec$yHJ9OyptN-K9<&W$8sy&%hc8$^w7UyG
zEbLyHlU;BJkCNE81DlL$`*XMU4yw}3&$pwnFGY1s+RiBt+s<RXo%|P1w_Z<1oU#}@
zqAc@P-4gEdT0l#53Qm6)XbZiX$G4DA-X@Z*?(ds1|JhWiv-(7a;W>342d+UJ@3Z0F
z%in<rasVe5kkY#nu&qc&^zq9nrc)(P=DUVJlGbRu%!=A<99h@f!5iVfj{tQ;osH4F
zYpSc2OD6*d3N$BgR8&W)@UGP)9h^H<^5B$P%;U?wxjL)n$bB_%p#$hl?kg$LHnhNx
zdUB3XjnyDdhHoygSo$|%<bcu2y33$lzQF5AluVI`AT~m@XwUo&&}RWe5he!SfQ2iC
zy=Bl9{CiD2UtS~T0nUH?nl9s3R~GJU+0q`v4$XsV<PoGqVh>kSH5xkHUm926oQztP
zyz2UBT!hu)`UV9x?gHQFIao}f&(?JW{MceMWF61++u9`~tUA9mewFSpG4c6%7Y+{m
z>tL_7-n!j!{#C$w>}-T->k`??;LpBRYL9J;Qb8}HO5d%CJV1$EcnX*-MdV)qgi0Y`
zD^X4IJYS8lW>r8|q{WYpbs}vCQ)BdG3#q_%W64F#GuYpgsGVgk@u?shn~nQ#|KMhs
zRtmsJ$!mU8$QAIjej)UhO+%FxPkh<uQR?cZn)kj&6{{nt_JPxykY#OfLV^w4{*!31
zMEB%TqLIFCJd0tP6U|uMK=|K3F&ziLI%?oBYy=eR4S;s`Z@gQaFw+GQTsb=+bn%})
zbWL5QZ0sUF5=yAJIXnn>I)j73+d1_M=#YZuRC1Hz%mJfVzkkojJm*>5*vA2SwH0-*
z?=b<&e#Bty>-%?E@6Cj052QVoxt+`t8RFD8_?ULjUr6TN8Bqe%8X#P~eqAy4U&o;&
zLy0njt-=?ExHkHn*HMn*k0}DId9Z5qo|ZwP`0q&DWwIP^h+*AB)<!!SM-)F{lEYRU
z%=y+lMW9$KTE!UfQwDn(S(3v_0QI1YcsnE9*IyVJsQ)-eZ0_}?mpw(ylOe?S93zIa
zAoEs;C&R01!M1{i0Z`LQzE6fv6*e@`3Lyx-dOn3~?%|@JJ>Se_JH2jY&J^~k97Piz
zm2``1`lZ=ZC89Sz2=rxZ{Lu@0X<wWB?72sCi$>kJ)Mfq)nYAK0jXUw?UpK@|8@@(H
zeveGcRVTezF?qbFgAcdIH%j6grH8+X5W3+jUvc}vJ?{7;@E*Z32io3nZP<tDXM+e^
zJ^cI;Rjlu4d?!++k7>mMMk50K@F&*&$uKWg6grj{x6p-Y`&p$5-5g_2x)B^o*c->F
z&?J@62grd4p4e3%<~FB(uYR#T@%h|$UV>>=3A(yt{`JHK#l?Mk_j=!iY2VTpdg=Gs
zHly_QP_Pn7wCZRW8G6D8=yG`^<29mDvN<CKreF7G(2hKI-~%}F0jW^}hcRK;5j?v?
z;Q9hgC6eQQJ=I`afY84ywyvOGt>-<+0S(DAtzekFa5VVF!M3tL*SxqdweIb}ygM!5
z`zwuWIB4riNs?NrwCi7`b=6%u1!(csB|be>_6SjP5lIN?{IMse3M=lJxABcfhcaV-
z7t8m;2U_fhn`8ic0_oa`t=nZN1M%zK0(xO%3Plb`xeqvg;Eu>?LgjvgEHU94FvCtE
zCMSYyfZ$DFUEPEFJmdnx*-_Z@s2TKe$xvgf7jDJ*kIQ}n2fTj-=3#4<YS@6sN*OqR
z50n>`=AxQ`^xb(sAGO=m^D=tJP0yR9F9Cj9e*M=4D!Ajfc&)}o?W4dSXW{~lYdud}
z13}YtMyj^A{9?3U6Xwl!QL3k`kDPmD2QF$E3NAP>Po+Ju4BFWVR1oIqt5&g=h^9WS
zzWU>5`)a>4*NMUtf`1GYdl^_tf6fjpU&Oa7<G%xuXd!rzId)XUv<{MyZXgZFbHPF&
z&LASVg+fg^Km|Uk3BPNI1Fd19s7W@U{5Dxpw*}-Ya5@=s(VqICH~(@U9TP`+%uEuc
zCX7JF^n3ZGv>5ditrR*$&qIRP@gPHz6oiz|^42%R8B(-<YedmBo}pCFSIhTw4{w%@
zkFvJC-t5V;@*uRWU6Gunx!>Uq|EGB6JSw4zRW`PN46bK;`eXZlW_+oZ{Z&8y8zOZ5
zdTTGgkx~7&W8CUr)+u<n!yhVqurUBaoGzp3>7KtlAYTfAE`aHao?sKQiNgNhPpC1V
zu%*VQ7-4Qv;Y1{g^g8T@LA=SqJ(U3l4e=m1W<utsKs!8T={rJl?wRd|&JPv`+)3`~
z#B6|DNG_l$V|H8$co#n#Ynk{z#6BbTeU54RW>MYo<|RgteBI}y(mbmA7V*sw=;^m`
z1h_*5^>5;VaP&aNeTpLgASU5Mx+`5_RuWW!vyN|q^J!KUB3?NEJxe@&3e5}BdYh*-
z799Mnry8G@=<<+QdMiXq&l|L^Qvd|PF61!~!D#x3eRu+)7=r45gVQrsCc9k<ZPY1h
z_Qrn`!J5}XgrCy~NW<hs<>3df@#azlPbjAe+;AYlFy{LZb&VYKiYCF9QM${|7`Nj4
zcddMk>wa4C1flCIx}o*cV+*?ia8b+!(+q|b&`y0#xh?GiY1T3Q5@SHsUtRsmbB-kS
z^W29#=ea3TGvb{l*P}+jF{azOt>oYWh@NdR6FN4|^!Q(f4Kb>6LbOWL77f3?{ic{<
zE~x#*@yq^Ku3K=Sk4Dyl+7#2Fv?5ENq<Yuuj|wAx>n!zbjT#XP&JWY`zRG;!Bo0gi
zD@GVlew&21CPQk-NRJHh25{02Xi2<?cLB6+`U2uYkje+g1Y!yKbVOmomvvG{+wNBN
zOMMcFXM5(%&$;Q(hG-cY-Q}`*T}ywXEnbo<>!)Q#+SqV}l=-XBR|+C=<|QRU8CS0|
zd^<W_%5MqwSo$(c_g3NA(8>OBYxaeB;M31#)#dO(rTeQ*s3eRqzzmF>3{A;gU=RMl
zU+dwkYj#7_xVuEd0~V8E_bUbxd|F-9P@R&6yJ95t(y5$1to^Ha<XDsp$AMjf-=h4D
zmHZz$4NGi|o>v2Y89tg-LO0T|Fq4kOU<-OCr*<xnt6dLk2W;Q1U3y)m7~d%uTC`Ty
zKy03gY@N87W=#}Yn8HvMcwM?E0Hk|sJ8MPxrhJ3eBw@B(y|!%-_$da{A*z~cvXx56
zG8RkpzJJf0PW<#WJO_&X$xmmD5{JdvkAO=)Qn_HSfgE3`hce~|ZxJnJGRbNh(mCPh
zfry`m^%_H1>7~`(X^_dSKSES`r6$vS$%hE~=I@Uyukz8MFbIs}QC`Dcrf(M;wHB7g
zIkoS<$(dRtNwpu^XoNZ&w60u8nr`1N+sKReYX9`2_3-HGr3=j{*y{~^T&hs*{+70*
zVSjh(>{TYF?9;b1<UPwQF=Vw@cqLWr_s@oM>K4#<Q|A(K2i+v=zNxZr*!nMwFW`me
z19ZUJTZ}CP$s7|(5x^2tikx+Z5T`E!y`37pu^P16z^niUg^4Kz5})8cFyja@<sI?}
z!gzMEOu%RR$Pd4fgHFa~9oMhHuR_XzS(O&*Kku&a|6Xg_drWdnrm)!Fu^>n((i6q9
zkJdg*#HpT2Y`>2YUOmz+PVj%pgu7emv9O=E`^zsj`<`|2V*mb%!YyU8q3Kk;Iqu$t
zuR^tVC)kzb0*IE-LC5w4;+S|i-qhL{0`64W^g<h)a%_9|82K+8exNH%d))DgKrjg;
zp7(24OoyXV<j)dwO30->k3;sxlB3Ht#0YCm@Xb5VQ=Y0nuTtGNx%$LJXMhcgMa6nT
z$|zW(n&6ZjEl}(&^7u?Z1j_U5zB4ID8>o=cLhnuckjHD`>DP*i=+^>@T2KTwCMq$g
z`<OLue+(}>M1^z`@}Z#?^^KJ!gHwx0H=@q3UyB`Ks9}yC(8rhpUb@uUDUe_ppCuhm
zm2kbYY(9D<q6nH1>LyW@#vDN^)SfMk31wn<?V__zLnjft7~65fpU{!>HwM9Ta<X`t
zBt5p*a}5&KtB$w~wa+!~c{eg@`r(<iZJvqlbCyxFjuV%9o_3ZfAz#feb(*%#+wey2
z_qfI7M<qys(%<O6ce(ZTH(RaH(WxtoDL;_v1qNL|7j0@n4%xpr#882gwz``+Up<xg
zlv_ztDq|=^Eu$E!f}~vBs@bAh<)<)}@i5K;pG)!;z%`0yatN{k0$KoX8sjB_g*!@c
z%pfYK52?HawS?4EQrRLfg@~{+DE0}CuvUk_8(ssbM5N*PM*+~Sy}o-}eh=7gv$r$N
z&=#0=l>9q0iEjD^0p-m|rHH3qCM19U_R$#nnH`g~t6i4siQ%}%u^le1MI2<rGve$V
zNA*#{ywY4)3xnwoPYNvr{|x-`)<UU^HJ1JqmR-DCw!b15D3&lZb??(0ch|$sG?(qA
z!Wy5Mp~;#}PI(?8VkV|J{(7I}(`SDlNV$xj?@rbna%TIgzES;Mh<|mHT;}dMH&uQk
zmukJx8O=wVV!b)RI^u-460_BXw1$$;LayQ?2>kZ+H=3GCRD2%7REv<5-aulmMa3Ez
z;NSZWGeJ~)y~}|z2Xf7Ou`jZ5Q`|M`N9C1}6H$EeRp=|Et(v<J>+O1qS#7*0dCmi}
z7N&D-_YnKYeGC`PrD=F4GhjxPxEK4HZnE(F4rEvmPi*Fen?!C2Iwf-7caK`ee%vS=
z3zcJtH3j%`9JCR_UxzdfzO!FjKN5GzBgJ}<Y`PL9;udO(cwp&R&7v#TWCfa8)e27A
zslx);d{;?49WK|XwEqbhb?ytl8{ci)KTrxQA603cxf5%h&-z)T>sXa#@v&3NNZF8i
zJ!ieX*iY}9)3na~qr7a3cT!@-hRY5aF0Hg6c|sg;v}(?{&?`edd0fkchLCq#JEd}4
zSIcjejrz!XT^|3X6|ovqmw8?vqYFjbAU3W7YK=o6-G{F;m}Uct%kVA~&X%Hvi_Hy*
zD_L<^g0H`W96SLcm>@OWg6nl0MW6A1t$_+CS`cl!^&E<IrVn5S`cOFTJKBVirjx}#
z$M?20`jTv0_H&LybpF97+#>g>L=)g%S%{0TGEqX2TeR>EQV?af6gX*AlAX?3JeM{T
z4x?b(kNgEziM<I+P%22k<2Wy~$6L1_C&@1K9j~z&@m*XvvX<Mr8&R3jG~xE*O#Ioz
z%pdxmvxX44-;7ZWWo#<rwqon4eQUSew3zOy>ePmwOtzsgb__)<F;@Q~Ko8GFfx9_V
z1fGJwfCZEjN)Uw{>H=MQ7)3~pKK_ga7vtHnp}t9jU#skO89CNG&bBHbryKeAMi=(9
zn0n71t_?guzX)d5?Zk@ObnD|=@SA}bw{$CL$M8Ft>s0#+S{^YDmv#<2Ns+EuFE?4*
zR`Po0GGdd;*mE9Ee|_!sjNx-|=U5ucvxm9odSP#qgwOB3LN+6Dxo@c}1FOj5Sz&F&
zawuK08DT&KveW{(I~$J{K(Ih+Sfk}Ol;L~vjKCdjOsWWC$p_~!_A*A99@+DaPuc;<
zwzYw0fvi?9u5%vaZ7G6mgmqWo)#uhz?#5>3w7QkHvZCdbZK53b>EQ@;oQVE0;>hEG
z*VQbhJM`|XnRL$Q!p+kL>F*@9E4LW7lKmA6Mo^KS7mF%vlRGj?bGzeBY9<{DPc^Ik
z`GJE4e`op{6h@IEfaz=oi4lGg4lH&Aa&!J_6fLSk+9L4nm$$g#1W5rr8x@rhU`-)x
z0sMN4J0qYU0G@$NqzEQ}e@LD^+3cOd;#iM>fYVpYx$oED8jwV6Hv|*jC(jq<7up^A
z>p)$~-I*X$u{(jkM7prDn67id*`sysLj3#o+Opqy1o6}CC%Dpv(&%T(On@ddA4-sf
zyam`8uuPFn%n<J{ahob)MUD*E(^g*uK@x%Q|8Wf;aU&it7|I9ul>^oyrYRjWQP3(g
z8_2_j7-dKX1K}d{J=K`cCAhPZeTr&dbmx)So7EYPB(yL<Z`gTsuYc+t+pW=Q{`NE1
zv;};akjqoNe2kU&j(U1p`$5=81*ZK-S4T4V{(^t1DAbyrZWqFL^E1xuH1!#9nTEG!
z6NMB4mipF%p}ip*c~rs<2(GJGrW4cK^fjMx#nf0v99E6vZQnE*vR6e?Q5can1+a>k
zx*~C|7eSs=gTirGAS=kpp7oJARI_HA32G$A{p73Jq^U{4U12Puj6Gk>fWt|7x^WDq
zZJpTL7g{*Q8o57aTGamcH=O@bZLW=y|8}uSBU0IkwDvon=9J<Dmi|fXzV3<oBL_tB
z*^jL>e>$gwR8wo%Ml}#GfRQ+D<n1IE1m*<^#&EnMW6>!X^6b)b-E~(9;^#L(tl({C
zgdi(XiU@oLU<Itp0XLaQHBc-oBx1X%&k<2mPj(4X_MPB;o4b*Ta)PTXmQjUH_|XeM
zOIjh_U*{lKruoYE^yWs=Z6-voGCeGAf$zm=toni{VN;PUjA<7p^|C`9XMHXiHlmIi
zKeMRMY5@243B$eO*)B;sz`OdgaBsiICwKhhDBIDq3x*uLz}QgKbdS(vP!!N&ldQ<V
z=i3Co&5qQ`r$rA@NJkr=hLuUYu!1y5&^<KU`dS=cNim8FFfgV191)Pg?d^?8bs~O!
z4t<Yidj|>fz{&7n?GVz_@EFQoNnp?#Z^1)*bxms7_1nVp$>^<$<3=4mB#3d3L)}#C
ztf@YZ`*ZMajK(M?Ll^)0&|3DmksOF!o0_gM&aLx2X-`k*`j2oPQHuj~IBABWL6l;0
zq+OCJ1bp0nLcpqMY@lbx2cX#iCklj6gk?an*C|Y0)sE(p01%+NC~?=J1r_RaUr&a5
za#|c}!{<cyeN(mQm~hC8o5P{a?R#Rc(me6}ICfoQICtkDp3(Mi_5EA13Nn1dbk||N
zBi(c4n?!OuYv{ulcv(0`;@rN%0W!c?%nTww8$#XD0rLb`2glUI@}WfrI7JcD0+yAF
z01Z9cjVhoy8N7PFGFcZA_gfNjhwNW$)k8pn?f$|hh4ftY>;na^RuexBHAUdtsIgB0
zUcl(&OK%PPh1%#tz5m|lAwI}Wa{b=e4IaL#uXCIT+zqWk@@T0|MxvUjb~1)GhVs&3
zOxl(6?XW?0jh|v@TKY#lY7ddkU&wRBAm0@!JFWxkyO0EAmMRZA9<L4k#iF75mhGC7
z@FF*4rl#noF3zy*GB)~)uN9shykBV15LrA8O%Oe_4~%s_x`#51TR$=Eyuh&|{x1!s
zc}lwlaGRor7Ih_rJkb_K`s?z83!MNjJoQAsygS&97g?)0KH(W}y3C;QFA>Z}8DuIo
zk((#9>O!zxI-LBGqFWxEG^do_&<5$Rq>DPo7mC_C`0bBAEJTrPKumz&dD)v~0WeY2
zP+-C+=z5&%p>E2A0ysVkCyOY0*oi+81kxvHrT*ch0pNClzzqi}M`Rf^-~j^~Ui9`N
zkov)-50`V<w&AS#zh~{8H{@GssMZc%fqv$gzVCwi$7bzWSz$@GE1X23MtDINYqa{6
zqnUXw5@EQgNEF&Q3QN5t6H1ZQV1b_!H4R02@)3fpaTf4dduV5PEOxydc2^94JUvBI
zgT&pG#E)>8!tpA4rq>YxtPs}+I7vW5MtBHp*Z_$qh>B1uHa>I}o4ku3z4(wJCI@y;
zyhptPD5F5dHmmfX)}DxJJfS6@U#uD(cHPq#pNX{mzs&OjkPc<!1s1N|sCB@6K}If;
zkg!vT)=30`nk3!2$|Gq5(<(?}m>~8R-Oc*Ffy)3AnPa7)Xcv0m#0&qC9&lyGR3Wt<
z0=D+B0%lw+6AlFh6B_v69zHV2MLK59knf)$v{EqZoVHA1kmqNA-JEu*pS<~d!C%S6
z_Qz#xJ;k~hlvf7)byr~6$S*#K9CPgFSPQ5nyEFpLW*~-_7iaUK$WixbB=2g3i_2n}
zqP-t>ZF17x-k=Hark$LD+|a`F!4i;)3D6Q?MJ55}yG&+_>NuA1Fd!IMK*4a3H$z5$
z;RXEnp9X%gyjBk>7={-`PrO+<|B4d-aa-&E9>u4r2D(3TS9rte5V)2mBs)<FJV+>&
z<ndUKk-j;@CCxcjSt+899!1&jluo(!q@4qNA`74mjrN6riR(Hb&aed_@b+8d6KM-1
zG#nikkl_d+`iR~QLZBD^fosc2Ht$C^sLxkk%+f}%(!Zj23ipqGdK2`XF`qBH=^U>X
z7goRF<X{qm4tZZi+r#7`0S1iaz~lpX>J*^*p3bs?Ii`&ntExRr%n^msKs@Q3$X?MQ
z>5<eF(+ENmS!Xjc_MIS>84{6)R}nE)H5(Rz8jDCjfLigIIzT|0Eed1d4I2x3fGY_2
zfEarWtEAVSyLse{!qJ<Z-g^L>a%m(hI1ZD}J$QcahMdBUGmu38H_~8Y87(#b0T<9i
z5G=Rj_oKp2N74WrVRun;4lsfy6lMERvdxfxe5Dr#3DC#gEXSGxv*zFPab{bE&Ch`{
z4>DUD=-31cMF1;~Fw_EG()B)J5ROq7?r#^RGX@+535`&KycqaTDhlaPFnwWK8>@jb
zF^Gu*+rw;UaeOmExn>{F{$J$U-10g@7iBJ>(FO2+mF9KoQ}Vpi@mFxFZH24OF_&_W
z)N~o0rCK>IGYx5{>U_Ppc$uB99BK_ga`UYB-(v=JH*|owaxmJZN`d%jNnt>q0x1Q&
zrJ4j~43=gwNI*Rdq^bJ&>qs0gBzuAef{bppzsKvjJAT#BzK&9v=DEfH5hXwFAGiuD
z{(w8T8BxHlDSral)1x()Y?4*|!JRG#vwNme`t^v5{asSlh&|gzT8?ET*e<?I#{dmh
z!!XC1j<BlBzifndea3sLCL?WcV!puopW(0-%80QiKoeMaI|}&>LYpg*@hQB}V?$iv
z$D-Do(gLvF&p2)?=pNe#s39b5T~)642=Zb<D%wZjl2B2f2*mly5^OK!UL22H2yMJQ
zG(@KCX8`gFja}T-+~2+eSJwZ&+q^ynUhjQ{<|`LbfxaTZmyZK>Mu7EEVGoo<xw7h=
znqby;k3pKDp}4omeJpJGKm&zQ3S#|7*l8Vrd=UfS3ib8maBmuyx$TtyPi|UZ{Znmp
zw=8CO{}D8WTM6N&^qTivC||H~GI^l#DNZ5Er&iKKB-w-`bq)LkSM_ni=XdZi&G-r-
zii8kK&mQOQD?CLy%+LsBjMVW#AtOUkGLCzf22%Qu)sC=8YvDN_P?c%Mx;qrLUPVhW
zK9VH_#bK2~P$~!KXt2KQ3x~|x!~7&59+tesr(l8VU=1H@#C+}jIO5;M;qx<wL*4nB
z`TxB`)F6-6U_sBdyzd22{ORh{CP^Wixc2GZ{g+XN13#d5qB7BdF+~^=O2`5lR%}8b
z((aIWU@zT{pBykT1Nb=p6;@e68dXp?Np2j`I9>T?2K&;DCC32D7m5a02ZCM&#aOp3
z>11Wy``$$})tlZRA-61Ugt~Ro_C{7Vk&RWxS<?r!hj^1W>oP;-SY*J&EsHJ#&jkf;
z<_I!hf>%PX(8Xo2!O6+5Z!#fSVnh(ukN_Q3O^`Uqy5NSVxoafP$cs_9%<1+_HZ^a`
zwC72hKA>v$zm&)#zW~=YS(wohDZQX<6WGct_vPb5MHgF6;oG0SaoGN;PUSr}8U8*2
zxl`QUA_X=59*Ns;h!VuxZH>pX0t2fc36c~8LPdd_)u`E6pg)Tj0BM`YNK6iND?f&*
z{n-bjh+`9-h4Hoj9)eqbEXi^f84bK-6hFMtjYpe-C4c<6{J&7S4*3U^Ol|(AeiT@E
z&K3BVTRZXr3Ee*M_}Yp!Ea`_g-y0h)2L|=>*JqJd5>|V+?{d~wp2tnH#B@LLJls^`
zg@ZKt#!Z5q;ciD-^f`_xHng~1%eTchAm4hj$F!)<swOE|QCa}#1lLf%0Ar+InM~ZJ
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
bCH(w<U|w{MZA4H50}yz+`njxgN@xNAg|z~w

literal 0
HcmV?d00001

diff --git a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/main/MainScreen.kt b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/main/MainScreen.kt
index 584124e..0d551e2 100644
--- a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/main/MainScreen.kt
+++ b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/main/MainScreen.kt
@@ -62,6 +62,7 @@ data object VibrationRangesScreenRoute
 
 @Serializable
 data class BleSelectorScreenRoute(
+    val filter: List<String> = emptyList(),
     val type: BleInfo.Type?
 )
 
@@ -187,8 +188,11 @@ fun MainScreen() {
                             VehicleFormContract.Effect.Navigation.NavigateUp ->
                                 controller.navigateUp()
 
-                            VehicleFormContract.Effect.Navigation.NavigateToSelectBle ->
-                                controller.navigate(BleSelectorScreenRoute(type = BleInfo.Type.ACCELEROMETER))
+                            is VehicleFormContract.Effect.Navigation.NavigateToSelectBle ->
+                                controller.navigate(BleSelectorScreenRoute(
+                                    type = BleInfo.Type.ACCELEROMETER,
+                                    filter = it.selected
+                                ))
                         }
                     }
                 )
diff --git a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/reader/BleReaderScreen.kt b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/reader/BleReaderScreen.kt
index c6e4d0b..7fc3ed6 100644
--- a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/reader/BleReaderScreen.kt
+++ b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/reader/BleReaderScreen.kt
@@ -171,7 +171,7 @@ private fun LoadingState(
             )
 
             Text(
-                text = "Чтение данных с утсройтсва \"${state.vehicle.name}\"",
+                text = "Чтение данных с устройства\n\"${state.vehicle.name}\"",
                 textAlign = TextAlign.Center
             )
 
diff --git a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/selector/BleSelectorViewModel.kt b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/selector/BleSelectorViewModel.kt
index 6133974..cd3843a 100644
--- a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/selector/BleSelectorViewModel.kt
+++ b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/selector/BleSelectorViewModel.kt
@@ -27,7 +27,6 @@ class BleSelectorViewModel @Inject constructor(
 
         val params = savedStateHandle.toRoute<BleSelectorScreenRoute>()
 
-
         viewModelScope.launch  {
 
             if (ActivityCompat.checkSelfPermission(
@@ -42,7 +41,10 @@ class BleSelectorViewModel @Inject constructor(
 
                     setState {
                         copy(
-                            ble = it.filter { ble -> ble.type == params.type }
+                            ble = it
+                                .filter { ble -> ble.type == params.type }
+                                .filterNot { ble -> params.filter.contains(ble.serial) }
+                                .sortedBy { it.name }
                         )
                     }
 
diff --git a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormContract.kt b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormContract.kt
index 24b6325..50e9238 100644
--- a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormContract.kt
+++ b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormContract.kt
@@ -10,6 +10,8 @@ class VehicleFormContract {
 
     sealed class Event : ViewEvent {
 
+        data object OnReset : Event()
+
         data class OnNameChanged(
             val name: String
         ) : Event()
@@ -47,7 +49,8 @@ class VehicleFormContract {
             val name: String,
             val bleSerial: String?,
             val ranges: List<VibrationRange>,
-            val history: HistoryState
+            val history: HistoryState,
+            val clearing: Boolean,
         ) : State() {
 
             sealed class HistoryState {
@@ -75,6 +78,10 @@ class VehicleFormContract {
 
     sealed class Effect : ViewSideEffect {
 
+        data class ShowClearResult(
+            val success: Boolean
+        ) : Effect()
+
         data object ShowVehicleNameIsEmpty : Effect()
 
         data object ShowBleNotSelected : Effect()
@@ -85,7 +92,9 @@ class VehicleFormContract {
 
             data object NavigateUp : Navigation()
 
-            data object NavigateToSelectBle : Navigation()
+            data class NavigateToSelectBle(
+                val selected: List<String>
+            ) : Navigation()
 
         }
 
diff --git a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormScreen.kt b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormScreen.kt
index 76fdc20..2aaedc4 100644
--- a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormScreen.kt
+++ b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
@@ -117,6 +118,10 @@ fun VehicleFormScreen(
                     keyboardController?.hide()
                     snackbarHostState.showSnackbar("Введите название ТС")
                 }
+
+                is VehicleFormContract.Effect.ShowClearResult -> launch {
+                    snackbarHostState.showSnackbar(if(it.success) "Форматирование завершено" else "Ошибка форматирования")
+                }
             }
         }
     }
@@ -289,6 +294,34 @@ fun DisplayState(
                         modifier = Modifier.fillMaxWidth()
                     )
 
+                    if(state.bleSerial != null){
+
+                        Spacer(modifier = Modifier.height(12.dp))
+
+                        Button(
+                            enabled = state.clearing.not(),
+                            onClick = {
+                                viewModel.setEvent(VehicleFormContract.Event.OnReset)
+                            },
+                            modifier = Modifier.fillMaxWidth().height(48.dp)
+                        ) {
+
+                            if(state.clearing){
+                                CircularProgressIndicator(
+                                    strokeWidth = 2.dp,
+                                    modifier = Modifier.size(24.dp)
+                                )
+                            } else {
+
+                                Text(
+                                    text = "Форматировать BLE"
+                                )
+
+                            }
+
+                        }
+
+                    }
 
                 }
 
diff --git a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormViewModel.kt b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormViewModel.kt
index 0da30fa..8d0463f 100644
--- a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormViewModel.kt
+++ b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/form/VehicleFormViewModel.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.lastOrNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import llc.arma.common.clearAccelerometerHistory
 import llc.arma.common.domain.Ble
 import llc.arma.common.domain.ProgressState
 import llc.arma.common.getAccelerometerHistory
@@ -18,6 +19,7 @@ import llc.arma.vgate.app.ui.screens.main.VehicleFormScreenRoute
 import llc.arma.vgate.domain.model.VibrationRange
 import llc.arma.vgate.domain.usecase.SaveVehicle
 import llc.arma.vgate.domain.usecase.GetVehicleById
+import llc.arma.vgate.domain.usecase.GetVehicles
 import llc.arma.vgate.domain.usecase.GetVibrationRangesByVehicleIdFlow
 import javax.inject.Inject
 
@@ -27,7 +29,8 @@ class VehicleFormViewModel @Inject constructor(
     getVibrationRangesByIdFlow: GetVibrationRangesByVehicleIdFlow,
     private val app: Application,
     private val getVehicleById: GetVehicleById,
-    private val saveVehicle: SaveVehicle
+    private val saveVehicle: SaveVehicle,
+    private val getVehicles: GetVehicles
 ) : BaseViewModel<VehicleFormContract.State, VehicleFormContract.Event, VehicleFormContract.Effect>() {
 
     init {
@@ -42,7 +45,8 @@ class VehicleFormViewModel @Inject constructor(
                     name = "",
                     bleSerial = null,
                     ranges = emptyList(),
-                    history = VehicleFormContract.State.Display.HistoryState.NotSelected
+                    history = VehicleFormContract.State.Display.HistoryState.NotSelected,
+                    clearing = false
                 )
             }
 
@@ -70,7 +74,8 @@ class VehicleFormViewModel @Inject constructor(
                                     name = vehicle.name,
                                     bleSerial = vehicle.bleSerial,
                                     ranges = it,
-                                    history = VehicleFormContract.State.Display.HistoryState.NotSelected
+                                    history = VehicleFormContract.State.Display.HistoryState.NotSelected,
+                                    clearing = false
                                 )
                             }
 
@@ -98,16 +103,66 @@ class VehicleFormViewModel @Inject constructor(
             is VehicleFormContract.Event.OnSave -> reduce(viewState.value, event)
             is VehicleFormContract.Event.OnNameChanged -> reduce(viewState.value, event)
             is VehicleFormContract.Event.OnSelectBle -> reduce(viewState.value, event)
+            is VehicleFormContract.Event.OnReset -> reduce(viewState.value, event)
         }
     }
 
+    private fun reduce(
+        state: VehicleFormContract.State,
+        event: VehicleFormContract.Event.OnReset
+    ){
+
+        if(state is VehicleFormContract.State.Display && state.bleSerial != null && state.clearing.not()) {
+
+            viewModelScope.launch {
+
+                setState {
+                    state.copy(clearing = true)
+                }
+
+                clearAccelerometerHistory(state.bleSerial, app).fold(
+                    onSuccess = {
+                        println("success")
+                        setEffect {
+                            VehicleFormContract.Effect.ShowClearResult(true)
+                        }
+                    },
+                    onFailure = {
+                        println("error")
+                        setEffect {
+                            VehicleFormContract.Effect.ShowClearResult(false)
+                        }
+                    }
+                )
+                println("final")
+                setState {
+                    state.copy(clearing = false)
+                }
+
+            }
+
+        }
+
+    }
+
     private fun reduce(
         state: VehicleFormContract.State,
         event: VehicleFormContract.Event.OnSelectBle
     ){
 
-        setEffect {
-            VehicleFormContract.Effect.Navigation.NavigateToSelectBle
+        if(state is VehicleFormContract.State.Display) {
+
+            viewModelScope.launch {
+
+                val vehicles = getVehicles()
+
+                setEffect {
+                    VehicleFormContract.Effect.Navigation.NavigateToSelectBle(
+                        vehicles.map { it.bleSerial }
+                    )
+                }
+            }
+
         }
 
     }
@@ -291,10 +346,11 @@ class VehicleFormViewModel @Inject constructor(
 
             if(result != null) {
 
-                val state = viewState.value
-
                 result.fold(
                     onSuccess = {
+
+                        val state = viewState.value
+
                         when(it){
                             is ProgressState.Finished<List<Ble.Accelerometer.HistoryPoint>> -> {
                                 if(state is VehicleFormContract.State.Display){
@@ -322,6 +378,9 @@ class VehicleFormViewModel @Inject constructor(
                         }
                     },
                     onFailure = {
+
+                        val state = viewState.value
+
                         if(state is VehicleFormContract.State.Display){
 
                             setState {
@@ -335,6 +394,8 @@ class VehicleFormViewModel @Inject constructor(
 
             } else {
 
+                val state = viewState.value
+
                 if(state is VehicleFormContract.State.Display){
 
                     setState {
diff --git a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/selector/VehicleSelectorViewModel.kt b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/selector/VehicleSelectorViewModel.kt
index 4c793ee..f8d2d8f 100644
--- a/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/selector/VehicleSelectorViewModel.kt
+++ b/vgate/src/main/java/llc/arma/vgate/app/ui/screens/vehicle/selector/VehicleSelectorViewModel.kt
@@ -29,6 +29,7 @@ class VehicleSelectorViewModel @Inject constructor(
             setState {
                 VehicleSelectorContract.State(
                     vehicles.filter { vehicle -> bleAroundSerials.contains(vehicle.bleSerial) }
+                        .sortedBy { it.name }
                         .associateWith { vehicle ->
                             bleAround.first { it.serial == vehicle.bleSerial }
                         }
diff --git a/vgate/src/main/java/llc/arma/vgate/domain/usecase/SendWaitingReports.kt b/vgate/src/main/java/llc/arma/vgate/domain/usecase/SendWaitingReports.kt
index 31923b9..575d1df 100644
--- a/vgate/src/main/java/llc/arma/vgate/domain/usecase/SendWaitingReports.kt
+++ b/vgate/src/main/java/llc/arma/vgate/domain/usecase/SendWaitingReports.kt
@@ -95,7 +95,7 @@ class SendWaitingReports @Inject constructor(
         }
         
         val sendResult = emailRepository.sendFile(
-            subject = "Отчет от vGate",
+            subject = "Отчет от vGate по \"${vehicle.name}\"",
             fileName = "Report.xlsx",
             body = "Статистика активности \"${vehicle.name}\" за ${formatter.format(Date(readResult.date))}" ,
             file = reportFile
diff --git a/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 6f3b755..036d09b 100644
--- a/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 6f3b755..036d09b 100644
--- a/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/vgate/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/vgate/src/main/res/mipmap-hdpi/ic_launcher.webp b/vgate/src/main/res/mipmap-hdpi/ic_launcher.webp
index c209e78ecd372343283f4157dcfd918ec5165bb3..a712c271a086df10a6a8508d47c50686648e2dd2 100644
GIT binary patch
literal 1468
zcmV;t1w;B$Nk&Gr1pok7MM6+kP&iDe1pojqN5ByfO)zZRHWH-txjXN_v2TZn{!hTr
zmnl&hR&)KVEGyiyV2zpp#6zD2qezkz^)mX`$-KWq32GwQYMzAu0Ri||69rJkI){Qx
z+Gf{?f05PE{|Ny0Z%_g`(H)GW1>sK4P7C1(F1%-NE7kCZU;Iz+^bP@>%Xfx?wr!Y{
zKkT<bh=>W`S2J$UJi@JQTeY&z`-*h{DWPYyLJtfoaLB2HK?7t^z|V-hi0``5d)~MQ
z3nSoG+qOKppD*s7B|N1kbxtbV16E-TcejqtVF^mNkMC39wvCcwW_*I=?f(qP`TnYV
z%#Cf^wzE3M`74rp?zvl6+qRu~_GH@{G^&D`p698Gj&y9>R&7;%?2Eg^lz>7~B6o+(
zB_(wE?*8vxvLi`yZ6#|K4Q}8l&T9Gj)J`~X8%dG8jF;m-AozC+i9iVa<9%ds5F;=?
zIABbh1P)~dkKu!B4ocW5vZ@h?{C0z@&H|UVN;uFO!<h|nGh)LGPD()lhLbmC!4R<3
z{@oPP^TIUgLy!<vDt!|qL6fwI!XSm5X)_iCVZc~krh(fH0*9FbmmmE3qL&hy0|seQ
z1xmS;p4&U=C>ycTr+#c9g=&p@60_1Cz@<ji^3?E<jASH`M&c=z7G<!U8ip`$y;7-?
zmX#BowS=WmTMX+MF=S>*6k-5JT5YgFsWXr)@9Cgv*`m%E4YOHZmCdbB%6Q3L$BT2u
zFfCuHTg;;niX+n24NobfYfG<&t*3FGf<uQTGh?h4><|zq5`Sv=a@v2G#NX5Kso3jN
z^ZtnZ!t9p)<6B1|-{AoOfUaNX!R@j4Wi7A(fC-ystrwth5M=|jCUP7fp|)pplY8Rp
z0Kn|V{V8Pf%6_)sxn0(A6{kpXYpiG90x)r-4`oc9vkwL=I6b?mOo0lXG-4fVWp{yQ
zzpPQFUT@~Y0s#Al23-HYbl8K#urw>y*elp4qo-8qA>IH0K%8DX>cg)d4!l0q>lK6s
zh_)iJk}SFZrJAqfiz-JF06;WB(+vP1Xu|7Ed-JuOeJ{5}G?y#{b?l#KBW`7~iP^)u
z=Zan>5RH$~%lcl;YV|VBwdsyy3Fwu(6h_;9sXXWAEEfupVEgtw6s@P&j6}Ac+GF$b
zO=$tX6l8Phm2BSY6Qp^a#jVE}b@Bf#E{H^;f{?bok9T*QLY^2GM{i~RK<xVK-HJnL
z8)*Udwr5*cC%Yk$Ac%^LSiWo?K1bfZTb|=MH28n`l=s%!v*SOE3JBtV&cj>JXXaHB
z5(+>hG;Cs1GMDF>BTG$H%Q1r9Hu%z=eR_wTNl^RImlwD03!{Mm2}K4FY$8KWajLDf
z|4OTzEAaD*t5-a@;tyPW2uqMq1d1jSiVQPsvZt!Z!Yf+_w(!l0hnGLP{O80h8bA#M
z5h$8rVuKp$V8}8EP0qiWp=OLba3ywHz9>I`J0GL%ArT}5B9X|D!zTC6U?WSaIX$n8
za^TkDY+N%mZULj}{&{`>&S%eD03blK0BEz?Fgu6#NH)?gd^@$0Nv}L|*YPGTAo>6F
z|Moxse}94iU`89w^~w{F#%O9vR60GYYFp#0j25xoo_}62OVC`hXwYb4qp~py$Qwj6
z#73)KmSD9e%;u~uZ#lFO182kNbJ2lZbNf%jhOj{9;9<#9Y+5XAzg|!2hLq*cZ&mhW
z2Ycu4*9yl|;5Qh;wb<s83;5p~@ZYAwg`yCCg{PlJ5Qgafcs$<-LqvE8W5Clbw3Plv
z*g1XKUv5>bh%l$Yhlkx={I*RF(j|QDEuXKf)aNP4Z}xb2JXqrWNKWLd$W5N|#dx(c
zADy~FpE?Ny7$A&91xi*%m^ah=zJK07;N?05kmgp~u~wQCVU)iJetBJcH~E#>4lO0x
W!Li9s%`MsX2Y;oigF;r#|49HF>Crv_

literal 1404
zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r
zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN
zXl<@<#Cm<R)d19?=)E<{+g@mp0C)CAX%7ksNnpX=jPlJEkqD9%o*fC(U7iySOYHHS
zCLH@bXPyI|^Z)Mc^PG7Oc+NfBJO`d7p5;U`M53Wbd!w|M(MUoNRc2m{@^!wFKzL?&
zx_RAc-^9Azxo%DmXW^9GV0~;n_G9&dym)|QrMEx!y_F=oDunn;1y)cvAc6z{0MHiz
zodGIH07w8nF%*bGq9Gv`YHnm80|d1T$uW=u4vGV%tX#>e5f5yr2h%@8TWh?)bSK`O
z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF!
z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!<r*4*+?g*sysFgiN}}d!-T(>jH(_Z*nzTK4
zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG
z?Fe{#<RA5Hg_mG&BZS>9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~
zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd
zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK
zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG<W<SKpuS2eaDGkL-J-
z!+&UV_N0e<DV*|igwqdC*l{lj0T&&`uq=ycU@f9x0i8jzLa(y*X(YV?PCtUw;ks}p
z4zFn7N(-OG^(9ot1ZhYISOWe9?+l%f6v41n+j<OM$_uJgNP?ZJy}hEMMH=;WiG4I`
zs(bIWwSD<LJnAN(E(Xjr4k(^UYF37F_3f{;E%%FEa&I3I0GbdH@{pD5$m+1PN5CW)
zyZ&*9o#8wstdx@^rci;0B4BP2+H4Y<KbJI5L(bXG(k@`Kp=d>8I5h*uf{rn48Z!_@
z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqro<oln8GL@_6LPC)kg1!M)Y!|NCn7b*0sG
zEN=&c2xMM<>a($ne7EUK;#3V<N-jQ7j($tREa0F&-HzYCQtR#fTCZMRN*ZSm;T7a+
zuxa$}zDL8R9wGYkHb$+gJoiM@z+u{u7a_VUBwtd)bPzHxH}C`W=^2PsBr`s7taBMG
zm#Ss=-o`)W8%%x%>YkXaew%Kh^3OrMht<?zOY6P}#rBhn_hrWY$_P`{#CBR9w?+E6
zt7r#NN-tjxFY{9q75P<|L<ZJBHwn4FhG(&i>jYN?XEoY`tRPQsAkH-DSL^QqyN0>^
zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y
z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu
z4)<UE%?IC0Du41FrE~F_qc8nOq>P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6
z>%NbT+5*@L5(I9<vs%8>j@06@(!<!eaZcF<_le1MVaYMg=gRy*f2#IaBH-mJIpy+L
z=Gsbhd6=3>{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W
Kmw_-CKmY()leWbG

diff --git a/vgate/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/vgate/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b58ef16c654c49da411bce93b6d53322733c20c8
GIT binary patch
literal 2492
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
GZ`eKxLA4kF

literal 0
HcmV?d00001

diff --git a/vgate/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/vgate/src/main/res/mipmap-hdpi/ic_launcher_round.webp
index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..d30f8565bf16a86e335324b02a4395bac0189f5d 100644
GIT binary patch
literal 3016
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
K|1_xflp+8Fw&FPe

literal 2898
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

diff --git a/vgate/src/main/res/mipmap-mdpi/ic_launcher.webp b/vgate/src/main/res/mipmap-mdpi/ic_launcher.webp
index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..ac0ed8b0c2e48bf3a40aaae6d7bf310db8110f19 100644
GIT binary patch
literal 1076
zcmV-41k3wUNk&F21ONb6MM6+kP&iB<1ONapFTe{BwT6MTZBqZTzk7&?2|!S-*RkQ&
zwymnVZ81op1VSQ;p%2Zh19ynE1&8b@eh23=UcTYG;%*U+Y}+=Y*tVUNM^V+y^olbu
zMrAeq5VUQZSRaI!gJj#bP22f5``Y)}wr$(CZQHhOGd?I?w3dDG0dbycF?NG<Ynvgd
zF>6E$mD%=gWFxd~vwvmP_tn_8Q3YF)WYgAc9NWIO?_HQRdw=+~{b<{^wffJ%Z6ifq
z#^ZYgjG~A42(mrD9(Ko+-um3`Ku_;Qy^v_T1n!*I<9b8=pk2vU+VFz=Wa?N44Mb?q
z7&_h_T|+&6sW0uP{)o;y9lGb3i~Xoy6iem)wf!R7F1wFV8^7blE9E9AUx$;Z<LVkX
zT)<J*UmqxDyX!t4XZ@c<=TlEKYlz4pE`-0ne-fFcWYhqVLtK9Nx15ZM3NAsKvjGZ*
zSVzknVT#BbZu(g|g%}_%Bx53i3M1UsCIrUWn-O7%sJlIs)1a;pL%@Y(Ohj(;c9g9}
zgE&Gl!O?^YLqyO0s^Bg2RXON;%}^Ksa*4xZ1h|rlitN35$*t3ze<c;k@YHB9$tEs@
zNzNu*fT&=KeqHqU6_=ncoFeJ_7=+-5jZ|1f&Z|Fy_7-)12ZMJP{~(g#?yQ$(j0_4U
zIvPdeYwp6DhSvZ6d;Z)yra*N#BdcdJ`aS|kT~M3p5GX|bzpDItUiyQ}aEB^7d3}i|
zWqtWwQzWIp*dG}^Q%9NPYy^YJy0`nx=XlQQaop~1GIecvr~dhFuKCvNbxcF+|2)@x
zhf5Ietx-a*fJ}}tS=L8Gevk=(z!Y6ScA)z+`2G8L4Q;^Xa(biw1yf+B{-wX`0%8g*
zr@}hMZWR<t$Q2lu(=$2Nm*}p>1OPawc{BJL*3kOD^P}6&@{Hnr!EIbJUT|wF5w|gS
z5dhUts-RF}LJ^rfV+3Q*Ud|7ob@1@JV9@v*G+5p7&E+B-&7PKyCkiMMC<355NL3Wd
zC=`*)GhQ1`1E`$d`7RtZ@8-0-Upc`R1`-X3N);It5fG}P{HDl6ey|8&xb0Gi*582l
z$z03O;b`l1bIYx}oMtnmQ=(ELgCbERfK&saf}%H`0Pv#Z$LV@nFy$<)y(<2@ySsa(
z>a1{yO^Hq&DiDP#5+DK4)YSQ$TOb?l)IU4iPV(sd4rDK`@zdSiD{f`F>bR5`lxUPF
zK&FPCtxN#yJ-IFa>FPVpn_n-R-CAn6M^r6z5{NJtlCffMCCgLO9?skrY-##W&hDR2
zHANjyZ@eB3e;{9$B6g|=&8ss*m>Azd##HAr9F_;7<w1hNnz56+$#8QgzpLF^&*lRp
u3)FAvy{Y%k8Ri{Jt$jyruZgyn!OxC6{5Fd5Od@;vxP$9iAjzIE2mk<_!Wp^%

literal 982
zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^
z^1csucXz7-Qrhzl9HuH<!ckn_w-(t15itRHmqN0O$B3XH(E|jyV^QXq8=yM`Q**vy
zpEpgQd+no=J<Tlv&+_>B%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N
zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}<p
z;bEy|mw1;}P&gp|0ssKe4*;D3Dlh;r06r}ehC-pC4mGy`3;|+W04+#B4r_x~@mHHy
z)H}bD|I2-n_L$pW;*I)~?=#N<)`92&<$3IR`#<SH6@I&FRQa6xBmQ5wPwJ2PAI(ne
z$L2Yb@JHxb`+bLk*AjR$^`b?pr|?!6=+AboIQ2D-p)UI7x(J0|5(5~ur$_+)`>C%4
zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{
ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT
zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh
zOBLA>$~P3r4b*NcqR;y6pwyhZ<hjKiZs6mOSFB&+cIl`GV$93-<ciUjF#*1^<p~gh
ziQ_{)r0dA7$It&Fe=obxu8n!+elxmgqxPbUL!FxW0;AOfqz@8JOz9Qbm)m-9!^7D)
z480@BoIIb<oT``+rVla8L)8fXO&6}3P9n4v$`6WG<DUNWuKb9J9rUsAn7d-_YWT^U
z{NXl@OAPIJ!>3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu
z(U^&XLW^Q<WhKYr9rXr6*~Tmpuq6NjnD6;;NNBGIg-1ZvfACQ4{ocrwM0)?`oL2ts
zCXY5KT@`(ir63J0?%+_(-dDgf<6R$u{lCdy6Zi5d+Bf;1OXyD;xe3#Gug*&T|0o41
zD8;$|JvUv&@vsLIH&C5+S{!k&{~Z54^y@9r>X7F9Z*SRPpQl{B%x)_AMp^}_v~?j7
zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0
z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@
E0Of=7!T<mO

diff --git a/vgate/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/vgate/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5777b03c9e31347ab9e1980d6f155f0d1ac905fc
GIT binary patch
literal 1458
zcmV;j1x@-=Nk&Gh1pok7MM6+kP&iDT1pojqYrq;170I!+ZE+j#DH|||nZ}y`|Nif{
ztE?kik2Icf@ukieCUv2XJ7(2kF3IWK&XMad>!ju^fSI{tR2PPdDrT<a24Lg}(G`Ua
ziO3-*qz2FJY4IU#Py`it?j+4DKC|!hms{I*vqkhl>OJTgN$(1qQ2@=+f_J+5etZjr
zX5v|sxduiKZQG{y*tTukwynx$Y+K!5#qMm|wrxB4jJq7Uk)%kDlm-@V^ak#{VO8CK
zT{YG;$+iI|yaYlGg!Tq7)+2NB<4%CK+e@|0eSp9c5E_`UbuW2%8%|QVUbboHR^qC=
zLj%RwR<`Zs2iiomN+5*2MQUt?q;)8BdN5&s*&(TRlJo%{vK0`&ob-`u1(anUj{VDy
zfpE&`PW1_s+z)hi2Uzndf2e_wIS+`_kLhZEDTX_pl|}655k3Gh(hR_Mmhhnf#Diu$
zEZ8y#AB2(m+j&47dQ5o2d)YudceD+rlFo!P9`+o8m;=PCMGk{0c0Fdw89cPW+lT<7
z6u8$Qgvq9HD65c3f+o}y3LHIw$v4JhiS(r%j71ivfOS%B$77~nuq_zZ#qOvllSnvY
zc>)k}m?Dw3_UmVc{h68Dbz)fC(ze=`2!xVVkRPyZr+m<*C#gD)V&(rSh;g_9J)W6s
zpLf0MGW}U!mx+`M`2*pH5hEKx34-KWaF>}qDQo(zuW5;BI8uP}!$vtbLX5kvB?PZ6
zWcD<z_oRrrCaj+u3PlK%?~#32VG2f2VTGVfm019@&ney)qV}fX$wa@}+~tH|PzJ{K
zF+}NdABCXC3PB}ShBAk^6XOq2`BKPjy*~w00T429iKL{ue>af(^j4T<DzLDzzlmw=
z-)$_6<7aCGKUl39&m6QA1ww^C6<;d5Jt@?+#Cm@S|4-3*c%dF1n)T2xFK}H11rFmA
zqOVpvQ!q2L!ZZm%ZQd6|AJ5F8^m)NF0-+3P@ixKJga`dj2!>1$;Z%t7;DF%1FRnEl
z_*)O`tNK5u%Upf&Zh+`>^w9sfE`on`d6-?@zZ)<|FU2e(dlC*~a4?iW2rU(FCZ_d!
zEr?Y_4&znjS=S~6RT_PenID>`&u*%Y8aSL)=!5Rg%p41!618a~VT3~oh4DI&%8-h;
z3H#1RY?AB*e-a+5%2lpySjK-?{9VB|#iLfn?UI<CpL<J|c~j{5AQZNe#Np2sdoHeh
zNZ@Ou|AUoreyX2#?oGP<FU0L^iQ0*TQ<@qKWATudN>5KFnJ>0{DbS@acAZiyKLot(
zUWKuBN`?1_52mwEb}Zc)*Q;q)u_x(5!i9vKSY&=iZInXk41Rs0rLw})WEKSj9l5yn
z0sLD)3PLE9rb3xjh<XKvDuxPaS5mIDCY6ahGcW(F+=f)VnNCoEmCv2IxbuXX`G<Vp
zL<pDy#V+-#WL(LpkXB(&(wT&_xU%KvUdyw5q0cEm@M$x+E^fS{mVP1sEMgkMWRO+m
z?aAC)3r{=lYH8}>KpOt04=K>);XpIsKqaETRG2Qj!tLkRYW9y(yd~O-Z%<}adAFx^
z)YB_J$46|0tsD-9?xR3ej&+2U{}CKj{S>#5d7;{$;?(NrYWaIf(pKz}+l7=eGYVI>
zjQ>{(g^i&A`$s1Pe>u>lKhwKY>cb|VceVU8O@6LD`){(+<?YFLBlqO@GZOwI8sfkd
zQW(Ps3R_tDzM<auvrV#_50qKn|Ife0%8@A*W)z;r>>?@~B=V;QYhPmr!5_N6&tTis
zU1Un)yHIee`1WMRmHb;I>1#hw`FYWWlczL+=yw{><JloI4ikjh{cCN-E^oIjPq|8y
zE>jJz8!?&W(TkrR`ZBD%kCkc{!QTiT!M#~a@N5{fW5IS}EQMAf95aPK#Vo7Ja6B-S
MSERG~ac2i(0OY~U`Tzg`

literal 0
HcmV?d00001

diff --git a/vgate/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/vgate/src/main/res/mipmap-mdpi/ic_launcher_round.webp
index 62b611da081676d42f6c3f78a2c91e7bcedddedb..8f4f78648ba9facfc35b58fda932117705327794 100644
GIT binary patch
literal 1914
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
AUH||9

literal 1772
zcmV<I1{3*GNk&HG1^@t8MM6+kP&il$0000G0000l001ul06|PpNL&H{00E$D+qP-j
z>Qj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP*
z(X?&brZw<itFzD+K&M3~p69>({`)WU&rdAs1i<RDIiSY82S2mupC8Pt4!H6t1GTb(
zWRM~Q$%>T<R+Yg3{a%pbg++@O@<l(ulw^R7DJ5kYQ(?LhFeMn^80iDc8a#OdFhyzL
zDn(d!5nfX;MJV7nMVO%oPb#QF78@wSOhvdEwtz$5l){XK=|H&u(ZCCOX72e)L;uHO
z1tnw`glk~|XjH3U$_P_d)`A8s=1~}>a0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE
z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TR<yeHWl(T-||IU&i!Rd!TMUruU72
z<l~rLRD-qWW4hw3Q)?MQ93gOvat1wqq{JcosXwejji>Z+cz#eD3f8V;2r-1fE!F}W
zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_<vjH0E1*B
zfk*0C6jY|!Rf=RG!W+$uDg^D?-XzoVrR42)&Y)P6w7*9BP@dq)8yymh;%(CA$R7+o
zloov8A4l6H7NzQ3vsrJ*;3X6j#0T=toMt(L(p9c**S(b_DMgZG<-Trpa|&g3Ns}I1
zKlp(~|M0=q9!(O5aw}K0apy5RZoJ5U{>?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7
zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n
zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u
zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR
zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u*
z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN
zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT
zDL1m&|DVpI<IwA;|3z1u>y=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=*
zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8
z52e1W<DmYW|KhLyAh*AQ$=bd-79$cFL1=dC7E!?lJ(DK_A2rbd*I!fTiWjU@hO@LO
z{34r?8R+y6;5?)6c=hv86*TVD<6h<-YN#p%M+B*z{-U|t?d%$+^@~OhgQ=;&eE7WW
zQMm4(i7@Afmhf}Dnwx!Q1lKgexn~licBP}_&7QY=>U%^L1}15Ex0fF$e@eCT(()_P
zvV?CA<sp1RgQ~qYDHIC(K$HgNSDgI7aFI{AcoU=(>%#Sy08_U6VPt4EtmVQraWJX`
zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4
zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN
z8U5{-<bq**{p6!H-(%Tic#_E`wcN6#HU8-OK@OS$MA~<4ln|3Duf90UXNW1nMhk@X
z!<X~il$GI)0FveT${!;q6+#ptj}^6#CM6bt!8aB|<oIwiQzNU~!^v#E0ATVF@f>yY
zvV{`&WKU2$mZeoBmiJrEd<YP=_2@e1bJ|tRh6}2@09)72_kFh|s|{=Q%;lrD1V0sq
z5(|fB{Q};57E-A$Y;tLp9MPkkDs1?cxgaM#DX)SROj{lUu_=U;L%&QSd(1lwW9=M~
zPXv~y>zUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA
z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)<p
z|22C&(o0<{zD=}o7hFmrnHiNsKS+q5do@k^v7dAg(j37~!7%msUYhV9SAD*hicVK@
zd=IyocF&y5dH^sh4`7M2vQg8OP##~+Eu~vo(S~k<e%FqF9ffGv{w_F?KH5TRvvnu}
O>FJ$wK}0tWNB{uH;AM~i

diff --git a/vgate/src/main/res/mipmap-xhdpi/ic_launcher.webp b/vgate/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 948a3070fe34c611c42c0d3ad3013a0dce358be0..8cf042bbe59d87d2b872f21b78935bf147a39076 100644
GIT binary patch
literal 1996
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

literal 1900
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

diff --git a/vgate/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/vgate/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5ded43d2bd8c0aead3a15e24fa6ee79536fbbb00
GIT binary patch
literal 3618
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

literal 0
HcmV?d00001

diff --git a/vgate/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/vgate/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..dc55f847159d5a676fdc8ba0bca063d4d296deeb 100644
GIT binary patch
literal 3920
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

literal 3918
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

diff --git a/vgate/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/vgate/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index 28d4b77f9f036a47549d47db79c16788749dca10..3727e5932e2be6af52cfbecdf426f0960f940f9e 100644
GIT binary patch
literal 2976
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
WRaF(#1ONjAL-`X3gyv1dKS}}X51khP

literal 2884
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

diff --git a/vgate/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/vgate/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8cb97db4ac5899b088fc44334505da51b86c0acf
GIT binary patch
literal 6414
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

literal 0
HcmV?d00001

diff --git a/vgate/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/vgate/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
index 9287f5083623b375139afb391af71cc533a7dd37..6cc6ef143258dfccca83546daba9c6dcb3c46e43 100644
GIT binary patch
literal 6512
zcmV-$8IR^tNk&F!82|uRMM6+kP&iCm82|t;kH8}kO)zLANlJQV_`$#6-325>^nU{Q
z*;5AFQ&Rkf=57oDh{25@0*EfvLL=Q>5~QXFNWK^)o(#!-C7M)V*gHek=GgaL>A)Pv
zv2RJ3?ID9}S=axbrz~7WlB8I5%#8k(t%Sb2$FP5op8z+KZJX8#pY8dN=0)bWZ6jdX
zNRp#LtA?L{bc_1Effn@NY}z(T+U`9A@^2x54nKyNS7ZPHa*$CkkO2Uk2N}Fta!>$-
zf>-67+gdvg+){WU{Tjces+C^`PtGh%{@wH|N8`5~Ra9aUO~Ir5F9c%eO@ZwrFNTIb
zQIAT5Kw9*#(`BjMZiX1H1NEqv44>A>Q3&L=9%LX71^m^sA>LpZFliX_|Ji`H-42L|
z3D6hu#gw{HWE9ndw&V#5#wjiUku~V$AFXZMwzzTgjCLh^EpK+c8)jx^EYl}u#y`-0
zXJ%$*X6Cxg+%PB0Xj|6Gk}S=KwdB#vxbW?6x0!MqIy&i0=qWP<oK6qFrMHY>_EVZN
z1-G?AP$b({UG=#y%*=6-Gy|HykBo)Sis3nkBuSC7XYQF%!pHl!cSH-@_Ck{Oeo3mk
z$FsI=+qUi9qu-~tZQHhuwY_88XiisEl5YYmyZ@(1k`qzTjKj3d%*?!d+}rx-tNj3e
zBxa`N9p;&3-eG9wF331kO;u*f5Abc7GgAs<YdTf(Z6VE2t5KTS%am6`tISj*nW<Nl
zY};1tHgnw{1^eF+uBFJ#SZ78_w)Ho~Mv@#!l6%w<{gu6^ogNcF5Z>c%LISBkFqr!?
zUqrx!WmGSO5HK_MIld?+40;qIok%4@L<$ikBx1rPI*25ZAYzOjL($BAhp!L=0MU&Y
zL<}c}5(9{SL{}o4$UKrzN<nKve~pL`?L;$CMN|;QL?KZ|Gyy;e&3%Ed5CiH1#B^d7
zF_9QdbO!(vpqB;!Kr|91#3kYsab`#ZAvC+3iBKLuWDv876~ugE%o#ugZDJu1NCgIi
zp$r5N;G;wiafJATI6*{#y4LPxLJBeJe<C&$D~TaM6q~S!2&`ph76TaoL<#Xb@eOg*
zLkP|8WFj@=RALXYix>--aBM<KP;1uQF9C>a#An1OABU*eg^tz?Vh(ZLkBKxy-dqK{
zYHgqp5OLyL;tk?BM7hn;h(RnRZY7ohCfW~S@0j;C0EoYcr#=9LZsJRf4-<D2tAXzw
zEwDewdj}wXB_2U6;u@g`Vjyt?u@7uwOcb2z^&1d~>ko$)x`Pi$neD^|U_TQHCljV0
zUm6rZTtIpFaDwe$!T09E;rzYmD+zXd7@l&R0*IBw6nJw5ju+*Dn7lWjoaJkLomc=w
z3a+T42tW8bv^Yp&l$b_LfOj-pGxTsmf$50FF#-%@GLeNy;Gz;mA4)KJ2;vX{5il7J
zf)!j=I4UuGTLKVA2s%hN=!Mva>#8_N(5p-a!~u*HnM5{N;KFhuOtMFi1%mB|1Zf|F
zi+{x+4R#kW;UID`lnE3eh^-i9;)Dm6FXLs2fo;Ud6Cv8+_E9(CnMA<0VT>nk5<%d0
zK~yIC24Y~FFjm1QYS0&!L4mp(;(~3#AxsJ&eSwrfi6Rc!4vJ0Afl%BRuz@OqPR_Hk
zfkuXlL@Nv|`a~TSX`9S>=$e@jTBtC&21Xxgz}+B6{$`XwY89fy{|I1j6+>++H;g;Z
z?`@+W*<Q`Q_RG)xum2o;-oBcF1Z)KZ6hM|^x?ZEB4ZI@1qR#dj;oaNS{knVhHkIT}
zV$Qyk`p!HUvK80!pq*cbT2VFe39U>{!@$7KMt0zB*SGBaN+$)+#G3s#C_CZ2U+1`R
zK?qWdaInBF2w>;zZX33o_kfL2WN&QDK9y{QpbKolok6_@Cc?m<K!1}%b#13aW-zpG
zjN(7ggZiG7jkJlHMC&sdG^DH(%+Ea-gpEtBnQEA7pdKX~VerBfZpFtzXdP#HQ}4}o
z+K#uao-l_x?1N_7i1+TqPUJ0ag)EBwQJgFBBhG`3zjC8)JE$;;RvsBOVIQ2A2Q&He
zf*kcdYlPqoFTy~=&i9WMGfm7+;0Wvw8==1)OyCvWim)X1TR2?eXNm2U<@)G6V1D~{
zZq?96aUPn%-xuUJpU_qi#BDr;1d{DE6t~Q$Er{Wy)BLazA2Ac`%%l1w3t|&7FXxK9
z1r0m@XlIrzU>1&tjbLDBfhl}?2@cQoieui92Ta<IuvbU*AF%RI$94r^BTdL@gkR5n
z`~*;(iClrYSv-OP*g3<V@q0^X<Bnio`<NgB|6l^oU!T%9po;R(Qw{7wWGf@ShP81l
z9lPygfT$U?u=%ic(FFBI$rNS|XG)}OW&Ij%D*IsWa4?#2&tjppB75^jgfz1evDhlH
z8q=zsv1km@J`$(F{A`qwP%lg<xECo6tbz|)$Fk-8s7Z@hhx^MuC_|@?X3_P?8j|Xi
zT$X7GMn}qC%-l6Et2(e8KeLZIyqV#bWUjO#t80bSNS0wg*!-DU;ailA72|>MY=iy2
zFdxems`dlINiiR`Z)nG;HY}nqmTCm{K_i%l8OL7`Bh`q!nE}HY7b&~#KAy8-)nEU#
zX{fZ#+$3mb<h>XnPe4@jMx<Vd$p)EP>_!G_vEyVBoxK$;E!&uoZX$hYrb}2&1`eB;
ziZTrQcjw(4nHG6#=Qi3VFyT|@VVar`TZMl`Y?xvkoLCy<*06|QE`*VGfe9Kw6Qc=r
zZ&)hH6R>wAvqaCxfE<9=Q3(iHlg))*Cv7ADOf%?eba?_?MJs|YN<YGfI041lSqE$A
z&4s%x?BW}siEbBWh}<7pX(W^ZqZtHt2C>}taD-;j60YyZww_&tQ>al4l@_QH2$5zm
zz6Xa&)Xfv)r0$velr*mktFf<5aAFF~!%&6FJ3vU%7wi<M&3)sdyy|>cjB{}OJW>Z?
zI^r~AY~eb^CIP`-BYmWbEwE}hec^1%A=<N?2akou)z06%>l;_T|Ks*A9r|xdMUXgm
zlmCsd2cmyA&@23ArB)ybdPd@?Du-{m^-JIRn(51bBZo{B#!aht*u+0PMYnMOp`LDv
z*ne5nFf!qqsmD9^xv$}A2hKNg`c^?Z4~u*T?14jvlfEFKR&Z0Or<EaGom7K#1a84|
z3vOt1*%<CpzTXy*<q~WOdjvs})Qgf1)e~fXQVmkzqOLq|z!STyOC1Pz!IpEYd@5`K
zBnh>UCa5%;fI$%Av~mi(7$x%&Ykd!9hH9nJW6J$?7bz@R+h7YH2?C=CqRQbod&ALW
zMOV2nrMqC<IGE9zkwznDp6#y|#50GXt9Reg^8`6iyR@>-&BOM?itCqw9e@NXNkA&h
zL`X;oM}1^^8(y`W@!Iu*@8`<k#apuujC1msE}1!Oe(d7^{F{qX#`o7!o-~#nI$;k3
zsYLYzlpr|y^FwwUx7ZL%<Tl5Jc}3Q@oc-ebmPpYnQ8JYFzZyBjkEdWdZDGQwJP}3#
zLl_51wnPIdupzIivs+FLPKXu=5{QAK;Z)_Y|2)AGVFweF!(sy56OcojXs}~i^017d
z5cbWN9djh+YC-xk5fRDQZB&?3hvQ-atz(qX1vILhif`h=xu=|cih{p>C31Lj{)#Qc
z3P4OZ+hxxIB4*7~Q>JABOuU(Rl{Sa51IZE{4tmM4H4Ec=d7f!&@v|_{prZ*Dasz7S
z*)?;s49Me7Ac<|@o`8ptFo_{@%u6E?Ma<4TG$^slUIEa)FNErV1##S&Wl>Zl@mwO9
z5ANv+@RAUh2*bHA&mR;qC-X^-jSeCr{74-|dPaHF@|=+ktAaTNqJ;kT$9m!=0q1Ej
z06XRthvqEe$jFyzVx_KBk;K<%xuFgfpMzQltl~LYn&Tw_DlU)UJhiar=MAK-FNYD<
zww9{p*MkCj_{!DKg7l%8C&L{`Z|TSQK!p343u1_!u6y3)P-#sR6u~SS3HxoXkcPQ~
zY7kUAH`O|Huift3pn>)QVp)sXJnHH}PdP8WT^PA&Y?uYjiCLCsKsy-7M5P00?Q4h~
zW9PBNdX_bi0?1IysFJ5p1_P?uST`19DK^mv@(0u6*x1U<%ttp@=2!vGoE4*cc{+0o
zC8vlabU;9)eV7t?f4k-U$TVw)@?a{Z)pTQdODf7Fhqy+=y%l)ZzO7J=f|qYguJnb`
z@(7J&l0Vo*qt44oW9Fo|@_`;m(+X%EMIh5hF@oXCUBA9%2@{mV-IY=<U@N^HqaR95
zk$RYLO<cb_u3Ozbmm*Wqap<L+gX*O@H`-atcypyC>#xV=<Q`+>?3^pdV~8O`<AS46
z(2?&<4cy#)huisCOQH<T&!Jquw*t4q3xHRV%ux)kg(iWaHkuTlQ7RJ^Lk?2^KI3rV
z;j~D%)|h2Y_~)KS07kjc-76gsJys=%sEC4J0_ls}Z(4}{u)=@~ppA;R5m^|1BbMNv
zz~_VFHm(Jz<)8GQFm);sEuNc$uFr$>QcEg*U3Ts<_Qx0iMywfEKkR36LPQlHKunkj
z5WSI`xB3~^gpuZ%Ajp9k6cGL<2u9^Dtlp7}Fc39JV!vG-Fgb<=fBulS(>XwlC_NIA
zYw&^b+6OzJMFNhHA{sw*e881U?s_g={nQ3v9*)a`aa_{hM`iBD#LwhvH?2d2wJxXd
zd~k|YNIXIDyu$c_3RQ-8-15p_Sbv-QS9ihzNnO<ukNHu>_X+f0SDn^z%rpZl?Sx;)
z#W;iIN|=Hj1K*j(POc%cY~QT}TN>~c%RWWd3GEk{8Nr-hjI>q%^~PVh|Gr05m7FjX
zfez6!{EA<#qDT}4sd~rkhH1!yDHJ`DiuY$QsLXG~t^~&uISK3YQFtvl8P?MebiW0Y
z-$(2KvQc<%C9yJXGZw|Qf7|_l8mI_EA(=A3uL3*-Vj!y=n_Akf?d~+o1i>B?xk$Ln
zf$wr9a2iYK*K*v%BoJ)XZrf|1mQ)D3Q(@Q2fR_ncbJzk*k3um5;0<Tz*mT}Hu0M8W
z2JVDWxC&_SD<S}mnuMUKNDhxB5006{$F*TL=Wsj%%cy1tw09k@c8~)TwraA*j40Fu
z^tXU2TNJ80?3@jFel#8r9w4}{;L*`Gz&>?fevGWlc^?T0@j@}YaS+rv+6N*a2;@Yx
zTh7uj$$)=7k>Xo%#v6xU6}H1{3K9Nz{(<F_0!o6~fKp%#PoVJy#T2xI9nyezL;+Ps
z%B9Xw;o&*ngck}C`G91F2zUs;Tn+*`dUEG5Cki^i&KxHa8zD|Zwag}(@L#}RCA<WJ
zEt)1ktto5J>;Yr{gR!`Svc@M}??u=>{vt|>Zpm>&EmO8Ce)J<A(txf6!Gl_7#*StV
zA2%KUP5k+VGMc#>@GJ2~Vs1d*3@+eAi+)@)fQk)TeL<%`jO7i+PydShQ!)PHN7Q+q
zOURE1JzN=Xs6z*Efe<Y%h|R}F)0_mH2jj@SGv|KrT3kl;1g#1a{^tBRCjl&qnGIk<
z{P|OTa_SA#H;Ma<&2>suO$E`w7okxgAo77KNDFw77?U)`1i>`0HNO+dm4KkP9e7{3
zIlpD8Cj?=wX_YO&5qGLDP_O^5zEk~^Qvz^YREtz-IU+QXt`Nzb(7u-TSIKy`rYQ!t
zjF?E%!};zD?Re;|Y>vMc+)CR{{5prNncD)(^rK&|LDFRVz^G;ZGW*eGUpe(X>Ph$j
z%EYK@jS2#o@O>Wz5#<0XwVWPiL<6U6%YUz-es!=lp7aKB2KNh(<*P2d1d=V8myNKh
zw#|6L0Xh(ETZ3Y~6bEuU?pYhZr~Adryldc~fvWGxK@^lDs1kbGuLME4Jb$*q3^tGx
z@L$Xqgx`r9qu0D0{!*CRQaFy^yMeZ3R+}Hz)Z^f*r#y7nY#+%M1HcFVw>g*p*V?y=
zKSLx^Go>{O0aV64&_LjqDF?AU<v3+Rl)$!u9XR|zE}gIg9>KlSgl@toyeINr4&BdI
zH0M!0Z9&ioF1mL512cwCfg{}T#JM*lUQh$$LYe@GDn3)>R?3xN);#+10uu)M$6;Q~
z`-Ink_H^%{Hz&CS=0;rGo}Y?9TM@?@Z5GV?#27Oc&*2!wNRe}Kz%$mR15^mWCn}=?
zaP(BUQr2g2zod8*44$$jf8T@CpWTWMjoveRCETAsh_^B%`q=`e@q(yJvp$*%Xv!vh
zcsE7IpV)d=`ma?2aDu3Urz;?#@gst=jQR7T8*9@9?%$b?r}Ng&yYW2c-T~YJFNk~{
z;RRp=M-yZLeQ}pYVbbQzQk`LD{D~X=%sxgV63_MUT$Sn|hB~@l**LgAl6zlS7ayQ_
z6VeHsW}LUtyZ|Z#!|G$F!|&i)iXOudCa|K^k71NdsbL2tFn5^gdmclin4Y`Wb3G>A
zk~8U+#-(Ljx22Qf12iItt~-%41KS9}@(lJ*6Yv(Lg~%8N8;}JUNX1BO;0KB;J)I&Z
zm%ir6hJy-suj}Et9^Rz0H_Wg<#WcY`wM6<DVw31t0QntcfmH<0z~rz`qA*3k-_HtS
znap>LmB^rope`Cs2IkjT5=jn@z0M>as_<OANw1yFXdq@9m;_WN^n7wYcMQXF=0y>I
zE0ITZ|ClA{Ppryo+-C3T0wh}P7|gF^V4+`o?TA~i9(SIe7kUhJaQ3>cM|~W#clniC
zMkWMkKosag6n4XlAel43GH@GaH1bWfH&WY;lYqqv`2CK&U5mI4qkOuAACEtL@tE#p
zO=p0$wX^rIK9-I9Fm$<e8W1YQ;=_&G;W+8i(bqKrGkpWjp%OH`gO(O#JBCq9Zo@aR
zkLPL;*Vop7YH9A&=C%VF5J$^tPV5_XF7UCuWK_r45S<tTBECP9`=b@H#9RaG=g`mL
z;@Q7p{I3SgdL+nWU&o0eK|-)a?{^12mce;Dr%oCPX=c=xP|XDEmuF;}Uc&)FeL&zh
zf);vQg0b~9!8)VXgsgX?!etpf9Fc&<{e0eQDMp1QWIg1AY9%V{0IG!nho3EOCubi!
z4+GT6p%O;zR1>NLk`Z(}Ja9W4*hJ^>J0ozE64VY7rf^i4BJ*%Ifva&6{IaeZP@$j;
zsvRIoH6UeKQihQcz|{{=k+w7`a-32Edy1$eLKYxYj}W+60yUP9B#}x4b`=o_y7A|T
zTS+%4<3k7*5!eSJf=PH?#Qp|$BgR2F;?r;;BCrtv5fhSK=*Sa3NEvYCHqn5AIH*8)
z93A3|08=3w2?UY{OxP?f2bCapn*qNIbkP#?J_3RLxqxM!L1hlJ4+3{NCySXumF6=U
zj$~cHj6oFPt;lPmHVX{Mz(#Hn4GwjHnbdDf9u7EDGr+cEFmo5?Kz=&;Qz>c(1%wV<
zVz7jm38qo}Tyl%pG}MJ=W(e#r0MEWFv2mR5Abzre)RFU|!T!%rCq9k~;|X&SW@b2)
znOVnKbPL2U;rMti%>X&bfD_orS<&D?0h$UXaOI^O<IiXDW6cb91_0(bEFeY^IC*=b
ztK+mV^p|PG|HXs?$3z2z;S?}|+AaC}`IPORf-`u8iJ2Kr)=Gs5WD;2dTTr_eT}Ch{
zNidB#4}Rc?XmHR#?Y1M)?fCxz{G-!g7MjqW)^Iq%B1-KshCm0%;peDZlunHd9ENH_
z48liXvj~F&{nNlMxSR9$qj_gCk=>i&3`vhLF|*?UQA%|q#^Pk)or$Dq7)wTyJ|@lx
z#6QnA5q@B!Xkc*YbGuC-u{B4Y#V1cBr-+#!YQyuqSZn720)eO!NFYX|_SuS-EM+Yq
zK^K$E`9U+#@cqCRCg6eKxGdOhS8BHA|EKcZ3n<<FH#yuqF5!Q{(+t-XNC7@B4Q1h-
z2)~NUixOX%<%=<9K2pbkCU7?Uz63Ricwj(|>jI}tA+ZZNZ|ASO@mm}5gIeGsx|0Oq
z5}rpG&8{JsT?%j#F&eo~0ZqtDGW>!pT!xtoF?<Z6ucbi(oXsW#Ux1(&5x^V_$Z^pu
z&<>`P98cl)oO&^bpFu&q`}`n>mm&F&fBf7dEW>3P;G_RGFR~L+0E7syz^DzFxi}LS
zVCY!7j|9zN1o$Vk2?KtFAOa9X2spryLJ6GH2{K?RjZ-Mvnai)^%;U-RbP6<M+i>6a
zkDveC^EA5-0A^jn5`ktyO{g|7S7ZgcUW}2;F?K$Njiuixx{V~W5ggk9lHi{Sa433?
z=FBO8A~@%q43U{MO{Z!qMca_`eDb%USrcqvzcvfqNivH|_;E~VX1FtJ)`t<!@y9n4
zY(izBgGA)8^U-rP`YlM``RF-<uFZ5#lbIwniIXBQ40&2m#+EQeyaHa4jx3QZty!9<
zQ8$sAw^Q{}8Vp=!J}?dcx)b*cU-$x{<CqD!ICEGJk3YU%Zy?ZwlSCB3Opt^K5`hrH
zL@hvQG{H17g}|9vOdIZGlIIatgPDtP3rK?9XW{4Z2<?603xx4B#MQu}l&XjIdRPw|
zP)Sr0nMCL!{MCa900Mwu00*W)654(DBBqGWqY2~1o)>$B)f(<E5T%p~LluUhQc9!&
zp^^v)7`qcTk7d?c$8oIVSZl2r+y?*<h=?eqq=(r7aF1GR)><<&gVC1?1R{{xA()-P
Wvx6B7MxQJI1ONm80{{bHI2r)C;`dnq

literal 5914
zcmV+#7v<<uNk&Ez7XScPMM6+kP&il$0000G0001w0055w06|PpNFxXU009|=ZQHgn
zNOpH4`X7PzLlv+kr;~&u5J=ize1wQdZAZ0jE!n|crW7E6^)EmH0x*}~^%g*95fd;0
zmbPs>CP}*Q=lvp4$ZXrTZQHhO+w%wJn3c8j%+5C3UAFD&%8dBl_qi9D5g8fry}6Ev
z2_Q~)5^N$!IU`BPh1O|=BxQ#*C5*}`lluC515$lxc-vNC)IgW=K|=z7o%cWFpndn=
zX}f{`!VK<lX!FLkOBT(Yy<iOh1h{fQLjvrOQ%*nbfL+k;)$>02_kU+Q5a3m37J;c}
zTzbxteE{GNf?yLt5X=Bzc-mio^Up0nunMCgp*ZJ;%MJvPM3QK)BryP(_v@ei4UvHr
z6<pZ&&fAXylxW0w%M}QG@yfnPZdDXqIP=jPCIit7o$6lTs5icHCgh=N0unBI<zgT*
zptDoN<h$R!7(%ELhKSSOx&nxS==cyKaPf0zAd!_(MC|v$-B2pfoh+ho#bf&+hH7Al
zeEH1*q<}6i9Juxt0<3_LaK_h8L<~fCTg1Svrz2X|nM!={Hli82o)&S!Wq@^;;Sc+N
z{~W{um1qFY-5<^_GW?+R&A}Lmstggwo`S@#F#weeVu1=JFn9vNE-}DWg2+&<6b|VD
zyTX820Y3(!YAs>+sbCifQaOkL6-;5fL8$W($zZ_;CZp305C;~$hhRquZr-r)jjd1z
z31%ZK{-(`P#|Um_Sivn@p$-vz46uqT>QG0B1w9znfS9A8PB2LaHdzA|_)yjXVR*l{
zkcu3@vEf7bxH0nkh`q?8FmoO_Ucui*>_a~P?qQrl<J8L#kWCf%Wh%yn(Y}gU%LfuZ
zDk8@t_|u4e$m`1t<6z}J_rs7?FJ3+<S^J2$5qt6i-|juKZJ|8nXar<dxa}M-+9i7p
zv6dS|d)2&6A)dFrYRGP(%Pv>Z9@+D7%MTpSnztpylXrt5!-k8_QPB?YL8Kx_On8WD
zgT+111d(Op$^$&KLAN5+@?>f7F4~wFi(8TL8+szgVmcMDTp5l&k6~=rA{Dt}!gb^r
zSWY<)M7D|Z2P0cEodj6E42PV>&>DFmQpgt)E-|#sSUU@uKed+F680H@<;-x{p|n<l
zp8yXzqfa@7p%sObAm$9h$>uH4!_mn85rx>wz;0mPi2ZkL#k6;sznu?cXh!T0S>{w6
zL^gvR05NY64l*<+_L>On$rjx9!US;l;LX6@z}yi#2XHh)F@Oo+l)h%fq$v}DNmF2>
zfs^_t0)3N-W<9-N?uedVv{)-J0W5mh#29QM5R5h&KuiRM=0Zvnf#lF=K#WlCgc#9c
zS;qvh(P$<N4^0H>!_a8JwyhI^ZJV2k+B6Z^64?w|1?5gyo6y{}923CRZfYVe1#?F%
z7h2SUiNO3;T#JUOyovSs@@C1GtwipycA=*x5{BpIZ_#GCMuV8XK=x;qCNy{d7?wA~
zC+=vjls;ci&zW=6$H~<UuGL>4^K%v{p}Ab?U%C6Z4p%eC<3ExqU$XR<<U%Vkem)I3
z!`%PIvLz&ze?Zp%vCR@%m16n3hACIF^0#G_T7epA#z)8(rvE?Hg_ap6_uYP)Tb`)h
z2GK)|(Rz!WpFyU@LzjyfQ_<i5^lr&=M4!BSy(W%@)>}LLF67A$Sr20DR_pJ3yeBa~
z^sw{V0FI5;UpwXsScYuhbqGQ`YQ25;6p6W^+tgL&;Ml;>S3CGpSZ>VrTn0m1$y$HU
z&65)I!c?oREz};c=nLCliriqQX->4uivHTgd${GqeAlf*!P^B|jkU|*IdNP(&6C>4
zqOW$)Nw9nvjy^&`?E|gotDV{JmJ9Q~vuhy<<G@fboDAhcI5Dsk#+9Mh1`k6v58TQ6
zTpAxMdW*w$2XjE|dQ{O{2;)nJq6kNrSbdZo9zqeu3!nwqzHn9@9s3%Bu@kHycSZ(x
z2&|bA;|GSCg#oDAgn`0}Ky&~=v%vnTsQAhK3}!@Ul4k5Hs;%f_FcO_g5=04B6;XmB
ziOvB@G`0e&A^~64K@uGVfFy@D!BjmmY#Jg-bQD1l@^zr9M#Q=#5Jcz8rNs%Ao0hm-
z=t_Aq%~%e4bvUtd2FypO;{-_wnmGsNRpExY)16Tgh|VXVky}6f62Ys$1HSxdlSZOT
zCCO8y{_zPY?=~0l+26%7xde3w04W9Q!Is)V1LkBGNde1$zrfW<NfNr*%|ZxRzT^JA
zmcTCY6tLybe{jSY-O=SD&Deu-#rFFZ=3p1N3e^Al)6K5on3B|W0L{#5+PrG&o;8D$
z9VJJ=wm<!FVPYf3<lcP%LC|1@)-Aw}12hTj5D5k>`^C4XIUDt|j4o6rK^e8_(=YqC
zuaR<q<0Od&Y@7Cjug_237^*j7a#aQ~lCq#UYtH7{U_qlC0^1@%Gyuc1|NWO)TNBEm
zMx%@_RIC6AfxhnJIcv(^$)J&PfGr82VdUyLpZ<4xbZB^JxZa4#RXG^p?q<@OkN-Dg
z>6TRVf@tUFHB079o4MBIh{M~4>WwnGgesQH<tZ7VZHqtr^FKfQeBMqw3{0x^1cRqW
zV`%gGwJVk_Syh(=#d=wm^?D<@gsPV0$vs99^0;ZqG|-B^-cjnq$sLjec-e@tEK@9#
zOQ>*3?w(RA%hCZ*7)b!aNV=yOQ%o_Y=<Y6|>Lt0Sl*(9^jfRnC210Om$=y>*o|3z}
zAR&vAdrB#mWoaB0fJSw9xw|Am$fzK>rx-~R#7IFSAwdu_EI|SRfB*yl0w8oX09H^q
zAjl2?0I)v*odGJ40FVGaF&2qJq9Gv`>V>2r0|c`GX8h>CX8eHcOy>S0@<;M3<_6UM
z7yCEpug5NZL!H_0>Hg_HasQ<COXdOkdH!pu@0dU6f8zgSJ>GxR`rY&Z{geOy?N92Z
z{lER^um|$*?*G63*njwc(R?NT)Bei*3jVzR>FWUDb^gKhtL4A=kE_1p-%Fo2`!8M}
z(0AjuCiS;G{?*^1tB-uY%=)SRx&D)pK4u@>f6@KPe3}2j_har$>HqzH;UCR^ssFD0
z<L=e_ckEC4xZ1K8&yCddum>7h+VLO4o@_Yt>>AeaZKUxqyvxWCAjKB>qjQ30UA)#w
z&=RmdwlT`7a8J8Yae=7*c8XL|{@%wA8uvCqfsNX^?UZsS>wX}QD{K}ad4y~iO*p%4
z_cS{u7Ek%?WV6em2(U9#d8(&JDirb^u~7wK4+xP$iiI6IlD|a&S)6o=kG;59N|>K1
zn(0mUqbG3YIY7dQd+*4~)`!S9m7H6HP6YcKHhBc#b%1<GJDT!^vq^Fhq9+GQ)rw<7
zX>L}VIisp%;TckEkcu0>lo@u995$<*Em;XNodjTiCdC%R+TX|_ZR#|1`RR|`^@Teh
zl#w@8fI1FTx2Dy+{blUT{`^kY*V-AZUd?ZZqCS4gW(kY5?retkLbF=>p=59Nl|=sf
zo1Pc|{{N4>5nt#627ylGF`3n>X%`w%bw-Y~zWM_{Si$dc82|=YhISal{N7OY?O`C4
zD|qb}6nLWJ`hUyL+E>-;ricg9J@ZNYP(x(Sct&OI$Y!QWr*=^VN;G3#i>^1n4e#Je
zOVhbFbLpXVu*16enDM+ic;97@R~u&kh__kgP#!R`*rQEnA+_dLkNP~L`0alC|J;c;
zeiK=s8;BsLE)KbG3BD&Br@(Ha@SBT&$?xX`=$;eeel=|R_dIr6-Ro?=HEjnsJ_b`1
zK6Yg^-6;^2aW!xeTK)A~3Rm|L^FCHB_I>jIju7ZGo&N_1*QHkxH2!<tj^laH{Fyx_
z{&=J_f2vo<Z;k$M1Ir~ug1#5Ga52L4CpFf22cxv6fws^ma=KG?212=Y!jNISS!|Lb
z8x-AF@-9``d4}WvRUse6F;u?af>!%@o4iZ?vntS;&zJdPe1dH#04YD93A44o-MpfD
zP{rn_aq>U%RDvC2+bp;xPlsOzauIi3*Lf42`jVKK<K1>ZCRuKdYhi>FDuL<yU&41y
zW;YPPNe&8L>2l=v{$BCN#<T4EqS^BZve&iW4$t~r2^LU29B#Olvb3z==K0V~Xm$T^
zTEZQM|D{j?1st_dU8g^<gdhmv$NdVXjg~&|9i!p3%#sZ~>Q6796s%r-AG$Q^t(3c@
zD?w0UhYr11@feiyl9kY_@H8~|xlmO<8PfQmj1!$@WieW@VxR@Psx<u&LsG06B}sH+
zIY;3Fh+6GQ0@)pP#J1>fe-v9WCi1+f>F4VL?0O~K7T?m4-u|pSkBpUJZZe*16_wAp
zSYZ@;k`3;W3UHKUWc8QeI}0jH5Ly=cGWQPw(Kr2fm=-5L(d`lcXofy8tJY3@Tuadz
zYWXR{mW7XT!RF#RVCe%}=tM*O6!AD3^(!8un~opNI%Uko7$5t@<8+?<JTSi(aPRTt
z&Ml{N#KaBO+?nu~`4Q07^34=s`MzQHq<x4YOM_H9N_$hsJ2<doMH*MCk}b~+4UINa
zTwL7@3kg)_0*#Q$wrCkv#2-q6kYzsssFc?p^mKPeVprz0gBMiUOMbNTyj3-qRER>;
zTxDys(MyyGsUjtSu9$+|_-t!U3fVb1dkK?l`17<+jfl=hrBHnDSV>^R1=TnQeyqbW
z>ov#l%!1|S!1>8UUxIdhQq`_klcHVx0{?#>K3#$4GlXncwldt!g17TcvKq-jo_996
z>oA=tH9CqRl6Yw?Uc`am!V?lHJbizOJaVaScf1U<ZufBT_PTSYy1Kz}Ee^oj{1{Jb
zPK-`C@vPnz@)Il&x&GuPat%?B<3q8e7{hr^F{nmmxEn(YMpk7=cxlRqBY%WZC*EF)
zEGiQ`?WYSV^pF##Wu_nvJYxLapR?xP7cc)>P5e7Dbgabq=b!B~T&_F6?ooU>w%x0A
zH~&MHJ=q`fCH{U<7MDXE4SD32cDZA)WJeWkllJ`UspWaS#eDe^kg^oU_A14UE9<xI
zdNHNo$`_W}M5oe9+e37~{LsytH8U$kdU4k6Wd+jywdyHFMcdx1=~?-!S7R)G4c`N&
zcWK7v+_<;uHA$qDdzdA<PssWlx07Z!S%-(-yIKQguM<#>zG-a^g{xaXf$})Wik>gT
zl#dkzGr(;h0JZDuFn(+k8wNq?PZ5grQ<+sM?wBGt@JnH6v0#or-5wBQWKU~(S_&GT
zkE!tc*ZJ1Y&*p(xX84POb3cClR<n^{&58_5a3*@tLK%RDE@eA8<N0urSMl|?a*z{{
z|I<QGAb!#~MTWAsI&lS{s3^f%*Cq>Md!^qJ#CAZfIepEj-<`VURS_yCz0(?*Ixcj4
z-!zV1_QZhpm=0<;*(nm+F>T=)o?ep@CK5I%g^VAA+RB25ab?7)A~z~egru=I1S|@v
zH7tXV!0wmGS^qj#e+MY;C5eUjEAp$Y?LDkS^QPZ}8WN85?r$u<-Epi;yZ1|J2J`se
z$D6DpH~2F=eI0B&=UFAUnJvZAmClJlK)sutJ?M>xpZiWV&0=G4MZP+x+p>EX=HbCz
zxls%Mw?*u^;LbHWIWCyq+yi)`GmFn9J112CZda_u@YIP%i;srFg_paU02Ifij*7}l
z&CF-<n3E$I?p-QiuZUl*H!IK>(3|>*a|+vbNR`^RP=9G?ymEJ0Z~)d&c*UE$UMepZ
zcITr{0WqhxkjUnM15js_gW=e3Uh|y6ZReaXHIz-=p`x5VvB&rH9y>Amv@^WmXFEw)
zQXYrk3feir=a{jM<dzdx8r#aUNr$FCI&rFeKEw-pN(>Q+wDIkkFnZ$k{sJakHn*?u
za%4b!00ev8NVLM1TY=cl?KB&55BY_MU-sg?c>=Dbz_W{(Z~c?HJi*XpYL)C6Bd8WH
zt+v-#0&o~@t4qESi*)+eW%@VD0|o^yF)n0hM<gQ+PU=IAxwIpk4S6|%K*&)iTbk{k
z!-s&ZD6V|2;CyHbFJb|~GXX8L?gXzy++xyz?IYV^U-~qRctg`i7PNG+E%K%rj1#lA
zgkh1rUqL7W9)e)2c+*k8wKU)vO;P^cyrum5UZ1j=T*)ids=e&KO0D*dbQW0q)Dh%0
zC(oDisK58>E$UtXF$*Lvh}7sso{`|pn*JDIy5^Fm3s$5*zEE=?u5<=l8FJc3r%+H}
zdfoNl2J0^~!-*mOL5o-x32|e0Im*E!yY7F7E5N)W3>+v_LBydlEx?4$RL5f2oYRD#
zaR0wv(-p~wO0eLDl3K=%`{5+0Gd$ktO=W)gWlGZJ0`K<b1^|j#Ha<G@=c9EaeXzf;
z&txt4&rY=X-H_Lvj5eR1K_rweFrPjPyTDZN(Ek|onY%1(4Crv_P7LnIj49do8Wd;~
zCSHo|+D@^-(re?Y49f$%^lZgf&fe1}InrGRWcnc_=giCTrGmDRo?m;MF<+&2oxsg>
z$_RNA=ckrfa;H0KA~dR^p&#0(p-{x$&=IACIfoAR<Nvvu>!za)F-^da-t3#0Dycnp
zwO~NVXwXCl;jE<}>%@<pC<8PLRXJuvO4y>xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r
z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv
zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m
z!GmimlG$=wgXCnr6j@m<1gAL46#T~5<Pf8lV3fF#Ppu>Bnm=2{^@>|t&`9mkEPddj
zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx
z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@<t56P}GC(ea
zcuDo~%vU?vTqAIp#flPNMI2`5;t8&98^HQwmsAsoPNK_fx^Bggb1WVe*N(RqH8#4x
zCQN_rN*!W39u4A)O3%B(eX4-oO~1PlFj1j%A~@Wj>9A|X;;IA>8!oX+y(BKJ$EzV*
znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o
z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE?
zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG)
zaZ7j)dq!O}{?#8Y7~7i6fHh4{`<bqO>pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek
zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m#
z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU
zuSa6v^kXi0x<PZ)*(STjdw~o@Rw-Or2Ax?U!if0^R7qyS!JDYN`R9pBUrvi5{Lgqu
za0I&Zd*A54UPC}|lJz-2f!1VYM+A-ElFU{V`W)8LtCk5Mx|)Il)$QH*gA63%JZFt}
zGq@eFEWXJ~R>Ps?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf
zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q
w)2!4MKjfSAeN<ek%udeE*tim(T?PyxRjZ^lIknLzS6Fbvpe_110000002i;2E&u=k

diff --git a/vgate/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/vgate/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..156f996dc1b604c25e9873cbe3a0db99548098db 100644
GIT binary patch
literal 4114
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
Q2pf`v;}(!t-@jl30LM9+4gdfE

literal 3844
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
G0001O&w8c+

diff --git a/vgate/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/vgate/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c5f86d2fafebde06b43679db02acae9fb67bd0b5
GIT binary patch
literal 9682
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
O{r@+T{~ji_g#QCa8e^6K

literal 0
HcmV?d00001

diff --git a/vgate/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/vgate/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
index 9126ae37cbc3587421d6889eadd1d91fbf1994d4..56313e3b8479818c02eda7b12a71f517bef44cce 100644
GIT binary patch
literal 9216
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
W5CotY&Juv4zhXcIKnzIqCwv!?2sASQ

literal 7778
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

diff --git a/vgate/src/main/res/values/ic_launcher_background.xml b/vgate/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/vgate/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file