diff options
4 files changed, 39 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index c861f64d5..a040e1964 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -51,6 +51,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers inviteToConversation(mConversation); } }; + private TextView ConferenceName; private TextView mYourNick; private ImageView mYourPhoto; private ImageButton mEditNickButton; @@ -247,6 +248,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_muc_details); + ConferenceName = (TextView) findViewById(R.id.conference_name); mYourNick = (TextView) findViewById(R.id.muc_your_nick); mYourPhoto = (ImageView) findViewById(R.id.your_photo); mEditNickButton = (ImageButton) findViewById(R.id.edit_nick_button); @@ -548,6 +550,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers absubtitle.setVisibility(View.GONE); absubtitle.setClickable(false); } + ConferenceName.setText(mConversation.getName()); mAccountJid.setText(getString(R.string.using_account, account)); mYourPhoto.setImageBitmap(avatarService().get(mConversation.getAccount(), getPixel(48))); setTitle(mConversation.getName()); diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java index 063054c0b..6270e4721 100644 --- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java @@ -112,6 +112,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp private Jid accountJid; private TextView lastseen; private Jid contactJid; + private TextView contactDisplayName; private TextView contactJidTv; private TextView accountJidTv; private TextView statusMessage; @@ -272,6 +273,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp this.messageFingerprint = getIntent().getStringExtra("fingerprint"); setContentView(R.layout.activity_contact_details); + contactDisplayName = (TextView) findViewById(R.id.contact_display_name); contactJidTv = (TextView) findViewById(R.id.details_contactjid); accountJidTv = (TextView) findViewById(R.id.details_account); lastseen = (TextView) findViewById(R.id.details_lastseen); @@ -434,6 +436,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp invalidateOptionsMenu(); setTitle(contact.getDisplayName()); + contactDisplayName.setText(contact.getDisplayName()); if (contact.showInRoster()) { send.setVisibility(View.VISIBLE); receive.setVisibility(View.VISIBLE); diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 932e4c8e5..4f842aec1 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -20,17 +20,32 @@ android:background="@drawable/infocard_border" android:padding="@dimen/infocard_padding"> + <com.vanniktech.emoji.EmojiTextView + android:id="@+id/contact_display_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/contact" + android:textColor="@color/black87" + android:textIsSelectable="false" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:paddingBottom="5dp" + android:textAlignment="center" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" /> + <QuickContactBadge android:id="@+id/details_contact_badge" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" android:adjustViewBounds="true" android:background="@drawable/message_border" android:maxHeight="384dp" android:maxWidth="384dp" - android:padding="1dp" /> + android:padding="1dp" + android:layout_below="@+id/contact_display_name" + android:layout_centerHorizontal="true" /> <LinearLayout android:id="@+id/details_jidbox" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 72eea9df5..125ba933e 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -22,6 +22,21 @@ android:orientation="vertical" android:padding="@dimen/infocard_padding"> + <com.vanniktech.emoji.EmojiTextView + android:id="@+id/conference_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/conference_subject" + android:textColor="@color/black87" + android:textIsSelectable="false" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:paddingBottom="5dp" + android:textAlignment="center" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" /> + <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content"> |