diff options
Diffstat (limited to 'app/src/main/java/net/lacolaco')
23 files changed, 27 insertions, 29 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/Command.java b/app/src/main/java/net/lacolaco/smileessence/command/Command.java index b5d2773c..33a65912 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/Command.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/Command.java @@ -45,13 +45,11 @@ public abstract class Command implements IViewModel { // ------------------------------ FIELDS ------------------------------ - private final int key; private final Activity activity; // -------------------------- STATIC METHODS -------------------------- - public Command(int key, Activity activity) { - this.key = key; + public Command(Activity activity) { this.activity = activity; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenHashtagDialog.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenHashtagDialog.java index 65ba220e..2a2a8ab4 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenHashtagDialog.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenHashtagDialog.java @@ -37,7 +37,7 @@ public class CommandOpenHashtagDialog extends Command { // --------------------------- CONSTRUCTORS --------------------------- public CommandOpenHashtagDialog(Activity activity, String hashtag) { - super(-1, activity); + super(activity); this.hashtag = hashtag; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java index b8238f74..032b1354 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenSearch.java @@ -37,7 +37,7 @@ public class CommandOpenSearch extends Command { // --------------------------- CONSTRUCTORS --------------------------- public CommandOpenSearch(Activity activity, SearchQuery searchQuery) { - super(-1, activity); + super(activity); this.query = searchQuery; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.java index d696bb0e..b43676a5 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.java @@ -36,7 +36,7 @@ public class CommandOpenURL extends Command { // --------------------------- CONSTRUCTORS --------------------------- public CommandOpenURL(Activity activity, String url) { - super(-1, activity); + super(activity); this.url = url; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java index 37da2f3f..1636dffb 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java @@ -41,7 +41,7 @@ public class CommandOpenUserDetail extends Command { // --------------------------- CONSTRUCTORS --------------------------- public CommandOpenUserDetail(Activity activity, String screenName) { - super(-1, activity); + super(activity); this.screenName = screenName; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserList.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserList.java index bf60dcf2..5b2c47e3 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserList.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserList.java @@ -36,7 +36,7 @@ public class CommandOpenUserList extends Command { // --------------------------- CONSTRUCTORS --------------------------- public CommandOpenUserList(Activity activity, String listFullName) { - super(-1, activity); + super(activity); this.listFullName = listFullName; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java index 863b86cb..24d858e7 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java @@ -37,7 +37,7 @@ public class CommandSearchOnTwitter extends Command { // --------------------------- CONSTRUCTORS --------------------------- public CommandSearchOnTwitter(Activity activity, String text) { - super(-1, activity); + super(activity); this.text = text; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommand.java b/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommand.java index 0bc5145b..b33b8428 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommand.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommand.java @@ -36,8 +36,8 @@ public abstract class MessageCommand extends Command { // --------------------------- CONSTRUCTORS --------------------------- - public MessageCommand(int key, Activity activity, DirectMessage message) { - super(key, activity); + public MessageCommand(Activity activity, DirectMessage message) { + super(activity); this.message = message; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommandCopyTextToClipboard.java b/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommandCopyTextToClipboard.java index 8642b94e..1c2d2663 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommandCopyTextToClipboard.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/message/MessageCommandCopyTextToClipboard.java @@ -35,7 +35,7 @@ public class MessageCommandCopyTextToClipboard extends MessageCommand { // --------------------------- CONSTRUCTORS --------------------------- public MessageCommandCopyTextToClipboard(Activity activity, DirectMessage message) { - super(-1, activity, message); + super(activity, message); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommand.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommand.java index 12cddf77..1dbad2b2 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommand.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommand.java @@ -36,8 +36,8 @@ public abstract class StatusCommand extends Command { // --------------------------- CONSTRUCTORS --------------------------- - public StatusCommand(int key, Activity activity, Tweet tweet) { - super(key, activity); + public StatusCommand(Activity activity, Tweet tweet) { + super(activity); this.tweet = tweet; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandAddToReply.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandAddToReply.java index e45ca7bf..e843f881 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandAddToReply.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandAddToReply.java @@ -35,7 +35,7 @@ public class StatusCommandAddToReply extends StatusCommand { // --------------------------- CONSTRUCTORS --------------------------- public StatusCommandAddToReply(Activity activity, Tweet tweet) { - super(R.id.key_command_status_add_to_reply, activity, tweet); + super(activity, tweet); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyTextToClipboard.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyTextToClipboard.java index 43c72bdc..6263cb44 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyTextToClipboard.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyTextToClipboard.java @@ -35,7 +35,7 @@ public class StatusCommandCopyTextToClipboard extends StatusCommand { // --------------------------- CONSTRUCTORS --------------------------- public StatusCommandCopyTextToClipboard(Activity activity, Tweet tweet) { - super(R.id.key_command_status_copy_text_to_clipboard, activity, tweet); + super(activity, tweet); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyURLToClipboard.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyURLToClipboard.java index 90f26e50..2140048b 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyURLToClipboard.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCopyURLToClipboard.java @@ -35,7 +35,7 @@ public class StatusCommandCopyURLToClipboard extends StatusCommand { // --------------------------- CONSTRUCTORS --------------------------- public StatusCommandCopyURLToClipboard(Activity activity, Tweet tweet) { - super(R.id.key_command_status_copy_url_to_clipboard, activity, tweet); + super(activity, tweet); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenInBrowser.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenInBrowser.java index 0659bfd8..55f22086 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenInBrowser.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenInBrowser.java @@ -34,7 +34,7 @@ public class StatusCommandOpenInBrowser extends StatusCommand { // --------------------------- CONSTRUCTORS --------------------------- public StatusCommandOpenInBrowser(Activity activity, Tweet tweet) { - super(R.id.key_command_status_open_in_browser, activity, tweet); + super(activity, tweet); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java index c86046b5..e56af074 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java @@ -35,7 +35,7 @@ public class StatusCommandOpenTalkView extends StatusCommand { // --------------------------- CONSTRUCTORS --------------------------- public StatusCommandOpenTalkView(Activity activity, Tweet tweet) { - super(R.id.key_command_status_open_chain, activity, tweet); + super(activity, tweet); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommand.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommand.java index 6cf220be..3a486304 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommand.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommand.java @@ -36,8 +36,8 @@ public abstract class UserCommand extends Command { // --------------------------- CONSTRUCTORS --------------------------- - public UserCommand(int key, Activity activity, User user) { - super(key, activity); + public UserCommand(Activity activity, User user) { + super(activity); this.user = user; } diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandAddToReply.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandAddToReply.java index 52ae678a..a224a635 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandAddToReply.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandAddToReply.java @@ -35,7 +35,7 @@ public class UserCommandAddToReply extends UserCommand { // --------------------------- CONSTRUCTORS --------------------------- public UserCommandAddToReply(Activity activity, User user) { - super(R.id.key_command_user_add_to_reply, activity, user); + super(activity, user); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java index 4807baa1..78036005 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java @@ -37,7 +37,7 @@ public class UserCommandBlock extends UserCommand implements IConfirmable { // --------------------------- CONSTRUCTORS --------------------------- public UserCommandBlock(Activity activity, User user) { - super(R.id.key_command_user_block, activity, user); + super(activity, user); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandOpenAclog.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandOpenAclog.java index bed7c71e..6d037c8b 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandOpenAclog.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandOpenAclog.java @@ -34,7 +34,7 @@ public class UserCommandOpenAclog extends UserCommand { // --------------------------- CONSTRUCTORS --------------------------- public UserCommandOpenAclog(Activity activity, User user) { - super(R.id.key_command_user_open_aclog, activity, user); + super(activity, user); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java index b4e9c6d1..eeef236f 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java @@ -37,7 +37,7 @@ public class UserCommandReportForSpam extends UserCommand implements IConfirmabl // --------------------------- CONSTRUCTORS --------------------------- public UserCommandReportForSpam(Activity activity, User user) { - super(R.id.key_command_user_r4s, activity, user); + super(activity, user); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java index 29e9e3d9..a09a3f91 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java @@ -35,7 +35,7 @@ public class UserCommandSendMessage extends UserCommand { // --------------------------- CONSTRUCTORS --------------------------- public UserCommandSendMessage(Activity activity, User user) { - super(R.id.key_command_user_send_message, activity, user); + super(activity, user); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java index c099cc66..5fae1fa5 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java @@ -37,7 +37,7 @@ public class UserCommandUnblock extends UserCommand implements IConfirmable { // --------------------------- CONSTRUCTORS --------------------------- public UserCommandUnblock(Activity activity, User user) { - super(R.id.key_command_user_unblock, activity, user); + super(activity, user); } // --------------------- GETTER / SETTER METHODS --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectImageDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectImageDialogFragment.java index 9b736aa2..891fadf3 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectImageDialogFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectImageDialogFragment.java @@ -47,7 +47,7 @@ public class SelectImageDialogFragment extends MenuDialogFragment { protected List<Command> getMenuCommands() { Activity activity = getActivity(); List<Command> commands = new ArrayList<>(); - commands.add(new Command(-1, activity) { + commands.add(new Command(activity) { @Override public boolean execute() { startGallery(); @@ -59,7 +59,7 @@ public class SelectImageDialogFragment extends MenuDialogFragment { return activity.getString(R.string.command_select_image_from_gallery); } }); - commands.add(new Command(-1, activity) { + commands.add(new Command(activity) { @Override public boolean execute() { startCamera(); |