moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-27 19:22:15 -05:00
Code Issues Releases Wiki Activity

reworked muc details and contact details a bit

Browse Source
This commit is contained in:
iNPUTmice 2014-10-13 14:36:19 +02:00
parent c423da46b2
commit d61e4cce10
14 changed files with 193 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
art/ic_action_copy.svg
View File

@ -1,108 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="128"
height="128"
id="svg4066"
version="1.1"
inkscape:version="0.48.5 r10040"
sodipodi:docname="ic_action_copy.svg">
<defs
id="defs4068" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.54117647"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.67"
inkscape:cx="51.750573"
inkscape:cy="57.547291"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
borderlayer="false"
inkscape:window-width="1035"
inkscape:window-height="853"
inkscape:window-x="369"
inkscape:window-y="3"
inkscape:window-maximized="0" />
<metadata
id="metadata4071">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-924.36218)">
<rect
ry="0"
height="91.708199"
width="71.625328"
stroke-miterlimit="4"
y="952.36743"
x="42.730034"
id="rect10"
style="fill:none;stroke:#000000;stroke-width:8.6679945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.54117647;stroke-dasharray:none"
inkscape:transform-center-x="-21.391573"
inkscape:transform-center-y="28.294015" />
<path
style="fill:#000000;fill-opacity:0.5411765;fill-rule:evenodd;stroke:#000000;stroke-width:0.41999999999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117649999999995;stroke-miterlimit:4;stroke-dasharray:none"
d="m 20.552281,933.36985 0,0.0209 -0.128276,0 -0.399078,99.83215 0.213792,0 0,0.1463 13.212333,-0.021 0.05701,-8.1392 -4.076297,0.011 0.327814,-84.87039 58.436429,0 0.0285,3.427 11.10293,0 -0.0855,-9.25707 -0.057,0 0,-1.1493 -78.63263,0 z"
id="rect12-6"
inkscape:connector-curvature="0" />
<rect
height="4.7259107"
width="37.242958"
y="967.49921"
x="50.137043"
id="rect12"
style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.23799089px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647" />
<rect
style="fill:#000000;fill-opacity:0.54117647000000002;fill-rule:evenodd;stroke:#000000;stroke-width:0.274;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647000000002;stroke-miterlimit:4;stroke-dasharray:none"
id="rect4272"
x="50.137043"
y="982.49921"
width="49.452484"
height="4.7259107" />
<rect
height="4.7259107"
width="43.542446"
y="997.49921"
x="50.137043"
id="rect4274"
style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.2573325px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647" />
<rect
style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.25050664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647"
id="rect4276"
x="50.137043"
y="1012.4992"
width="41.263123"
height="4.7259107" />
<rect
height="4.7259107"
width="49.397911"
y="1027.4993"
x="50.137043"
id="rect4278"
style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.27408957px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

2
art/render.rb
View File

@ -1,6 +1,6 @@
#!/bin/env ruby #!/bin/env ruby
resolutions={'mdpi'=> 1, 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3} resolutions={'mdpi'=> 1, 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3}
images = { 'conversations.svg' => ['ic_launcher', 48], 'conversations_baloon.svg' => ['ic_activity', 32], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12], 'ic_action_copy.svg' => ['ic_action_copy', 32] } images = { 'conversations.svg' => ['ic_launcher', 48], 'conversations_baloon.svg' => ['ic_activity', 32], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12] }
images.each do |source, result| images.each do |source, result|
resolutions.each do |name, factor| resolutions.each do |name, factor|
size = factor * result[1] size = factor * result[1]

BIN
res/drawable-hdpi/ic_action_copy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 717 B

After

Width:  |  Height:  |  Size: 381 B

BIN
res/drawable-mdpi/ic_action_copy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 585 B

After

Width:  |  Height:  |  Size: 288 B

BIN
res/drawable-xhdpi/ic_action_copy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 763 B

After

Width:  |  Height:  |  Size: 353 B

BIN
res/drawable-xxhdpi/ic_action_copy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 470 B

11
res/drawable/section_header.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<size
android:height="1.5dp"
android:width="2000dp" />
<solid android:color="@color/divider" />
</shape>

18
res/layout/activity_contact_details.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="match_parent" android:layout_height="fill_parent"
android:background="@color/secondarybackground" android:background="@color/secondarybackground" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical" >
<RelativeLayout <RelativeLayout
@ -10,7 +14,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:background="@drawable/infocard_border" android:background="@drawable/infocard_border"
android:padding="8dp" > android:padding="16dp" >
<QuickContactBadge <QuickContactBadge
android:id="@+id/details_contact_badge" android:id="@+id/details_contact_badge"
@ -31,7 +35,6 @@
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:singleLine="true"
android:text="@string/account_settings_example_jabber_id" android:text="@string/account_settings_example_jabber_id"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeHeadline" android:textSize="?attr/TextSizeHeadline"
@ -106,5 +109,6 @@
android:padding="8dp" android:padding="8dp"
android:showDividers="middle" > android:showDividers="middle" >
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

104
res/layout/activity_edit_account.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout 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" >
<ScrollView <ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -19,8 +19,10 @@
android:id="@+id/editor" android:id="@+id/editor"
android:layout_width="fill_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:orientation="vertical" android:orientation="vertical"
android:padding="8dp" > android:padding="16dp" >
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -34,7 +36,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/account_settings_example_jabber_id" android:hint="@string/account_settings_example_jabber_id"
android:inputType="textEmailAddress" /> android:inputType="textEmailAddress"
android:textColor="@color/primarytext"
android:textColorHint="@color/secondarytext"
android:textSize="?attr/TextSizeBody" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -49,7 +54,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/password" android:hint="@string/password"
android:inputType="textPassword" /> android:inputType="textPassword"
android:textColor="@color/primarytext"
android:textColorHint="@color/secondarytext"
android:textSize="?attr/TextSizeBody" />
<CheckBox <CheckBox
android:id="@+id/account_register_new" android:id="@+id/account_register_new"
@ -76,31 +84,25 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:hint="@string/confirm_password" android:hint="@string/confirm_password"
android:inputType="textPassword" android:inputType="textPassword"
android:visibility="gone" /> android:visibility="gone"
android:textColor="@color/primarytext"
android:textColorHint="@color/secondarytext"
android:textSize="?attr/TextSizeBody" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/stats" android:id="@+id/stats"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginTop="8dp" android:layout_margin="8dp"
android:background="@drawable/infocard_border"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp" android:padding="16dp"
android:visibility="gone" > android:visibility="gone" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/additional_information"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" />
<TableLayout <TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:stretchColumns="1" > android:stretchColumns="1" >
<TableRow <TableRow
@ -110,13 +112,17 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_session_established" /> android:text="@string/server_info_session_established"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<TextView <TextView
android:id="@+id/session_est" android:id="@+id/session_est"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" /> android:layout_gravity="right"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
</TableRow> </TableRow>
<TableRow <TableRow
@ -127,13 +133,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_pep" android:text="@string/server_info_pep"
android:textColor="@color/primarytext" /> android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<TextView <TextView
android:id="@+id/server_info_pep" android:id="@+id/server_info_pep"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" /> android:layout_gravity="right"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
</TableRow> </TableRow>
<TableRow <TableRow
@ -143,13 +152,17 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_stream_management" /> android:text="@string/server_info_stream_management"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<TextView <TextView
android:id="@+id/server_info_sm" android:id="@+id/server_info_sm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" /> android:layout_gravity="right"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
</TableRow> </TableRow>
<TableRow <TableRow
@ -159,59 +172,64 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_carbon_messages" /> android:text="@string/server_info_carbon_messages"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<TextView <TextView
android:id="@+id/server_info_carbons" android:id="@+id/server_info_carbons"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" /> android:layout_gravity="right"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
<TextView
android:id="@+id/otr_fingerprint_headline"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center_horizontal"
android:text="@string/otr_fingerprint"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" />
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="8dp"> android:id="@+id/otr_fingerprint_box"
android:layout_marginTop="32dp">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/action_copy_to_clipboard" android:layout_toLeftOf="@+id/action_copy_to_clipboard"
android:orientation="vertical" android:orientation="vertical">
android:layout_centerVertical="true">
<TextView <TextView
android:id="@+id/otr_fingerprint" android:id="@+id/otr_fingerprint"
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:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
android:typeface="monospace" /> android:typeface="monospace" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeInfo"
android:text="@string/otr_fingerprint"/>
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:id="@+id/action_copy_to_clipboard" android:id="@+id/action_copy_to_clipboard"
android:layout_width="32dp" android:layout_width="wrap_content"
android:layout_height="32dp" android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:padding="4dp" android:background="?android:selectableItemBackground"
android:scaleType="fitXY" android:padding="8dp"
android:src="@drawable/ic_action_copy" android:src="@drawable/ic_action_copy"
android:visibility="invisible" /> android:visibility="visible" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

67
res/layout/activity_muc_details.xml
View File

@ -1,46 +1,35 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="match_parent" android:layout_height="fill_parent"
android:background="@color/primarybackground" > android:background="@color/secondarybackground" >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <LinearLayout
style="@style/sectionHeader" android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:layout_margin="8dp"
android:text="@string/muc_details_conference" /> android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="16dp" >
<TextView <TextView
android:id="@+id/muc_jabberid" android:id="@+id/muc_jabberid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp"
android:singleLine="true"
android:text="@string/account_settings_example_jabber_id" 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"
<TextView android:layout_marginBottom="16dp"/>
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:text="@string/you" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:background="?android:attr/activatedBackgroundIndicator"
android:padding="8dp"
android:paddingBottom="8dp" >
<ImageView <ImageView
android:id="@+id/your_photo" android:id="@+id/your_photo"
@ -85,22 +74,26 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_action_edit_dark" /> android:src="@drawable/ic_action_edit_dark" />
</RelativeLayout> </RelativeLayout>
<TextView
android:id="@+id/details_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="32dp"
android:text="@string/using_account"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeInfo" />
</LinearLayout>
<LinearLayout <LinearLayout
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="fill_parent"
android:orientation="vertical" >
<TextView
android:id="@+id/muc_participants_header"
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:layout_margin="8dp"
android:paddingRight="8dp" android:background="@drawable/infocard_border"
android:paddingTop="8dp" android:orientation="vertical"
android:text="@string/muc_details_other_members" /> android:padding="8dp" >
<LinearLayout <LinearLayout
android:id="@+id/muc_members" android:id="@+id/muc_members"
@ -111,7 +104,6 @@
android:orientation="vertical" android:orientation="vertical"
android:showDividers="middle" > android:showDividers="middle" >
</LinearLayout> </LinearLayout>
</LinearLayout>
<Button <Button
android:id="@+id/invite" android:id="@+id/invite"
@ -123,4 +115,5 @@
android:text="@string/invite_contact" /> android:text="@string/invite_contact" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>

19
res/values-nl/styles.xml
View File

@ -1,19 +0,0 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
<item name="android:drawableBottom">@drawable/section_header</item>
<item name="android:drawablePadding">4dp</item>
<item name="android:layout_marginTop">8dp</item>
<item name="android:textSize">14sp</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">#5b5b5b</item>
<item name="android:textStyle">bold</item>
</style>
<style name="Divider">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1.5dp</item>
<item name="android:background">#b7b7b7</item>
</style>
</resources>

11
res/values/styles.xml
View File

@ -1,15 +1,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
<item name="android:drawableBottom">@drawable/section_header</item>
<item name="android:drawablePadding">4dp</item>
<item name="android:layout_marginTop">8dp</item>
<item name="android:textSize">14sp</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">@color/primarytext</item>
<item name="android:textStyle">bold</item>
</style>
<style name="Divider"> <style name="Divider">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1.5dp</item> <item name="android:layout_height">1.5dp</item>

3
src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -41,6 +41,7 @@ public class ConferenceDetailsActivity extends XmppActivity {
private ImageButton mEditNickButton; private ImageButton mEditNickButton;
private TextView mRoleAffiliaton; private TextView mRoleAffiliaton;
private TextView mFullJid; private TextView mFullJid;
private TextView mAccountJid;
private LinearLayout membersView; private LinearLayout membersView;
private LinearLayout mMoreDetails; private LinearLayout mMoreDetails;
private Button mInviteButton; private Button mInviteButton;
@ -78,6 +79,7 @@ public class ConferenceDetailsActivity extends XmppActivity {
mEditNickButton = (ImageButton) findViewById(R.id.edit_nick_button); mEditNickButton = (ImageButton) findViewById(R.id.edit_nick_button);
mFullJid = (TextView) findViewById(R.id.muc_jabberid); mFullJid = (TextView) findViewById(R.id.muc_jabberid);
membersView = (LinearLayout) findViewById(R.id.muc_members); membersView = (LinearLayout) findViewById(R.id.muc_members);
mAccountJid = (TextView) findViewById(R.id.details_account);
mMoreDetails = (LinearLayout) findViewById(R.id.muc_more_details); mMoreDetails = (LinearLayout) findViewById(R.id.muc_more_details);
mMoreDetails.setVisibility(View.GONE); mMoreDetails.setVisibility(View.GONE);
mInviteButton = (Button) findViewById(R.id.invite); mInviteButton = (Button) findViewById(R.id.invite);
@ -199,6 +201,7 @@ public class ConferenceDetailsActivity extends XmppActivity {
} }
private void populateView() { private void populateView() {
mAccountJid.setText(getString(R.string.using_account,conversation.getAccount().getJid()));
mYourPhoto.setImageBitmap(conversation.getAccount().getImage(this, 48)); mYourPhoto.setImageBitmap(conversation.getAccount().getImage(this, 48));
setTitle(conversation.getName()); setTitle(conversation.getName());
mFullJid.setText(conversation.getContactJid().split("/", 2)[0]); mFullJid.setText(conversation.getContactJid().split("/", 2)[0]);

12
src/eu/siacs/conversations/ui/EditAccountActivity.java
View File

@ -17,6 +17,7 @@ import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
@ -43,7 +44,7 @@ public class EditAccountActivity extends XmppActivity {
private TextView mServerInfoPep; private TextView mServerInfoPep;
private TextView mSessionEst; private TextView mSessionEst;
private TextView mOtrFingerprint; private TextView mOtrFingerprint;
private TextView mOtrFingerprintHeadline; private RelativeLayout mOtrFingerprintBox;
private ImageButton mOtrFingerprintToClipboardButton; private ImageButton mOtrFingerprintToClipboardButton;
private String jidToEdit; private String jidToEdit;
@ -277,7 +278,7 @@ public class EditAccountActivity extends XmppActivity {
this.mServerInfoSm = (TextView) findViewById(R.id.server_info_sm); this.mServerInfoSm = (TextView) findViewById(R.id.server_info_sm);
this.mServerInfoPep = (TextView) findViewById(R.id.server_info_pep); this.mServerInfoPep = (TextView) findViewById(R.id.server_info_pep);
this.mOtrFingerprint = (TextView) findViewById(R.id.otr_fingerprint); this.mOtrFingerprint = (TextView) findViewById(R.id.otr_fingerprint);
this.mOtrFingerprintHeadline = (TextView) findViewById(R.id.otr_fingerprint_headline); this.mOtrFingerprintBox = (RelativeLayout) findViewById(R.id.otr_fingerprint_box);
this.mOtrFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard); this.mOtrFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard);
this.mSaveButton = (Button) findViewById(R.id.save_button); this.mSaveButton = (Button) findViewById(R.id.save_button);
this.mCancelButton = (Button) findViewById(R.id.cancel_button); this.mCancelButton = (Button) findViewById(R.id.cancel_button);
@ -378,8 +379,7 @@ public class EditAccountActivity extends XmppActivity {
final String fingerprint = this.mAccount final String fingerprint = this.mAccount
.getOtrFingerprint(xmppConnectionService); .getOtrFingerprint(xmppConnectionService);
if (fingerprint != null) { if (fingerprint != null) {
this.mOtrFingerprintHeadline.setVisibility(View.VISIBLE); this.mOtrFingerprintBox.setVisibility(View.VISIBLE);
this.mOtrFingerprint.setVisibility(View.VISIBLE);
this.mOtrFingerprint.setText(fingerprint); this.mOtrFingerprint.setText(fingerprint);
this.mOtrFingerprintToClipboardButton this.mOtrFingerprintToClipboardButton
.setVisibility(View.VISIBLE); .setVisibility(View.VISIBLE);
@ -398,9 +398,7 @@ public class EditAccountActivity extends XmppActivity {
} }
}); });
} else { } else {
this.mOtrFingerprintToClipboardButton.setVisibility(View.GONE); this.mOtrFingerprintBox.setVisibility(View.GONE);
this.mOtrFingerprint.setVisibility(View.GONE);
this.mOtrFingerprintHeadline.setVisibility(View.GONE);
} }
} else { } else {
if (this.mAccount.errorStatus()) { if (this.mAccount.errorStatus()) {