diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34881d6e15..e9c6926046 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Attention: don't forget to add the flag for F-Droid before release
- [Feature] Skip infrared signals on setup screen
- [Feature] Better user-ux when configuring remote control
- [Feature] Add flipper action dialogs into remote control and move it into bottombar
+- [Feature] Add new icons for remote-controls
- [Refactor] Load RemoteControls from flipper, emulating animation
- [Refactor] Update to Kotlin 2.0
- [Refactor] Replace Ktorfit with Ktor requests in remote-controls
diff --git a/components/remote-controls/core-model/src/commonMain/kotlin/com/flipperdevices/ifrmvp/model/buttondata/IconButtonData.kt b/components/remote-controls/core-model/src/commonMain/kotlin/com/flipperdevices/ifrmvp/model/buttondata/IconButtonData.kt
index 7ddd5b4ea9..f6cc49cd15 100644
--- a/components/remote-controls/core-model/src/commonMain/kotlin/com/flipperdevices/ifrmvp/model/buttondata/IconButtonData.kt
+++ b/components/remote-controls/core-model/src/commonMain/kotlin/com/flipperdevices/ifrmvp/model/buttondata/IconButtonData.kt
@@ -14,15 +14,76 @@ data class IconButtonData(
override val type: ButtonData.ButtonType = ButtonData.ButtonType.ICON
enum class IconType {
- BACK, HOME, INFO, MORE, MUTE,
- POWER, COOL, HEAT, FAN, CAMERA,
- BRIGHT_MORE, BRIGHT_LESS,
- PAUSE, PLAY, STOP, EXIT,
- MENU, ZOOM_IN, ZOOM_OUT,
- RESET, NEXT, PREVIOUS,
- EJECT, RECORD, WIND_SPEED,
- MODE, LIGHT, TIMER, OFF,
- DELETE, LIVE_TV, FAVORITE,
- ENERGY_SAVE, VOL_UP, VOL_DOWN
+ ADD_PLUS_MORE,
+ AUX,
+ BACK,
+ BRIGHT_LESS,
+ BRIGHT_MORE,
+ CH_DOWN,
+ CH_UP,
+ COLD_WIND,
+ COOL,
+ DELETE,
+ DOWN,
+ EJECT,
+ ENERGY_SAVE,
+ EXIT,
+ FAN_HIGH,
+ FAN_MEDIUM,
+ FAN_LOW,
+ FAN_OFF,
+ FAN_SPEED,
+ FAN_SPEED_DOWN,
+ FAN_SPEED_UP,
+ FAR,
+ FAVORITE,
+ FOCUS_LESS,
+ FOCUS_MORE,
+ FORWARD,
+ HEAT_ADD,
+ HEAT_REDUCE,
+ HOME,
+ INFO,
+ LEFT,
+ LIGHT,
+ LIVE_TV,
+ MENU,
+ MODE,
+ MUTE,
+ NEAR,
+ NEXT,
+ OK,
+ OSCILLATE,
+ PAUSE,
+ PREVIOUS,
+ POWER,
+ RECORD,
+ REMOVE_MINUS_LESS,
+ RESET,
+ REWIND,
+ RIGHT,
+ SETTINGS,
+ SHAKE_WIND,
+ CAMERA,
+ SLEEP,
+ STOP,
+ SWING,
+ TEMPERATURE_DOWN,
+ TEMPERATURE_UP,
+ TIMER,
+ TIMER_ADD,
+ TIMER_REDUCE,
+ TV,
+ UP,
+ VOD,
+ VOL_DOWN,
+ VOL_UP,
+ WIND_SPEED,
+ WIND_TYPE,
+ ZOOM_OUT,
+ ZOOM_IN,
+ PLAY,
+ MORE,
+ HEAT,
}
}
diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt
index 44373a396d..fa7a978252 100644
--- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt
+++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt
@@ -11,18 +11,12 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material.icons.filled.KeyboardArrowDown
-import androidx.compose.material.icons.filled.KeyboardArrowUp
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.Color
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import com.flipperdevices.core.ui.theme.FlipperThemeInternal
import com.flipperdevices.core.ui.theme.LocalPalletV2
@@ -30,8 +24,8 @@ import com.flipperdevices.ifrmvp.core.ui.button.core.EmulatingBox
import com.flipperdevices.ifrmvp.core.ui.button.core.NoConnectionBox
import com.flipperdevices.ifrmvp.core.ui.button.core.SyncingBox
import com.flipperdevices.ifrmvp.core.ui.layout.core.sf
-import com.flipperdevices.ifrmvp.core.ui.layout.core.sfp
import com.flipperdevices.ifrmvp.core.ui.util.GridConstants
+import com.flipperdevices.remotecontrols.core.ui.R as RemoteControlsR
@Suppress("LongMethod")
@Composable
@@ -44,7 +38,6 @@ fun NavigationButton(
modifier: Modifier = Modifier,
background: Color = LocalPalletV2.current.surface.menu.body.dufault,
iconTint: Color = MaterialTheme.colors.onPrimary,
- textColor: Color = MaterialTheme.colors.onPrimary,
) {
Box(
modifier = modifier
@@ -55,7 +48,7 @@ fun NavigationButton(
contentAlignment = Alignment.Center
) {
Icon(
- painter = rememberVectorPainter(Icons.Filled.KeyboardArrowUp),
+ painter = painterResource(RemoteControlsR.drawable.ic_rc_up),
tint = iconTint,
contentDescription = null,
modifier = Modifier
@@ -65,7 +58,7 @@ fun NavigationButton(
.align(Alignment.TopCenter)
)
Icon(
- painter = rememberVectorPainter(Icons.AutoMirrored.Filled.KeyboardArrowLeft),
+ painter = painterResource(RemoteControlsR.drawable.ic_rc_left),
tint = iconTint,
contentDescription = null,
modifier = Modifier
@@ -88,19 +81,18 @@ fun NavigationButton(
.align(Alignment.Center),
contentAlignment = Alignment.Center,
content = {
- Text(
- text = "OK",
- style = MaterialTheme.typography.caption,
- color = textColor,
- fontSize = 16.sfp,
- lineHeight = 2.sfp
+ Icon(
+ painter = painterResource(RemoteControlsR.drawable.ic_rc_ok),
+ tint = MaterialTheme.colors.onPrimary,
+ contentDescription = null,
+ modifier = Modifier.size(48.sf)
)
}
)
}
Icon(
- painter = rememberVectorPainter(Icons.AutoMirrored.Filled.KeyboardArrowRight),
+ painter = painterResource(RemoteControlsR.drawable.ic_rc_right),
tint = iconTint,
contentDescription = null,
modifier = Modifier
@@ -111,7 +103,7 @@ fun NavigationButton(
)
Icon(
- painter = rememberVectorPainter(Icons.Filled.KeyboardArrowDown),
+ painter = painterResource(RemoteControlsR.drawable.ic_rc_down),
tint = iconTint,
contentDescription = null,
modifier = Modifier
diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ShutterButtonComposable.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ShutterButtonComposable.kt
index 984633dbc3..bf1dc5ed3b 100644
--- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ShutterButtonComposable.kt
+++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ShutterButtonComposable.kt
@@ -10,13 +10,11 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.CameraAlt
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.vector.rememberVectorPainter
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import com.flipperdevices.core.ui.ktx.clickableRipple
import com.flipperdevices.core.ui.theme.FlipperThemeInternal
@@ -24,6 +22,7 @@ import com.flipperdevices.core.ui.theme.LocalPalletV2
import com.flipperdevices.ifrmvp.core.ui.button.core.EmulatingBox
import com.flipperdevices.ifrmvp.core.ui.button.core.SyncingBox
import com.flipperdevices.ifrmvp.core.ui.layout.core.sf
+import com.flipperdevices.remotecontrols.core.ui.R as RemoteControlsR
@Composable
fun ShutterButtonComposable(
@@ -49,7 +48,7 @@ fun ShutterButtonComposable(
contentAlignment = Alignment.Center
) {
Icon(
- painter = rememberVectorPainter(Icons.Default.CameraAlt),
+ painter = painterResource(RemoteControlsR.drawable.ic_rc_shutter),
tint = MaterialTheme.colors.onPrimary,
contentDescription = null,
modifier = Modifier.size(48.sf)
diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/core/SquareIconButton.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/core/SquareIconButton.kt
index 7ed9cb62ed..671b6c7c0d 100644
--- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/core/SquareIconButton.kt
+++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/core/SquareIconButton.kt
@@ -37,7 +37,7 @@ fun SquareIconButton(
tint = iconTint,
modifier = Modifier
.fillMaxSize()
- .padding(12.sf)
+ .padding(8.sf)
)
}
}
diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/ext/IconTypeExt.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/ext/IconTypeExt.kt
index ad22e957ec..6cec4cee94 100644
--- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/ext/IconTypeExt.kt
+++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/ext/IconTypeExt.kt
@@ -1,84 +1,82 @@
package com.flipperdevices.ifrmvp.core.ui.ext
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.Logout
-import androidx.compose.material.icons.automirrored.filled.Reply
-import androidx.compose.material.icons.automirrored.filled.VolumeDown
-import androidx.compose.material.icons.automirrored.filled.VolumeOff
-import androidx.compose.material.icons.automirrored.filled.VolumeUp
-import androidx.compose.material.icons.filled.Air
-import androidx.compose.material.icons.filled.Brightness2
-import androidx.compose.material.icons.filled.Brightness5
-import androidx.compose.material.icons.filled.CameraAlt
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Eject
-import androidx.compose.material.icons.filled.EmergencyRecording
-import androidx.compose.material.icons.filled.EnergySavingsLeaf
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.Fireplace
-import androidx.compose.material.icons.filled.Light
-import androidx.compose.material.icons.filled.LiveTv
-import androidx.compose.material.icons.filled.LockReset
-import androidx.compose.material.icons.filled.Logout
-import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material.icons.filled.Mode
-import androidx.compose.material.icons.filled.MoreHoriz
-import androidx.compose.material.icons.filled.Pause
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.PowerOff
-import androidx.compose.material.icons.filled.SettingsPower
-import androidx.compose.material.icons.filled.SevereCold
-import androidx.compose.material.icons.filled.SkipNext
-import androidx.compose.material.icons.filled.SkipPrevious
-import androidx.compose.material.icons.filled.Stop
-import androidx.compose.material.icons.filled.Timer
-import androidx.compose.material.icons.filled.VolumeDown
-import androidx.compose.material.icons.filled.VolumeUp
-import androidx.compose.material.icons.filled.WindPower
-import androidx.compose.material.icons.filled.ZoomIn
-import androidx.compose.material.icons.filled.ZoomOut
-import androidx.compose.material.icons.outlined.Home
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.painterResource
import com.flipperdevices.ifrmvp.model.buttondata.IconButtonData
+import com.flipperdevices.remotecontrols.core.ui.R as RemoteControlsR
-@Suppress("CyclomaticComplexMethod")
+@Suppress("CyclomaticComplexMethod", "LongMethod")
@Composable
fun IconButtonData.IconType.asPainter() = when (this) {
- IconButtonData.IconType.BACK -> rememberVectorPainter(Icons.AutoMirrored.Filled.Reply)
- IconButtonData.IconType.HOME -> rememberVectorPainter(Icons.Outlined.Home)
- IconButtonData.IconType.INFO -> rememberVectorPainter(Icons.Outlined.Info)
- IconButtonData.IconType.MORE -> rememberVectorPainter(Icons.Filled.MoreHoriz)
- IconButtonData.IconType.MUTE -> rememberVectorPainter(Icons.AutoMirrored.Filled.VolumeOff)
- IconButtonData.IconType.POWER -> rememberVectorPainter(Icons.Default.SettingsPower)
- IconButtonData.IconType.COOL -> rememberVectorPainter(Icons.Default.SevereCold)
- IconButtonData.IconType.HEAT -> rememberVectorPainter(Icons.Default.Fireplace)
- IconButtonData.IconType.FAN -> rememberVectorPainter(Icons.Default.Air)
- IconButtonData.IconType.CAMERA -> rememberVectorPainter(Icons.Default.CameraAlt)
- IconButtonData.IconType.BRIGHT_MORE -> rememberVectorPainter(Icons.Default.Brightness2)
- IconButtonData.IconType.BRIGHT_LESS -> rememberVectorPainter(Icons.Default.Brightness5)
- IconButtonData.IconType.PAUSE -> rememberVectorPainter(Icons.Default.Pause)
- IconButtonData.IconType.PLAY -> rememberVectorPainter(Icons.Default.PlayArrow)
- IconButtonData.IconType.STOP -> rememberVectorPainter(Icons.Default.Stop)
- IconButtonData.IconType.ENERGY_SAVE -> rememberVectorPainter(Icons.Default.EnergySavingsLeaf)
- IconButtonData.IconType.EXIT -> rememberVectorPainter(Icons.AutoMirrored.Filled.Logout)
- IconButtonData.IconType.MENU -> rememberVectorPainter(Icons.Default.Menu)
- IconButtonData.IconType.ZOOM_IN -> rememberVectorPainter(Icons.Default.ZoomIn)
- IconButtonData.IconType.ZOOM_OUT -> rememberVectorPainter(Icons.Default.ZoomOut)
- IconButtonData.IconType.RESET -> rememberVectorPainter(Icons.Default.LockReset)
- IconButtonData.IconType.NEXT -> rememberVectorPainter(Icons.Default.SkipNext)
- IconButtonData.IconType.PREVIOUS -> rememberVectorPainter(Icons.Default.SkipPrevious)
- IconButtonData.IconType.EJECT -> rememberVectorPainter(Icons.Default.Eject)
- IconButtonData.IconType.RECORD -> rememberVectorPainter(Icons.Default.EmergencyRecording)
- IconButtonData.IconType.WIND_SPEED -> rememberVectorPainter(Icons.Default.WindPower)
- IconButtonData.IconType.MODE -> rememberVectorPainter(Icons.Default.Mode)
- IconButtonData.IconType.LIGHT -> rememberVectorPainter(Icons.Default.Light)
- IconButtonData.IconType.TIMER -> rememberVectorPainter(Icons.Default.Timer)
- IconButtonData.IconType.OFF -> rememberVectorPainter(Icons.Default.PowerOff)
- IconButtonData.IconType.DELETE -> rememberVectorPainter(Icons.Default.Delete)
- IconButtonData.IconType.LIVE_TV -> rememberVectorPainter(Icons.Default.LiveTv)
- IconButtonData.IconType.FAVORITE -> rememberVectorPainter(Icons.Default.Favorite)
- IconButtonData.IconType.VOL_UP -> rememberVectorPainter(Icons.AutoMirrored.Filled.VolumeUp)
- IconButtonData.IconType.VOL_DOWN -> rememberVectorPainter(Icons.AutoMirrored.Filled.VolumeDown)
-}
+ IconButtonData.IconType.BACK -> RemoteControlsR.drawable.ic_rc_back
+ IconButtonData.IconType.HOME -> RemoteControlsR.drawable.ic_rc_home
+ IconButtonData.IconType.INFO -> RemoteControlsR.drawable.ic_rc_info
+ IconButtonData.IconType.MORE -> RemoteControlsR.drawable.ic_rc_more_points
+ IconButtonData.IconType.MUTE -> RemoteControlsR.drawable.ic_rc_mute
+ IconButtonData.IconType.POWER -> RemoteControlsR.drawable.ic_rc_pwr
+ IconButtonData.IconType.COOL -> RemoteControlsR.drawable.ic_rc_cool
+ IconButtonData.IconType.HEAT -> RemoteControlsR.drawable.ic_rc_heat_add
+ IconButtonData.IconType.CAMERA -> RemoteControlsR.drawable.ic_rc_shutter
+ IconButtonData.IconType.BRIGHT_MORE -> RemoteControlsR.drawable.ic_rc_brightness_up
+ IconButtonData.IconType.BRIGHT_LESS -> RemoteControlsR.drawable.ic_rc_brightness_down
+ IconButtonData.IconType.PAUSE -> RemoteControlsR.drawable.ic_rc_pause
+ IconButtonData.IconType.PLAY -> RemoteControlsR.drawable.ic_rc_play
+ IconButtonData.IconType.STOP -> RemoteControlsR.drawable.ic_rc_stop
+ IconButtonData.IconType.ENERGY_SAVE -> RemoteControlsR.drawable.ic_rc_energy_save_eco
+ IconButtonData.IconType.EXIT -> RemoteControlsR.drawable.ic_rc_exit
+ IconButtonData.IconType.MENU -> RemoteControlsR.drawable.ic_rc_menu
+ IconButtonData.IconType.ZOOM_IN -> RemoteControlsR.drawable.ic_rc_zoom_up
+ IconButtonData.IconType.ZOOM_OUT -> RemoteControlsR.drawable.ic_rc_zoom_down
+ IconButtonData.IconType.RESET -> RemoteControlsR.drawable.ic_rc_reset
+ IconButtonData.IconType.NEXT -> RemoteControlsR.drawable.ic_rc_next
+ IconButtonData.IconType.PREVIOUS -> RemoteControlsR.drawable.ic_rc_previous
+ IconButtonData.IconType.EJECT -> RemoteControlsR.drawable.ic_rc_eject
+ IconButtonData.IconType.RECORD -> RemoteControlsR.drawable.ic_rc_record
+ IconButtonData.IconType.WIND_SPEED -> RemoteControlsR.drawable.ic_rc_wind_speed
+ IconButtonData.IconType.MODE -> RemoteControlsR.drawable.ic_rc_mode
+ IconButtonData.IconType.LIGHT -> RemoteControlsR.drawable.ic_rc_light
+ IconButtonData.IconType.TIMER -> RemoteControlsR.drawable.ic_rc_timer
+ IconButtonData.IconType.DELETE -> RemoteControlsR.drawable.ic_rc_delete
+ IconButtonData.IconType.LIVE_TV -> RemoteControlsR.drawable.ic_rc_live_tv
+ IconButtonData.IconType.FAVORITE -> RemoteControlsR.drawable.ic_rc_favorite
+ IconButtonData.IconType.VOL_UP -> RemoteControlsR.drawable.ic_rc_vol_up
+ IconButtonData.IconType.VOL_DOWN -> RemoteControlsR.drawable.ic_rc_vol_down
+ IconButtonData.IconType.ADD_PLUS_MORE -> RemoteControlsR.drawable.ic_rc_add_plus_more
+ IconButtonData.IconType.AUX -> RemoteControlsR.drawable.ic_rc_aux
+ IconButtonData.IconType.CH_DOWN -> RemoteControlsR.drawable.ic_rc_ch_down
+ IconButtonData.IconType.CH_UP -> RemoteControlsR.drawable.ic_rc_ch_up
+ IconButtonData.IconType.COLD_WIND -> RemoteControlsR.drawable.ic_rc_cold_wind
+ IconButtonData.IconType.DOWN -> RemoteControlsR.drawable.ic_rc_down
+ IconButtonData.IconType.FAN_HIGH -> RemoteControlsR.drawable.ic_rc_fan_high
+ IconButtonData.IconType.FAN_MEDIUM -> RemoteControlsR.drawable.ic_rc_fan_medium
+ IconButtonData.IconType.FAN_LOW -> RemoteControlsR.drawable.ic_rc_fan_low
+ IconButtonData.IconType.FAN_OFF -> RemoteControlsR.drawable.ic_rc_fan_off
+ IconButtonData.IconType.FAN_SPEED -> RemoteControlsR.drawable.ic_rc_fan_speed
+ IconButtonData.IconType.FAN_SPEED_DOWN -> RemoteControlsR.drawable.ic_rc_fan_speed_down
+ IconButtonData.IconType.FAN_SPEED_UP -> RemoteControlsR.drawable.ic_rc_fan_speed_up
+ IconButtonData.IconType.FAR -> RemoteControlsR.drawable.ic_rc_far
+ IconButtonData.IconType.FOCUS_LESS -> RemoteControlsR.drawable.ic_rc_focus_less
+ IconButtonData.IconType.FOCUS_MORE -> RemoteControlsR.drawable.ic_rc_focus_more
+ IconButtonData.IconType.FORWARD -> RemoteControlsR.drawable.ic_rc_forw_forward
+ IconButtonData.IconType.HEAT_ADD -> RemoteControlsR.drawable.ic_rc_heat_add
+ IconButtonData.IconType.HEAT_REDUCE -> RemoteControlsR.drawable.ic_rc_heat_reduce
+ IconButtonData.IconType.LEFT -> RemoteControlsR.drawable.ic_rc_left
+ IconButtonData.IconType.NEAR -> RemoteControlsR.drawable.ic_rc_near
+ IconButtonData.IconType.OK -> RemoteControlsR.drawable.ic_rc_ok
+ IconButtonData.IconType.OSCILLATE -> RemoteControlsR.drawable.ic_rc_oscillate
+ IconButtonData.IconType.REMOVE_MINUS_LESS -> RemoteControlsR.drawable.ic_rc_remove_minus_less
+ IconButtonData.IconType.REWIND -> RemoteControlsR.drawable.ic_rc_rew_rewind
+ IconButtonData.IconType.RIGHT -> RemoteControlsR.drawable.ic_rc_right
+ IconButtonData.IconType.SETTINGS -> RemoteControlsR.drawable.ic_rc_set_settings
+ IconButtonData.IconType.SHAKE_WIND -> RemoteControlsR.drawable.ic_rc_shake_wind
+ IconButtonData.IconType.SLEEP -> RemoteControlsR.drawable.ic_rc_sleep
+ IconButtonData.IconType.SWING -> RemoteControlsR.drawable.ic_rc_swing
+ IconButtonData.IconType.TEMPERATURE_DOWN -> RemoteControlsR.drawable.ic_rc_temperature_down
+ IconButtonData.IconType.TEMPERATURE_UP -> RemoteControlsR.drawable.ic_rc_temperature_up
+ IconButtonData.IconType.TIMER_ADD -> RemoteControlsR.drawable.ic_rc_timer_add
+ IconButtonData.IconType.TIMER_REDUCE -> RemoteControlsR.drawable.ic_rc_timer_reduce
+ IconButtonData.IconType.TV -> RemoteControlsR.drawable.ic_rc_tv
+ IconButtonData.IconType.UP -> RemoteControlsR.drawable.ic_rc_up
+ IconButtonData.IconType.VOD -> RemoteControlsR.drawable.ic_rc_vod
+ IconButtonData.IconType.WIND_TYPE -> RemoteControlsR.drawable.ic_rc_wind_type
+}.let { painterResource(it) }
diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/ButtonsComposable.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/ButtonsComposable.kt
index 9d94a1b136..ba18fbe7b4 100644
--- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/ButtonsComposable.kt
+++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/ButtonsComposable.kt
@@ -19,7 +19,7 @@ import com.flipperdevices.ifrmvp.core.ui.util.GridConstants
import com.flipperdevices.ifrmvp.model.IfrButton
import com.flipperdevices.ifrmvp.model.IfrKeyIdentifier
import com.flipperdevices.ifrmvp.model.PageLayout
-import com.flipperdevices.remotecontrols.core.ui.R as GridUiR
+import com.flipperdevices.remotecontrols.core.ui.R as RemoteControlsR
@Composable
internal fun BoxWithConstraintsScope.ButtonsComposable(
@@ -33,7 +33,7 @@ internal fun BoxWithConstraintsScope.ButtonsComposable(
) {
if (pageLayout?.buttons.isNullOrEmpty()) {
ErrorComposable(
- desc = stringResource(GridUiR.string.empty_page),
+ desc = stringResource(RemoteControlsR.string.empty_page),
onReload = onReload
)
}
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_add_plus_more.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_add_plus_more.xml
new file mode 100644
index 0000000000..15430a532b
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_add_plus_more.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_aux.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_aux.xml
new file mode 100644
index 0000000000..18e5f49af9
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_aux.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_back.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_back.xml
new file mode 100644
index 0000000000..258eccfe69
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_back.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_brightness_down.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_brightness_down.xml
new file mode 100644
index 0000000000..7782692668
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_brightness_down.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_brightness_up.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_brightness_up.xml
new file mode 100644
index 0000000000..88a08625b1
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_brightness_up.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ch_down.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ch_down.xml
new file mode 100644
index 0000000000..1f2d9b4315
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ch_down.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ch_up.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ch_up.xml
new file mode 100644
index 0000000000..71475c84bc
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ch_up.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_cold_wind.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_cold_wind.xml
new file mode 100644
index 0000000000..0fd5ae614a
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_cold_wind.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_cool.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_cool.xml
new file mode 100644
index 0000000000..938094d550
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_cool.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_delete.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_delete.xml
new file mode 100644
index 0000000000..e59179483f
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_delete.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_down.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_down.xml
new file mode 100644
index 0000000000..8e803dfb46
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_down.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_eject.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_eject.xml
new file mode 100644
index 0000000000..b5093c6882
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_eject.xml
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_energy_save_eco.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_energy_save_eco.xml
new file mode 100644
index 0000000000..12fef765e2
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_energy_save_eco.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_exit.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_exit.xml
new file mode 100644
index 0000000000..fd6e168b71
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_exit.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_high.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_high.xml
new file mode 100644
index 0000000000..e9309b3813
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_high.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_low.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_low.xml
new file mode 100644
index 0000000000..2ada32f234
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_low.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_medium.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_medium.xml
new file mode 100644
index 0000000000..8db0dd4d03
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_medium.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_off.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_off.xml
new file mode 100644
index 0000000000..6163b3f4b3
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_off.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed.xml
new file mode 100644
index 0000000000..7c9b6dae0d
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed_down.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed_down.xml
new file mode 100644
index 0000000000..c44ff366be
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed_down.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed_up.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed_up.xml
new file mode 100644
index 0000000000..71edeca90c
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_fan_speed_up.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_far.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_far.xml
new file mode 100644
index 0000000000..eb4d465bb3
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_far.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_favorite.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_favorite.xml
new file mode 100644
index 0000000000..7c6859bdcc
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_favorite.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_focus_less.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_focus_less.xml
new file mode 100644
index 0000000000..3e8116e1ef
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_focus_less.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_focus_more.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_focus_more.xml
new file mode 100644
index 0000000000..6269369166
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_focus_more.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_forw_forward.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_forw_forward.xml
new file mode 100644
index 0000000000..cf901855ac
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_forw_forward.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_heat_add.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_heat_add.xml
new file mode 100644
index 0000000000..e63dba4d13
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_heat_add.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_heat_reduce.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_heat_reduce.xml
new file mode 100644
index 0000000000..671fbf5a53
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_heat_reduce.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_home.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_home.xml
new file mode 100644
index 0000000000..faec5850bd
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_home.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_info.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_info.xml
new file mode 100644
index 0000000000..b96fc80176
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_info.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_left.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_left.xml
new file mode 100644
index 0000000000..9388a7e56e
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_left.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_light.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_light.xml
new file mode 100644
index 0000000000..7b50d9059b
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_light.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_live_tv.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_live_tv.xml
new file mode 100644
index 0000000000..eeea557f97
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_live_tv.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_menu.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_menu.xml
new file mode 100644
index 0000000000..706484368e
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_menu.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_mode.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_mode.xml
new file mode 100644
index 0000000000..fae919cb94
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_mode.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_more_points.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_more_points.xml
new file mode 100644
index 0000000000..13294dd6ab
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_more_points.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_mute.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_mute.xml
new file mode 100644
index 0000000000..5d1ccee74c
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_mute.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_near.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_near.xml
new file mode 100644
index 0000000000..635415969d
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_near.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_next.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_next.xml
new file mode 100644
index 0000000000..6c30205c5d
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_next.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ok.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ok.xml
new file mode 100644
index 0000000000..b8efd5b0de
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_ok.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_oscillate.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_oscillate.xml
new file mode 100644
index 0000000000..1058250aa1
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_oscillate.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_pause.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_pause.xml
new file mode 100644
index 0000000000..d8f05a7d04
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_pause.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_play.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_play.xml
new file mode 100644
index 0000000000..3e237a5b0a
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_play.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_previous.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_previous.xml
new file mode 100644
index 0000000000..258eccfe69
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_previous.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_pwr.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_pwr.xml
new file mode 100644
index 0000000000..78d4d24611
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_pwr.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_record.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_record.xml
new file mode 100644
index 0000000000..f5f362c6cc
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_record.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_remove_minus_less.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_remove_minus_less.xml
new file mode 100644
index 0000000000..bbd766e4c9
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_remove_minus_less.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_reset.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_reset.xml
new file mode 100644
index 0000000000..89b3dca084
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_reset.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_rew_rewind.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_rew_rewind.xml
new file mode 100644
index 0000000000..44d87095b8
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_rew_rewind.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_right.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_right.xml
new file mode 100644
index 0000000000..384a281282
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_right.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_set_settings.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_set_settings.xml
new file mode 100644
index 0000000000..92b1c5de7d
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_set_settings.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_shake_wind.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_shake_wind.xml
new file mode 100644
index 0000000000..f3d003d925
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_shake_wind.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_shutter.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_shutter.xml
new file mode 100644
index 0000000000..80657779dd
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_shutter.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_sleep.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_sleep.xml
new file mode 100644
index 0000000000..a653e5fc56
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_sleep.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_stop.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_stop.xml
new file mode 100644
index 0000000000..8a71bb463a
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_stop.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_swing.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_swing.xml
new file mode 100644
index 0000000000..f279390c19
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_swing.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_temperature_down.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_temperature_down.xml
new file mode 100644
index 0000000000..4859d14081
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_temperature_down.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_temperature_up.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_temperature_up.xml
new file mode 100644
index 0000000000..ea5bfac5ec
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_temperature_up.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer.xml
new file mode 100644
index 0000000000..146b03fd6f
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer_add.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer_add.xml
new file mode 100644
index 0000000000..14544e5ee8
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer_add.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer_reduce.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer_reduce.xml
new file mode 100644
index 0000000000..7ff4e21aa1
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_timer_reduce.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_tv.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_tv.xml
new file mode 100644
index 0000000000..d3d7b73f91
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_tv.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_up.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_up.xml
new file mode 100644
index 0000000000..fcb5af2975
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_up.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vod.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vod.xml
new file mode 100644
index 0000000000..99cf9dec0a
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vod.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vol_down.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vol_down.xml
new file mode 100644
index 0000000000..933eccd181
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vol_down.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vol_up.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vol_up.xml
new file mode 100644
index 0000000000..989536d3a9
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_vol_up.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_wind_speed.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_wind_speed.xml
new file mode 100644
index 0000000000..50a043ce53
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_wind_speed.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_wind_type.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_wind_type.xml
new file mode 100644
index 0000000000..344afff512
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_wind_type.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_zoom_down.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_zoom_down.xml
new file mode 100644
index 0000000000..adc3cdef8d
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_zoom_down.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
diff --git a/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_zoom_up.xml b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_zoom_up.xml
new file mode 100644
index 0000000000..feaf5ce8b3
--- /dev/null
+++ b/components/remote-controls/core-ui/src/main/res/drawable/ic_rc_zoom_up.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
diff --git a/components/remote-controls/grid/saved/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/local/composable/components/GridOptions.kt b/components/remote-controls/grid/saved/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/local/composable/components/GridOptions.kt
index 004fc330be..c2b9aa9b21 100644
--- a/components/remote-controls/grid/saved/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/local/composable/components/GridOptions.kt
+++ b/components/remote-controls/grid/saved/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/local/composable/components/GridOptions.kt
@@ -31,7 +31,8 @@ import com.flipperdevices.core.ui.theme.LocalPallet
import com.flipperdevices.core.ui.theme.LocalPalletV2
import com.flipperdevices.core.ui.theme.LocalTypography
import com.flipperdevices.remotecontrols.grid.saved.impl.R
-import com.flipperdevices.core.ui.res.R as SharedRes
+import com.flipperdevices.core.ui.res.R as DesignSystem
+import com.flipperdevices.remotecontrols.core.ui.R as RemoteControlsR
@Composable
@Suppress("LongMethod")
@@ -69,7 +70,7 @@ internal fun ComposableInfraredDropDown(
)
.size(24.dp),
tint = moreIconTint,
- painter = painterResource(SharedRes.drawable.ic_more_points),
+ painter = painterResource(RemoteControlsR.drawable.ic_rc_more_points),
contentDescription = null
)
DropdownMenu(
@@ -97,7 +98,7 @@ internal fun ComposableInfraredDropDown(
Divider(modifier = Modifier.padding(horizontal = 8.dp))
ComposableInfraredDropDownItem(
text = stringResource(R.string.option_share),
- painter = painterResource(SharedRes.drawable.ic_upload),
+ painter = painterResource(DesignSystem.drawable.ic_upload),
onClick = {
onChangeState.invoke()
onShare.invoke()
@@ -106,7 +107,7 @@ internal fun ComposableInfraredDropDown(
Divider(modifier = Modifier.padding(horizontal = 8.dp))
ComposableInfraredDropDownItem(
text = stringResource(R.string.option_delete),
- painter = painterResource(SharedRes.drawable.ic_trash_icon),
+ painter = painterResource(DesignSystem.drawable.ic_trash_icon),
colorText = LocalPallet.current.keyDelete,
colorIcon = LocalPallet.current.keyDelete,
onClick = {
diff --git a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/util/InfraredRemoteExt.kt b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/util/InfraredRemoteExt.kt
index aeff5343d9..a8451c12f7 100644
--- a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/util/InfraredRemoteExt.kt
+++ b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/util/InfraredRemoteExt.kt
@@ -12,6 +12,7 @@ internal fun InfraredRemote.toByteArray(): ByteArray {
)
is InfraredRemote.Raw -> listOf(
+ type,
frequency,
dutyCycle,
data