Issue #379: Support projector screen

SUPLA/ChannelCell.m

@@ -236,7 +236,7 @@ -(void) updateCellView {
     if ( isGroup ) {
         self.cint_LeftStatusWidth.constant = 6;
         self.cint_RightStatusWidth.constant = 6;
-        self.right_ActiveStatus.percent = ((SAChannelGroup*)_channelBase).activePercentage;
+        self.right_ActiveStatus.percent = [UseCaseLegacyWrapper getActivePercentage:(SAChannelGroup*)_channelBase];
         self.right_ActiveStatus.singleColor = YES;
         self.right_ActiveStatus.hidden = NO;
         self.right_OnlineStatus.shapeType = stLinearVertical;

SUPLA/Core/DI/DiContainer.swift

@@ -174,6 +174,7 @@ extension DiContainer {
         register(ReadGroupByRemoteIdUseCase.self, ReadGroupByRemoteIdUseCaseImpl())
         register(GetGroupOnlineSummaryUseCase.self, GetGroupOnlineSummaryUseCaseImpl())
         register(UpdateChannelGroupTotalValueUseCase.self, UpdateChannelGroupTotalValueUseCaseImpl())
+        register(GetGroupActivePercentageUseCase.self, GetGroupActivePercentageUseCaseImpl())
         // Usecases - Icon
         register(GetDefaultIconNameUseCase.self, GetDefaultIconNameUseCaseImpl())
         // Usecases - Location

SUPLA/Core/UI/Details/StandardDetailVC.swift

@@ -91,6 +91,8 @@ class StandardDetailVC<S : ViewState, E : ViewEvent, VM : StandardDetailVM<S, E>
                 viewControllers.append(facadeBlindDetail())
             case .terraceAwning:
                 viewControllers.append(terraceAwningDetail())
+            case .projectorScreen:
+                viewControllers.append(projectorScreenDetail())
             }
         }
 
@@ -250,6 +252,17 @@ class StandardDetailVC<S : ViewState, E : ViewEvent, VM : StandardDetailVM<S, E>
         )
         return vc
     }
+
+    private func projectorScreenDetail() -> ProjectorScreenVC {
+        let vc = ProjectorScreenVC(itemBundle: item)
+        vc.navigationCoordinator = navigationCoordinator
+        vc.tabBarItem = UITabBarItem(
+            title: settings.showBottomLabels ? Strings.StandardDetail.tabGeneral : nil,
+            image: .iconGeneral,
+            tag: DetailTabTag.Window.rawValue
+        )
+        return vc
+    }
 }
 
 protocol NavigationItemProvider: AnyObject {

SUPLA/Core/UI/TableView/BaseTableViewModel.swift

@@ -60,7 +60,9 @@ class BaseTableViewModel<S: ViewState, E: ViewEvent>: BaseViewModel<S, E> {
              SUPLA_CHANNELFNC_GENERAL_PURPOSE_MEASUREMENT,
              SUPLA_CHANNELFNC_CONTROLLINGTHEROLLERSHUTTER,
              SUPLA_CHANNELFNC_CONTROLLINGTHEROOFWINDOW,
-             SUPLA_CHANNELFNC_CONTROLLINGTHEFACADEBLIND:
+             SUPLA_CHANNELFNC_CONTROLLINGTHEFACADEBLIND,
+             SUPLA_CHANNELFNC_TERRACE_AWNING,
+             SUPLA_CHANNELFNC_PROJECTOR_SCREEN:
             return true
         case SUPLA_CHANNELFNC_LIGHTSWITCH,
              SUPLA_CHANNELFNC_POWERSWITCH,

SUPLA/Core/UI/TableView/ChannelBaseTableViewController.swift

@@ -194,7 +194,8 @@ class ChannelBaseTableViewController<S: ViewState, E: ViewEvent, VM: BaseTableVi
         case SUPLA_CHANNELFNC_CONTROLLINGTHEROOFWINDOW,
              SUPLA_CHANNELFNC_CONTROLLINGTHEFACADEBLIND,
              SUPLA_CHANNELFNC_CONTROLLINGTHEROLLERSHUTTER,
-             SUPLA_CHANNELFNC_TERRACE_AWNING:
+             SUPLA_CHANNELFNC_TERRACE_AWNING,
+             SUPLA_CHANNELFNC_PROJECTOR_SCREEN:
             return cellIdForIcon
         default:
             return cellIdForChannel

SUPLA/Features/ChannelList/Cells/IconCell.swift

@@ -104,7 +104,8 @@ final class IconCell: BaseCell<ChannelWithChildren> {
         case SUPLA_CHANNELFNC_CONTROLLINGTHEROOFWINDOW,
              SUPLA_CHANNELFNC_CONTROLLINGTHEFACADEBLIND,
              SUPLA_CHANNELFNC_CONTROLLINGTHEROLLERSHUTTER,
-             SUPLA_CHANNELFNC_TERRACE_AWNING: true
+             SUPLA_CHANNELFNC_TERRACE_AWNING,
+             SUPLA_CHANNELFNC_PROJECTOR_SCREEN: true
         default: false
         }
     }
@@ -114,7 +115,8 @@ final class IconCell: BaseCell<ChannelWithChildren> {
         case SUPLA_CHANNELFNC_CONTROLLINGTHEROOFWINDOW,
              SUPLA_CHANNELFNC_CONTROLLINGTHEFACADEBLIND,
              SUPLA_CHANNELFNC_CONTROLLINGTHEROLLERSHUTTER,
-             SUPLA_CHANNELFNC_TERRACE_AWNING: true
+             SUPLA_CHANNELFNC_TERRACE_AWNING,
+             SUPLA_CHANNELFNC_PROJECTOR_SCREEN: true
         default: false
         }
     }

SUPLA/Features/Details/SwitchDetail/DeviceStateHelper/DeviceStateHelperVMI.swift

@@ -35,22 +35,10 @@ extension DeviceStateHelperVMI {
     private func createIconData(_ channel: SAChannelBase) -> IconData {
         @Singleton<GetChannelBaseStateUseCase> var getChannelBaseStateUseCase
 
-        let online = if let channel = channel as? SAChannel {
-            channel.value?.online ?? false
-        } else if let channel = channel as? SAChannelGroup {
-            channel.isOnline()
-        } else {
-            false
-        }
-
         return IconData(
             function: channel.func,
             altIcon: channel.alticon,
-            state: getChannelBaseStateUseCase.invoke(
-                function: channel.func,
-                online: online,
-                activeValue: channel.imgIsActive()
-            ),
+            state: getChannelBaseStateUseCase.invoke(channelBase: channel),
             userIcon: channel.usericon
         )
     }

SUPLA/Features/Details/SwitchDetail/SwitchGeneral/SwitchGeneralVM.swift

@@ -19,7 +19,6 @@
 class SwitchGeneralVM: BaseViewModel<SwitchGeneralViewState, SwitchGeneralViewEvent>, DeviceStateHelperVMI {
 
     @Singleton<ReadChannelByRemoteIdUseCase> private var readChannelByRemoteIdUseCase
-    @Singleton<GetChannelBaseStateUseCase> private var getChannelBaseStateUseCase
     @Singleton<ExecuteSimpleActionUseCase> private var executeSimpleActionUseCase
     @Singleton<DateProvider> private var dateProvider
 

SUPLA/Features/Details/SwitchDetail/TimerDetail/SwitchTimerDetailVM.swift

@@ -21,7 +21,6 @@ import RxSwift
 class SwitchTimerDetailVM: BaseViewModel<SwitchTimerDetailViewState, SwitchTimerDetailViewEvent>, DeviceStateHelperVMI {
 
     @Singleton<ReadChannelByRemoteIdUseCase> private var readChannelByRemoteIdUseCase
-    @Singleton<GetChannelBaseStateUseCase> private var getChannelBaseStateUseCase
     @Singleton<StartTimerUseCase> private var startTimerUseCase
     @Singleton<ExecuteSimpleActionUseCase> private var executeSimpleAxtionUseCase
     @Singleton<DateProvider> private var dateProvider

SUPLA/Features/Details/WindowDetail/Base/Model/ProjectorScreenState.swift

@@ -0,0 +1,33 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+struct ProjectorScreenState: WindowState, Equatable, Changeable {
+    /**
+     * The blind roller position in percentage
+     * 0 - open
+     * 100 - closed
+     */
+    var position: WindowGroupedValue
+
+    var positionTextFormat: WindowGroupedValueFormat = .percentage
+
+    /**
+     * Used for groups - shows positions of single roller shutter
+     */
+    var markers: [CGFloat] = []
+}

SUPLA/Features/Details/WindowDetail/Base/UI/ProjectorScreen/ProjectorScreenColors.swift

@@ -0,0 +1,45 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+struct ProjectorScreenColors {
+    let screen: UIColor
+    let shadow: UIColor
+    let bottomRect: UIColor
+    let topRect: UIColor
+    let logoColor: UIColor
+
+    static func standard(_ traitCollection: UITraitCollection) -> ProjectorScreenColors {
+        ProjectorScreenColors(
+            screen: .rollerShutterWindow.resolvedColor(with: traitCollection),
+            shadow: .black,
+            bottomRect: .rollerShutterSlatBackground.resolvedColor(with: traitCollection),
+            topRect: .gray.resolvedColor(with: traitCollection),
+            logoColor: .primaryVariant.copy(alpha: 0.2)
+        )
+    }
+
+    static func offline(_ traitCollection: UITraitCollection) -> ProjectorScreenColors {
+        ProjectorScreenColors(
+            screen: .surface.resolvedColor(with: traitCollection),
+            shadow: .black,
+            bottomRect: .rollerShutterSlatBackground.resolvedColor(with: traitCollection),
+            topRect: .disabled.resolvedColor(with: traitCollection),
+            logoColor: .disabled.copy(alpha: 0.2)
+        )
+    }
+}