diff options
author | rhenium <rhenium@rhe.jp> | 2015-03-10 20:07:29 +0900 |
---|---|---|
committer | rhenium <rhenium@rhe.jp> | 2015-03-10 20:11:42 +0900 |
commit | d5be67b763ce1560a74ee1372855ab364497a458 (patch) | |
tree | 0155981f95ed5646f70f9380a2cc318bba9288f6 /app/src/main | |
parent | 424bee123dd71c2a29f8ea2d80f3002651e3dd45 (diff) | |
download | SmileEssence-d5be67b763ce1560a74ee1372855ab364497a458.tar.gz |
Rename class of status/message command "Copy to clipboard" for consistency
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/smileessence/command/Command.java | 9 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/smileessence/command/message/MessageCommandCopyTextToClipboard.java (renamed from app/src/main/java/net/lacolaco/smileessence/smileessence/command/message/MessageCommandClipboard.java) | 6 | ||||
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/smileessence/command/status/StatusCommandCopyTextToClipboard.java (renamed from app/src/main/java/net/lacolaco/smileessence/smileessence/command/status/StatusCommandClipboard.java) | 8 | ||||
-rw-r--r-- | app/src/main/res/values-ja/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/commands.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
6 files changed, 13 insertions, 16 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/smileessence/command/Command.java b/app/src/main/java/net/lacolaco/smileessence/smileessence/command/Command.java index 4a0bfe26..0c6f2c9f 100644 --- a/app/src/main/java/net/lacolaco/smileessence/smileessence/command/Command.java +++ b/app/src/main/java/net/lacolaco/smileessence/smileessence/command/Command.java @@ -29,10 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; import net.lacolaco.smileessence.R; -import net.lacolaco.smileessence.command.message.MessageCommandClipboard; -import net.lacolaco.smileessence.command.message.MessageCommandSearchOnGoogle; -import net.lacolaco.smileessence.command.message.MessageCommandShare; -import net.lacolaco.smileessence.command.message.MessageCommandTofuBuster; +import net.lacolaco.smileessence.command.message.*; import net.lacolaco.smileessence.command.status.*; import net.lacolaco.smileessence.command.user.*; import net.lacolaco.smileessence.data.CommandSettingCache; @@ -96,7 +93,7 @@ public abstract class Command implements IViewModel commands.add(new StatusCommandOpenQuoteDialog(activity, status)); commands.add(new StatusCommandShare(activity, status)); commands.add(new StatusCommandOpenInBrowser(activity, status)); - commands.add(new StatusCommandClipboard(activity, status)); + commands.add(new StatusCommandCopyTextToClipboard(activity, status)); commands.add(new StatusCommandCopyURLToClipboard(activity, status)); commands.add(new StatusCommandCopy(activity, status)); commands.add(new StatusCommandSearchOnGoogle(activity, status)); @@ -113,7 +110,7 @@ public abstract class Command implements IViewModel { List<Command> commands = new ArrayList<>(); commands.add(new MessageCommandShare(activity, message)); - commands.add(new MessageCommandClipboard(activity, message)); + commands.add(new MessageCommandCopyTextToClipboard(activity, message)); commands.add(new MessageCommandSearchOnGoogle(activity, message)); commands.add(new MessageCommandTofuBuster(activity, message)); return commands; diff --git a/app/src/main/java/net/lacolaco/smileessence/smileessence/command/message/MessageCommandClipboard.java b/app/src/main/java/net/lacolaco/smileessence/smileessence/command/message/MessageCommandCopyTextToClipboard.java index 07efa0bd..b3928a2e 100644 --- a/app/src/main/java/net/lacolaco/smileessence/smileessence/command/message/MessageCommandClipboard.java +++ b/app/src/main/java/net/lacolaco/smileessence/smileessence/command/message/MessageCommandCopyTextToClipboard.java @@ -31,12 +31,12 @@ import net.lacolaco.smileessence.R; import net.lacolaco.smileessence.notification.Notificator; import twitter4j.DirectMessage; -public class MessageCommandClipboard extends MessageCommand +public class MessageCommandCopyTextToClipboard extends MessageCommand { // --------------------------- CONSTRUCTORS --------------------------- - public MessageCommandClipboard(Activity activity, DirectMessage message) + public MessageCommandCopyTextToClipboard(Activity activity, DirectMessage message) { super(-1, activity, message); } @@ -46,7 +46,7 @@ public class MessageCommandClipboard extends MessageCommand @Override public String getText() { - return getActivity().getString(R.string.command_status_clipboard); + return getActivity().getString(R.string.command_status_copy_text_to_clipboard); } @Override diff --git a/app/src/main/java/net/lacolaco/smileessence/smileessence/command/status/StatusCommandClipboard.java b/app/src/main/java/net/lacolaco/smileessence/smileessence/command/status/StatusCommandCopyTextToClipboard.java index 6b52cd3f..51bdc3d8 100644 --- a/app/src/main/java/net/lacolaco/smileessence/smileessence/command/status/StatusCommandClipboard.java +++ b/app/src/main/java/net/lacolaco/smileessence/smileessence/command/status/StatusCommandCopyTextToClipboard.java @@ -31,14 +31,14 @@ import net.lacolaco.smileessence.R; import net.lacolaco.smileessence.notification.Notificator; import twitter4j.Status; -public class StatusCommandClipboard extends StatusCommand +public class StatusCommandCopyTextToClipboard extends StatusCommand { // --------------------------- CONSTRUCTORS --------------------------- - public StatusCommandClipboard(Activity activity, Status status) + public StatusCommandCopyTextToClipboard(Activity activity, Status status) { - super(R.id.key_command_status_clipboard, activity, status); + super(R.id.key_command_status_copy_text_to_clipboard, activity, status); } // --------------------- GETTER / SETTER METHODS --------------------- @@ -46,7 +46,7 @@ public class StatusCommandClipboard extends StatusCommand @Override public String getText() { - return getActivity().getString(R.string.command_status_clipboard); + return getActivity().getString(R.string.command_status_copy_text_to_clipboard); } @Override diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ae5e0237..031af425 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -213,7 +213,7 @@ <string name="command_status_quote">引用する</string> <string name="command_status_quote_url">URLを引用する</string> <string name="command_status_quote_text">本文を引用する</string> - <string name="command_status_clipboard">クリップボードにコピーする</string> + <string name="command_status_copy_text_to_clipboard">クリップボードにコピーする</string> <string name="command_status_copy_url_to_clipboard">URLをクリップボードにコピーする</string> <string name="command_status_share">共有する</string> <string name="command_status_open_in_browser">ブラウザで開く</string> diff --git a/app/src/main/res/values/commands.xml b/app/src/main/res/values/commands.xml index 53040f51..20e6ea70 100644 --- a/app/src/main/res/values/commands.xml +++ b/app/src/main/res/values/commands.xml @@ -27,7 +27,7 @@ <item name="key_command_status_reply_to_all" type="id"/> <item name="key_command_status_fav_and_rt" type="id"/> <item name="key_command_status_quote" type="id"/> - <item name="key_command_status_clipboard" type="id"/> + <item name="key_command_status_copy_text_to_clipboard" type="id"/> <item name="key_command_status_copy_url_to_clipboard" type="id"/> <item name="key_command_status_share" type="id"/> <item name="key_command_status_open_in_browser" type="id"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0f19e8fe..b8583413 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -213,7 +213,7 @@ <string name="command_status_quote">Quote</string> <string name="command_status_quote_url">Permalink quote</string> <string name="command_status_quote_text">Text quote</string> - <string name="command_status_clipboard">Copy to clipboard</string> + <string name="command_status_copy_text_to_clipboard">Copy to clipboard</string> <string name="command_status_copy_url_to_clipboard">Copy permalink to clipboard</string> <string name="command_status_share">Share</string> <string name="command_status_open_in_browser">Open in browser</string> |