TizenRefApp-7613 Implement update of Done button state when add/remove record field

Change-Id: I8a5e2ea1f79da9b1f096b16509c8d8916d288e34
Signed-off-by: Nataliia Kamyshna <n.kamyshna@samsung.com>

diff --git a/lib-common/inc/Common/FileUtils.h b/lib-common/inc/Common/FileUtils.h
index 4a97d65964a3dc6e8341464c59706ab918f25635..36514baedee476722bb48b0f8fa3d62305242072 100644 (file)
--- a/lib-common/inc/Common/FileUtils.h
+++ b/lib-common/inc/Common/FileUtils.h
@@ -36,6 +36,13 @@ namespace Common
         */
        EXPORT_API bool removeFile(const char *filePath);
 
+       /**
+        * @brief Get file state.
+        * @param[in]   filePath   File path.
+        * @return true if exist, otherwise false.
+        */
+       EXPORT_API bool isFileExist(const char *filePath);
+
        /**
         * @brief Create folder.
         * @param[in]   dirPath   Destination path.

diff --git a/lib-common/inc/Common/Model/SoundRecord.h b/lib-common/inc/Common/Model/SoundRecord.h
index a70841422d599f4cd5d09335709300deef6f5c42..7eb8ca4f21895bfff2bf8746ac98bf47b0c30892 100644 (file)
--- a/lib-common/inc/Common/Model/SoundRecord.h
+++ b/lib-common/inc/Common/Model/SoundRecord.h
@@ -43,6 +43,12 @@ namespace Common
                         */
                        const std::string &getPath() const;
 
+                       /**
+                        * @brief Get record file state.
+                        * @return true if record file exist, otherwise false.
+                        */
+                       bool isExist() const;
+
                private:
                        std::string m_Path;
                };

diff --git a/lib-common/src/Common/FileUtils.cpp b/lib-common/src/Common/FileUtils.cpp
index e0e08b1e9ad18268b7d9705c25135fc53fa50232..8aed7c0116ca8ba93c443ac49384fb356b257120 100644 (file)
--- a/lib-common/src/Common/FileUtils.cpp
+++ b/lib-common/src/Common/FileUtils.cpp
@@ -42,18 +42,22 @@ bool Common::copyFile(const char *srcPath, const char *destPath)
 bool Common::removeFile(const char *filePath)
 {
        int res = 0;
-       struct stat st = {0};
-       if (filePath != NULL && stat(filePath, &st) == 0) {
+       if (isFileExist(filePath)) {
                res = std::remove(filePath);
        }
        return (res == 0);
 }
 
+bool Common::isFileExist(const char *filePath)
+{
+       struct stat st = {0};
+       return (filePath != nullptr && stat(filePath, &st) == 0);
+}
+
 bool Common::createFolder(const char *dirPath)
 {
        int res = 0;
-       struct stat st = {0};
-       if (stat(dirPath, &st) == -1) {
+       if (!isFileExist(dirPath)) {
                res = mkdir(dirPath, ACCESSPERMS);
        }
        return (res == 0);

diff --git a/lib-common/src/Common/Model/Memo.cpp b/lib-common/src/Common/Model/Memo.cpp
index 240b97879c36d9dac4bf417ab1a39d808f1ebf06..ba38e3edbf3fabbf167f80e769e0b79ca12429e0 100644 (file)
--- a/lib-common/src/Common/Model/Memo.cpp
+++ b/lib-common/src/Common/Model/Memo.cpp
@@ -213,7 +213,7 @@ bool Memo::isNew() const
 bool Memo::isEmpty() const
 {
        return (m_Title.empty() && m_Content.empty()
-                       && m_Images.empty() && !m_SoundRecord);
+                       && m_Images.empty() && (!m_SoundRecord || !m_SoundRecord->isExist()));
 }
 
 int Memo::onUpdate(void *data)

diff --git a/lib-common/src/Common/Model/SoundRecord.cpp b/lib-common/src/Common/Model/SoundRecord.cpp
index e803e93a344356ac61e9cb53098865c7db056034..5060407bfd261a2259919b593245dff65676f160 100644 (file)
--- a/lib-common/src/Common/Model/SoundRecord.cpp
+++ b/lib-common/src/Common/Model/SoundRecord.cpp
@@ -15,9 +15,12 @@
  */
 
 #include "Common/Model/SoundRecord.h"
+#include "Common/FileUtils.h"
+
 #include "App/Path.h"
 
 using namespace App;
+using namespace Common;
 using namespace Common::Model;
 
 namespace
@@ -35,3 +38,8 @@ const std::string &SoundRecord::getPath() const
 {
        return m_Path;
 }
+
+bool SoundRecord::isExist() const
+{
+       return isFileExist(m_Path.c_str());
+}

diff --git a/memo-app/inc/Input/RecordField.h b/memo-app/inc/Input/RecordField.h
index 3fe31f15ff8b5eeff544aa78a4cbd04b8c3b25f8..0dd74f47cf1a1697ebfbbfafd5c7fad8f678b990 100644 (file)
--- a/memo-app/inc/Input/RecordField.h
+++ b/memo-app/inc/Input/RecordField.h
@@ -44,6 +44,11 @@ namespace Input
                        ModePlayer
                };
 
+               /**
+                * @brief Recording start callback
+                */
+               typedef std::function<void()> RecordingStartCallback;
+
                /**
                 * @brief Delete callback
                 */
@@ -57,6 +62,12 @@ namespace Input
                explicit RecordField(std::string path, Mode mode = ModeRecorder);
                ~RecordField();
 
+               /**
+                * @brief Set recording start callback.
+                * @param[in]   callback   Recording start callback.
+                */
+               void setRecordingStartCallback(RecordingStartCallback callback);
+
                /**
                 * @brief Set delete callback.
                 * @param[in]   callback   Delete callback.
@@ -129,6 +140,7 @@ namespace Input
                Common::Recorder *m_Recorder;
                Common::Player *m_Player;
                Ecore_Timer *m_PlayTimer;
+               RecordingStartCallback m_OnRecordingStarted;
                DeleteCallback m_OnDelete;
        };
 }

diff --git a/memo-app/src/Input/InputView.cpp b/memo-app/src/Input/InputView.cpp
index 75d0505c1ee73ae94d6c8b5f0004ed29e2caefd7..2b748061370ff0fb3b4847e9ba589f8ec0269648 100644 (file)
--- a/memo-app/src/Input/InputView.cpp
+++ b/memo-app/src/Input/InputView.cpp
@@ -233,6 +233,7 @@ Evas_Object *InputView::createRecordField(Evas_Object *parent, RecordField::Mode
        m_RecordField = new RecordField(m_Memo.getSoundRecord()->getPath(), mode);
        m_RecordField->create(parent);
        m_RecordField->setRotation(getRotation());
+       m_RecordField->setRecordingStartCallback(std::bind(&InputView::onMemoChanged, this));
        m_RecordField->setDeleteCallback(std::bind(&InputView::onRecordFieldDelete, this));
 
        return m_RecordField->getEvasObject();
@@ -377,6 +378,7 @@ void InputView::onContentChanged(bool isEmpty)
 void InputView::onRecordFieldDelete()
 {
        m_Memo.removeSoundRecord();
+       onMemoChanged();
 }
 
 void InputView::onMemoChanged()

diff --git a/memo-app/src/Input/RecordField.cpp b/memo-app/src/Input/RecordField.cpp
index d5ea98322a062bbfccd8729d251fbc69349468a6..68a9c5843cad48ccf29e85eb303f2983f198bbd6 100644 (file)
--- a/memo-app/src/Input/RecordField.cpp
+++ b/memo-app/src/Input/RecordField.cpp
@@ -64,6 +64,11 @@ RecordField::~RecordField()
        delete m_Player;
 }
 
+void  RecordField::setRecordingStartCallback(RecordingStartCallback callback)
+{
+       m_OnRecordingStarted = std::move(callback);
+}
+
 void RecordField::setDeleteCallback(DeleteCallback callback)
 {
        m_OnDelete = std::move(callback);
@@ -257,6 +262,9 @@ void RecordField::onRecordPressed()
        elm_object_signal_emit(getEvasObject(), SIGNAL_ICON_REC, "*");
        elm_object_signal_emit(getEvasObject(), SIGNAL_BTN_STOP_SHOW, "*");
        elm_object_signal_emit(m_RecordBtn, SIGNAL_BTN_PAUSE, "*");
+       if (m_OnRecordingStarted) {
+               m_OnRecordingStarted();
+       }
 }
 
 void RecordField::onRecordPausePressed()