Improved

Author: sajith

CMakeLists.txt

@@ -3,6 +3,7 @@ project(SOLID)
 
 set(CMAKE_CXX_STANDARD 20)
 #add_subdirectory(plant-care)
+add_subdirectory(plant-care-better)
 
 #add_executable(main main.cpp)
 

plant-care-better/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(plantcare-better)
+
+SET(CMAKE_CXX_FLAGS "-std=c++17 -pthread -O3 -pedantic -Wall -Werror")
+
+add_subdirectory(sensors)
+add_subdirectory(caretaker)
+add_subdirectory(main)

plant-care-better/caretaker/CMakeLists.txt

@@ -0,0 +1,15 @@
+project(caretaker)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+
+set(SOURCE
+        ${PROJECT_SOURCE_DIR}/include/caretaker/WaterDevice.h
+        ${PROJECT_SOURCE_DIR}/include/caretaker/WindowDevice.h
+        ${PROJECT_SOURCE_DIR}/include/caretaker/AloeCaretaker.h
+        ${PROJECT_SOURCE_DIR}/include/caretaker/CactusCaretaker.h
+        ${PROJECT_SOURCE_DIR}/src/AloeCaretaker.cpp
+        ${PROJECT_SOURCE_DIR}/src/CactusCaretaker.cpp
+        )
+
+add_library(${PROJECT_NAME} STATIC ${SOURCE})
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include)

plant-care-better/caretaker/include/caretaker/AloeCaretaker.h

@@ -0,0 +1,27 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#ifndef SOLID_ALOECARETAKER_H
+#define SOLID_ALOECARETAKER_H
+
+#include "caretaker/WaterDevice.h"
+#include "caretaker/WindowDevice.h"
+
+namespace caretaker
+{
+    class AloeCaretaker : public interfaces::WaterDevice, public interfaces::WindowDevice
+    {
+        bool windowBlindsOpen = true;
+
+
+    public:
+        void pourWater() override;
+        void sprinkleWater() override;
+
+        void openWindowBlinds() override;
+        void closeWindowBlinds() override;
+    };
+}
+
+#endif //SOLID_ALOECARETAKER_H

plant-care-better/caretaker/include/caretaker/CactusCaretaker.h

@@ -0,0 +1,21 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#ifndef SOLID_CACTUSCARETAKER_H
+#define SOLID_CACTUSCARETAKER_H
+
+#include "caretaker/WaterDevice.h"
+
+namespace caretaker
+{
+    class CactusCaretaker : public interfaces::WaterDevice
+    {
+    public:
+
+        void pourWater() override;
+        void sprinkleWater() override;
+    };
+}
+
+#endif //SOLID_CACTUSCARETAKER_H

plant-care-better/caretaker/include/caretaker/WaterDevice.h

@@ -0,0 +1,19 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#ifndef SOLID_WATERDEVICE_H
+#define SOLID_WATERDEVICE_H
+
+namespace interfaces
+{
+    class WaterDevice
+    {
+    public:
+        virtual ~WaterDevice() = default;
+        virtual void pourWater() = 0;
+        virtual void sprinkleWater() = 0;
+    };
+}
+
+#endif //SOLID_WATERDEVICE_H

plant-care-better/caretaker/include/caretaker/WindowDevice.h

@@ -0,0 +1,20 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#ifndef SOLID_WINDOWDEVICE_H
+#define SOLID_WINDOWDEVICE_H
+
+namespace interfaces
+{
+    class WindowDevice
+    {
+    public:
+        virtual ~WindowDevice() = default;
+
+        virtual void openWindowBlinds() = 0;
+        virtual void closeWindowBlinds() = 0;
+    };
+}
+
+#endif //SOLID_WINDOWDEVICE_H

plant-care-better/caretaker/src/AloeCaretaker.cpp

@@ -0,0 +1,38 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#include <iostream>
+#include "caretaker/AloeCaretaker.h"
+
+
+namespace caretaker
+{
+    void AloeCaretaker::pourWater()
+    {
+        std::cout << "Pouring water on Aloe" << std::endl;
+    }
+
+    void AloeCaretaker::sprinkleWater()
+    {
+        std::cout << "Sprinkling water on Aloe" << std::endl;
+    }
+
+    void AloeCaretaker::openWindowBlinds()
+    {
+        if (not windowBlindsOpen)
+        {
+            windowBlindsOpen = true;
+            std::cout << "Opened window blinds for Aloe" << std::endl;
+        }
+    }
+
+    void AloeCaretaker::closeWindowBlinds()
+    {
+        if (windowBlindsOpen)
+        {
+            windowBlindsOpen = false;
+            std::cout << "Closed window blinds for Aloe" << std::endl;
+        }
+    }
+}

plant-care-better/caretaker/src/CactusCaretaker.cpp

@@ -0,0 +1,21 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#include <iostream>
+
+#include "caretaker/CactusCaretaker.h"
+
+
+namespace caretaker
+{
+    void CactusCaretaker::pourWater()
+    {
+        std::cout << "Pouring water on Cactus" << std::endl;
+    }
+
+    void CactusCaretaker::sprinkleWater()
+    {
+        std::cout << "Sprinkling water on Cactus" << std::endl;
+    }
+}

plant-care-better/main/CMakeLists.txt

@@ -0,0 +1,5 @@
+project(plantcare)
+
+add_executable(${PROJECT_NAME} src/main.cpp)
+
+target_link_libraries(${PROJECT_NAME} caretaker sensors)

plant-care-better/main/src/main.cpp

@@ -0,0 +1,11 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#include <iostream>
+
+int main()
+{
+
+    return 0;
+}

plant-care-better/sensors/CMakeLists.txt

@@ -0,0 +1,14 @@
+project(sensors)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+
+set(SOURCE
+        ${PROJECT_SOURCE_DIR}/include/sensors/SunlightSensor.h
+        ${PROJECT_SOURCE_DIR}/include/sensors/MoistureSensor.h
+        ${PROJECT_SOURCE_DIR}/src/SunlightSensor.cpp
+        ${PROJECT_SOURCE_DIR}/src/MoistureSensor.cpp
+        )
+
+add_library(${PROJECT_NAME} STATIC ${SOURCE})
+target_link_libraries(${PROJECT_NAME} caretaker)
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include)

plant-care-better/sensors/include/sensors/MoistureSensor.h

@@ -0,0 +1,8 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#ifndef SOLID_MOISTURESENSOR_H
+#define SOLID_MOISTURESENSOR_H
+
+#endif //SOLID_MOISTURESENSOR_H

plant-care-better/sensors/include/sensors/SunlightSensor.h

@@ -0,0 +1,8 @@
+//
+// Created by sajith on 4/20/21.
+//
+
+#ifndef SOLID_SUNLIGHTSENSOR_H
+#define SOLID_SUNLIGHTSENSOR_H
+
+#endif //SOLID_SUNLIGHTSENSOR_H

plant-care-better/sensors/src/MoistureSensor.cpp

@@ -0,0 +1,4 @@
+//
+// Created by sajith on 4/20/21.
+//
+

plant-care-better/sensors/src/SunlightSensor.cpp

@@ -0,0 +1,4 @@
+//
+// Created by sajith on 4/20/21.
+//
+