moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-02 13:42:18 -05:00
Code Issues Releases Wiki Activity

redesigned contact details a bit

Browse Source
This commit is contained in:
iNPUTmice 2014-10-13 12:36:41 +02:00
parent 0b05acc50c
commit 2ec021a426
4 changed files with 90 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
res/layout/activity_contact_details.xml
View File

@ -1,101 +1,75 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/primarybackground" > android:background="@color/secondarybackground"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical" >
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/action_contact_details"
android:textColor="@color/primarytext" />
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="88dp" android:layout_margin="8dp"
android:background="@drawable/infocard_border"
android:padding="8dp" > android:padding="8dp" >
<QuickContactBadge <QuickContactBadge
android:id="@+id/details_contact_badge" android:id="@+id/details_contact_badge"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_centerVertical="true" android:layout_alignParentTop="true"
android:scaleType="centerCrop" /> android:scaleType="centerCrop" />
<LinearLayout <LinearLayout
android:id="@+id/details_jidbox" android:id="@+id/details_jidbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginLeft="16dp"
android:layout_toRightOf="@+id/details_contact_badge" android:layout_toRightOf="@+id/details_contact_badge"
android:orientation="vertical" android:orientation="vertical" >
android:paddingLeft="8dp" >
<TextView <TextView
android:id="@+id/details_contactjid" android:id="@+id/details_contactjid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/account_settings_example_jabber_id"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<TextView <TextView
android:id="@+id/details_contactstatus" android:id="@+id/details_contactstatus"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:textColor="@color/secondarytext"
android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" />
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" · "
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody" />
<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:paddingLeft="8dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/primarytext" android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/your_account"
android:textColor="@color/primarytext" />
<TextView
android:id="@+id/details_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/subscriptions"
android:textColor="@color/primarytext" />
<CheckBox <CheckBox
android:id="@+id/details_send_presence" android:id="@+id/details_send_presence"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/send_presence_updates" android:text="@string/send_presence_updates"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
@ -107,22 +81,30 @@
android:text="@string/receive_presence_updates" android:text="@string/receive_presence_updates"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
</LinearLayout>
<TextView <TextView
style="@style/sectionHeader" android:id="@+id/details_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:layout_alignParentRight="true"
android:text="@string/keys" /> android:layout_below="@+id/details_jidbox"
android:layout_marginTop="32dp"
android:text="@string/using_account"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeInfo" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/details_contact_keys" android:id="@+id/details_contact_keys"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp"
android:background="@drawable/infocard_border"
android:divider="?android:dividerHorizontal" android:divider="?android:dividerHorizontal"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp"
android:showDividers="middle" > android:showDividers="middle" >
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </LinearLayout>

5
res/layout/contact_key.xml
View File

@ -16,14 +16,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeHeadline" android:textSize="?attr/TextSizeBody"
android:typeface="monospace" /> android:typeface="monospace" />
<TextView <TextView
android:id="@+id/key_type" android:id="@+id/key_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/secondarytext" /> android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeInfo"/>
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton

1
res/values/strings.xml
View File

@ -265,5 +265,6 @@
<string name="conference_banned">You are banned from this conference</string> <string name="conference_banned">You are banned from this conference</string>
<string name="conference_members_only">This conference is members only</string> <string name="conference_members_only">This conference is members only</string>
<string name="conference_kicked">You have been kicked from this conference</string> <string name="conference_kicked">You have been kicked from this conference</string>
<string name="using_account">using account %s</string>
</resources> </resources>

10
src/eu/siacs/conversations/ui/ContactDetailsActivity.java
View File

@ -309,7 +309,7 @@ public class ContactDetailsActivity extends XmppActivity {
} else { } else {
contactJidTv.setText(contact.getJid()); contactJidTv.setText(contact.getJid());
} }
accountJidTv.setText(contact.getAccount().getJid()); accountJidTv.setText(getString(R.string.using_account,contact.getAccount().getJid()));
UIHelper.prepareContactBadge(this, badge, contact, UIHelper.prepareContactBadge(this, badge, contact,
getApplicationContext()); getApplicationContext());
@ -319,9 +319,11 @@ public class ContactDetailsActivity extends XmppActivity {
} }
keys.removeAllViews(); keys.removeAllViews();
boolean hasKeys = false;
LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
for (Iterator<String> iterator = contact.getOtrFingerprints() for (Iterator<String> iterator = contact.getOtrFingerprints()
.iterator(); iterator.hasNext();) { .iterator(); iterator.hasNext();) {
hasKeys = true;
final String otrFingerprint = iterator.next(); final String otrFingerprint = iterator.next();
View view = (View) inflater.inflate(R.layout.contact_key, keys, View view = (View) inflater.inflate(R.layout.contact_key, keys,
false); false);
@ -342,6 +344,7 @@ public class ContactDetailsActivity extends XmppActivity {
}); });
} }
if (contact.getPgpKeyId() != 0) { if (contact.getPgpKeyId() != 0) {
hasKeys = true;
View view = (View) inflater.inflate(R.layout.contact_key, keys, View view = (View) inflater.inflate(R.layout.contact_key, keys,
false); false);
TextView key = (TextView) view.findViewById(R.id.key); TextView key = (TextView) view.findViewById(R.id.key);
@ -370,6 +373,11 @@ public class ContactDetailsActivity extends XmppActivity {
}); });
keys.addView(view); keys.addView(view);
} }
if (hasKeys) {
keys.setVisibility(View.VISIBLE);
} else {
keys.setVisibility(View.GONE);
}
} }
protected void confirmToDeleteFingerprint(final String fingerprint) { protected void confirmToDeleteFingerprint(final String fingerprint) {