Search query can be deletedbeta-0.9.1

6 files changed, 102 insertions, 24 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 19481baa..7b46a7c6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.lacolaco.smileessence"
-          android:versionCode="1"
+          android:versionCode="2"
           android:versionName="@string/app_version">
 
 <uses-sdk
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e7f7b18b..7d96fd4c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -221,4 +221,6 @@
     <string name="error_intent_status_cannot_load">ツイートを取得できませんでした</string>
     <string name="intent_post">つぶやく</string>
     <string name="post_button_send_message">メッセージを送信</string>
+    <string name="dialog_confirm_delete_query">クエリを削除しますか？</string>
+    <string name="notice_search_query_deleted">クエリを削除しました</string>
 </resources>
diff --git a/res/values/app_info.xml b/res/values/app_info.xml
index d387ffb0..3d353c82 100644
--- a/res/values/app_info.xml
+++ b/res/values/app_info.xml
@@ -25,7 +25,7 @@
 
 <resources>
     <string name="app_name">SmileEssence</string>
-    <string name="app_version">0.9.0</string>
+    <string name="app_version">0.9.1</string>
     <string name="app_version_full">1.0.0 \"Dolphin\"</string>
     <string name="app_url">http://smileessence.lacolaco.net</string>
     <string name="app_author">Developed by laco0416</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4daa062b..20ad16ff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -228,4 +228,6 @@
     <string name="error_intent_status_cannot_load">Failed to get tweet</string>
     <string name="intent_post">つぶやく</string>
     <string name="post_button_send_message">Send Message</string>
+    <string name="dialog_confirm_delete_query">Delete this query, OK?</string>
+    <string name="notice_search_query_deleted">Query was deleted</string>
 </resources>
diff --git a/src/net/lacolaco/smileessence/command/CommandOpenSearch.java b/src/net/lacolaco/smileessence/command/CommandOpenSearch.java
new file mode 100644
index 00000000..5de04e08
--- /dev/null
+++ b/src/net/lacolaco/smileessence/command/CommandOpenSearch.java
@@ -0,0 +1,73 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2012-2014 lacolaco.net
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package net.lacolaco.smileessence.command;
+
+import android.app.Activity;
+import net.lacolaco.smileessence.activity.MainActivity;
+import net.lacolaco.smileessence.entity.SearchQuery;
+
+public class CommandOpenSearch extends Command
+{
+
+    // ------------------------------ FIELDS ------------------------------
+
+    private final SearchQuery query;
+
+    // --------------------------- CONSTRUCTORS ---------------------------
+
+    public CommandOpenSearch(Activity activity, SearchQuery searchQuery)
+    {
+        super(-1, activity);
+        this.query = searchQuery;
+    }
+
+    // --------------------- GETTER / SETTER METHODS ---------------------
+
+    public SearchQuery getQuery()
+    {
+        return query;
+    }
+
+    @Override
+    public String getText()
+    {
+        return query.query;
+    }
+
+    @Override
+    public boolean isEnabled()
+    {
+        return true;
+    }
+
+    // -------------------------- OTHER METHODS --------------------------
+
+    @Override
+    public boolean execute()
+    {
+        ((MainActivity) getActivity()).openSearchPage(query.query);
+        return true;
+    }
+}
diff --git a/src/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java b/src/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java
index db66ea45..f123537f 100644
--- a/src/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java
+++ b/src/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java
@@ -28,18 +28,21 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.command.Command;
+import net.lacolaco.smileessence.command.CommandOpenSearch;
 import net.lacolaco.smileessence.entity.Account;
 import net.lacolaco.smileessence.entity.SearchQuery;
+import net.lacolaco.smileessence.notification.Notificator;
 import net.lacolaco.smileessence.view.adapter.CustomListAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class SelectSearchQueryDialogFragment extends MenuDialogFragment
+public class SelectSearchQueryDialogFragment extends MenuDialogFragment implements AdapterView.OnItemLongClickListener
 {
 
     // ------------------------ OVERRIDE METHODS ------------------------
@@ -61,6 +64,7 @@ public class SelectSearchQueryDialogFragment extends MenuDialogFragment
         }
         adapter.update();
         listView.setOnItemClickListener(onItemClickListener);
+        listView.setOnItemLongClickListener(this);
 
         return new AlertDialog.Builder(activity).setView(body).setTitle(R.string.dialog_title_select_search_query).setCancelable(true).create();
     }
@@ -73,29 +77,26 @@ public class SelectSearchQueryDialogFragment extends MenuDialogFragment
         {
             for(final SearchQuery query : queries)
             {
-                commands.add(new Command(-1, activity)
-                {
-                    @Override
-                    public boolean execute()
-                    {
-                        activity.openSearchPage(query.query);
-                        return true;
-                    }
-
-                    @Override
-                    public String getText()
-                    {
-                        return query.query;
-                    }
-
-                    @Override
-                    public boolean isEnabled()
-                    {
-                        return true;
-                    }
-                });
+                commands.add(new CommandOpenSearch(activity, query));
             }
         }
         return commands;
     }
+
+    @Override
+    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id)
+    {
+        final CommandOpenSearch command = (CommandOpenSearch) parent.getItemAtPosition(position);
+        ConfirmDialogFragment.show(getActivity(), getString(R.string.dialog_confirm_delete_query), new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                command.getQuery().delete();
+                Notificator.publish(getActivity(), R.string.notice_search_query_deleted);
+                dismiss();
+            }
+        }, false);
+        return false;
+    }
 }