aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-08-26 16:34:42 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-08-26 16:34:42 +0200
commitfd54dc5aff2e2df0c0773ac0ce7936094edfeb39 (patch)
tree626dd75784d79b7aacd9137912b3ac17b53dac6b /src/main/java/eu/siacs
parent76cbb4f72751ec6255aa40b72218db80ea6d9472 (diff)
wrap dynamic tags into multiple lines. fixes #2003
Diffstat (limited to 'src/main/java/eu/siacs')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java6
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index af1a9917..836e345b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -28,6 +28,8 @@ import android.widget.QuickContactBadge;
import android.widget.TextView;
import android.widget.Toast;
+import com.wefika.flowlayout.FlowLayout;
+
import org.openintents.openpgp.util.OpenPgpUtils;
import java.security.cert.X509Certificate;
@@ -113,7 +115,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
private Button addContactButton;
private QuickContactBadge badge;
private LinearLayout keys;
- private LinearLayout tags;
+ private FlowLayout tags;
private boolean showDynamicTags = false;
private boolean showLastSeen = false;
private String messageFingerprint;
@@ -215,7 +217,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
}
});
keys = (LinearLayout) findViewById(R.id.details_contact_keys);
- tags = (LinearLayout) findViewById(R.id.tags);
+ tags = (FlowLayout) findViewById(R.id.tags);
if (getActionBar() != null) {
getActionBar().setHomeButtonEnabled(true);
getActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
index c29b01bc..655d52b4 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
@@ -16,6 +16,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import com.wefika.flowlayout.FlowLayout;
+
import java.lang.ref.WeakReference;
import java.util.List;
import java.util.concurrent.RejectedExecutionException;
@@ -60,7 +62,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
TextView tvName = (TextView) view.findViewById(R.id.contact_display_name);
TextView tvJid = (TextView) view.findViewById(R.id.contact_jid);
ImageView picture = (ImageView) view.findViewById(R.id.contact_photo);
- LinearLayout tagLayout = (LinearLayout) view.findViewById(R.id.tags);
+ FlowLayout tagLayout = (FlowLayout) view.findViewById(R.id.tags);
List<ListItem.Tag> tags = item.getTags(activity);
if (tags.size() == 0 || !this.showDynamicTags) {