From: Igor Olshevskyi Date: Thu, 1 Jun 2017 10:20:26 +0000 (+0300) Subject: TizenRefApp-8622 [Call UI] Convert project to Tizen 4.0 X-Git-Tag: submit/tizen/20170630.111746~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=153dc0124530ecefe438cbcd0f386d2025125233;p=profile%2Fwearable%2Fapps%2Fnative%2Fcall-ui.git TizenRefApp-8622 [Call UI] Convert project to Tizen 4.0 Change-Id: Icd2516581592680f6301ef172e4345a01a58ffd4 --- diff --git a/.cproject b/.cproject index 8c8c083..c3ed9e8 100644 --- a/.cproject +++ b/.cproject @@ -19,7 +19,7 @@ - + @@ -30,15 +30,17 @@ - + - + - + - + - + diff --git a/.tproject b/.tproject index de5a150..dd94734 100644 --- a/.tproject +++ b/.tproject @@ -2,7 +2,7 @@ - wearable-3.0 + wearable-4.0 diff --git a/Build/build_c.mk b/Build/build_c.mk index d818ab6..5fffeea 100644 --- a/Build/build_c.mk +++ b/Build/build_c.mk @@ -10,10 +10,11 @@ _FUNC_CPP2O = $(call _FUNC_EXT2O,$(1),$(2),cpp) # $(1) - C/C++ soruce file # $(2) - output path # $(3) - .ext -CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(call CONVERT_4MAKE_TO_OUT,$(patsubst %.$(3),%.o,$(1)))) +# $(4) - unique id +CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(notdir $(patsubst %.$(3),%-$(4).o,$(1)))) -CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c) -CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) +#CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c) +#CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) # parameter : @@ -27,13 +28,13 @@ CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) # output : # $(8) - output files list define C_BUILD_PROC_RAW -$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) : $(call DECODE_4MAKE,$(1)) $(7) +$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) : $(call DECODE_4MAKE,$(1)) $(7) @echo ' Building file: $$<' @echo ' Invoking: $(3) Compiler' $$(call MAKEDIRS,$$(@D)) $(5) -c "$$<" -o "$$@" $(6) -Wp,@$(7) @echo ' Finished building: $$<' -$(8) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) +$(9) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) endef @@ -50,17 +51,17 @@ endef # $(10) - ext (c/cpp) # $(11) - compiler ($(CC)/$(CXX)) # output : -# $(12) - OBJS +# $(12) - OBJS # return : # none define C_PROC_RAW _OUTPUT_DIR := $$(strip $(1))# -_SRCS := $(2)# -_INCS := $(3)# -_INC_FILES := $(4)# -_DEFS := $(5)# -_UNDEFS := $(6)# +_SRCS := $(2)# +_INCS := $(3)# +_INC_FILES := $(4)# +_DEFS := $(5)# +_UNDEFS := $(6)# _OPT := $(7) _OPT_FILE := $(8) @@ -71,7 +72,7 @@ _COMPILER := $(11) #_OUTPUT_FILES := $(12) -_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) _ENC_SRCS := $$(filter %.$$(_EXT),$$(_ENC_SRCS)) ifneq ($$(strip $$(_SRCS)),) @@ -84,7 +85,7 @@ _ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \ ifneq ($$(strip $$(_ALL_SRCS)),) -_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) _CDEFS := $$(CDEFS) _CDEFS += $$(addprefix -D,$$(_DEFS)) @@ -92,15 +93,17 @@ _CDEFS += $$(addprefix -U,$$(_UNDEFS)) _ENC_C_INCS := $$(call ENCODE_4MAKE,$$(_INCS)) _ENC_C_INCS := $$(addprefix -I,$$(_ENC_C_INCS)) - -_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) + +_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) _ENC_INC_FILES += $$(addprefix -include,$$(_ENC_INC_FILES)) _C_INCS := $$(call DECODE_4MAKE,$$(_ENC_C_INCS) $$(_ENC_C_INC_FILES)) _DEFS := $$(_CDEFS) $$(_C_INCS) -I"pch" $$(_OPT) -$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$(12)))) +_UNIQUE_ID = $$(firstword $$(shell echo $$(var) | $$(CKSUM))) + +$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$$(_UNIQUE_ID),$(12)))) endif # (_(strip _(_ALL_SRCS)),) diff --git a/Build/flags.mk b/Build/flags.mk index 39e3e39..2ea72ac 100644 --- a/Build/flags.mk +++ b/Build/flags.mk @@ -1,6 +1,6 @@ -DEBUG_OP = -CPP_DEBUG_OP = -g3 +DEBUG_OP = -D_DEBUG +CPP_DEBUG_OP = -g3 -D_DEBUG OPTIMIZATION_OP = CPP_OPTIMIZATION_OP = -O0 diff --git a/Build/tooldef.mk b/Build/tooldef.mk index fded35b..c62243c 100644 --- a/Build/tooldef.mk +++ b/Build/tooldef.mk @@ -61,3 +61,10 @@ MSGFMT = $(MSGFMT_BIN) else MSGFMT = msgfmt endif + +ifneq ($(strip $(CKSUM_BIN)),) +CKSUM = $(CKSUM_BIN) +else +CKSUM = cksum +endif + diff --git a/project_def.prop b/project_def.prop index 1caca2c..6151b2e 100644 --- a/project_def.prop +++ b/project_def.prop @@ -1,15 +1,15 @@ # Project Name -APPNAME = call-ui +APPNAME = w-call-ui # Project Type type = app # Project Profile -profile = wearable-3.0 +profile = wearable-4.0 # C/CPP Sources -USER_SRCS = src/call-ui.cpp +USER_SRCS = ucl/src/gui/Naviframe.cpp ucl/src/gui/WidgetItem.cpp src/presenters/InstanceManager.cpp ucl/src/appfw/UIApp.cpp src/presenters/AcceptDialog.cpp ucl/src/gui/NaviItem.cpp src/model/CallManager.cpp ucl/src/gui/Layout.cpp src/model/IncomingCall.cpp src/presenters/Page.cpp src/resources.cpp src/model/CallBuilder.cpp src/presenters/Instance.cpp ucl/src/gui/Window.cpp src/presenters/CallStatus.cpp ucl/src/gui/Widget.cpp src/model/ActiveCall.cpp src/model/RejectMsgProvider.cpp src/model/Call.cpp ucl/src/appfw/SysEventProvider.cpp src/types.cpp src/presenters/RejectMsgPresenter.cpp src/presenters/CallInfoPresenter.cpp src/model/BatteryStateSource.cpp src/model/ConnectionStateSource.cpp src/presenters/Presenter.cpp src/model/CallClient.cpp src/model/ContactInfo.cpp src/model/EndCall.cpp src/presenters/Indicator.cpp src/presenters/MainPage.cpp src/model/RssiStateSource.cpp src/view/helpers.cpp src/model/HdVoiceStateSource.cpp ucl/src/util/logging.cpp ucl/src/util/types/Result.cpp ucl/src/misc/Variant.cpp src/model/IndicatorStateProvider.cpp src/presenters/helpers.cpp src/main.cpp src/view/VolumeControl.cpp src/model/MsgClient.cpp src/model/CallInfo.cpp ucl/src/appfw/helpers.cpp ucl/src/gui/ElmWidget.cpp src/model/SimSlotStateSource.cpp src/presenters/AcceptRejectPresenter.cpp ucl/src/gui/EdjeWidget.cpp src/model/ConferenceCallInfo.cpp src/model/HeldCall.cpp src/model/SoundManager.cpp src/model/RejectMsg.cpp ucl/src/appfw/InstanceManagerBase.cpp # EDC Sources USER_EDCS = @@ -36,21 +36,26 @@ USER_OBJS = USER_C_INC_DIRS = USER_INC_FILES = ## C++ Compiler -USER_CPP_INC_DIRS = inc +USER_CPP_INC_DIRS = inc ucl/inc USER_CPP_INC_FILES = USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS) # User Library Path -USER_LIB_DIRS = lib +USER_LIB_DIRS = # EDC Resource Path -USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} -USER_EDCS_SOUND_DIRS = ${OUTPUT_DIR} -USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} +USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edc/images +USER_EDCS_SOUND_DIRS = +USER_EDCS_FONT_DIRS = # EDC Flags -USER_EXT_EDC_KEYS = +USER_EXT_EDC_KEYS = EDC0 + +USER_EXT_EDC0_EDCS = res/edje/theme.edc +USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edc/images +USER_EXT_EDC0_EDCS_SOUND_DIRS = +USER_EXT_EDC0_EDCS_FONT_DIRS = # Resource Filter USER_RES_INCLUDE = diff --git a/src/model/CallManager.h b/src/model/CallManager.h index 0dde5c6..c1b24f5 100644 --- a/src/model/CallManager.h +++ b/src/model/CallManager.h @@ -79,7 +79,6 @@ namespace callui { private: CallClientSRef m_callClient; RejectMsgProviderSRef m_rejectMsgProvider; - MsgClientSRef m_msgClient; ICallManagerListenerWRef m_listener; IncomingCallSRef m_incomingCall; ActiveCallSRef m_activeCall; diff --git a/src/presenters/MainPage.cpp b/src/presenters/MainPage.cpp index db250f9..fc1b848 100644 --- a/src/presenters/MainPage.cpp +++ b/src/presenters/MainPage.cpp @@ -242,14 +242,14 @@ namespace callui { auto provider = incom->getRejectMsgProvider(); if (!provider) { - LOG_RETURN(RES_FAIL, "Reject message provider is NULL"); + ELOG("Reject message provider is NULL"); } FAIL_RETURN(createAcceptRejectPresenter(), "createAcceptRejectPresenter() failed!"); if (!isUnknownCaller(*incom->getInfo()) - && (provider->getMsgCount() > 0)) { + && (provider && provider->getMsgCount() > 0)) { m_rmLy = Layout::Builder(). setTheme(impl::LAYOUT_REJECT_MSG_WIDGET). setIsOwner(true). @@ -365,6 +365,7 @@ namespace callui { { auto end = m_cm->getEndCall(); if (!end) { + m_ecTimer = nullptr; requestExit(); LOG_RETURN_VALUE(RES_FAIL, ECORE_CALLBACK_CANCEL, "end is NULL"); } diff --git a/tizen-manifest.xml b/tizen-manifest.xml index b2aae8f..b972fd7 100644 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -1,8 +1,8 @@ - + - - + + call-ui.png @@ -21,8 +21,7 @@ http://tizen.org/privilege/contact.read http://tizen.org/privilege/message.write http://tizen.org/privilege/notification - http://tizen.org/privilege/message.read http://tizen.org/privilege/display - http://tizen.org/privilege/keygrab + http://tizen.org/privilege/message.read diff --git a/ucl/inc/ucl/gui/Theme.h b/ucl/inc/ucl/gui/Theme.h index f82d675..d8b5b31 100644 --- a/ucl/inc/ucl/gui/Theme.h +++ b/ucl/inc/ucl/gui/Theme.h @@ -29,7 +29,7 @@ namespace ucl { public: Theme(); - Theme(nullptr_t); + Theme(std::nullptr_t); explicit Theme(Elm_Theme *th, bool isOwner = false); Theme(Theme &&tmp); Theme &operator=(Theme &&tmp); diff --git a/ucl/inc/ucl/gui/Theme.hpp b/ucl/inc/ucl/gui/Theme.hpp index dac1d57..65910df 100644 --- a/ucl/inc/ucl/gui/Theme.hpp +++ b/ucl/inc/ucl/gui/Theme.hpp @@ -31,7 +31,7 @@ namespace ucl { { } - inline Theme::Theme(nullptr_t) : + inline Theme::Theme(std::nullptr_t) : Theme() { } diff --git a/ucl/inc/ucl/gui/WidgetItem.h b/ucl/inc/ucl/gui/WidgetItem.h index edef5e9..7794444 100644 --- a/ucl/inc/ucl/gui/WidgetItem.h +++ b/ucl/inc/ucl/gui/WidgetItem.h @@ -24,7 +24,7 @@ namespace ucl { class WidgetItem { public: constexpr WidgetItem(); - constexpr WidgetItem(nullptr_t); + constexpr WidgetItem(std::nullptr_t); explicit WidgetItem(Elm_Object_Item *it); Elm_Object_Item *getIt() const; diff --git a/ucl/inc/ucl/gui/WidgetItem.hpp b/ucl/inc/ucl/gui/WidgetItem.hpp index 9880816..26b6cbd 100644 --- a/ucl/inc/ucl/gui/WidgetItem.hpp +++ b/ucl/inc/ucl/gui/WidgetItem.hpp @@ -21,7 +21,7 @@ namespace ucl { { } - constexpr WidgetItem::WidgetItem(nullptr_t) : + constexpr WidgetItem::WidgetItem(std::nullptr_t) : WidgetItem() { } diff --git a/ucl/inc/ucl/gui/types.h b/ucl/inc/ucl/gui/types.h index ed7d03f..f4deb13 100644 --- a/ucl/inc/ucl/gui/types.h +++ b/ucl/inc/ucl/gui/types.h @@ -105,7 +105,7 @@ namespace ucl { const char *style; constexpr LayoutTheme(); - constexpr LayoutTheme(nullptr_t); + constexpr LayoutTheme(std::nullptr_t); constexpr LayoutTheme(const char *klass, const char *group, const char *style); }; diff --git a/ucl/inc/ucl/gui/types.hpp b/ucl/inc/ucl/gui/types.hpp index 95521a2..7f128c8 100644 --- a/ucl/inc/ucl/gui/types.hpp +++ b/ucl/inc/ucl/gui/types.hpp @@ -27,7 +27,7 @@ namespace ucl { { } - constexpr LayoutTheme::LayoutTheme(nullptr_t) : + constexpr LayoutTheme::LayoutTheme(std::nullptr_t) : LayoutTheme() { } diff --git a/ucl/inc/ucl/misc/Aspect.h b/ucl/inc/ucl/misc/Aspect.h index 9b40f98..082cd91 100644 --- a/ucl/inc/ucl/misc/Aspect.h +++ b/ucl/inc/ucl/misc/Aspect.h @@ -26,7 +26,7 @@ namespace ucl { const char *name; constexpr Aspect(); - constexpr Aspect(nullptr_t); + constexpr Aspect(std::nullptr_t); explicit constexpr Aspect(const char *name); constexpr operator const char *() const; diff --git a/ucl/inc/ucl/misc/Aspect.hpp b/ucl/inc/ucl/misc/Aspect.hpp index 03127ec..aac7ddb 100644 --- a/ucl/inc/ucl/misc/Aspect.hpp +++ b/ucl/inc/ucl/misc/Aspect.hpp @@ -27,7 +27,7 @@ namespace ucl { } template - constexpr Aspect::Aspect(nullptr_t) : + constexpr Aspect::Aspect(std::nullptr_t) : Aspect() { } diff --git a/ucl/inc/ucl/misc/Variant.h b/ucl/inc/ucl/misc/Variant.h index a69866b..3bfa6d6 100644 --- a/ucl/inc/ucl/misc/Variant.h +++ b/ucl/inc/ucl/misc/Variant.h @@ -72,7 +72,7 @@ namespace ucl { public: Variant() noexcept; - Variant(nullptr_t) noexcept; + Variant(std::nullptr_t) noexcept; Variant(bool aBool) noexcept; Variant(int anInt) noexcept; @@ -83,7 +83,7 @@ namespace ucl { Variant(const char *aString, int length); Variant(const std::string &aString); - Variant(nullptr_t, int arrayLength); + Variant(std::nullptr_t, int arrayLength); Variant(const Variant *anArray, int length); Variant(const VarVector &anArray); template diff --git a/ucl/inc/ucl/misc/Variant.hpp b/ucl/inc/ucl/misc/Variant.hpp index 86ad92e..04c6650 100644 --- a/ucl/inc/ucl/misc/Variant.hpp +++ b/ucl/inc/ucl/misc/Variant.hpp @@ -74,7 +74,7 @@ namespace ucl { { } - inline Variant::Variant(nullptr_t) noexcept : + inline Variant::Variant(std::nullptr_t) noexcept : Variant() { } diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.h b/ucl/inc/ucl/util/delegation/BaseDelegate.h index e49ce22..d5c518c 100644 --- a/ucl/inc/ucl/util/delegation/BaseDelegate.h +++ b/ucl/inc/ucl/util/delegation/BaseDelegate.h @@ -35,7 +35,7 @@ namespace ucl { public: constexpr BaseDelegate() noexcept; - constexpr BaseDelegate(nullptr_t) noexcept; + constexpr BaseDelegate(std::nullptr_t) noexcept; template BaseDelegate(const BaseDelegate2 &d) noexcept; diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.hpp b/ucl/inc/ucl/util/delegation/BaseDelegate.hpp index 9fe4369..4cb9741 100644 --- a/ucl/inc/ucl/util/delegation/BaseDelegate.hpp +++ b/ucl/inc/ucl/util/delegation/BaseDelegate.hpp @@ -25,7 +25,7 @@ namespace ucl { template constexpr BaseDelegate:: - BaseDelegate(nullptr_t) noexcept : + BaseDelegate(std::nullptr_t) noexcept : BaseDelegate() { } diff --git a/ucl/inc/ucl/util/memory/SharedRef.h b/ucl/inc/ucl/util/memory/SharedRef.h index 9e4793f..4bd7ca0 100644 --- a/ucl/inc/ucl/util/memory/SharedRef.h +++ b/ucl/inc/ucl/util/memory/SharedRef.h @@ -34,7 +34,7 @@ namespace ucl { public: constexpr SharedRef() noexcept; - constexpr SharedRef(nullptr_t) noexcept; + constexpr SharedRef(std::nullptr_t) noexcept; SharedRef(RefCountObjBase *rc, T *ptr) noexcept; diff --git a/ucl/inc/ucl/util/memory/SharedRef.hpp b/ucl/inc/ucl/util/memory/SharedRef.hpp index d6b4ee6..5b5ad55 100644 --- a/ucl/inc/ucl/util/memory/SharedRef.hpp +++ b/ucl/inc/ucl/util/memory/SharedRef.hpp @@ -24,7 +24,7 @@ namespace ucl { } template - constexpr SharedRef::SharedRef(nullptr_t) noexcept + constexpr SharedRef::SharedRef(std::nullptr_t) noexcept { } diff --git a/ucl/inc/ucl/util/memory/WeakRef.h b/ucl/inc/ucl/util/memory/WeakRef.h index c8edef4..78450a5 100644 --- a/ucl/inc/ucl/util/memory/WeakRef.h +++ b/ucl/inc/ucl/util/memory/WeakRef.h @@ -34,7 +34,7 @@ namespace ucl { public: constexpr WeakRef() noexcept; - constexpr WeakRef(nullptr_t) noexcept; + constexpr WeakRef(std::nullptr_t) noexcept; WeakRef(RefCountObjBase *rc, T *ptr) noexcept; diff --git a/ucl/inc/ucl/util/memory/WeakRef.hpp b/ucl/inc/ucl/util/memory/WeakRef.hpp index 7508815..b1681ed 100644 --- a/ucl/inc/ucl/util/memory/WeakRef.hpp +++ b/ucl/inc/ucl/util/memory/WeakRef.hpp @@ -22,7 +22,7 @@ namespace ucl { } template - constexpr WeakRef::WeakRef(nullptr_t) noexcept + constexpr WeakRef::WeakRef(std::nullptr_t) noexcept { } diff --git a/ucl/inc/ucl/util/memory/helpers.h b/ucl/inc/ucl/util/memory/helpers.h index ad78591..4e6c0e0 100644 --- a/ucl/inc/ucl/util/memory/helpers.h +++ b/ucl/inc/ucl/util/memory/helpers.h @@ -87,28 +87,28 @@ namespace ucl { template , T>::value>::type> - inline bool operator==(const T &lhs, nullptr_t rhs) noexcept + inline bool operator==(const T &lhs, std::nullptr_t rhs) noexcept { return !lhs; } template , T>::value>::type> - bool operator==(nullptr_t lhs, const T &rhs) noexcept + bool operator==(std::nullptr_t lhs, const T &rhs) noexcept { return !rhs; } template , T>::value>::type> - bool operator!=(const T &lhs, nullptr_t rhs) noexcept + bool operator!=(const T &lhs, std::nullptr_t rhs) noexcept { return lhs; } template , T>::value>::type> - bool operator!=(nullptr_t lhs, const T &rhs) noexcept + bool operator!=(std::nullptr_t lhs, const T &rhs) noexcept { return rhs; } diff --git a/ucl/src/misc/Variant.cpp b/ucl/src/misc/Variant.cpp index 3859bc5..4509118 100644 --- a/ucl/src/misc/Variant.cpp +++ b/ucl/src/misc/Variant.cpp @@ -38,7 +38,7 @@ namespace ucl { } } - Variant::Variant(nullptr_t, const int arrayLength) : + Variant::Variant(std::nullptr_t, const int arrayLength) : m_type(static_cast((arrayLength > 0) ? TYPE_ARRAY : TYPE_NIL)) { if (arrayLength > 0) {