From e15f6ee167f40b85455aadf1de452a3c075537b2 Mon Sep 17 00:00:00 2001
From: Sergey Pisarchik <pisarchik@mapswithme.com>
Date: Thu, 12 Jun 2014 08:25:21 +0300
Subject: [PATCH] [Tizen] Add show all to search form.

---
 tizen/MapsWithMe/inc/SearchForm.hpp |  7 +++++
 tizen/MapsWithMe/src/SearchForm.cpp | 41 +++++++++++------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/tizen/MapsWithMe/inc/SearchForm.hpp b/tizen/MapsWithMe/inc/SearchForm.hpp
index ad28dbc0ef..c3271364c5 100644
--- a/tizen/MapsWithMe/inc/SearchForm.hpp
+++ b/tizen/MapsWithMe/inc/SearchForm.hpp
@@ -12,6 +12,7 @@ class SearchForm: public Tizen::Ui::Controls::Form
 , public Tizen::Ui::Controls::IListViewItemProviderF
 , public Tizen::Ui::Controls::IListViewItemEventListener
 , public Tizen::Ui::ITextEventListener
+, public Tizen::Ui::IKeypadEventListener
 {
 public:
   SearchForm();
@@ -41,6 +42,12 @@ private:
   // IScrollEventListener
   virtual void  OnScrollEndReached (Tizen::Ui::Control & source, Tizen::Ui::Controls::ScrollEndEvent type){};
   virtual void  OnScrollPositionChanged (Tizen::Ui::Control & source, int scrollPosition);
+  // IKeypadEventListener
+  virtual void  OnKeypadActionPerformed (Tizen::Ui::Control & source, Tizen::Ui::KeypadAction keypadAction);
+  virtual void  OnKeypadBoundsChanged (Tizen::Ui::Control & source) {};
+  virtual void  OnKeypadClosed (Tizen::Ui::Control & source){}
+  virtual void  OnKeypadOpened (Tizen::Ui::Control & source){}
+  virtual void  OnKeypadWillOpen (Tizen::Ui::Control & source){}
   // search
   void OnSearchResultsReceived(search::Results const & results);
 
diff --git a/tizen/MapsWithMe/src/SearchForm.cpp b/tizen/MapsWithMe/src/SearchForm.cpp
index a9e78f83ec..477cd128a0 100644
--- a/tizen/MapsWithMe/src/SearchForm.cpp
+++ b/tizen/MapsWithMe/src/SearchForm.cpp
@@ -15,6 +15,7 @@
 #include <FApp.h>
 #include "Utils.hpp"
 #include "Framework.hpp"
+#include "Constants.hpp"
 
 using namespace Tizen::Base;
 using namespace Tizen::Ui;
@@ -24,6 +25,7 @@ using namespace Tizen::App;
 using namespace Tizen::Web::Controls;
 using namespace Tizen::Graphics;
 using namespace search;
+using namespace consts;
 
 namespace detail
 {
@@ -52,23 +54,6 @@ CategoriesT const & GetCategories()
   return vr;
 }
 
-::Framework * GetFramework()
-{
-  return ::tizen::Framework::GetInstance();
-}
-
-static Color const white(0xFF,0xFF,0xFF);
-static Color const gray(0xB0,0xB0,0xB0);
-
-static int topHght = 27; //margin from top to text
-static int btwWdth = 20; //margin between texts
-static int imgWdth = 60; //left img width
-static int imgHght = 60; //left img height
-static int lstItmHght = 120; //list item height
-static int backWdth = 150; //back txt width
-static int mainFontSz = 45; //big font
-static int minorFontSz = 25; //small font
-
 CustomItem * CreateFeatureItem(Result const & val, double itemWidth)
 {
   String itemText = val.GetString();
@@ -81,14 +66,7 @@ CustomItem * CreateFeatureItem(Result const & val, double itemWidth)
   pItem->AddElement(FloatRectangle(btwWdth + imgWdth + btwWdth, 15, txtWdht, imgHght), 1, val.GetString(), mainFontSz, white, white, white);
   pItem->AddElement(FloatRectangle(btwWdth + imgWdth + btwWdth, 60.0f, txtWdht, imgHght), 2, val.GetRegionString(), minorFontSz, white, white, white);
   String feature = val.GetFeatureType();
-  int ind;
-  if (feature.IndexOf(" ", 0, ind) == E_SUCCESS)
-  {
-    String s;
-    feature.SubString(0,ind,s);
-    feature = s;
-  }
-  pItem->AddElement(FloatRectangle(itemWidth - backWdth, 10, backWdth, imgHght), 3, feature, minorFontSz, gray, gray, gray);
+  pItem->AddElement(FloatRectangle(itemWidth - backWdth, 10, backWdth, imgHght), 3, GetFeature(feature), minorFontSz, gray, gray, gray);
   double lat, lon;
   GetFramework()->GetCurrentPosition(lat, lon);
   double north = 0;
@@ -140,6 +118,7 @@ result SearchForm::OnInitializing(void)
   m_searchBar->SetMode(SEARCH_BAR_MODE_INPUT);
   m_searchBar->AddActionEventListener(*this);
   m_searchBar->AddTextEventListener(*this);
+  m_searchBar->AddKeypadEventListener(*this);
 
   ListView * pList = static_cast<ListView *>(GetControl(IDC_LISTVIEW, true));
   pList->SetItemProvider(*this);
@@ -155,6 +134,7 @@ void SearchForm::OnActionPerformed(Tizen::Ui::Control const & source, int action
 {
   if (actionId == m_searchBar->GetButtonActionId())
   {
+    GetFramework()->CancelInteractiveSearch();
     SceneManager * pSceneManager = SceneManager::GetInstance();
     pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
   }
@@ -179,6 +159,7 @@ void SearchForm::OnSearchResultsReceived(search::Results const & results)
 
 void SearchForm::OnFormBackRequested(Tizen::Ui::Controls::Form & source)
 {
+  GetFramework()->CancelInteractiveSearch();
   SceneManager * pSceneManager = SceneManager::GetInstance();
   pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
 }
@@ -299,3 +280,13 @@ bool SearchForm::IsShowCategories() const
 {
   return GetSearchString().IsEmpty();
 }
+
+void SearchForm::OnKeypadActionPerformed (Tizen::Ui::Control & source, Tizen::Ui::KeypadAction keypadAction)
+{
+  if (keypadAction == KEYPAD_ACTION_SEARCH)
+  {
+    GetFramework()->ShowAllSearchResults();
+    SceneManager * pSceneManager = SceneManager::GetInstance();
+    pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
+  }
+}