4 files changed, 50 insertions, 88 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/Command.java b/app/src/main/java/net/lacolaco/smileessence/command/Command.kt
index 0225b886..98183dc7 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/Command.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/Command.kt
@@ -22,23 +22,14 @@
  * SOFTWARE.
  */
 
-package net.lacolaco.smileessence.command;
+package net.lacolaco.smileessence.command
 
-import net.lacolaco.smileessence.activity.MainActivity;
+import net.lacolaco.smileessence.activity.MainActivity
 
-public abstract class Command {
-    private final MainActivity activity;
+abstract class Command(protected val activity: MainActivity) {
 
-    public Command(MainActivity activity) {
-        this.activity = activity;
-    }
+    abstract fun execute(): Boolean
 
-    protected MainActivity getActivity() {
-        return activity;
-    }
-
-    public abstract boolean execute();
-
-    public abstract String getText();
+    abstract val text: String
 
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandAddHashtag.kt
index c62e2601..5d8077d5 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandAddHashtag.kt
@@ -22,36 +22,27 @@
  * SOFTWARE.
  */
 
-package net.lacolaco.smileessence.command;
+package net.lacolaco.smileessence.command
 
-import net.lacolaco.smileessence.activity.MainActivity;
-import net.lacolaco.smileessence.util.IntentUtils;
+import net.lacolaco.smileessence.activity.MainActivity
 
-public class CommandOpenURL extends Command {
+class CommandAddHashtag
+// --------------------------- CONSTRUCTORS ---------------------------
 
-    // ------------------------------ FIELDS ------------------------------
+(activity: MainActivity,
+        // ------------------------------ FIELDS ------------------------------
 
-    private final String url;
-
-    // --------------------------- CONSTRUCTORS ---------------------------
-
-    public CommandOpenURL(MainActivity activity, String url) {
-        super(activity);
-        this.url = url;
-    }
+ private val hashtag: String) : Command(activity) {
 
     // --------------------- GETTER / SETTER METHODS ---------------------
 
-    @Override
-    public String getText() {
-        return url;
-    }
+    override val text: String
+        get() = "#" + hashtag
 
     // -------------------------- OTHER METHODS --------------------------
 
-    @Override
-    public boolean execute() {
-        IntentUtils.openUri(getActivity(), url);
-        return true;
+    override fun execute(): Boolean {
+        activity.world.postState.beginTransaction().appendText(" #" + hashtag).commit()
+        return true
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandAddHashtag.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.kt
index b2de5c21..b9150e12 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandAddHashtag.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.kt
@@ -22,35 +22,25 @@
  * SOFTWARE.
  */
 
-package net.lacolaco.smileessence.command;
+package net.lacolaco.smileessence.command
 
-import net.lacolaco.smileessence.activity.MainActivity;
+import net.lacolaco.smileessence.activity.MainActivity
+import net.lacolaco.smileessence.util.IntentUtils
 
-public class CommandAddHashtag extends Command {
+class CommandOpenURL
+// --------------------------- CONSTRUCTORS ---------------------------
 
-    // ------------------------------ FIELDS ------------------------------
+(activity: MainActivity,
+        // ------------------------------ FIELDS ------------------------------
 
-    private final String hashtag;
+        // --------------------- GETTER / SETTER METHODS ---------------------
 
-    // --------------------------- CONSTRUCTORS ---------------------------
-
-    public CommandAddHashtag(MainActivity activity, String hashtag) {
-        super(activity);
-        this.hashtag = hashtag;
-    }
-
-    // --------------------- GETTER / SETTER METHODS ---------------------
-
-    @Override
-    public String getText() {
-        return "#" + hashtag;
-    }
+ override val text: String) : Command(activity) {
 
     // -------------------------- OTHER METHODS --------------------------
 
-    @Override
-    public boolean execute() {
-        getActivity().getWorld().getPostState().beginTransaction().appendText(" #" + hashtag).commit();
-        return true;
+    override fun execute(): Boolean {
+        IntentUtils.openUri(activity, text)
+        return true
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.kt
index 600e0bc0..89d5d2ef 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.kt
@@ -22,47 +22,37 @@
  * SOFTWARE.
  */
 
-package net.lacolaco.smileessence.command;
+package net.lacolaco.smileessence.command
 
-import net.lacolaco.smileessence.R;
-import net.lacolaco.smileessence.activity.MainActivity;
-import net.lacolaco.smileessence.twitter.task.Users;
-import net.lacolaco.smileessence.view.DialogHelper;
-import net.lacolaco.smileessence.view.dialog.UserDetailDialogFragment;
+import net.lacolaco.smileessence.R
+import net.lacolaco.smileessence.activity.MainActivity
+import net.lacolaco.smileessence.twitter.task.Users
+import net.lacolaco.smileessence.view.DialogHelper
+import net.lacolaco.smileessence.view.dialog.UserDetailDialogFragment
 
-public class CommandOpenUserDetail extends Command {
+class CommandOpenUserDetail
+// --------------------------- CONSTRUCTORS ---------------------------
 
-    // ------------------------------ FIELDS ------------------------------
+(activity: MainActivity,
+        // ------------------------------ FIELDS ------------------------------
 
-    private final String screenName;
-
-    // --------------------------- CONSTRUCTORS ---------------------------
-
-    public CommandOpenUserDetail(MainActivity activity, String screenName) {
-        super(activity);
-        this.screenName = screenName;
-    }
+ private val screenName: String) : Command(activity) {
 
     // --------------------- GETTER / SETTER METHODS ---------------------
 
-    @Override
-    public String getText() {
-        return String.format("@%s", screenName);
-    }
+    override val text: String
+        get() = String.format("@%s", screenName)
 
     // -------------------------- OTHER METHODS --------------------------
 
-    @Override
-    public boolean execute() {
-        new Users.GetTask(getActivity().getWorld().getAccount(), screenName)
-                .onDoneUI(user -> {
-                    UserDetailDialogFragment fragment = new UserDetailDialogFragment();
-                    fragment.setUserID(user.getId());
-                    DialogHelper.showDialog(getActivity(), fragment);
-                })
-                .onFail(x -> getActivity().getWorld().notifyError(R.string.notice_error_show_user))
-                .execute();
+    override fun execute(): Boolean {
+        Users.GetTask(activity.world.account, screenName)
+                .onDoneUI { user ->
+                    DialogHelper.showDialog(activity, UserDetailDialogFragment.newInstance(user))
+                }
+                .onFail { x -> activity.world.notifyError(R.string.notice_error_show_user) }
+                .execute()
 
-        return false;
+        return false
     }
 }