From 15e30e50aabf9482d9cb705ce8788027a95393e2 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Mon, 29 Sep 2014 12:49:26 -0400 Subject: Fix typos in string resource --- res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 8d976dce..a4302a24 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -256,10 +256,10 @@ Use larger font sizes across the entire app Send button indicates status Request message receipts - Received masseges will be marked with a green tick. Be aware that this might no work in every case. + Received messages will be marked with a green tick if supported. Colorize send button to indicate contact status Other Conference name Use room’s subject instead of JID to identify conferences - \ No newline at end of file + -- cgit v1.2.3 From 503d9e7a1e92fc1345e408f33ca1a4a346abf0b9 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Mon, 29 Sep 2014 13:03:53 -0400 Subject: Remove full stop in description for consistency --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a4302a24..b1156e27 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -256,7 +256,7 @@ Use larger font sizes across the entire app Send button indicates status Request message receipts - Received messages will be marked with a green tick if supported. + Received messages will be marked with a green tick if supported Colorize send button to indicate contact status Other Conference name -- cgit v1.2.3 From 19fef19d5d6a9e8cb124def32b88cf104b87e80b Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 10 Oct 2014 16:46:13 +0200 Subject: updated mtm to latest version --- libs/MemorizingTrustManager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/MemorizingTrustManager b/libs/MemorizingTrustManager index 452f7020..3f67eba2 160000 --- a/libs/MemorizingTrustManager +++ b/libs/MemorizingTrustManager @@ -1 +1 @@ -Subproject commit 452f70208f0dd5f9e56376944e96f5c10704245e +Subproject commit 3f67eba2e4663841dd0024908f8ffb2613078140 -- cgit v1.2.3 From 2a57d76191d051944dce8a2ff2992e1a102cdae8 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 12 Oct 2014 15:08:02 +0200 Subject: updated flattr url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da376cf6..9fc74fdd 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ transfer (SEPA). My Bitcoin Address is: 1NxSU1YxYzJVDpX1rcESAA3NJki7kRgeeu -[![Flattr this!](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=inputmice&url=https%3A%2F%2Fgithub.com%2Fsiacs%2FConversations) +[![Flattr this!](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=inputmice&url=http%3A%2F%2Fconversations.siacs.eu&title=Conversations&tags=github&category=software) ####How do I create an account? XMPP like email for example is a federated protocol which means that there is -- cgit v1.2.3 From 0b05acc50c82d63e0cbe8ec10d0f301fb648f054 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 12 Oct 2014 15:18:52 +0200 Subject: added rendered version of logo --- art/logo.png | Bin 0 -> 53734 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 art/logo.png diff --git a/art/logo.png b/art/logo.png new file mode 100644 index 00000000..a8ab6176 Binary files /dev/null and b/art/logo.png differ -- cgit v1.2.3 From 2ec021a42629120e8b4f1ae5a95027ec414b2b5c Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 13 Oct 2014 12:36:41 +0200 Subject: redesigned contact details a bit --- res/layout/activity_contact_details.xml | 158 +++++++++------------ res/layout/contact_key.xml | 5 +- res/values/strings.xml | 3 +- .../conversations/ui/ContactDetailsActivity.java | 10 +- 4 files changed, 84 insertions(+), 92 deletions(-) diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index f4fd9c1e..1dceab53 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -1,128 +1,110 @@ - + android:background="@color/secondarybackground" + android:orientation="vertical" > - + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:padding="8dp" > - + - + android:layout_marginLeft="16dp" + android:layout_toRightOf="@+id/details_contact_badge" + android:orientation="vertical" > - + + android:orientation="horizontal" > + android:text=" · " + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> - - - - - - - - + - + + + android:layout_alignParentRight="true" + android:layout_below="@+id/details_jidbox" + android:layout_marginTop="32dp" + android:text="@string/using_account" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" /> + - - + - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml index e10f8420..7053857f 100644 --- a/res/layout/contact_key.xml +++ b/res/layout/contact_key.xml @@ -16,14 +16,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeHeadline" + android:textSize="?attr/TextSizeBody" android:typeface="monospace" /> + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo"/> You are banned from this conference This conference is members only You have been kicked from this conference + using account %s - + \ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java index 9926e126..394aab6e 100644 --- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -309,7 +309,7 @@ public class ContactDetailsActivity extends XmppActivity { } else { contactJidTv.setText(contact.getJid()); } - accountJidTv.setText(contact.getAccount().getJid()); + accountJidTv.setText(getString(R.string.using_account,contact.getAccount().getJid())); UIHelper.prepareContactBadge(this, badge, contact, getApplicationContext()); @@ -319,9 +319,11 @@ public class ContactDetailsActivity extends XmppActivity { } keys.removeAllViews(); + boolean hasKeys = false; LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); for (Iterator iterator = contact.getOtrFingerprints() .iterator(); iterator.hasNext();) { + hasKeys = true; final String otrFingerprint = iterator.next(); View view = (View) inflater.inflate(R.layout.contact_key, keys, false); @@ -342,6 +344,7 @@ public class ContactDetailsActivity extends XmppActivity { }); } if (contact.getPgpKeyId() != 0) { + hasKeys = true; View view = (View) inflater.inflate(R.layout.contact_key, keys, false); TextView key = (TextView) view.findViewById(R.id.key); @@ -370,6 +373,11 @@ public class ContactDetailsActivity extends XmppActivity { }); keys.addView(view); } + if (hasKeys) { + keys.setVisibility(View.VISIBLE); + } else { + keys.setVisibility(View.GONE); + } } protected void confirmToDeleteFingerprint(final String fingerprint) { -- cgit v1.2.3 From c423da46b20fd723d37fcc17722ecbeb64050c80 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 13 Oct 2014 12:36:56 +0200 Subject: added missing border --- res/drawable/infocard_border.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 res/drawable/infocard_border.xml diff --git a/res/drawable/infocard_border.xml b/res/drawable/infocard_border.xml new file mode 100644 index 00000000..9a4970c8 --- /dev/null +++ b/res/drawable/infocard_border.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file -- cgit v1.2.3 From a42f0dd3bc08308e4035ce42c7fbc11f1824d329 Mon Sep 17 00:00:00 2001 From: "M. Dietrich" Date: Wed, 8 Oct 2014 23:24:36 +0200 Subject: use setAlpha(float) method, not the depricated one --- src/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 2671cf50..dbf2184b 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -390,7 +390,7 @@ public class MessageAdapter extends ArrayAdapter { viewHolder.contact_picture.setImageBitmap(mBitmapCache.get( item.getConversation().getContact(), getContext())); - viewHolder.contact_picture.setAlpha(128); + viewHolder.contact_picture.setAlpha(0.5f); viewHolder.contact_picture .setOnClickListener(new OnClickListener() { -- cgit v1.2.3 From d61e4cce1075e3561406be96b402def5f90dcd58 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 13 Oct 2014 14:36:19 +0200 Subject: reworked muc details and contact details a bit --- art/ic_action_copy.svg | 108 -------------- art/render.rb | 2 +- res/drawable-hdpi/ic_action_copy.png | Bin 717 -> 381 bytes res/drawable-mdpi/ic_action_copy.png | Bin 585 -> 288 bytes res/drawable-xhdpi/ic_action_copy.png | Bin 763 -> 353 bytes res/drawable-xxhdpi/ic_action_copy.png | Bin 1040 -> 470 bytes res/drawable/section_header.xml | 11 -- res/layout/activity_contact_details.xml | 162 +++++++++++---------- res/layout/activity_edit_account.xml | 108 ++++++++------ res/layout/activity_muc_details.xml | 77 +++++----- res/values-nl/styles.xml | 19 --- res/values/styles.xml | 11 -- .../ui/ConferenceDetailsActivity.java | 3 + .../conversations/ui/EditAccountActivity.java | 12 +- 14 files changed, 190 insertions(+), 323 deletions(-) delete mode 100644 art/ic_action_copy.svg delete mode 100644 res/drawable/section_header.xml delete mode 100644 res/values-nl/styles.xml diff --git a/art/ic_action_copy.svg b/art/ic_action_copy.svg deleted file mode 100644 index 485fd2ed..00000000 --- a/art/ic_action_copy.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/art/render.rb b/art/render.rb index a78a2f47..f2d66b9a 100755 --- a/art/render.rb +++ b/art/render.rb @@ -1,6 +1,6 @@ #!/bin/env ruby 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| resolutions.each do |name, factor| size = factor * result[1] diff --git a/res/drawable-hdpi/ic_action_copy.png b/res/drawable-hdpi/ic_action_copy.png index b47bb69c..22327391 100644 Binary files a/res/drawable-hdpi/ic_action_copy.png and b/res/drawable-hdpi/ic_action_copy.png differ diff --git a/res/drawable-mdpi/ic_action_copy.png b/res/drawable-mdpi/ic_action_copy.png index 75788f1f..71348202 100644 Binary files a/res/drawable-mdpi/ic_action_copy.png and b/res/drawable-mdpi/ic_action_copy.png differ diff --git a/res/drawable-xhdpi/ic_action_copy.png b/res/drawable-xhdpi/ic_action_copy.png index a45423f6..5ddf1513 100644 Binary files a/res/drawable-xhdpi/ic_action_copy.png and b/res/drawable-xhdpi/ic_action_copy.png differ diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/res/drawable-xxhdpi/ic_action_copy.png index 3a0e8449..a0508df8 100644 Binary files a/res/drawable-xxhdpi/ic_action_copy.png and b/res/drawable-xxhdpi/ic_action_copy.png differ diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml deleted file mode 100644 index 9db04f90..00000000 --- a/res/drawable/section_header.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index 1dceab53..f7cb2198 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -1,110 +1,114 @@ - + - - - + android:orientation="vertical" > - + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:padding="16dp" > - + + android:layout_marginLeft="16dp" + android:layout_toRightOf="@+id/details_contact_badge" + android:orientation="vertical" > + android:text="@string/account_settings_example_jabber_id" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> - + + + + + + + + + - - - - - + android:layout_alignParentRight="true" + android:layout_below="@+id/details_jidbox" + android:layout_marginTop="32dp" + android:text="@string/using_account" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" /> + - - - - + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:padding="8dp" + android:showDividers="middle" > + - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml index 91bda7b1..97289628 100644 --- a/res/layout/activity_edit_account.xml +++ b/res/layout/activity_edit_account.xml @@ -2,7 +2,7 @@ + android:background="@color/secondarybackground" > + android:padding="16dp" > + android:inputType="textEmailAddress" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + android:visibility="gone" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> - - - + android:text="@string/server_info_session_established" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:text="@string/server_info_stream_management" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:text="@string/server_info_carbon_messages" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> - + + android:id="@+id/otr_fingerprint_box" + android:layout_marginTop="32dp"> + + android:orientation="vertical"> + + + android:visibility="visible" /> + + @@ -251,4 +269,4 @@ android:textColor="@color/secondarytext" /> - + \ No newline at end of file diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index 1a676548..f689f10d 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -1,46 +1,35 @@ + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/secondarybackground" > - + - - - + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:layout_marginBottom="16dp"/> + + 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" /> + + + + -