diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-08-26 16:34:42 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-08-26 22:49:08 +0200 |
| commit | d4cb06cecbb338f9092406bef04f61d98ef90c3a (patch) | |
| tree | c3f2604fdcdc2f7b1f1dfba0bb0457ec12b32fd1 /src/main/java | |
| parent | f32064aa8272c95d8122d9d12415720a672efe5d (diff) | |
wrap dynamic tags into multiple lines. fixes #2003
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java | 6 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java index ca0c8ce9c..c919955a8 100644 --- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/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; @@ -114,7 +116,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; @@ -216,7 +218,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/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java index f338f7170..cea0cc67f 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/pixart/messenger/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; @@ -59,7 +61,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) { |