Remotecontrols/move into tools

CHANGELOG.md

@@ -43,6 +43,7 @@ Attention: don't forget to add the flag for F-Droid before release
 - [FIX] Share infrared remote after rename
 - [FIX] Fix app bar colors on remote controls
 - [FIX] Fix remote controls texts and favorite dropdown
+- [FIX] Move remote controls into tools tab
 - [FIX] Remove share from remote controls
 - [CI] Fix merge-queue files diff
 - [CI] Add https://github.com/LionZXY/detekt-decompose-rule

components/archive/category/src/main/java/com/flipperdevices/archive/category/api/CategoryScreenDecomposeComponentImpl.kt

@@ -9,7 +9,6 @@ import com.flipperdevices.archive.category.composable.ComposableCategory
 import com.flipperdevices.archive.category.composable.ComposableDeleted
 import com.flipperdevices.archive.category.model.CategoryNavigationConfig
 import com.flipperdevices.archive.category.viewmodels.CategoryViewModel
-import com.flipperdevices.archive.category.viewmodels.DebugSettingsViewModel
 import com.flipperdevices.archive.category.viewmodels.DeleteViewModel
 import com.flipperdevices.archive.model.CategoryType
 import com.flipperdevices.bridge.dao.api.model.FlipperKeyPath
@@ -34,15 +33,11 @@ class CategoryScreenDecomposeComponentImpl @AssistedInject constructor(
     private val deleteViewModelProvider: Provider<DeleteViewModel>,
     private val categoryViewModelFactory: CategoryViewModel.Factory,
     private val synchronizationUiApi: SynchronizationUiApi,
-    private val debugSettingsViewModelProvider: Provider<DebugSettingsViewModel>,
 ) : ScreenDecomposeComponent(componentContext) {
 
     @Composable
     @Suppress("NonSkippableComposable")
     override fun Render() {
-        val debugSettingsViewModel = viewModelWithFactory(key = null) {
-            debugSettingsViewModelProvider.get()
-        }
         val deleteViewModel = viewModelWithFactory(key = null) {
             deleteViewModelProvider.get()
         }
@@ -57,8 +52,6 @@ class CategoryScreenDecomposeComponentImpl @AssistedInject constructor(
         val onOpenKeyScreen: (FlipperKeyPath) -> Unit = { flipperKeyPath ->
             rootNavigation.push(RootScreenConfig.OpenKey(flipperKeyPath))
         }
-        val showRemoteControls by debugSettingsViewModel.showRemoteControls.collectAsState()
-
         when (categoryType) {
             is CategoryType.ByFileType -> ComposableCategory(
                 categoryType = categoryType,
@@ -67,7 +60,6 @@ class CategoryScreenDecomposeComponentImpl @AssistedInject constructor(
                 onOpenKeyScreen = onOpenKeyScreen,
                 categoryState = categoryState,
                 synchronizationState = synchronizationState,
-                showRemoteControls = showRemoteControls
             )
 
             CategoryType.Deleted -> ComposableDeleted(

components/archive/category/src/main/java/com/flipperdevices/archive/category/composable/ComposableCategory.kt

@@ -20,42 +20,21 @@ import com.flipperdevices.archive.model.CategoryType
 import com.flipperdevices.archive.shared.composable.ComposableKeyCard
 import com.flipperdevices.bridge.dao.api.model.FlipperKey
 import com.flipperdevices.bridge.dao.api.model.FlipperKeyPath
-import com.flipperdevices.bridge.dao.api.model.FlipperKeyType
 import com.flipperdevices.bridge.dao.api.model.FlipperKeyType.Companion.colorByFlipperKeyType
 import com.flipperdevices.bridge.synchronization.api.SynchronizationState
 import com.flipperdevices.bridge.synchronization.api.SynchronizationUiApi
 import com.flipperdevices.core.ui.ktx.OrangeAppBar
-import com.flipperdevices.core.ui.ktx.clickableRipple
 import com.flipperdevices.core.ui.theme.LocalPallet
-import com.flipperdevices.core.ui.theme.LocalPalletV2
 import com.flipperdevices.core.ui.theme.LocalTypography
-import com.flipperdevices.deeplink.model.Deeplink
 import com.flipperdevices.keyparser.api.model.FlipperKeyParsed
-import com.flipperdevices.rootscreen.api.LocalDeeplinkHandler
 import kotlinx.collections.immutable.ImmutableList
 
-@Composable
-fun AddRemoteEndBlock(modifier: Modifier = Modifier) {
-    val deeplinkHandler = LocalDeeplinkHandler.current
-    Text(
-        text = stringResource(R.string.add_remote),
-        style = LocalTypography.current.buttonB14,
-        color = LocalPalletV2.current.text.title.blackOnColor,
-        modifier = modifier
-            .padding(horizontal = 14.dp)
-            .clickableRipple {
-                deeplinkHandler.handleDeeplink(Deeplink.BottomBar.ArchiveTab.RemoteControls)
-            }
-    )
-}
-
 @Composable
 fun ComposableCategory(
     categoryType: CategoryType.ByFileType,
     categoryState: CategoryState,
     synchronizationState: SynchronizationState,
     synchronizationUiApi: SynchronizationUiApi,
-    showRemoteControls: Boolean,
     onBack: () -> Unit,
     modifier: Modifier = Modifier,
     onOpenKeyScreen: (FlipperKeyPath) -> Unit
@@ -64,11 +43,6 @@ fun ComposableCategory(
         OrangeAppBar(
             title = categoryType.fileType.humanReadableName,
             onBack = onBack,
-            endBlock = {
-                if (categoryType.fileType == FlipperKeyType.INFRARED && showRemoteControls) {
-                    AddRemoteEndBlock()
-                }
-            }
         )
         ComposableCategoryContent(
             categoryType = categoryType,

components/archive/impl/src/main/java/com/flipperdevices/archive/impl/api/ArchiveDecomposeComponentImpl.kt

@@ -13,7 +13,6 @@ import com.flipperdevices.archive.impl.model.toArchiveNavigationStack
 import com.flipperdevices.bottombar.handlers.ResetTabDecomposeHandler
 import com.flipperdevices.core.di.AppGraph
 import com.flipperdevices.deeplink.model.Deeplink
-import com.flipperdevices.remotecontrols.api.RemoteControlsScreenDecomposeComponent
 import com.flipperdevices.ui.decompose.DecomposeComponent
 import com.flipperdevices.ui.decompose.DecomposeOnBackParameter
 import com.flipperdevices.ui.decompose.findComponentByConfig
@@ -32,7 +31,6 @@ class ArchiveDecomposeComponentImpl @AssistedInject constructor(
     private val openCategoryFactory: CategoryDecomposeComponent.Factory,
     private val searchFactory: SearchDecomposeComponent.Factory,
     private val archiveScreenFactory: ArchiveScreenDecomposeComponentImpl.Factory,
-    private val remoteControlsComponentFactory: RemoteControlsScreenDecomposeComponent.Factory,
 ) : ArchiveDecomposeComponent<ArchiveNavigationConfig>(),
     ComponentContext by componentContext,
     ResetTabDecomposeHandler {
@@ -67,11 +65,6 @@ class ArchiveDecomposeComponentImpl @AssistedInject constructor(
             onItemSelected = null,
             onBack = { navigation.popOr(onBack::invoke) }
         )
-
-        is ArchiveNavigationConfig.RemoteControls -> remoteControlsComponentFactory(
-            componentContext = componentContext,
-            onBack = { navigation.popOr(onBack::invoke) }
-        )
     }
 
     override fun handleDeeplink(deeplink: Deeplink.BottomBar.ArchiveTab) {

components/archive/impl/src/main/java/com/flipperdevices/archive/impl/model/ArchiveNavigationConfig.kt

@@ -17,9 +17,6 @@ sealed class ArchiveNavigationConfig {
 
     @Serializable
     data object OpenSearch : ArchiveNavigationConfig()
-
-    @Serializable
-    data object RemoteControls : ArchiveNavigationConfig()
 }
 
 fun Deeplink.BottomBar.ArchiveTab?.toArchiveNavigationStack(): List<ArchiveNavigationConfig> {
@@ -39,10 +36,6 @@ fun Deeplink.BottomBar.ArchiveTab?.toArchiveNavigationStack(): List<ArchiveNavig
 
         null -> {
         }
-
-        Deeplink.BottomBar.ArchiveTab.RemoteControls -> {
-            stack.add(ArchiveNavigationConfig.RemoteControls)
-        }
     }
     return stack
 }

components/core/preference/src/commonMain/proto/settings.proto

@@ -60,5 +60,4 @@ message Settings {
   bool fatal_ble_security_exception_happens = 26;
   bool notification_topic_update_enabled = 27;
   bool notification_dialog_shown = 28;
-  bool show_remote_controls = 29;
 }

components/deeplink/api/src/main/java/com/flipperdevices/deeplink/model/Deeplink.kt

@@ -51,9 +51,6 @@ sealed interface Deeplink {
 
         @Serializable
         sealed interface ArchiveTab : BottomBar {
-            @Serializable
-            data object RemoteControls : ArchiveTab
-
             @Serializable
             sealed interface ArchiveCategory : ArchiveTab {
                 val category: FlipperKeyType?

components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoriesLoadedContent.kt

@@ -1,6 +1,7 @@
 package com.flipperdevices.remotecontrols.impl.categories.composable.components
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
@@ -19,7 +20,9 @@ internal fun DeviceCategoriesLoadedContent(
 ) {
     LazyVerticalGrid(
         columns = GridCells.Fixed(2),
-        modifier = modifier.padding(horizontal = 16.dp, vertical = 14.dp),
+        modifier = modifier
+            .padding(horizontal = 16.dp, vertical = 14.dp)
+            .fillMaxHeight(),
         horizontalArrangement = Arrangement.spacedBy(12.dp),
         verticalArrangement = Arrangement.spacedBy(12.dp)
     ) {

components/settings/impl/src/main/java/com/flipperdevices/settings/impl/composable/category/DebugCategory.kt

@@ -93,12 +93,6 @@ private fun DebugCategoryItems(
         onSwitchState = { onSwitch(DebugSettingSwitch.FapHubDev, it) }
     )
     GrayDivider()
-    SwitchableElement(
-        titleId = R.string.debug_application_show_remote_controls,
-        state = settings.show_remote_controls,
-        onSwitchState = { onSwitch(DebugSettingSwitch.ShowRemoteControls, it) }
-    )
-    GrayDivider()
     SwitchableElement(
         titleId = R.string.debug_selfupdater,
         state = settings.self_updater_debug,

components/settings/impl/src/main/java/com/flipperdevices/settings/impl/model/DebugSetting.kt

@@ -7,7 +7,6 @@ sealed interface DebugSettingSwitch {
     data object SkipAutoSync : DebugSettingSwitch
     data object FapHubDev : DebugSettingSwitch
     data object SelfUpdaterDebug : DebugSettingSwitch
-    data object ShowRemoteControls : DebugSettingSwitch
 }
 
 sealed interface DebugSettingAction {

components/settings/impl/src/main/java/com/flipperdevices/settings/impl/viewmodels/DebugViewModel.kt

@@ -49,7 +49,6 @@ class DebugViewModel @Inject constructor(
             DebugSettingSwitch.SelfUpdaterDebug -> onSwitchSelfUpdaterDebug(flag)
             DebugSettingSwitch.SkipAutoSync -> onSwitchSkipAutoSync(flag)
             DebugSettingSwitch.SkipProvisioning -> onSwitchIgnoreSubGhzProvisioning(flag)
-            DebugSettingSwitch.ShowRemoteControls -> onShowRemoteControls(flag)
         }
     }
 
@@ -140,16 +139,6 @@ class DebugViewModel @Inject constructor(
         }
     }
 
-    private fun onShowRemoteControls(enabled: Boolean) {
-        viewModelScope.launch {
-            settingsDataStore.updateData {
-                it.copy(
-                    show_remote_controls = enabled
-                )
-            }
-        }
-    }
-
     private fun installAllApplication() {
         viewModelScope.launch {
             fapInstallationAllApi.installAll()

components/toolstab/impl/build.gradle.kts

@@ -24,6 +24,7 @@ dependencies {
     implementation(projects.components.bottombar.api)
     implementation(projects.components.rootscreen.api)
     implementation(projects.components.info.shared)
+    implementation(projects.components.remoteControls.main.api)
 
     // Compose
     implementation(libs.compose.ui)

components/toolstab/impl/src/main/java/com/flipperdevices/toolstab/impl/api/ToolsDecomposeComponentImpl.kt

@@ -9,6 +9,7 @@ import com.flipperdevices.bottombar.handlers.ResetTabDecomposeHandler
 import com.flipperdevices.core.di.AppGraph
 import com.flipperdevices.deeplink.model.Deeplink
 import com.flipperdevices.nfc.mfkey32.api.MfKey32DecomposeComponent
+import com.flipperdevices.remotecontrols.api.RemoteControlsScreenDecomposeComponent
 import com.flipperdevices.toolstab.api.ToolsDecomposeComponent
 import com.flipperdevices.toolstab.impl.model.ToolsNavigationConfig
 import com.flipperdevices.toolstab.impl.model.toConfigStack
@@ -26,7 +27,8 @@ class ToolsDecomposeComponentImpl @AssistedInject constructor(
     @Assisted deeplink: Deeplink.BottomBar.ToolsTab?,
     @Assisted private val onBack: DecomposeOnBackParameter,
     private val hubMainFactory: ToolsMainScreenDecomposeComponentImpl.Factory,
-    private val mfKey32Factory: MfKey32DecomposeComponent.Factory
+    private val mfKey32Factory: MfKey32DecomposeComponent.Factory,
+    private val remoteControlsComponentFactory: RemoteControlsScreenDecomposeComponent.Factory,
 ) : ToolsDecomposeComponent<ToolsNavigationConfig>(),
     ComponentContext by componentContext,
     ResetTabDecomposeHandler {
@@ -51,6 +53,11 @@ class ToolsDecomposeComponentImpl @AssistedInject constructor(
             componentContext = componentContext,
             onBack = { navigation.popOr(onBack::invoke) }
         )
+
+        ToolsNavigationConfig.RemoteControls -> remoteControlsComponentFactory(
+            componentContext = componentContext,
+            onBack = { navigation.popOr(onBack::invoke) }
+        )
     }
 
     override fun handleDeeplink(deeplink: Deeplink.BottomBar.ToolsTab) {

components/toolstab/impl/src/main/java/com/flipperdevices/toolstab/impl/api/ToolsMainScreenDecomposeComponentImpl.kt

@@ -33,6 +33,9 @@ class ToolsMainScreenDecomposeComponentImpl @AssistedInject constructor(
             hasNotification = hasNotification,
             onOpenMfKey32 = {
                 navigation.pushToFront(ToolsNavigationConfig.MfKey32)
+            },
+            onOpenRemoteControls = {
+                navigation.pushToFront(ToolsNavigationConfig.RemoteControls)
             }
         )
     }

components/toolstab/impl/src/main/java/com/flipperdevices/toolstab/impl/composable/ComposableHub.kt

@@ -6,11 +6,13 @@ import androidx.compose.ui.Modifier
 import com.flipperdevices.core.ui.ktx.OrangeAppBar
 import com.flipperdevices.toolstab.impl.R
 import com.flipperdevices.toolstab.impl.composable.elements.MifareClassicComposable
+import com.flipperdevices.toolstab.impl.composable.elements.RemoteControlsComposable
 
 @Composable
 fun ComposableHub(
     hasNotification: Boolean,
     onOpenMfKey32: () -> Unit,
+    onOpenRemoteControls: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     Column(modifier) {
@@ -21,5 +23,8 @@ fun ComposableHub(
             hasMfKey32Notification = hasNotification,
             onOpenMfKey32 = onOpenMfKey32
         )
+        RemoteControlsComposable(
+            onOpenRemoteControls = onOpenRemoteControls
+        )
     }
 }