thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrate to CardView in contact and muc details

Browse source
This commit is contained in:
Christian Schneppe 2018-03-16 21:15:47 +01:00
parent 4d5754ac5d
commit f26cab3b03
5 changed files with 377 additions and 375 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -62,6 +62,7 @@ dependencies {
implementation "com.android.support:support-emoji-appcompat:$supportLibVersion" implementation "com.android.support:support-emoji-appcompat:$supportLibVersion"
implementation "com.android.support:exifinterface:$supportLibVersion" implementation "com.android.support:exifinterface:$supportLibVersion"
implementation "com.android.support:design:$supportLibVersion" implementation "com.android.support:design:$supportLibVersion"
implementation "com.android.support:cardview-v7:$supportLibVersion"
implementation 'com.github.bumptech.glide:glide:3.8.0' implementation 'com.github.bumptech.glide:glide:3.8.0'
implementation 'com.github.chrisbanes:PhotoView:2.0.0' implementation 'com.github.chrisbanes:PhotoView:2.0.0'
implementation 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.3' implementation 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.3'

23
src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
View file

@ -1,6 +1,5 @@
package de.pixart.messenger.ui; package de.pixart.messenger.ui;
import android.support.v7.app.AlertDialog;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -9,6 +8,8 @@ import android.content.IntentSender.SendIntentException;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.CardView;
import android.util.Log; import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -83,10 +84,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
private TextView mFullJid; private TextView mFullJid;
private TextView mAccountJid; private TextView mAccountJid;
private LinearLayout membersView; private LinearLayout membersView;
private LinearLayout mMoreDetails; private CardView mMoreDetails;
private RelativeLayout mMucSettings; private RelativeLayout mMucSettings;
private TextView mConferenceType; private TextView mConferenceType;
private LinearLayout mConferenceInfoTable; private CardView mConferenceInfoTable;
private TextView mConferenceInfoMam; private TextView mConferenceInfoMam;
private TextView mNotifyStatusText; private TextView mNotifyStatusText;
private ImageButton mChangeConferenceSettingsButton; private ImageButton mChangeConferenceSettingsButton;
@ -298,25 +299,15 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} }
mEditNickButton.setOnClickListener(new OnClickListener() { mEditNickButton.setOnClickListener(v -> quickEdit(mConversation.getMucOptions().getActualNick(),
@Override
public void onClick(View v) {
quickEdit(mConversation.getMucOptions().getActualNick(),
0, 0,
new OnValueEdited() { value -> {
@Override
public String onValueEdited(String value) {
if (xmppConnectionService.renameInMuc(mConversation, value, renameCallback)) { if (xmppConnectionService.renameInMuc(mConversation, value, renameCallback)) {
return null; return null;
} else { } else {
return getString(R.string.invalid_username); return getString(R.string.invalid_username);
} }
} }));
});
}
});
this.mAdvancedMode = getPreferences().getBoolean("advanced_muc_mode", false); this.mAdvancedMode = getPreferences().getBoolean("advanced_muc_mode", false);
this.mConferenceInfoTable = findViewById(R.id.muc_info_more); this.mConferenceInfoTable = findViewById(R.id.muc_info_more);
this.mConferenceInfoTable.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE); this.mConferenceInfoTable.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE);

8
src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
View file

@ -14,6 +14,7 @@ import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents; import android.provider.ContactsContract.Intents;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.widget.CardView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@ -123,7 +124,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
private Button mShowInactiveDevicesButton; private Button mShowInactiveDevicesButton;
private QuickContactBadge badge; private QuickContactBadge badge;
private LinearLayout keys; private LinearLayout keys;
private LinearLayout keysWrapper; private CardView keysWrapper;
private FlowLayout tags; private FlowLayout tags;
private boolean showDynamicTags = false; private boolean showDynamicTags = false;
private boolean showLastSeen = false; private boolean showLastSeen = false;
@ -292,12 +293,9 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} }
mShowInactiveDevicesButton.setOnClickListener(new OnClickListener() { mShowInactiveDevicesButton.setOnClickListener(v -> {
@Override
public void onClick(View v) {
showInactiveOmemo = !showInactiveOmemo; showInactiveOmemo = !showInactiveOmemo;
populateView(); populateView();
}
}); });
this.mNotifyStatusButton = findViewById(R.id.notification_status_button); this.mNotifyStatusButton = findViewById(R.id.notification_status_button);
this.mNotifyStatusButton.setOnClickListener(this.mNotifyStatusClickListener); this.mNotifyStatusButton.setOnClickListener(this.mNotifyStatusClickListener);

101
src/main/res/layout/activity_contact_details.xml
View file

@ -10,42 +10,46 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <android.support.v7.widget.CardView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin">
android:background="@drawable/infocard_border"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/infocard_padding"> android:padding="@dimen/infocard_padding">
<android.support.text.emoji.widget.EmojiTextView <android.support.text.emoji.widget.EmojiTextView
android:id="@+id/contact_display_name" android:id="@+id/contact_display_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:paddingBottom="5dp"
android:text="@string/contact" android:text="@string/contact"
android:textAlignment="center"
android:textColor="@color/black87" android:textColor="@color/black87"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textSize="?attr/TextSizeHeadline" android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" android:textStyle="bold" />
android:paddingBottom="5dp"
android:textAlignment="center"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<QuickContactBadge <QuickContactBadge
android:id="@+id/details_contact_badge" android:id="@+id/details_contact_badge"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/contact_display_name"
android:layout_centerHorizontal="true"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/message_border" android:background="@drawable/message_border"
android:maxHeight="384dp" android:maxHeight="384dp"
android:maxWidth="384dp" android:maxWidth="384dp"
android:padding="1dp" android:padding="1dp"
android:layout_below="@+id/contact_display_name" android:scaleType="centerCrop" />
android:layout_centerHorizontal="true" />
<LinearLayout <LinearLayout
android:id="@+id/details_jidbox" android:id="@+id/details_jidbox"
@ -65,7 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/account_settings_example_jabber_id" android:text="@string/account_settings_example_jabber_id"
android:textColor="@color/black87" android:textColor="?attr/color_text_primary"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="?attr/TextSizeHeadline" android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" android:textStyle="bold"
@ -79,42 +83,41 @@
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:layout_marginLeft="-2dp" android:layout_marginLeft="-2dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:orientation="horizontal"> android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout>
</com.wefika.flowlayout.FlowLayout>
<TextView <TextView
android:id="@+id/details_lastseen" android:id="@+id/details_lastseen"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:textColor="@color/black54"
android:textSize="?attr/TextSizeBody"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:layout_marginTop="4dp" /> android:layout_marginTop="4dp"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" />
<android.support.text.emoji.widget.EmojiTextView <android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_message" android:id="@+id/status_message"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@color/black54" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
android:textStyle="italic" android:textStyle="italic" />
android:layout_marginBottom="4dp" />
<android.support.text.emoji.widget.EmojiTextView <android.support.text.emoji.widget.EmojiTextView
android:id="@+id/resource" android:id="@+id/resource"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@color/black54" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
android:textStyle="italic" android:textStyle="italic" />
android:layout_marginBottom="4dp" />
<Button <Button
android:id="@+id/add_contact_button" android:id="@+id/add_contact_button"
@ -123,9 +126,9 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/add_contact"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:layout_marginTop="4dp" /> android:layout_marginTop="4dp"
android:text="@string/add_contact" />
<CheckBox <CheckBox
android:id="@+id/details_send_presence" android:id="@+id/details_send_presence"
@ -134,10 +137,10 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/add_contact_button" android:layout_below="@+id/add_contact_button"
android:layout_marginTop="4dp"
android:text="@string/send_presence_updates" android:text="@string/send_presence_updates"
android:textColor="@color/black87" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody" />
android:layout_marginTop="4dp" />
<CheckBox <CheckBox
android:id="@+id/details_receive_presence" android:id="@+id/details_receive_presence"
@ -147,7 +150,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/details_send_presence" android:layout_below="@+id/details_send_presence"
android:text="@string/receive_presence_updates" android:text="@string/receive_presence_updates"
android:textColor="@color/black87" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
</LinearLayout> </LinearLayout>
@ -164,59 +167,59 @@
android:textSize="?attr/TextSizeInfo" android:textSize="?attr/TextSizeInfo"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
</android.support.v7.widget.CardView>
<RelativeLayout <android.support.v7.widget.CardView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin">
android:background="@drawable/infocard_border"
android:padding="@dimen/infocard_padding">
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:touchscreenBlocksFocus="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" > android:layout_alignParentStart="true"
android:background="@drawable/infocard_border"
android:padding="@dimen/infocard_padding"
android:touchscreenBlocksFocus="true">
<TextView <TextView
android:id="@+id/notification_status_text" android:id="@+id/notification_status_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/notify_on_all_messages"
android:layout_centerVertical="true"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/notification_status_button" /> android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/notification_status_button"
android:text="@string/notify_on_all_messages"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" />
<ImageButton <ImageButton
android:id="@+id/notification_status_button" android:id="@+id/notification_status_button"
style="?android:attr/buttonStyleSmall" style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:padding="@dimen/image_button_padding" android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_notifications_grey600_24dp" /> android:src="@drawable/ic_notifications_grey600_24dp" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </android.support.v7.widget.CardView>
<LinearLayout <android.support.v7.widget.CardView
android:id="@+id/keys_wrapper" android:id="@+id/keys_wrapper"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/infocard_padding"> android:padding="@dimen/infocard_padding">
@ -231,8 +234,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:divider="?android:dividerHorizontal" android:divider="?android:dividerHorizontal"
android:orientation="vertical" android:orientation="vertical"
android:showDividers="middle"> android:showDividers="middle"></LinearLayout>
</LinearLayout>
<Button <Button
android:id="@+id/show_inactive_devices" android:id="@+id/show_inactive_devices"
@ -244,7 +246,6 @@
android:text="@string/show_inactive_devices" android:text="@string/show_inactive_devices"
android:textColor="@color/accent" /> android:textColor="@color/accent" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>

83
src/main/res/layout/activity_muc_details.xml
View file

@ -11,14 +11,19 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <android.support.v7.widget.CardView
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border" android:orientation="vertical"
android:padding="@dimen/infocard_padding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/infocard_padding"> android:padding="@dimen/infocard_padding">
@ -26,21 +31,21 @@
android:id="@+id/conference_name" android:id="@+id/conference_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:paddingBottom="5dp"
android:text="@string/conference_subject" android:text="@string/conference_subject"
android:textAlignment="center"
android:textColor="@color/black87" android:textColor="@color/black87"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textSize="?attr/TextSizeHeadline" android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" android:textStyle="bold" />
android:paddingBottom="5dp"
android:textAlignment="center"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<RelativeLayout <RelativeLayout
android:id="@+id/muc_settings"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:id="@+id/muc_settings">
<TextView <TextView
android:id="@+id/muc_conference_type" android:id="@+id/muc_conference_type"
@ -74,21 +79,21 @@
android:id="@+id/notification_status_text" android:id="@+id/notification_status_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/notify_on_all_messages"
android:layout_centerVertical="true"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/notification_status_button" /> android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/notification_status_button"
android:text="@string/notify_on_all_messages"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" />
<ImageButton <ImageButton
android:id="@+id/notification_status_button" android:id="@+id/notification_status_button"
style="?android:attr/buttonStyleSmall" style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:padding="@dimen/image_button_padding" android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_notifications_grey600_24dp" /> android:src="@drawable/ic_notifications_grey600_24dp" />
@ -112,13 +117,14 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:text="@string/account_settings_example_jabber_id" android:text="@string/account_settings_example_jabber_id"
android:textColor="@color/black87" android:textColor="@color/black87"
android:textIsSelectable="true"
android:textSize="?attr/TextSizeHeadline" android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" android:textStyle="bold"
android:textIsSelectable="true"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
<LinearLayout <android.support.v7.widget.CardView
android:id="@+id/muc_more_details" android:id="@+id/muc_more_details"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -126,10 +132,14 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/infocard_padding"> android:padding="@dimen/infocard_padding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/infocard_padding">
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -142,12 +152,12 @@
android:layout_height="72dp" android:layout_height="72dp"
android:layout_alignParentEnd="false" android:layout_alignParentEnd="false"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentRight="false"
android:padding="1dp" android:padding="1dp"
android:src="@drawable/ic_profile" android:src="@drawable/ic_profile"
app:riv_corner_radius="36dp"
app:riv_border_width="1dp"
app:riv_border_color="@color/grey500" app:riv_border_color="@color/grey500"
android:layout_alignParentRight="false" /> app:riv_border_width="1dp"
app:riv_corner_radius="36dp" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -192,8 +202,7 @@
android:layout_weight="1" android:layout_weight="1"
android:divider="?android:dividerHorizontal" android:divider="?android:dividerHorizontal"
android:orientation="vertical" android:orientation="vertical"
android:showDividers="middle"> android:showDividers="middle"></LinearLayout>
</LinearLayout>
<Button <Button
android:id="@+id/invite" android:id="@+id/invite"
@ -212,25 +221,28 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:text="@string/destroy_muc" /> android:text="@string/destroy_muc" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
<LinearLayout <android.support.v7.widget.CardView
android:layout_width="fill_parent" android:id="@+id/muc_info_more"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/infocard_padding" android:padding="@dimen/infocard_padding"
android:id="@+id/muc_info_more"
android:shrinkColumns="0"
android:stretchColumns="1"
android:visibility="gone"> android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/infocard_padding">
<TableLayout <TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -243,11 +255,11 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/server_info_mam" android:text="@string/server_info_mam"
android:textColor="@color/black87" android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody" />
android:singleLine="true"
android:ellipsize="end" />
<TextView <TextView
android:id="@+id/muc_info_mam" android:id="@+id/muc_info_mam"
@ -258,9 +270,8 @@
android:textColor="@color/black87" android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>