added dots modal

locales/en.json

@@ -96,7 +96,7 @@
         "modalUpdateSceneName": {
           "pageTitle": "Change scene name",
           "textTitle": "Scene name",
-          "textDescription": "Give the scene a name to easily find it later"
+          "textDescription": "Give the scene a name to easily find it later."
         }
       }
     },

src/Components/Button/index.js

@@ -31,7 +31,14 @@ export default function MyButton({ title, style, disabled, onPress }) {
   );
 }
 
-export function MyTextButton({ title, style, onPress, actionColor }) {
+export function MyTextButton({
+  title,
+  styleContainer,
+  style,
+  onPress,
+  actionColor,
+  iconName,
+}) {
   const appContext = useContext(AppContext);
 
   const color = actionColor
@@ -39,28 +46,32 @@ export function MyTextButton({ title, style, onPress, actionColor }) {
     : appContext.appTheme.textSecondary;
 
   return (
-    <TouchableOpacity onPress={onPress}>
+    <View style={styleContainer}>
-      <View
+      <TouchableOpacity onPress={onPress}>
-        style={[
+        <View
-          {
+          style={[
-            flexDirection: "row",
+            {
-            justifyContent: "center",
+              flexDirection: "row",
-            alignItems: "center",
+              justifyContent: "center",
-          },
+              alignItems: "center",
-          style,
+            },
-        ]}
+            style,
-      >
+          ]}
-        <MyIcon
+        >
-          name="plus-circle-outline"
+          <MyIcon
-          size={24}
+            name={iconName}
-          style={{
+            size={24}
-            marginRight: 10,
+            style={{
-            color: color,
+              marginRight: 10,
-          }}
+              color: color,
-        />
+            }}
-        <Text style={[{ color: color }, AppStyles.typography16]}>{title}</Text>
+          />
-      </View>
+          <Text style={[{ color: color }, AppStyles.typography16]}>
-    </TouchableOpacity>
+            {title}
+          </Text>
+        </View>
+      </TouchableOpacity>
+    </View>
   );
 }
 

src/Components/ColorPicker/index.js

@@ -20,7 +20,7 @@ import ColorPicker, {
 } from "reanimated-color-picker";
 import MyIcon from "../Icon";
 import { AppContext, AppStyles, VibrateShort } from "../../utils";
-
+/*
 function ColorLayer({ layerNumber, sharedColor, selected, onPress }) {
   const backgroundColorStyle = useAnimatedStyle(() => {
     return {
@@ -112,7 +112,7 @@ function ColorLayer({ layerNumber, sharedColor, selected, onPress }) {
     </TouchableHighlight>
   );
 }
-
+/*
 export default function MyColorPicker({ colorLayer }) {
   const appContext = useContext(AppContext);
   const [selectedGlasLayer, setSelectedGlasLayer] = useState(1);
@@ -247,7 +247,7 @@ export default function MyColorPicker({ colorLayer }) {
       </ColorPicker>
     </Animated.View>
   );
-}
+} */
 
 export function MyColorPickerV2({
   pickerRef,
@@ -342,43 +342,9 @@ export function MyColorPickerV2({
                 VibrateShort();
               }}
             >
-              {disabled ? (
+              <View>
-                <>
+                <MyColorSwatch size={28} backgroundColor={color} />
-                  <View
+              </View>
-                    style={{
-                      position: "absolute",
-                      zIndex: 2,
-                      backgroundColor: appContext.appTheme.colorPickerDisabled,
-                      width: 28,
-                      height: 28,
-                      borderRadius: 14,
-                    }}
-                  />
-                  <View
-                    style={[
-                      {
-                        backgroundColor: color,
-                        width: 28,
-                        height: 28,
-                        borderRadius: 16,
-                      },
-                      AppStyles.Shadow,
-                    ]}
-                  />
-                </>
-              ) : (
-                <View
-                  style={[
-                    {
-                      backgroundColor: color,
-                      width: 28,
-                      height: 28,
-                      borderRadius: 16,
-                    },
-                    AppStyles.Shadow,
-                  ]}
-                />
-              )}
             </TouchableHighlight>
           ))}
 
@@ -436,6 +402,23 @@ export function MyColorPickerV2({
   );
 }
 
+export function MyColorSwatch({ size, backgroundColor, style }) {
+  return (
+    <View
+      style={[
+        {
+          backgroundColor: backgroundColor,
+          width: size,
+          height: size,
+          borderRadius: 16,
+        },
+        AppStyles.Shadow,
+        style
+      ]}
+    />
+  );
+}
+
 const styles = StyleSheet.create({
   previewTxtContainer: {
     paddingTop: 20,

src/Components/Modal/index.js

@@ -1,10 +1,19 @@
 import { useContext, useEffect, useState } from "react";
 import { AppContext, AppStyles, ModalContainer } from "../../utils";
-import { Pressable, Text, View } from "react-native";
+import {
+  Modal,
+  Pressable,
+  SafeAreaView,
+  Text,
+  TouchableWithoutFeedback,
+  View,
+} from "react-native";
 import MyIcon from "../Icon";
 import MyTextInput from "../TextInput";
 import { MyIconButton } from "../Button";
 import { Divider } from "../Divider";
+import MyPressable from "../Pressable";
+import { FlatList } from "react-native-gesture-handler";
 
 //const modalContentStyle = { margin: 10, paddingTop: 10 };
 
@@ -103,6 +112,93 @@ export function MyDefaultModalHeader({ title, closeModal }) {
   );
 } */
 
+export function MyDotsModal({ isOpen, closeModal, data }) {
+  const appContext = useContext(AppContext);
+
+  const listItemStyle = (isFirst, isLast) => {
+    return {
+      borderTopLeftRadius: isFirst ? 10 : 0,
+      borderTopRightRadius: isFirst ? 10 : 0,
+      borderBottomLeftRadius: isLast ? 10 : 0,
+      borderBottomRightRadius: isLast ? 10 : 0,
+    };
+  };
+
+  const handleBackdropPress = (e) => {
+    const x = e.nativeEvent.locationX;
+    const y = e.nativeEvent.locationY;
+
+    const topLeftX = 0;
+    const topLeftY = 0;
+    const bottomRightX = 200; // width
+    const bottomRightY = 52; // height of item
+
+    if (x < topLeftX || x > bottomRightX || y < topLeftY || y > bottomRightY) {
+      closeModal();
+    }
+  };
+
+  return (
+    <Modal
+      visible={isOpen}
+      transparent
+      style={{ flex: 1 }}
+      onRequestClose={() => closeModal()}
+    >
+      <SafeAreaView style={{ flex: 1 }}>
+        <Pressable onPress={handleBackdropPress} style={{ flex: 1 }}>
+          <View
+            style={[
+              {
+                marginTop: 10,
+                backgroundColor: appContext.appTheme.card.backgroundColor,
+                width: 200,
+                borderRadius: 10,
+                alignSelf: "flex-end",
+              },
+              AppStyles.Shadow,
+            ]}
+          >
+            <FlatList
+              data={data}
+              renderItem={({ item, index }) => (
+                <MyPressable
+                  key={index}
+                  style={listItemStyle(index === 0, index === data.length - 1)}
+                  backgroundColor={appContext.appTheme.card.backgroundColor}
+                  onPress={() => {
+                    closeModal();
+                    item.onPress();
+                  }}
+                  disabled={item.disabled}
+                >
+                  {console.log("dis", item.disabled)}
+                  <View
+                    style={[
+                      {
+                        flexDirection: "row",
+                        alignItems: "center",
+                        gap: 10,
+                        padding: 16,
+                      },
+                      item.disabled && AppStyles.disabled,
+                    ]}
+                  >
+                    <MyIcon name={item.icon} size={24} />
+                    <Text style={{ color: appContext.appTheme.text }}>
+                      {item.label}
+                    </Text>
+                  </View>
+                </MyPressable>
+              )}
+            />
+          </View>
+        </Pressable>
+      </SafeAreaView>
+    </Modal>
+  );
+}
+
 export function MyPickerModalListItem({
   onPress,
   itemName,
@@ -112,53 +208,41 @@ export function MyPickerModalListItem({
   const appContext = useContext(AppContext);
 
   return (
-    <>
+    <MyPressable onPress={onPress} disabled={disabled}>
-      <Pressable
+      <View
-        onPress={onPress}
+        style={{
-        disabled={disabled}
+          flexDirection: "row",
-        style={({ pressed }) => [
+          justifyContent: "space-between",
-          {
+          padding: 12,
-            backgroundColor: pressed
+        }}
-              ? appContext.appTheme.modal.pressedPickerItemColor
-              : appContext.appTheme.backgroundColor,
-          },
-        ]}
       >
-        <View
+        <Text
-          style={{
+          style={[
-            flexDirection: "row",
+            AppStyles.typography16,
-            justifyContent: "space-between",
+            { color: appContext.appTheme.text },
-            padding: 12,
+            disabled && AppStyles.disabled,
-          }}
+          ]}
         >
-          <Text
+          {itemName}
-            style={[
+        </Text>
-              AppStyles.typography16,
-              { color: appContext.appTheme.text },
-              disabled && AppStyles.disabled,
-            ]}
-          >
-            {itemName}
-          </Text>
 
-          {itemSelected ? (
+        {itemSelected ? (
-            <MyIcon
+          <MyIcon
-              name="checkbox-marked-circle"
+            name="checkbox-marked-circle"
-              size={24}
+            size={24}
-              color={appContext.appTheme.colors.primary}
+            color={appContext.appTheme.colors.primary}
-            />
+          />
-          ) : (
+        ) : (
-            <MyIcon
+          <MyIcon
-              name="checkbox-blank-circle-outline"
+            name="checkbox-blank-circle-outline"
-              size={24}
+            size={24}
-              color={appContext.appTheme.colors.gray}
+            color={appContext.appTheme.colors.gray}
-              style={disabled && AppStyles.disabled}
+            style={disabled && AppStyles.disabled}
-            />
+          />
-          )}
+        )}
-        </View>
+      </View>
-        <Divider withoutMarginVertical />
+      <Divider withoutMarginVertical />
-      </Pressable>
+    </MyPressable>
-    </>
   );
 }
 

src/Components/Pressable/index.js

@@ -0,0 +1,32 @@
+import { useContext } from "react";
+import { Pressable } from "react-native";
+import { AppContext } from "../../utils";
+
+export default function MyPressable({
+  children,
+  onPress,
+  disabled,
+  style,
+  backgroundColor,
+}) {
+  const appContext = useContext(AppContext);
+
+  return (
+    <Pressable
+      onPress={onPress}
+      disabled={disabled}
+      style={({ pressed }) => [
+        {
+          backgroundColor: pressed
+            ? appContext.appTheme.modal.pressedPickerItemColor
+            : backgroundColor === undefined
+            ? appContext.appTheme.backgroundColor
+            : backgroundColor,
+        },
+        style,
+      ]}
+    >
+      {children}
+    </Pressable>
+  );
+}

src/Screens/Device/modals/AddSceneAction/index.js

@@ -1,10 +1,11 @@
 import { useContext } from "react";
-import { Image, Pressable, ScrollView, Text, View } from "react-native";
+import { Image, ScrollView, Text, View } from "react-native";
 import { AppContext, AppStyles, ModalContainer } from "../../../../utils";
 import MyIcon from "../../../../Components/Icon";
 import { Divider } from "../../../../Components/Divider";
 import { useTranslation } from "react-i18next";
 import MyTag from "../../../../Components/Tag";
+import MyPressable from "../../../../Components/Pressable";
 
 function Action({
   text,
@@ -27,17 +28,7 @@ function Action({
 
   return (
     <>
-      <Pressable
+      <MyPressable onPress={onPress} disabled={!deviceFirmwareVersionSupported}>
-        onPress={onPress}
-        disabled={!deviceFirmwareVersionSupported}
-        style={({ pressed }) => [
-          {
-            backgroundColor: pressed
-              ? appContext.appTheme.modal.pressedPickerItemColor
-              : appContext.appTheme.backgroundColor,
-          },
-        ]}
-      >
         <View
           style={[
             {
@@ -69,7 +60,7 @@ function Action({
             style={{ height: 150, width: 150, marginLeft: 12 }}
           />
         )}
-      </Pressable>
+      </MyPressable>
 
       <Divider withoutMarginVertical />
     </>

src/Screens/Device/modals/ChooseScene/index.js

@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { FlatList } from "react-native";
+import { FlatList, View } from "react-native";
 import {
   AppContext,
   AppSelectedUserDevice,
@@ -22,44 +22,51 @@ export default function ChooseSceneModalContent({ navigation, route }) {
 
   return (
     <ModalContainer withoutPadding>
-      {deviceScenes.length === 0 ? (
+      <FlatList
-        <MyResult
+        data={deviceScenes}
-          text={t("screens.device.scenes.modalChooseScene.noResult")}
+        ListEmptyComponent={
-          iconName={"selection-search"}
+          <MyResult
-        />
+            text={t("screens.device.scenes.modalChooseScene.noResult")}
-      ) : (
+            iconName={"selection-search"}
-        <FlatList
+          />
-          data={deviceScenes}
+        }
-          keyExtractor={(item) => item.sceneId}
+        keyExtractor={(item) => item.sceneId}
-          renderItem={({ item }) => (
+        renderItem={({ item }) => (
-            <MyPickerModalListItem
+          <MyPickerModalListItem
-              itemName={item.name}
+            itemName={item.name}
-              itemSelected={device.selectedScene === item.sceneId}
+            itemSelected={device.selectedScene === item.sceneId}
-              onPress={() => {
+            onPress={() => {
-                navigation.goBack();
+              navigation.goBack();
 
-                appContext.setDevices((arr) => {
+              appContext.setDevices((arr) => {
-                  const newArr = [...arr];
+                const newArr = [...arr];
 
-                  newArr[
+                newArr[
-                    arr.findIndex(
+                  arr.findIndex(
-                      (d) => d.id === AppSelectedUserDevice.current.id
+                    (d) => d.id === AppSelectedUserDevice.current.id
-                    )
+                  )
-                  ].selectedScene = item.sceneId;
+                ].selectedScene = item.sceneId;
 
-                  return newArr;
+                return newArr;
-                });
+              });
-              }}
+            }}
-            />
+          />
-          )}
+        )}
-        />
+        ListFooterComponent={
-      )}
+          <MyTextButton
-
+            styleContainer={{
-      <MyTextButton
+              alignItems: "center",
-        style={{ marginTop: 10 }}
+              marginTop: 10,
-        actionColor={!deviceScenes.length}
+            }}
-        onPress={() => navigation.navigate("modalCreateScene")}
+            style={{ padding: 8 }}
-        title={t("screens.device.scenes.modalChooseScene.textButtonAddScene")}
+            actionColor={!deviceScenes.length}
+            onPress={() => navigation.navigate("modalCreateScene")}
+            title={t(
+              "screens.device.scenes.modalChooseScene.textButtonAddScene"
+            )}
+            iconName="plus-circle-outline"
+          />
+        }
       />
     </ModalContainer>
   );

src/Screens/Device/scene.js

@@ -1,6 +1,12 @@
 import { FlatList, Text, TouchableOpacity, View } from "react-native";
 import Card from "../../Components/Card";
-import { AppContext, AppStyles, Constants, GetDevice } from "../../utils";
+import {
+  AppContext,
+  AppSelectedUserDevice,
+  AppStyles,
+  Constants,
+  GetDevice,
+} from "../../utils";
 import { useCallback, useContext, useState } from "react";
 import MyDropdown from "../../Components/Dropdown";
 import MyIcon from "../../Components/Icon";
@@ -8,19 +14,29 @@ import { useTranslation } from "react-i18next";
 import MyResult from "../../Components/Result";
 import { MyIconButton, MyTextButton } from "../../Components/Button";
 import { useFocusEffect } from "@react-navigation/native";
+import { Divider } from "../../Components/Divider";
+import { MyColorSwatch } from "../../Components/ColorPicker";
+import { MyDotsModal } from "../../Components/Modal";
 
 export default function SceneView({ navigation }) {
   const appContext = useContext(AppContext);
   const { t } = useTranslation();
 
   const [device, setDevice] = useState();
+  const [isDotsModalOpen, setIsDotsModalOpen] = useState(false);
 
   const getSelectedDeviceSceneName = () => {
-    const scenes = appContext.deviceScenes.find(
+    let scene;
-      (s) => s.sceneId === device.selectedScene
-    );
 
-    return scenes === undefined ? "None" : scenes.name;
+    if (device.selectedScene !== "") {
+      scene = appContext.deviceScenes.find(
+        (s) => s.sceneId === device.selectedScene
+      );
+    }
+
+    return scene === undefined
+      ? t("screens.device.scenes.dropdownSceneSelection.noSceneSelected")
+      : scene.name;
   };
 
   useFocusEffect(
@@ -32,15 +48,10 @@ export default function SceneView({ navigation }) {
           navigation.setOptions({
             headerRight: () => (
               <MyIconButton
-                iconName="pencil"
+                iconName="dots-vertical"
-                iconSize={22}
+                iconSize={24}
                 style={AppStyles.headerNavigationIcons}
-                onPress={() =>
+                onPress={() => setIsDotsModalOpen(true)}
-                  navigation.navigate("modalUpdateSceneName", {
-                    deviceSelectedScene: device.selectedScene,
-                    sceneName: getSelectedDeviceSceneName(),
-                  })
-                }
               />
             ),
           });
@@ -86,17 +97,11 @@ export default function SceneView({ navigation }) {
               device: { selectedScene: device.selectedScene },
             })
           }
-          selectedItemLabel={
+          selectedItemLabel={getSelectedDeviceSceneName()}
-            device.selectedScene === null
-              ? t(
-                  "screens.device.scenes.dropdownSceneSelection.noSceneSelected"
-                )
-              : getSelectedDeviceSceneName()
-          }
         />
       </Card>
 
-      {device.selectedScene === null ? (
+      {device.selectedScene === "" ? (
         <MyResult
           text={t("screens.device.scenes.infoNoSceneSelected")}
           iconName={"selection-search"}
@@ -118,31 +123,72 @@ export default function SceneView({ navigation }) {
                 console.log("item", item);
 
                 return (
-                  <Card cardBackgroundColor={"#e67e22"}>
+                  <View style={{ marginLeft: 10, marginRight: 10 }}>
-                    <View
+                    <TouchableOpacity
-                      style={{
+                      onPress={() =>
-                        flexDirection: "row",
+                        navigation.navigate("modalLayersEditAction", {
-                        justifyContent: "space-between",
+                          actionId: item.actionId,
-                      }}
+                          deviceFirmwareVersion: device.firmware.version,
+                        })
+                      }
                     >
-                      {getActionTypeIcon(item.type)}
+                      <View
-                      <View>
+                        style={{
-                        <Text>Layer 1 wird auf rot setzen</Text>
+                          flexDirection: "row",
-                        <Text>Animation In: Fade in</Text>
+                          alignItems: "center",
-                        <Text>Animation out: Fade out</Text>
+                          justifyContent: "space-between",
-                      </View>
+                        }}
-                      <TouchableOpacity
-                        onPress={() =>
-                          navigation.navigate("modalLayersEditAction", {
-                            actionId: item.actionId,
-                            deviceFirmwareVersion: device.firmware.version,
-                          })
-                        }
                       >
-                        <MyIcon name="pencil" size={24} />
+                        <View
-                      </TouchableOpacity>
+                          style={{ flexDirection: "row", alignItems: "center" }}
-                    </View>
+                        >
-                  </Card>
+                          {getActionTypeIcon(item.type)}
+                          <View style={{ marginLeft: 12 }}>
+                            <Text
+                              style={{
+                                color: appContext.appTheme.text,
+                              }}
+                            >
+                              Rainbow
+                            </Text>
+
+                            <View
+                              style={{
+                                flexDirection: "row",
+                                alignItems: "center",
+                              }}
+                            >
+                              <Text
+                                style={{
+                                  color: appContext.appTheme.textSecondary,
+                                }}
+                              >
+                                Set to
+                              </Text>
+
+                              <MyColorSwatch
+                                style={{ marginLeft: 6 }}
+                                size={16}
+                                backgroundColor={"red"}
+                              />
+                              <MyColorSwatch
+                                size={16}
+                                backgroundColor={"orange"}
+                              />
+                              <MyColorSwatch
+                                size={16}
+                                backgroundColor={"blue"}
+                              />
+                            </View>
+                          </View>
+                        </View>
+
+                        <MyIcon name="menu" size={20} />
+                      </View>
+
+                      <Divider />
+                    </TouchableOpacity>
+                  </View>
                 );
               }}
             />
@@ -150,7 +196,11 @@ export default function SceneView({ navigation }) {
 
           <MyTextButton
             title={t("screens.device.scenes.buttonAddAction")}
-            style={{ marginTop: 10 }}
+            styleContainer={{
+              alignItems: "center",
+              marginTop: 10,
+            }}
+            style={{ padding: 8 }}
             actionColor={
               deviceSceneActions === undefined ||
               deviceSceneActions.length === 0
@@ -160,9 +210,62 @@ export default function SceneView({ navigation }) {
                 deviceFirmwareVersion: device.firmware.version,
               })
             }
+            iconName="plus-circle-outline"
           />
         </View>
       )}
+
+      <MyDotsModal
+        isOpen={isDotsModalOpen}
+        closeModal={() => setIsDotsModalOpen(false)}
+        data={[
+          {
+            icon: "pencil",
+            label: "Change scene name",
+            onPress: () =>
+              navigation.navigate("modalUpdateSceneName", {
+                deviceSelectedScene: device.selectedScene,
+                sceneName: getSelectedDeviceSceneName(),
+              }),
+          },
+          {
+            icon: "trash-can",
+            label: "Delete scene",
+            disabled: GetDevice(appContext.devices).selectedScene === "",
+            onPress: () => {
+              appContext.setDeviceScenes((scenes) =>
+                scenes.filter(
+                  (scene) =>
+                    scene.sceneId !==
+                    GetDevice(appContext.devices).selectedScene
+                )
+              );
+
+              appContext.setDevices((arr) => {
+                const newArr = [...arr];
+
+                const foundDeviceIndex = arr.findIndex(
+                  (d) => d.id === AppSelectedUserDevice.current.id
+                );
+
+                if (foundDeviceIndex !== -1) {
+                  newArr[foundDeviceIndex].selectedScene = "";
+
+                  appContext.setDeviceSceneActions((actions) =>
+                    actions.filter(
+                      (action) =>
+                        action.sceneId !==
+                        newArr[foundDeviceIndex].selectedScene
+                    )
+                  );
+                }
+
+                return newArr;
+              });
+            },
+          },
+        ]}
+      />
     </>
   );
 }

src/utils.js

@@ -363,7 +363,7 @@ const devDevices = [
       version: "1.0.1",
       lastUpdated: "11.07.2023 um 20:33 Uhr",
     },
-    selectedScene: null,
+    selectedScene: "",
   },
   {
     id: "5b331a12a-0bec-4336-99bb-df3f9fc9f537", // deviceId
@@ -373,7 +373,7 @@ const devDevices = [
       version: "1.0.1",
       lastUpdated: "11.07.2023 um 20:33 Uhr",
     },
-    selectedScene: null,
+    selectedScene: "",
   },
 ];