changed add action button to disabled if last action is stop

src/Components/Button/index.js

@@ -38,16 +38,19 @@ export function MyTextButton({
   onPress,
   actionColor,
   iconName,
+  disabled,
 }) {
   const appContext = useContext(AppContext);
 
-  const color = actionColor
+  const color = disabled
+    ? appContext.appTheme.textDisabled
+    : actionColor
     ? appContext.appTheme.colors.primary
     : appContext.appTheme.textSecondary;
 
   return (
     <View style={styleContainer}>
-      <TouchableOpacity onPress={onPress}>
+      <TouchableOpacity onPress={onPress} disabled={disabled}>
         <View
           style={[
             {

src/Screens/Device/modals/EditActions/Stop/index.js

@@ -27,8 +27,13 @@ export default function StopEditActionModalContent({ navigation, route }) {
   );
 
   return (
-    <View style={{ marginTop: 40 }}>
+    <View style={{ margin: 40 }}>
-      <Text style={[{ textAlign: "center" }, AppStyles.typography16]}>
+      <Text
+        style={[
+          { textAlign: "center", color: appContext.appTheme.text },
+          AppStyles.typography16,
+        ]}
+      >
         {t("screens.device.scenes.editActions.modalStopEditAction.description")}
       </Text>
     </View>

src/Screens/Device/scene.js

@@ -189,29 +189,7 @@ export default function SceneView({ navigation }) {
           }
           ListFooterComponent={
             <>
-              {lastSceneAction?.type !== Constants.actionType.stop ? (
+              {lastSceneAction?.type === Constants.actionType.stop && (
-                <MyTextButton
-                  title={t("screens.device.scenes.buttonAddAction")}
-                  styleContainer={[
-                    {
-                      alignItems: "center",
-                      marginTop: 10,
-                    },
-                    AppStyles.appBottom,
-                  ]}
-                  style={{ padding: 8 }}
-                  actionColor={
-                    deviceSceneActions === undefined ||
-                    deviceSceneActions.length === 0
-                  }
-                  onPress={() =>
-                    navigation.navigate("modalAddSceneAction", {
-                      deviceFirmwareVersion: device.firmware.version,
-                    })
-                  }
-                  iconName="plus-circle-outline"
-                />
-              ) : (
                 <ActionListItem
                   drag={false}
                   navigation={navigation}
@@ -219,6 +197,29 @@ export default function SceneView({ navigation }) {
                   item={lastSceneAction}
                 />
               )}
+
+              <MyTextButton
+                title={t("screens.device.scenes.buttonAddAction")}
+                styleContainer={[
+                  {
+                    alignItems: "center",
+                    marginTop: 10,
+                  },
+                  AppStyles.appBottom,
+                ]}
+                style={{ padding: 8 }}
+                actionColor={
+                  deviceSceneActions === undefined ||
+                  deviceSceneActions.length === 0
+                }
+                onPress={() =>
+                  navigation.navigate("modalAddSceneAction", {
+                    deviceFirmwareVersion: device.firmware.version,
+                  })
+                }
+                iconName="plus-circle-outline"
+                disabled={lastSceneAction?.type === Constants.actionType.stop}
+              />
             </>
           }
           renderItem={({ item, drag }) => {
@@ -564,11 +565,7 @@ function ActionListItem({ drag, navigation, device, item }) {
             }}
             style={{ padding: 4 }}
           >
-            <MyIcon
+            <MyIcon name="menu" size={20} disabled={drag === false} />
-              name="menu"
-              size={20}
-              disabled={drag === false}
-            />
           </TouchableOpacity>
         </View>
 

src/utils.js

@@ -1,13 +1,7 @@
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { createContext, createRef, useEffect, useState } from "react";
+import { createContext, createRef, useState } from "react";
 import { useTranslation } from "react-i18next";
-import {
+import { Appearance, Platform, StyleSheet, View } from "react-native";
-  Appearance,
-  Platform,
-  StyleSheet,
-  Vibration,
-  View,
-} from "react-native";
 import uuid from "react-native-uuid";
 import * as Haptics from "expo-haptics";
 
@@ -85,6 +79,7 @@ const DarkAppTheme = {
   },
   text: "#fff",
   textSecondary: "#ddd",
+  textDisabled: "#b2bec3",
   backgroundColor: "#21252a",
   card: {
     backgroundColor: "#2b3139",
@@ -137,6 +132,7 @@ const LightAppTheme = {
   },
   text: "#000",
   textSecondary: "#555",
+  textDisabled: "#636e72",
   backgroundColor: "#f7f7f7",
   card: {
     backgroundColor: "#fff",