Hashtag で検索できてもあんまりうれしくないし、入力欄に追記するコマンドに変更した

4 files changed, 9 insertions, 79 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenHashtagDialog.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandAddHashtag.java
index 2a2a8ab4..5b68ade1 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenHashtagDialog.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandAddHashtag.java
@@ -25,10 +25,9 @@
 package net.lacolaco.smileessence.command;
 
 import android.app.Activity;
-import net.lacolaco.smileessence.view.DialogHelper;
-import net.lacolaco.smileessence.view.dialog.HashtagDialogFragment;
+import net.lacolaco.smileessence.data.PostState;
 
-public class CommandOpenHashtagDialog extends Command {
+public class CommandAddHashtag extends Command {
 
     // ------------------------------ FIELDS ------------------------------
 
@@ -36,7 +35,7 @@ public class CommandOpenHashtagDialog extends Command {
 
     // --------------------------- CONSTRUCTORS ---------------------------
 
-    public CommandOpenHashtagDialog(Activity activity, String hashtag) {
+    public CommandAddHashtag(Activity activity, String hashtag) {
         super(activity);
         this.hashtag = hashtag;
     }
@@ -52,9 +51,7 @@ public class CommandOpenHashtagDialog extends Command {
 
     @Override
     public boolean execute() {
-        HashtagDialogFragment dialogFragment = new HashtagDialogFragment();
-        dialogFragment.setText(hashtag);
-        DialogHelper.showDialog(getActivity(), dialogFragment);
-        return false;
+        PostState.getState().beginTransaction().appendText(" #" + hashtag).commit();
+        return true;
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/HashtagDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/HashtagDialogFragment.java
deleted file mode 100644
index c84c04e9..00000000
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/HashtagDialogFragment.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.view.dialog;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.os.Bundle;
-import net.lacolaco.smileessence.command.Command;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class HashtagDialogFragment extends MenuDialogFragment {
-
-    // ------------------------------ FIELDS ------------------------------
-
-    private static final String KEY_TEXT = "text";
-
-    // --------------------- GETTER / SETTER METHODS ---------------------
-
-    private String getHashtagText() {
-        return "#" + getArguments().get(KEY_TEXT);
-    }
-
-    public void setText(String text) {
-        Bundle bundle = new Bundle();
-        bundle.putString(KEY_TEXT, text);
-        setArguments(bundle);
-    }
-
-    // ------------------------ OVERRIDE METHODS ------------------------
-
-    @Override
-    protected List<Command> getMenuCommands() {
-        List<Command> commands = new ArrayList<>();
-        return commands;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        Dialog dialog = super.onCreateDialog(savedInstanceState);
-        dialog.setTitle(getHashtagText());
-        return dialog;
-    }
-}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
index 4b16cf49..2256bb97 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
@@ -36,7 +36,7 @@ import net.lacolaco.smileessence.Application;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.command.Command;
-import net.lacolaco.smileessence.command.CommandOpenHashtagDialog;
+import net.lacolaco.smileessence.command.CommandAddHashtag;
 import net.lacolaco.smileessence.command.CommandOpenURL;
 import net.lacolaco.smileessence.command.CommandOpenUserDetail;
 import net.lacolaco.smileessence.data.Account;
@@ -228,7 +228,7 @@ public class MessageDetailDialogFragment extends StackableDialogFragment impleme
             commands.add(new CommandOpenUserDetail(activity, screenName));
         }
         for (String hashtag : message.getHashtags()) {
-            commands.add(new CommandOpenHashtagDialog(activity, hashtag));
+            commands.add(new CommandAddHashtag(activity, hashtag));
         }
         // URL
         for (String url : message.getUrlsExpanded()) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
index b36e12f3..93b5c36c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
@@ -39,7 +39,7 @@ import net.lacolaco.smileessence.Application;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.command.Command;
-import net.lacolaco.smileessence.command.CommandOpenHashtagDialog;
+import net.lacolaco.smileessence.command.CommandAddHashtag;
 import net.lacolaco.smileessence.command.CommandOpenURL;
 import net.lacolaco.smileessence.command.CommandOpenUserDetail;
 import net.lacolaco.smileessence.data.PostState;
@@ -298,7 +298,7 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen
         }
         // Hashtags
         for (String hashtag : tweet.getHashtags()) {
-            commands.add(new CommandOpenHashtagDialog(activity, hashtag));
+            commands.add(new CommandAddHashtag(activity, hashtag));
         }
         // URL
         for (String url : tweet.getUrlsExpanded()) {