From b85614d9bc407901ce6a6e3632114818d24f5c72 Mon Sep 17 00:00:00 2001
From: Roman Makeev <57789105+makeevrserg@users.noreply.github.com>
Date: Wed, 30 Oct 2024 02:11:53 -0700
Subject: [PATCH] fix disappeared file manager (#980)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Background**

In some PR related to remote controls(when it was moved to tools)
experimental option accidentally has been removed 😬

**Changes**

- Return experimental options category

**Test plan**

- See the experimental options with file manager on previous place where
it was before
---
 CHANGELOG.md                                             | 1 +
 .../settings/impl/composable/ComposableSettings.kt       | 6 ++++++
 .../impl/composable/category/ExperimentalCategory.kt     | 9 ---------
 components/settings/impl/src/main/res/values/strings.xml | 2 --
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 581a88f8ec..225b974ab1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@ Attention: don't forget to add the flag for F-Droid before release
 - [FIX] Remove "RPC" argument from screen streaming request
 - [FIX] Fix remote-controls duplication ir files
 - [FIX] Fix infrared remotes card beta text color
+- [FIX] Fix disappeared file manager
 - [CI] Fix merge-queue files diff
 - [CI] Add https://github.com/LionZXY/detekt-decompose-rule
 - [CI] Enabling detekt module for android and kmp modules
diff --git a/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/ComposableSettings.kt b/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/ComposableSettings.kt
index a479fa0b59..25f9e47570 100644
--- a/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/ComposableSettings.kt
+++ b/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/ComposableSettings.kt
@@ -22,6 +22,7 @@ import com.flipperdevices.core.ui.theme.LocalPallet
 import com.flipperdevices.settings.impl.R
 import com.flipperdevices.settings.impl.composable.category.AppCategory
 import com.flipperdevices.settings.impl.composable.category.DebugCategory
+import com.flipperdevices.settings.impl.composable.category.ExperimentalCategory
 import com.flipperdevices.settings.impl.composable.category.ExportKeysCategory
 import com.flipperdevices.settings.impl.composable.category.OtherSettingsCategory
 import com.flipperdevices.settings.impl.composable.category.VersionCategory
@@ -76,6 +77,11 @@ fun ComposableSettings(
                     onDebugSettingSwitch = debugViewModel::onSwitch
                 )
             }
+            ExperimentalCategory(
+                settings = settings,
+                onSwitchExperimental = settingsViewModel::onSwitchExperimental,
+                onOpenFM = { onOpen(SettingsNavigationConfig.FileManager) },
+            )
             ExportKeysCategory(
                 exportState = exportState,
                 onExport = { settingsViewModel.onMakeExport(context) }
diff --git a/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/category/ExperimentalCategory.kt b/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/category/ExperimentalCategory.kt
index e7cdfba31f..535acd76f0 100644
--- a/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/category/ExperimentalCategory.kt
+++ b/components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/category/ExperimentalCategory.kt
@@ -3,7 +3,6 @@ package com.flipperdevices.settings.impl.composable.category
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.flipperdevices.core.preference.pb.Settings
-import com.flipperdevices.core.ui.theme.LocalTypography
 import com.flipperdevices.settings.impl.R
 import com.flipperdevices.settings.impl.composable.components.CategoryElement
 import com.flipperdevices.settings.impl.composable.components.ClickableElement
@@ -13,7 +12,6 @@ fun ExperimentalCategory(
     settings: Settings,
     onOpenFM: () -> Unit,
     onSwitchExperimental: (Boolean) -> Unit,
-    onSwitchRemoteControls: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     CardCategory(modifier = modifier) {
@@ -29,13 +27,6 @@ fun ExperimentalCategory(
                 descriptionId = R.string.experimental_file_manager_desc,
                 onClick = onOpenFM
             )
-            CategoryElement(
-                titleId = R.string.experimental_remote_control,
-                descriptionId = R.string.experimental_remote_control_desc,
-                state = settings.show_remote_controls,
-                onSwitchState = onSwitchRemoteControls,
-                titleTextStyle = LocalTypography.current.bodyR14
-            )
         }
     }
 }
diff --git a/components/settings/impl/src/main/res/values/strings.xml b/components/settings/impl/src/main/res/values/strings.xml
index 010c6d6602..59f7d44929 100644
--- a/components/settings/impl/src/main/res/values/strings.xml
+++ b/components/settings/impl/src/main/res/values/strings.xml
@@ -40,8 +40,6 @@
     <string name="experimental_options_desc">Unstable and untested features</string>
     <string name="experimental_file_manager">File Manager</string>
     <string name="experimental_file_manager_desc">Navigate through Flipper files</string>
-    <string name="experimental_remote_control">Remote controls</string>
-    <string name="experimental_remote_control_desc">Configure remote controls and use it with flipper</string>
     <string name="experimental_screen_streaming">Screen Streaming</string>
     <string name="experimental_screen_streaming_desc">Control Flipper via phone</string>
     <string name="experimental_application_catalog">Enable Apps in Hub</string>