Skip to content

Commit

Permalink
fix disappeared file manager (#980)
Browse files Browse the repository at this point in the history
**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
  • Loading branch information
makeevrserg authored Oct 30, 2024
1 parent 9f02e51 commit b85614d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -13,7 +12,6 @@ fun ExperimentalCategory(
settings: Settings,
onOpenFM: () -> Unit,
onSwitchExperimental: (Boolean) -> Unit,
onSwitchRemoteControls: (Boolean) -> Unit,
modifier: Modifier = Modifier,
) {
CardCategory(modifier = modifier) {
Expand All @@ -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
)
}
}
}
2 changes: 0 additions & 2 deletions components/settings/impl/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit b85614d

Please sign in to comment.