uip

3 files changed, 21 insertions, 18 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index f6351f30..8ba37f71 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -26,6 +26,7 @@ package net.lacolaco.smileessence.activity;
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -239,7 +240,9 @@ public class MainActivity extends Activity implements ViewPager.OnPageChangeList
     }
 
     private void setTitle() {
-        setTitle(getString(R.string.app_name) + " - @" + world.getAccount().getUser().getScreenName());
+        String label = getString(R.string.app_name) + " - @" + world.getAccount().getUser().getScreenName();
+        ActivityManager.TaskDescription desc = new ActivityManager.TaskDescription(label);
+        setTaskDescription(desc);
     }
 
     @Override
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/Partials.java b/app/src/main/java/net/lacolaco/smileessence/view/Partials.java
index c6f8ffef..bb14c11c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/Partials.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/Partials.java
@@ -168,11 +168,7 @@ public class Partials {
             convertView.setTag(bundle);
         }
 
-        convertView.setOnClickListener(new ListItemClickListener(activity, () -> {
-            MessageDetailDialogFragment dialogFragment = new MessageDetailDialogFragment();
-            dialogFragment.setMessageID(directMessage.getId());
-            DialogHelper.showDialog(activity, dialogFragment);
-        }));
+        convertView.setOnClickListener(new ListItemClickListener(activity, () -> DialogHelper.showDialog(activity, MessageDetailDialogFragment.newInstance(directMessage))));
 
         ImageView favorited = (ImageView) convertView.findViewById(R.id.imageview_status_favorited);
         favorited.setVisibility(View.GONE);
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 8383363c..f8a1e2e5 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
@@ -32,6 +32,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.ListView;
+import android.widget.TextView;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.command.Command;
@@ -39,6 +40,7 @@ import net.lacolaco.smileessence.command.CommandAddHashtag;
 import net.lacolaco.smileessence.command.CommandOpenURL;
 import net.lacolaco.smileessence.command.CommandOpenUserDetail;
 import net.lacolaco.smileessence.entity.DirectMessage;
+import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.task.Messages;
 import net.lacolaco.smileessence.util.SystemServiceHelper;
 import net.lacolaco.smileessence.view.DialogHelper;
@@ -50,20 +52,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class MessageDetailDialogFragment extends StackableDialogFragment implements View.OnClickListener {
-    private static final String KEY_MESSAGE_ID = "messageID";
+    private static final String KEY_MESSAGE_ID = "message_id";
     private DirectMessage message;
 
-    public void setMessageID(long messageID) {
+    public static MessageDetailDialogFragment newInstance(DirectMessage message) {
+        MessageDetailDialogFragment obj = new MessageDetailDialogFragment();
         Bundle args = new Bundle();
-        args.putLong(KEY_MESSAGE_ID, messageID);
-        setArguments(args);
+        args.putLong(KEY_MESSAGE_ID, message.getId());
+        obj.setArguments(args);
+        return obj;
     }
 
-    // ------------------------ INTERFACE METHODS ------------------------
-
-
-    // --------------------- Interface OnClickListener ---------------------
-
     @Override
     public void onClick(final View v) {
         switch (v.getId()) {
@@ -181,10 +180,15 @@ public class MessageDetailDialogFragment extends StackableDialogFragment impleme
             divider.setVisibility(View.VISIBLE);
             listView.setVisibility(View.VISIBLE);
             final CustomListAdapter<Command> adapter = new CustomListAdapter<Command>() {
-
                 @Override
                 public View getView(int position, View convertView, ViewGroup parent) {
-                    return null;
+                    if (convertView == null) {
+                        convertView = getActivity().getLayoutInflater().inflate(R.layout.menu_item_simple_text, null);
+                    }
+                    TextView textView = (TextView) convertView.findViewById(R.id.list_item_textview);
+                    textView.setTextSize(UserPreferenceHelper.getInstance().getTextSize());
+                    textView.setText(getItem(position).getText());
+                    return convertView;
                 }
 
                 @Override
@@ -192,7 +196,7 @@ public class MessageDetailDialogFragment extends StackableDialogFragment impleme
                     return commands;
                 }
             };
-            adapter.updateForce();
+            adapter.update();
             listView.setAdapter(adapter);
             listView.setOnItemClickListener((parent, view1, position, id) -> {
                 Command command = (Command) parent.getItemAtPosition(position);