加入应用列表的搜索功能

CMakeLists.txt

@@ -70,6 +70,7 @@ set(SOURCE_FILES
     inc/spkappitem.h gui/spkappitem.cpp
     inc/spkpopup.h gui/spkpopup.cpp
     inc/spkstretchlayout.h gui/spkstretchlayout.cpp
+    inc/spkfocuslineedit.h
 
     inc/page/spkpagebase.h gui/page/spkpagebase.cpp
     inc/page/spkpageuitest.h gui/page/spkpageuitest.cpp

gui/page/spkpageapplist.cpp

@@ -114,9 +114,10 @@ namespace SpkUi
     }
   }
 
-  void SpkPageAppList::SetPageStatus(int total, int current, int itemCount)
+  void SpkPageAppList::SetPageStatus(int total, int current, int itemCount, QString &keyword)
   {
     mCurrentPage = current;
+    mKeyword = keyword;
     mPageIndicator->setText(tr("Page %1 / %2, %3 apps in total")
                             .arg(current).arg(total).arg(itemCount));
     mBtnPgUp->setDisabled(current == 1);
@@ -135,13 +136,19 @@ namespace SpkUi
   void SpkPageAppList::PageUp()
   {
     DisablePageSwitchers();
-    emit SwitchListPage(mCategoryId, mCurrentPage - 1);
+    if(mKeyword.isEmpty())
+      emit SwitchListPage(mCategoryId, mCurrentPage - 1);
+    else
+      emit SwitchSearchPage(mKeyword, mCurrentPage - 1);
   }
 
   void SpkPageAppList::PageDown()
   {
     DisablePageSwitchers();
-    emit SwitchListPage(mCategoryId, mCurrentPage + 1);
+    if(mKeyword.isEmpty())
+      emit SwitchListPage(mCategoryId, mCurrentPage + 1);
+    else
+      emit SwitchSearchPage(mKeyword, mCurrentPage + 1);
   }
 
   void SpkPageAppList::GotoPage()
@@ -153,7 +160,10 @@ namespace SpkUi
       return SpkUiMessage::SendStoreNotification(tr("Page %1 is not a valid page number!")
                                                  .arg(page));
     DisablePageSwitchers();
-    emit SwitchListPage(mCategoryId, page);
+    if(mKeyword.isEmpty())
+      emit SwitchListPage(mCategoryId, page);
+    else
+      emit SwitchSearchPage(mKeyword, page);
   }
 
   void SpkPageAppList::Activated()

gui/spkmainwindow.cpp

@@ -116,11 +116,41 @@ void SpkMainWindow::CategoryListDataReceived()
     return;
   }
   SwitchToPage(SpkUi::PgAppList);
-  PopulateAppList(retval.toObject());
+  PopulateAppList(retval.toObject(), "");
   setCursor(Qt::ArrowCursor);
 }
 
-void SpkMainWindow::PopulateAppList(QJsonObject appData)
+void SpkMainWindow::SearchKeyword(QString aKeyword, int aPage)
+{
+  using namespace SpkUtils;
+  VerifySingleRequest(mCategoryAppListGetReply);
+  QJsonObject reqData;
+  QJsonDocument reqDoc;
+  reqData.insert("application_name", QJsonValue(aKeyword));
+  reqData.insert("page", QJsonValue(aPage));
+  reqDoc.setObject(reqData);
+  mCategoryAppListGetReply = STORE->SendApiRequest("application/get_application_list", reqDoc);
+  mCategoryAppListGetReply->setProperty("keyword", aKeyword);
+  DeleteReplyLater(mCategoryAppListGetReply);
+  connect(mCategoryAppListGetReply, &QNetworkReply::finished,
+          this, &SpkMainWindow::SearchDataReceived);
+  setCursor(Qt::BusyCursor);
+}
+
+void SpkMainWindow::SearchDataReceived()
+{
+  QJsonValue retval;
+  if(!SpkUtils::VerifyReplyJson(mCategoryAppListGetReply, retval) || !retval.isObject())
+  {
+    sErrPop(tr("Failed to search keyword! Type of retval: %1.").arg(retval.type()));
+    return;
+  }
+  SwitchToPage(SpkUi::PgAppList);
+  PopulateAppList(retval.toObject(), mCategoryAppListGetReply->property("keyword").toString());
+  setCursor(Qt::ArrowCursor);
+}
+
+void SpkMainWindow::PopulateAppList(QJsonObject appData, QString &&keyword)
 {
   auto w = ui->PageAppList;
   w->ClearAll();
@@ -141,7 +171,7 @@ void SpkMainWindow::PopulateAppList(QJsonObject appData)
   if(appData.contains("count") && appData.value("count").isDouble())
     totalApps = appData.value("count").toInt();
   else return err();
-  w->SetPageStatus(pgTotal, pgCurrent, totalApps);
+  w->SetPageStatus(pgTotal, pgCurrent, totalApps, keyword);
 
   if(!appData.contains("data") || !appData.value("data").isArray())
     return err();
@@ -184,6 +214,10 @@ void SpkMainWindow::Initialize()
           this, &SpkMainWindow::EnterCategoryList);
   connect(ui->PageAppList, &SpkUi::SpkPageAppList::SwitchListPage,
           this, &SpkMainWindow::EnterCategoryList);
+  connect(ui->PageAppList, &SpkUi::SpkPageAppList::SwitchSearchPage,
+          this, &SpkMainWindow::SearchKeyword);
+  connect(ui->SearchEdit, &QLineEdit::returnPressed,
+          [=](){ emit SearchKeyword(ui->SearchEdit->text(), 1); });
 }
 
 // ==================== Main Widget Initialization ====================
@@ -282,6 +316,45 @@ SpkUi::SpkMainWidget::SpkMainWidget(QWidget *parent) : QFrame(parent)
   HorizontalDivide->addWidget(SideBarRestrictor);
   HorizontalDivide->addLayout(VLayMain);
 
+  //============ Search Bar ============
+
+  SearchEdit = new SpkFocusLineEdit(this);
+  SearchEdit->setPlaceholderText(tr("Press Enter to search"));
+  SearchEdit->setFixedWidth(30);
+  SearchEdit->setFixedHeight(30);
+  SearchBarAnim = new QTimeLine(300, this);
+  SearchBarAnim->setDuration(300);
+  SearchBarAnim->setEasingCurve(QEasingCurve::OutExpo);
+  SearchBarAnim->setUpdateInterval(20);
+  ActClearSearchBar = SearchEdit->addAction(QIcon(":/icons/clear-input.svg"),
+                                            QLineEdit::TrailingPosition);
+  ActClearSearchBar->setVisible(false); // Invisible by default
+  ActSearchIcon = SearchEdit->addAction(QIcon(":/icons/search-mini.svg"), QLineEdit::LeadingPosition);
+  connect(SearchEdit, &SpkFocusLineEdit::focusGained,
+          [=](){
+    ActClearSearchBar->setVisible(true);
+    SearchBarAnim->setDirection(QTimeLine::Forward);
+    SearchBarAnim->start();
+  });
+  connect(SearchEdit, &SpkFocusLineEdit::focusLost,
+             [=](){
+    ActClearSearchBar->setVisible(false);
+    SearchBarAnim->setDirection(QTimeLine::Backward);
+    SearchBarAnim->start();
+  });
+  connect(SearchBarAnim, &QTimeLine::valueChanged,
+          [=](qreal v){
+    SearchEdit->setFixedWidth(static_cast<int>(250 * v) + 30);
+  });
+  connect(ActClearSearchBar, &QAction::triggered, [=](){ SearchEdit->clear(); });
+
+  auto space = TitleBar->GetUserSpace();
+  space->addWidget(SearchEdit);
+  space->addStretch();
+
+
+  //============ Pages =============
+
   // Red-Black tree based map will be able to sort things
   QMap<SpkStackedPages, QWidget*> sorter;
 

inc/page/spkpageapplist.h

@@ -18,7 +18,7 @@ namespace SpkUi
       void AddApplicationEntry(QString name, QString pkgName, QString description, QString iconUrl,
                                int appId);
       void ClearAll();
-      void SetPageStatus(int total, int current, int itemCount);
+      void SetPageStatus(int total, int current, int itemCount, QString &keyword);
       void SetCurrentCategory(int categoryId) { mCategoryId = categoryId; }
 
     private:
@@ -40,10 +40,12 @@ namespace SpkUi
       QIntValidator *mPageValidator;
 
       int mCategoryId, mCurrentPage;
+      QString mKeyword;
 
     signals:
       void ApplicationClicked(QString name, QString pkgName);
       void SwitchListPage(int categoryId, int page);
+      void SwitchSearchPage(QString keyword, int page);
 
     public slots:
       void ResourceAcquisitionFinished(int id, ResourceResult result);

inc/spkfocuslineedit.h

@@ -0,0 +1,19 @@
+
+#pragma once
+
+#include <QtWidgets/QLineEdit>
+
+class SpkFocusLineEdit final : public QLineEdit
+{
+    Q_OBJECT
+  public:
+    explicit SpkFocusLineEdit(QWidget *parent = nullptr) : QLineEdit(parent) {}
+
+  protected:
+    void focusInEvent(QFocusEvent *e) override { emit focusGained(); }
+    void focusOutEvent(QFocusEvent *e) override { emit focusLost(); }
+
+  signals:
+    void focusGained();
+    void focusLost();
+};

inc/spkmainwindow.h

@@ -12,8 +12,10 @@
 #include <QJsonObject>
 #include "spksidebartree.h" // In place of #include <QTreeWidget>
 #include <QPointer>
-#include "inc/page/spkpageuitest.h"
+#include <QTimeLine>
-#include "inc/page/spkpageapplist.h"
+#include "spkfocuslineedit.h"
+#include "page/spkpageuitest.h"
+#include "page/spkpageapplist.h"
 
 class QNetworkReply;
 
@@ -146,6 +148,11 @@ namespace SpkUi
 
       QTreeWidgetItem *CategoryParentItem;
 
+      // Title bar search bar
+      SpkFocusLineEdit *SearchEdit;
+      QAction *ActClearSearchBar, *ActSearchIcon;
+      QTimeLine *SearchBarAnim;
+
       //Pages
       SpkPageUiTest *PageQssTest;
       SpkPageAppList *PageAppList;
@@ -178,10 +185,13 @@ class SpkMainWindow : public SpkWindow
     void SwitchToPage(SpkUi::SpkStackedPages page);
 
     void CategoryDataReceived();
-
+    // Enter a category (and switch pages)
     void EnterCategoryList(int aCategoryId, int aPage);
     void CategoryListDataReceived();
+    // Search a keyword (and switch pages)
+    void SearchKeyword(QString aKeyword, int aPage);
+    void SearchDataReceived();
 
   private:
-    void PopulateAppList(QJsonObject appData);
+    void PopulateAppList(QJsonObject appData, QString &&keyword);
 };

resource/resource.qrc

@@ -9,5 +9,7 @@
     <qresource prefix="/">
         <file>icons/spark-store.svg</file>
         <file>icons/settings-dark.svg</file>
+        <file>icons/clear-input.svg</file>
+        <file>icons/search-mini.svg</file>
     </qresource>
 </RCC>