From 1cd5949a79838f74843914a30fb40429bb2e7e8b Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 9 Sep 2014 22:16:30 +0200 Subject: added a list of XEPs --- docs/XEPs.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docs/XEPs.md diff --git a/docs/XEPs.md b/docs/XEPs.md new file mode 100644 index 000000000..38eece439 --- /dev/null +++ b/docs/XEPs.md @@ -0,0 +1,16 @@ +* XEP-0030: Service Discovery +* XEP-0045: Multi-User Chat +* XEP-0115: Entity Capabilities +* XEP-0138: Stream Compression +* XEP-0163: Personal Eventing Protocol (avatars and nicks) +* XEP-0166: Jingle (only used for file transfer) +* XEP-0184: Message Delivery Receipts (reply only) +* XEP-0198: Stream Management +* XEP-0234: Jingle File Transfer +* XEP-0237: Roster Versioning +* XEP-0249: Direct MUC Invitations (receiving only) +* XEP-0260: Jingle SOCKS5 Bytestreams Transport Method +* XEP-0261: Jingle In-Band Bytestreams Transport Method +* XEP-0280: Message Carbons +* XEP-0333: Chat Markers +* XEP-0352: Client State Indication -- cgit v1.2.3 From a1d6f91036d2164eb59442248890d26c99a59ab7 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 9 Sep 2014 22:51:25 +0200 Subject: added bookmarks to XEP list --- docs/XEPs.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/XEPs.md b/docs/XEPs.md index 38eece439..8d1d0d5c5 100644 --- a/docs/XEPs.md +++ b/docs/XEPs.md @@ -1,5 +1,6 @@ * XEP-0030: Service Discovery * XEP-0045: Multi-User Chat +* XEP-0048: Bookmarks * XEP-0115: Entity Capabilities * XEP-0138: Stream Compression * XEP-0163: Personal Eventing Protocol (avatars and nicks) -- cgit v1.2.3 From a6d4a9cda1684d9a316146de4c6797834f7b0121 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 10 Sep 2014 17:58:37 +0200 Subject: started development on 0.8-alpha --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3999b4876..d9a5f44da 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="27" + android:versionName="0.8-alpha" > Date: Wed, 10 Sep 2014 17:59:57 +0200 Subject: IT'S CHRISTMAS ALREADY! --- art/ic_action_send_now.svg | 69 ++++++++++++++ res/drawable-hdpi/ic_action_send_now.png | Bin 578 -> 0 bytes res/drawable-hdpi/ic_action_send_now_away.png | Bin 0 -> 932 bytes res/drawable-hdpi/ic_action_send_now_dnd.png | Bin 0 -> 1135 bytes res/drawable-hdpi/ic_action_send_now_offline.png | Bin 0 -> 767 bytes res/drawable-hdpi/ic_action_send_now_online.png | Bin 0 -> 1095 bytes res/drawable-mdpi/ic_action_send_now_away.png | Bin 0 -> 650 bytes res/drawable-mdpi/ic_action_send_now_dnd.png | Bin 0 -> 784 bytes res/drawable-mdpi/ic_action_send_now_offline.png | Bin 0 -> 535 bytes res/drawable-mdpi/ic_action_send_now_online.png | Bin 0 -> 779 bytes res/drawable-xhdpi/ic_action_send_now.png | Bin 759 -> 0 bytes res/drawable-xhdpi/ic_action_send_now_away.png | Bin 0 -> 1180 bytes res/drawable-xhdpi/ic_action_send_now_dnd.png | Bin 0 -> 1438 bytes res/drawable-xhdpi/ic_action_send_now_offline.png | Bin 0 -> 968 bytes res/drawable-xhdpi/ic_action_send_now_online.png | Bin 0 -> 1395 bytes res/drawable-xxhdpi/ic_action_send_now_away.png | Bin 0 -> 1426 bytes res/drawable-xxhdpi/ic_action_send_now_dnd.png | Bin 0 -> 1456 bytes res/drawable-xxhdpi/ic_action_send_now_offline.png | Bin 0 -> 1433 bytes res/drawable-xxhdpi/ic_action_send_now_online.png | Bin 0 -> 1458 bytes res/layout/fragment_conversation.xml | 2 +- res/values/strings.xml | 2 + res/xml/preferences.xml | 5 + .../services/XmppConnectionService.java | 11 ++- .../conversations/ui/ConversationActivity.java | 104 ++++++++++++++------- .../conversations/ui/ConversationFragment.java | 53 ++++++++++- 25 files changed, 205 insertions(+), 41 deletions(-) create mode 100644 art/ic_action_send_now.svg delete mode 100644 res/drawable-hdpi/ic_action_send_now.png create mode 100644 res/drawable-hdpi/ic_action_send_now_away.png create mode 100644 res/drawable-hdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-hdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-hdpi/ic_action_send_now_online.png create mode 100644 res/drawable-mdpi/ic_action_send_now_away.png create mode 100644 res/drawable-mdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-mdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-mdpi/ic_action_send_now_online.png delete mode 100644 res/drawable-xhdpi/ic_action_send_now.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_away.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_online.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_away.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_online.png diff --git a/art/ic_action_send_now.svg b/art/ic_action_send_now.svg new file mode 100644 index 000000000..6bde9158f --- /dev/null +++ b/art/ic_action_send_now.svg @@ -0,0 +1,69 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/res/drawable-hdpi/ic_action_send_now.png b/res/drawable-hdpi/ic_action_send_now.png deleted file mode 100644 index ff0e369ee..000000000 Binary files a/res/drawable-hdpi/ic_action_send_now.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_action_send_now_away.png b/res/drawable-hdpi/ic_action_send_now_away.png new file mode 100644 index 000000000..505cbe63a Binary files /dev/null and b/res/drawable-hdpi/ic_action_send_now_away.png differ diff --git a/res/drawable-hdpi/ic_action_send_now_dnd.png b/res/drawable-hdpi/ic_action_send_now_dnd.png new file mode 100644 index 000000000..a376524d7 Binary files /dev/null and b/res/drawable-hdpi/ic_action_send_now_dnd.png differ diff --git a/res/drawable-hdpi/ic_action_send_now_offline.png b/res/drawable-hdpi/ic_action_send_now_offline.png new file mode 100644 index 000000000..d4d2d5103 Binary files /dev/null and b/res/drawable-hdpi/ic_action_send_now_offline.png differ diff --git a/res/drawable-hdpi/ic_action_send_now_online.png b/res/drawable-hdpi/ic_action_send_now_online.png new file mode 100644 index 000000000..48676f7bd Binary files /dev/null and b/res/drawable-hdpi/ic_action_send_now_online.png differ diff --git a/res/drawable-mdpi/ic_action_send_now_away.png b/res/drawable-mdpi/ic_action_send_now_away.png new file mode 100644 index 000000000..0fdca901a Binary files /dev/null and b/res/drawable-mdpi/ic_action_send_now_away.png differ diff --git a/res/drawable-mdpi/ic_action_send_now_dnd.png b/res/drawable-mdpi/ic_action_send_now_dnd.png new file mode 100644 index 000000000..c0aef36cc Binary files /dev/null and b/res/drawable-mdpi/ic_action_send_now_dnd.png differ diff --git a/res/drawable-mdpi/ic_action_send_now_offline.png b/res/drawable-mdpi/ic_action_send_now_offline.png new file mode 100644 index 000000000..7723f4aa9 Binary files /dev/null and b/res/drawable-mdpi/ic_action_send_now_offline.png differ diff --git a/res/drawable-mdpi/ic_action_send_now_online.png b/res/drawable-mdpi/ic_action_send_now_online.png new file mode 100644 index 000000000..39d00ee48 Binary files /dev/null and b/res/drawable-mdpi/ic_action_send_now_online.png differ diff --git a/res/drawable-xhdpi/ic_action_send_now.png b/res/drawable-xhdpi/ic_action_send_now.png deleted file mode 100644 index 373dde239..000000000 Binary files a/res/drawable-xhdpi/ic_action_send_now.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_send_now_away.png b/res/drawable-xhdpi/ic_action_send_now_away.png new file mode 100644 index 000000000..bb999d85d Binary files /dev/null and b/res/drawable-xhdpi/ic_action_send_now_away.png differ diff --git a/res/drawable-xhdpi/ic_action_send_now_dnd.png b/res/drawable-xhdpi/ic_action_send_now_dnd.png new file mode 100644 index 000000000..a0bf5561c Binary files /dev/null and b/res/drawable-xhdpi/ic_action_send_now_dnd.png differ diff --git a/res/drawable-xhdpi/ic_action_send_now_offline.png b/res/drawable-xhdpi/ic_action_send_now_offline.png new file mode 100644 index 000000000..6da9ff7bd Binary files /dev/null and b/res/drawable-xhdpi/ic_action_send_now_offline.png differ diff --git a/res/drawable-xhdpi/ic_action_send_now_online.png b/res/drawable-xhdpi/ic_action_send_now_online.png new file mode 100644 index 000000000..348ba657d Binary files /dev/null and b/res/drawable-xhdpi/ic_action_send_now_online.png differ diff --git a/res/drawable-xxhdpi/ic_action_send_now_away.png b/res/drawable-xxhdpi/ic_action_send_now_away.png new file mode 100644 index 000000000..12ec4d33f Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_send_now_away.png differ diff --git a/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/res/drawable-xxhdpi/ic_action_send_now_dnd.png new file mode 100644 index 000000000..7719f81a9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_send_now_dnd.png differ diff --git a/res/drawable-xxhdpi/ic_action_send_now_offline.png b/res/drawable-xxhdpi/ic_action_send_now_offline.png new file mode 100644 index 000000000..188958132 Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_send_now_offline.png differ diff --git a/res/drawable-xxhdpi/ic_action_send_now_online.png b/res/drawable-xxhdpi/ic_action_send_now_online.png new file mode 100644 index 000000000..29bde36e3 Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_send_now_online.png differ diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index b16e41132..91921fb56 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -58,7 +58,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:src="@drawable/ic_action_send_now" /> + android:src="@drawable/ic_action_send_now_offline" /> Please be very careful with those Increase font size Use larger font sizes across the entire app + Send button indicates status + Colorize send button to indicate a contacs status \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index f0d64e39c..47508c9e2 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -69,6 +69,11 @@ android:key="use_larger_font" android:title="@string/pref_use_larger_font" android:summary="@string/pref_use_larger_font_summary"/> + listAdapter; - private OnConversationUpdate onConvChanged = new OnConversationUpdate() { - - @Override - public void onConversationUpdate() { - runOnUiThread(new Runnable() { - - @Override - public void run() { - updateConversationList(); - if (paneShouldBeOpen) { - if (conversationList.size() >= 1) { - swapConversationFragment(); - } else { - startActivity(new Intent(getApplicationContext(), - StartConversationActivity.class)); - finish(); - } - } - ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager() - .findFragmentByTag("conversation"); - if (selectedFragment != null) { - selectedFragment.updateMessages(); - } - } - }); - } - }; - protected ConversationActivity activity = this; private Toast prepareImageToast; @@ -602,7 +577,7 @@ public class ConversationActivity extends XmppActivity { this.onBackendConnected(); } if (conversationList.size() >= 1) { - onConvChanged.onConversationUpdate(); + this.onConversationUpdate(); } } @@ -610,6 +585,8 @@ public class ConversationActivity extends XmppActivity { protected void onStop() { if (xmppConnectionServiceBound) { xmppConnectionService.removeOnConversationListChangedListener(); + xmppConnectionService.removeOnAccountListChangedListener(); + xmppConnectionService.removeOnRosterUpdateListener(); } super.onStop(); } @@ -672,8 +649,9 @@ public class ConversationActivity extends XmppActivity { public void registerListener() { if (xmppConnectionServiceBound) { - xmppConnectionService - .setOnConversationListChangedListener(this.onConvChanged); + xmppConnectionService.setOnConversationListChangedListener(this); + xmppConnectionService.setOnAccountListChangedListener(this); + xmppConnectionService.setOnRosterUpdateListener(this); } } @@ -806,7 +784,65 @@ public class ConversationActivity extends XmppActivity { } public boolean forceEncryption() { - return PreferenceManager.getDefaultSharedPreferences( - getApplicationContext()).getBoolean("force_encryption", false); + return getPreferences().getBoolean("force_encryption", false); + } + + public boolean useSendButtonToIndicateStatus() { + return getPreferences().getBoolean("send_button_status", false); + } + + @Override + public void onAccountUpdate() { + final ConversationFragment fragment = (ConversationFragment) getFragmentManager() + .findFragmentByTag("conversation"); + if (fragment != null) { + runOnUiThread(new Runnable() { + + @Override + public void run() { + fragment.updateMessages(); + } + }); + } + } + + @Override + public void onConversationUpdate() { + runOnUiThread(new Runnable() { + + @Override + public void run() { + updateConversationList(); + if (paneShouldBeOpen) { + if (conversationList.size() >= 1) { + swapConversationFragment(); + } else { + startActivity(new Intent(getApplicationContext(), + StartConversationActivity.class)); + finish(); + } + } + ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager() + .findFragmentByTag("conversation"); + if (selectedFragment != null) { + selectedFragment.updateMessages(); + } + } + }); + } + + @Override + public void onRosterUpdate() { + final ConversationFragment fragment = (ConversationFragment) getFragmentManager() + .findFragmentByTag("conversation"); + if (fragment != null) { + runOnUiThread(new Runnable() { + + @Override + public void run() { + fragment.updateMessages(); + } + }); + } } } diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index b73bcadbe..c6b129ad7 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -12,6 +12,7 @@ import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.Presences; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.ui.EditMessage.OnEnterPressed; import eu.siacs.conversations.ui.XmppActivity.OnPresenceSelected; @@ -61,6 +62,7 @@ public class ConversationFragment extends Fragment { protected String queuedPqpMessage = null; private EditMessage mEditMessage; + private ImageButton mSendButton; private String pastedText = null; private RelativeLayout snackbar; private TextView snackbarMessage; @@ -255,9 +257,8 @@ public class ConversationFragment extends Fragment { } }); - ImageButton sendButton = (ImageButton) view - .findViewById(R.id.textSendButton); - sendButton.setOnClickListener(this.mSendButtonListener); + mSendButton = (ImageButton) view.findViewById(R.id.textSendButton); + mSendButton.setOnClickListener(this.mSendButtonListener); snackbar = (RelativeLayout) view.findViewById(R.id.snackbar); snackbarMessage = (TextView) view.findViewById(R.id.snackbar_message); @@ -485,6 +486,7 @@ public class ConversationFragment extends Fragment { activity.getConversationList(), null, false); activity.updateConversationList(); } + this.updateSendButton(); } } @@ -497,6 +499,51 @@ public class ConversationFragment extends Fragment { updateChatMsgHint(); } + public void updateSendButton() { + Conversation c = this.conversation; + if (activity.useSendButtonToIndicateStatus() && c != null + && c.getAccount().getStatus() == Account.STATUS_ONLINE) { + if (c.getMode() == Conversation.MODE_SINGLE) { + switch (c.getContact().getMostAvailableStatus()) { + case Presences.ONLINE: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_online); + break; + case Presences.AWAY: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_away); + break; + case Presences.XA: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_away); + break; + case Presences.DND: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_dnd); + break; + default: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + break; + } + } else if (c.getMode() == Conversation.MODE_MULTI) { + if (c.getMucOptions().online()) { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_online); + } else { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + } + } else { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + } + } else { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + } + } + protected void updateStatusMessages() { if (conversation.getMode() == Conversation.MODE_SINGLE) { for (int i = this.messageList.size() - 1; i >= 0; --i) { -- cgit v1.2.3 From 7fd4f13ff8ff5822a4d24c79fdff92bd5e8cdb47 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 13:15:15 +0200 Subject: added something about delivery failed to readme --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index 53bcecb63..f4c0a37a8 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,9 @@ Conversations - the very last word in instant messaging ##Features * End-to-end encryption with either OTR or openPGP * Sending and receiving images +* Indication when your contact has read your message * Intuitive UI that follows Android Design guidelines +* Pictures / Avatars for your Contacts * Syncs with desktop client * Conferences (with support for bookmarks) * Address book integration @@ -119,6 +121,29 @@ details within Conversations. This will start an add to address book intent with as payload. This doesn’t require Conversations to have write permissions on your address book but also doesn’t require you to copy past Jabber ID from one app to another. + +####I get 'delivery failed' on my messages +If you get delivery failed on images it’s probably because the recipient lost +network connectivity during recepiton. In that case you can try it again at a +later time. + +For text messages the answer to your question is a little bit more complex. +'delivery failed' on text messages is always something that is being reported by +the server. The most common reason for this is that the recipient failed to +resume a connection. When a client loses connectivity for a short time the client +usually has a five minute window to pick up that connection again. When the +client fails to do so because the network connectivity is out for longer than +that all messages sent to that client will be returned to the sender resulting +in a delivery failed. + +Other less common reasons are that the message you sent didn’t meet some +criterias enforced by the server. (Too large, too many) Another reason could be +that the recipient is offline and the server doesn’t provide offline storage. + +Usually you are able to distinguish between these two groups in the fact that +the first one happens always after some time and the second one happens almost +instantly. + ####Where can I see the status of my contacts? How can I set a status or priority Status are a horrible metric. Setting them manually to a proper value rarely works because users are either lazy or just forget about them. Setting them -- cgit v1.2.3 From fef41ba2a219f15bedc6d1ed45570e2764869684 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 13:18:29 +0200 Subject: pare body in type=normal messages as well --- src/eu/siacs/conversations/parser/MessageParser.java | 16 +++++----------- .../siacs/conversations/xmpp/stanzas/MessagePacket.java | 5 +---- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java index bd136a334..534c9deaf 100644 --- a/src/eu/siacs/conversations/parser/MessageParser.java +++ b/src/eu/siacs/conversations/parser/MessageParser.java @@ -202,7 +202,7 @@ public class MessageParser extends AbstractParser implements if ((message == null) || (!message.hasChild("body"))) { if (status == Message.STATUS_RECEIVED && message.getAttribute("from") != null) { - parseNormal(message, account); + parseNonMessage(message, account); } return null; } @@ -256,13 +256,12 @@ public class MessageParser extends AbstractParser implements packet.getId(), Message.STATUS_SEND_FAILED); } - private void parseNormal(Element packet, Account account) { + private void parseNonMessage(Element packet, Account account) { if (packet.hasChild("event", "http://jabber.org/protocol/pubsub#event")) { Element event = packet.findChild("event", "http://jabber.org/protocol/pubsub#event"); parseEvent(event, packet.getAttribute("from"), account); - } - if (packet.hasChild("displayed", "urn:xmpp:chat-markers:0")) { + } else if (packet.hasChild("displayed", "urn:xmpp:chat-markers:0")) { String id = packet .findChild("displayed", "urn:xmpp:chat-markers:0") .getAttribute("id"); @@ -294,7 +293,6 @@ public class MessageParser extends AbstractParser implements mXmppConnectionService.updateConversationUi(); } } - } else if (packet.hasChild("x", "jabber:x:conference")) { Element x = packet.findChild("x", "jabber:x:conference"); String jid = x.getAttribute("jid"); @@ -382,7 +380,7 @@ public class MessageParser extends AbstractParser implements this.parseNick(packet, account); - if ((packet.getType() == MessagePacket.TYPE_CHAT)) { + if ((packet.getType() == MessagePacket.TYPE_CHAT || packet.getType() == MessagePacket.TYPE_NORMAL)) { if ((packet.getBody() != null) && (packet.getBody().startsWith("?OTR"))) { message = this.parseOtrChat(packet, account); @@ -407,9 +405,8 @@ public class MessageParser extends AbstractParser implements } } } else { - parseNormal(packet, account); + parseNonMessage(packet, account); } - } else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) { message = this.parseGroupchat(packet, account); if (message != null) { @@ -424,9 +421,6 @@ public class MessageParser extends AbstractParser implements } else if (packet.getType() == MessagePacket.TYPE_ERROR) { this.parseError(packet, account); return; - } else if (packet.getType() == MessagePacket.TYPE_NORMAL) { - this.parseNormal(packet, account); - return; } else if (packet.getType() == MessagePacket.TYPE_HEADLINE) { this.parseHeadline(packet, account); return; diff --git a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java index 386d9dc8b..4e7b532bf 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java +++ b/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java @@ -4,7 +4,6 @@ import eu.siacs.conversations.xml.Element; public class MessagePacket extends AbstractStanza { public static final int TYPE_CHAT = 0; - public static final int TYPE_UNKNOWN = 1; public static final int TYPE_NORMAL = 2; public static final int TYPE_GROUPCHAT = 3; public static final int TYPE_ERROR = 4; @@ -38,8 +37,6 @@ public class MessagePacket extends AbstractStanza { case TYPE_GROUPCHAT: this.setAttribute("type", "groupchat"); break; - case TYPE_UNKNOWN: - break; case TYPE_NORMAL: break; default: @@ -63,7 +60,7 @@ public class MessagePacket extends AbstractStanza { } else if (type.equals("headline")) { return TYPE_HEADLINE; } else { - return TYPE_UNKNOWN; + return TYPE_NORMAL; } } } -- cgit v1.2.3 From ff41918cb757fdb68cfff936dca74a4c9d351b05 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 13:19:46 +0200 Subject: missed show=chat for send button colorization --- src/eu/siacs/conversations/ui/ConversationFragment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index c6b129ad7..e09958cb5 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -505,6 +505,10 @@ public class ConversationFragment extends Fragment { && c.getAccount().getStatus() == Account.STATUS_ONLINE) { if (c.getMode() == Conversation.MODE_SINGLE) { switch (c.getContact().getMostAvailableStatus()) { + case Presences.CHAT: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_online); + break; case Presences.ONLINE: this.mSendButton .setImageResource(R.drawable.ic_action_send_now_online); -- cgit v1.2.3 From dee46f34536577f6b395f7fe62d3503ecf5cf7fc Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 14:24:10 +0200 Subject: match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources --- res/values/colors.xml | 4 +++- src/eu/siacs/conversations/ui/ContactDetailsActivity.java | 14 +++++++------- src/eu/siacs/conversations/ui/XmppActivity.java | 10 +++++++--- src/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 6 +++--- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index ed0a0ffbf..fdaff5da9 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -9,5 +9,7 @@ #ffeeeeee #ff323232 #1f000000 - #ffe51c23 + #ffe51c23 + #ffff9800 + #ff259b24 \ 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 8de2ce804..9d384c601 100644 --- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -278,31 +278,31 @@ public class ContactDetailsActivity extends XmppActivity { switch (contact.getMostAvailableStatus()) { case Presences.CHAT: status.setText(R.string.contact_status_free_to_chat); - status.setTextColor(0xFF83b600); + status.setTextColor(mColorGreen); break; case Presences.ONLINE: status.setText(R.string.contact_status_online); - status.setTextColor(0xFF83b600); + status.setTextColor(mColorGreen); break; case Presences.AWAY: status.setText(R.string.contact_status_away); - status.setTextColor(0xFFffa713); + status.setTextColor(mColorOrange); break; case Presences.XA: status.setText(R.string.contact_status_extended_away); - status.setTextColor(0xFFffa713); + status.setTextColor(mColorOrange); break; case Presences.DND: status.setText(R.string.contact_status_do_not_disturb); - status.setTextColor(0xFFe92727); + status.setTextColor(mColorRed); break; case Presences.OFFLINE: status.setText(R.string.contact_status_offline); - status.setTextColor(0xFFe92727); + status.setTextColor(mSecondaryTextColor); break; default: status.setText(R.string.contact_status_offline); - status.setTextColor(0xFFe92727); + status.setTextColor(mSecondaryTextColor); break; } if (contact.getPresences().size() > 1) { diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java index f13c112a9..a3503048e 100644 --- a/src/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/eu/siacs/conversations/ui/XmppActivity.java @@ -55,7 +55,9 @@ public abstract class XmppActivity extends Activity { protected int mPrimaryTextColor; protected int mSecondaryTextColor; - protected int mWarningTextColor; + protected int mColorRed; + protected int mColorOrange; + protected int mColorGreen; protected int mPrimaryColor; private DisplayMetrics metrics; @@ -183,7 +185,9 @@ public abstract class XmppActivity extends Activity { ExceptionHelper.init(getApplicationContext()); mPrimaryTextColor = getResources().getColor(R.color.primarytext); mSecondaryTextColor = getResources().getColor(R.color.secondarytext); - mWarningTextColor = getResources().getColor(R.color.warningtext); + mColorRed = getResources().getColor(R.color.red); + mColorOrange = getResources().getColor(R.color.orange); + mColorGreen = getResources().getColor(R.color.green); mPrimaryColor = getResources().getColor(R.color.primary); if (getPreferences().getBoolean("use_larger_font", false)) { setTheme(R.style.ConversationsTheme_LargerText); @@ -475,7 +479,7 @@ public abstract class XmppActivity extends Activity { } public int getWarningTextColor() { - return this.mWarningTextColor; + return this.mColorRed; } public int getPrimaryColor() { diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 967042d80..db01eabee 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -145,7 +145,7 @@ public class MessageAdapter extends ArrayAdapter { break; } if (error) { - viewHolder.time.setTextColor(0xFFe92727); + viewHolder.time.setTextColor(activity.getWarningTextColor()); } else { viewHolder.time.setTextColor(activity.getSecondaryTextColor()); } @@ -191,7 +191,7 @@ public class MessageAdapter extends ArrayAdapter { viewHolder.image.setVisibility(View.GONE); viewHolder.messageBody.setVisibility(View.VISIBLE); viewHolder.messageBody.setText(getContext().getString(r)); - viewHolder.messageBody.setTextColor(0xff33B5E5); + viewHolder.messageBody.setTextColor(activity.getSecondaryTextColor()); viewHolder.messageBody.setTypeface(null, Typeface.ITALIC); viewHolder.messageBody.setTextIsSelectable(false); } @@ -204,7 +204,7 @@ public class MessageAdapter extends ArrayAdapter { viewHolder.messageBody.setVisibility(View.VISIBLE); viewHolder.messageBody.setText(getContext().getString( R.string.decryption_failed)); - viewHolder.messageBody.setTextColor(0xFFe92727); + viewHolder.messageBody.setTextColor(activity.getWarningTextColor()); viewHolder.messageBody.setTypeface(null, Typeface.NORMAL); viewHolder.messageBody.setTextIsSelectable(false); } -- cgit v1.2.3 From 12b62adeca59e0f6dc2c04331fd65244dfc809f8 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 16:22:33 +0200 Subject: added missing strings back. + formating --- res/drawable/actionbar_tab_indicator.xml | 24 +-- res/drawable/es_slidingpane_shadow.xml | 13 +- res/drawable/grey.xml | 6 +- res/drawable/greybackground.xml | 10 +- res/drawable/message_border.xml | 17 +- res/drawable/section_header.xml | 1 + res/drawable/snackbar.xml | 16 +- .../fragment_conversations_overview.xml | 52 ++--- .../fragment_conversations_overview.xml | 52 ++--- .../fragment_conversations_overview.xml | 52 ++--- .../fragment_conversations_overview.xml | 52 ++--- res/layout/account_row.xml | 6 +- res/layout/actionview_search.xml | 2 +- res/layout/activity_contact_details.xml | 215 +++++++++++---------- res/layout/activity_muc_details.xml | 7 +- res/layout/activity_publish_profile_picture.xml | 16 +- res/layout/activity_start_conversation.xml | 2 +- res/layout/contact.xml | 4 +- res/layout/contact_key.xml | 4 +- res/layout/conversation_list_row.xml | 120 ++++++------ res/layout/create_contact_dialog.xml | 27 +-- res/layout/dialog_clear_history.xml | 13 +- res/layout/dialog_verify_otr.xml | 37 ++-- res/layout/fragment_conversations_overview.xml | 52 ++--- res/layout/join_conference_dialog.xml | 32 +-- res/layout/manage_accounts.xml | 4 +- res/layout/message_null.xml | 3 +- res/layout/message_status.xml | 8 +- res/layout/quickedit.xml | 9 +- res/menu/attachment_choices.xml | 9 +- res/menu/choose_contact.xml | 1 + res/menu/contact_details.xml | 16 +- res/menu/encryption_choices.xml | 29 ++- res/menu/manageaccounts.xml | 13 +- res/menu/muc_details.xml | 12 +- res/menu/start_conversation.xml | 2 - res/values-ca/arrays.xml | 4 +- res/values-ca/strings.xml | 15 +- res/values-de/arrays.xml | 4 +- res/values-de/strings.xml | 5 +- res/values-es/arrays.xml | 5 +- res/values-es/strings.xml | 3 +- res/values-eu/arrays.xml | 4 +- res/values-eu/strings.xml | 3 +- res/values-fr/arrays.xml | 4 +- res/values-fr/strings.xml | 3 +- res/values-gl/arrays.xml | 4 +- res/values-gl/strings.xml | 8 +- res/values-he/arrays.xml | 4 +- res/values-he/strings.xml | 4 +- res/values-nl/arrays.xml | 4 +- res/values-nl/strings.xml | 7 +- res/values-ru/arrays.xml | 4 +- res/values-ru/strings.xml | 3 +- res/values-sv/arrays.xml | 4 +- res/values-sv/strings.xml | 3 +- res/values/arrays.xml | 5 +- res/values/attrs.xml | 10 +- res/values/themes.xml | 6 +- 59 files changed, 565 insertions(+), 489 deletions(-) diff --git a/res/drawable/actionbar_tab_indicator.xml b/res/drawable/actionbar_tab_indicator.xml index 102b75d81..5598ee424 100644 --- a/res/drawable/actionbar_tab_indicator.xml +++ b/res/drawable/actionbar_tab_indicator.xml @@ -1,19 +1,21 @@ + - - + + - - + + - - - + + + + + + + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/drawable/es_slidingpane_shadow.xml b/res/drawable/es_slidingpane_shadow.xml index 5b6037f71..44ffd4ea6 100644 --- a/res/drawable/es_slidingpane_shadow.xml +++ b/res/drawable/es_slidingpane_shadow.xml @@ -1,7 +1,12 @@ - - + + + + + \ No newline at end of file diff --git a/res/drawable/grey.xml b/res/drawable/grey.xml index bdb9383fc..2e90d96d0 100644 --- a/res/drawable/grey.xml +++ b/res/drawable/grey.xml @@ -1,5 +1,7 @@ - + + + \ No newline at end of file diff --git a/res/drawable/greybackground.xml b/res/drawable/greybackground.xml index 529af5e8a..bedc4b17a 100644 --- a/res/drawable/greybackground.xml +++ b/res/drawable/greybackground.xml @@ -1,6 +1,6 @@ - - - + + + + + \ No newline at end of file diff --git a/res/drawable/message_border.xml b/res/drawable/message_border.xml index 4a581e7df..b463d788e 100644 --- a/res/drawable/message_border.xml +++ b/res/drawable/message_border.xml @@ -1,6 +1,15 @@ - - - - + + + + + + + + \ No newline at end of file diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml index e4cb97427..9db04f906 100644 --- a/res/drawable/section_header.xml +++ b/res/drawable/section_header.xml @@ -7,4 +7,5 @@ android:width="2000dp" /> + \ No newline at end of file diff --git a/res/drawable/snackbar.xml b/res/drawable/snackbar.xml index 5f5dc430f..951d7aee8 100644 --- a/res/drawable/snackbar.xml +++ b/res/drawable/snackbar.xml @@ -1,6 +1,14 @@ - - - - + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-sw360dp/fragment_conversations_overview.xml index ceb3b5fa8..ef8a1b6e2 100644 --- a/res/layout-sw360dp/fragment_conversations_overview.xml +++ b/res/layout-sw360dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout-sw384dp/fragment_conversations_overview.xml b/res/layout-sw384dp/fragment_conversations_overview.xml index 26d79d233..2a4220523 100644 --- a/res/layout-sw384dp/fragment_conversations_overview.xml +++ b/res/layout-sw384dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp/fragment_conversations_overview.xml b/res/layout-sw600dp/fragment_conversations_overview.xml index f26c840b4..5dfdceff5 100644 --- a/res/layout-sw600dp/fragment_conversations_overview.xml +++ b/res/layout-sw600dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout-sw720dp/fragment_conversations_overview.xml b/res/layout-sw720dp/fragment_conversations_overview.xml index b85f11167..bc52ec461 100644 --- a/res/layout-sw720dp/fragment_conversations_overview.xml +++ b/res/layout-sw720dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml index 230a5a982..2d1190a3a 100644 --- a/res/layout/account_row.xml +++ b/res/layout/account_row.xml @@ -16,8 +16,8 @@ @@ -35,9 +35,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_status_unknown" - android:textSize="?attr/TextSizeBody" android:textColor="@color/secondarytext" - android:textStyle="bold"/> + android:textSize="?attr/TextSizeBody" + android:textStyle="bold" /> \ No newline at end of file diff --git a/res/layout/actionview_search.xml b/res/layout/actionview_search.xml index 703009132..64b75f0ed 100644 --- a/res/layout/actionview_search.xml +++ b/res/layout/actionview_search.xml @@ -14,6 +14,6 @@ android:layout_height="wrap_content" android:focusable="true" android:inputType="textEmailAddress|textNoSuggestions" - android:textColor="@color/ondarktext"/> + android:textColor="@color/ondarktext" /> \ No newline at end of file diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index b3672e599..f4fd9c1e1 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -2,124 +2,127 @@ + android:background="@color/primarybackground" > - - - - + android:orientation="vertical" > - + - + android:minHeight="88dp" + android:padding="8dp" > - + - - - - - + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/details_contact_badge" + android:orientation="vertical" + android:paddingLeft="8dp" > - - - - + - + + + + + + + + + + + - - - - - - + android:id="@+id/details_send_presence" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/send_presence_updates" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + + + + + + + + + \ No newline at end of file diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index c3eb263dc..1a676548b 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -24,7 +24,7 @@ android:singleLine="true" android:text="@string/account_settings_example_jabber_id" android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> - + android:padding="8dp" + android:src="@drawable/ic_action_edit_dark" /> - + - - + android:textSize="?attr/TextSizeHeadline" /> + + android:textSize="?attr/TextSizeBody" /> \ No newline at end of file diff --git a/res/layout/activity_start_conversation.xml b/res/layout/activity_start_conversation.xml index 9c757540e..f9c985292 100644 --- a/res/layout/activity_start_conversation.xml +++ b/res/layout/activity_start_conversation.xml @@ -3,6 +3,6 @@ android:id="@+id/start_conversation_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/primarybackground"> + android:background="@color/primarybackground" > \ No newline at end of file diff --git a/res/layout/contact.xml b/res/layout/contact.xml index ff55ccac1..12ab3da1b 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -27,8 +27,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textSize="?attr/TextSizeHeadline" - android:textColor="@color/primarytext" /> + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" /> + android:visibility="invisible" /> \ No newline at end of file diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml index 8fdd64b7c..21147b4a0 100644 --- a/res/layout/conversation_list_row.xml +++ b/res/layout/conversation_list_row.xml @@ -2,71 +2,67 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="8dp"> - + android:padding="8dp" > - + - + - - - - - - + - - + + + + + + + + + - - - \ No newline at end of file diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml index a1e6f6ad2..1ab4b6862 100644 --- a/res/layout/create_contact_dialog.xml +++ b/res/layout/create_contact_dialog.xml @@ -3,36 +3,37 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="8dp"> + android:padding="8dp" > - + android:textSize="?attr/TextSizeBody" /> + - - + android:textSize="?attr/TextSizeBody" /> + - + android:textColorHint="@color/secondarytext" /> + + \ No newline at end of file diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml index 7edb4b87a..252808c84 100644 --- a/res/layout/dialog_clear_history.xml +++ b/res/layout/dialog_clear_history.xml @@ -3,16 +3,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="8dp"> + android:padding="8dp" > + + android:textSize="?attr/TextSizeBody" /> + - + android:text="@string/also_end_conversation" /> + + \ No newline at end of file diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index 301f465a0..831f06edc 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -3,55 +3,58 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="8dp" android:paddingBottom="16dp" - android:paddingRight="8dp"> - - + + + android:textSize="?attr/TextSizeHeadline" /> - + + + android:textSize="?attr/TextSizeHeadline" /> - + + + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" /> - + android:typeface="monospace" /> + + \ No newline at end of file diff --git a/res/layout/fragment_conversations_overview.xml b/res/layout/fragment_conversations_overview.xml index b85f11167..bc52ec461 100644 --- a/res/layout/fragment_conversations_overview.xml +++ b/res/layout/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml index a36a5ef78..95c9d24cb 100644 --- a/res/layout/join_conference_dialog.xml +++ b/res/layout/join_conference_dialog.xml @@ -3,45 +3,45 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="8dp"> + android:padding="8dp" > - + android:textSize="?attr/TextSizeBody" /> + - - + android:textSize="?attr/TextSizeBody" /> + + android:textColorHint="@color/secondarytext" /> + android:layout_marginTop="8dp" + android:checked="true" + android:text="@string/save_as_bookmark" /> - + \ No newline at end of file diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml index 71eb75728..11ce35b2f 100644 --- a/res/layout/manage_accounts.xml +++ b/res/layout/manage_accounts.xml @@ -3,14 +3,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/primarybackground"> + android:background="@color/primarybackground" > + android:dividerHeight="1dp" > \ No newline at end of file diff --git a/res/layout/message_null.xml b/res/layout/message_null.xml index 4c7dd9389..1e1485857 100644 --- a/res/layout/message_null.xml +++ b/res/layout/message_null.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" > + \ No newline at end of file diff --git a/res/layout/message_status.xml b/res/layout/message_status.xml index 33487984b..d5f8bb33f 100644 --- a/res/layout/message_status.xml +++ b/res/layout/message_status.xml @@ -3,11 +3,11 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingTop="6dp" android:paddingBottom="6dp" + android:paddingLeft="8dp" android:paddingRight="6dp" - android:paddingLeft="8dp"> - + android:paddingTop="6dp" > + + android:src="@drawable/ic_profile" /> \ No newline at end of file diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml index 07a7ac3b3..20a2868ac 100644 --- a/res/layout/quickedit.xml +++ b/res/layout/quickedit.xml @@ -3,16 +3,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp"> + android:padding="16dp" > + + android:textColor="@color/primarytext" > - - + + \ No newline at end of file diff --git a/res/menu/attachment_choices.xml b/res/menu/attachment_choices.xml index 6a4f295a2..20932489d 100644 --- a/res/menu/attachment_choices.xml +++ b/res/menu/attachment_choices.xml @@ -7,8 +7,9 @@ - + + \ No newline at end of file diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml index 3f402664a..e39091b38 100644 --- a/res/menu/choose_contact.xml +++ b/res/menu/choose_contact.xml @@ -7,4 +7,5 @@ android:icon="@drawable/ic_action_search" android:showAsAction="collapseActionView|always" android:title="@string/search"/> + \ No newline at end of file diff --git a/res/menu/contact_details.xml b/res/menu/contact_details.xml index 43e8ea6a2..02f2e8131 100644 --- a/res/menu/contact_details.xml +++ b/res/menu/contact_details.xml @@ -1,27 +1,27 @@ + + android:title="@string/action_edit_contact"/> + android:title="@string/action_delete_contact"/> - + android:title="@string/action_accounts"/> - + + \ No newline at end of file diff --git a/res/menu/encryption_choices.xml b/res/menu/encryption_choices.xml index 0596bfbc1..adf0ad8dc 100644 --- a/res/menu/encryption_choices.xml +++ b/res/menu/encryption_choices.xml @@ -1,17 +1,16 @@ - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/res/menu/manageaccounts.xml b/res/menu/manageaccounts.xml index 1d81ba3c6..b5cd9b50b 100644 --- a/res/menu/manageaccounts.xml +++ b/res/menu/manageaccounts.xml @@ -1,12 +1,15 @@ - - + - + + \ No newline at end of file diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml index 685109cd1..973690984 100644 --- a/res/menu/muc_details.xml +++ b/res/menu/muc_details.xml @@ -1,21 +1,21 @@ + + android:title="@string/action_edit_subject"/> - + android:title="@string/action_accounts"/> - + + \ No newline at end of file diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml index 271bac187..f72301693 100644 --- a/res/menu/start_conversation.xml +++ b/res/menu/start_conversation.xml @@ -7,7 +7,6 @@ android:icon="@drawable/ic_action_search" android:showAsAction="collapseActionView|always" android:title="@string/search"/> - - + Mòbil Telèfon @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index b9b2c5328..cfbe428bf 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -60,11 +60,11 @@ Missatge xifrat rebut. Prem per desxifrar i veure-ho. Imatge xifrada rebuda. Prem per desxifrar i veure-la. Imatge rebuda. Prem per veure - Recursos XMPP + Recursos XMPP El nom que identifica aquest client amb - Acceptar fitxers - Accepta fitxers automàticament amb una mida menor a… - Ajustos de notificacions + Acceptar fitxers + Accepta fitxers automàticament amb una mida menor a… + Ajustos de notificacions Notificacions Notifica quan arriba un nou missatge Vibra @@ -77,6 +77,7 @@ Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon Opcions avançades Mai enviïs informes d\'errors - Enviant traces d\'execució ajudes al futur desenvolupament del Conversations. - - + Enviant traces d\'execució ajudes al futur desenvolupament del Conversations. + Opcions de UI + + \ No newline at end of file diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index e095ed143..e468f478b 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -1,5 +1,6 @@ + Mobile Phone @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 4267f4837..e653147d5 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1,5 +1,6 @@ + Conversations Einstellungen Neue Unterhaltung @@ -230,4 +231,6 @@ Aktuelle Sitzung wiederhergestellt Zusätzliche Informationen Überspringen - + Benutzeroberfläche + + \ No newline at end of file diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml index 48996a69d..152319559 100644 --- a/res/values-es/arrays.xml +++ b/res/values-es/arrays.xml @@ -1,5 +1,6 @@ + Móvil Teléfono @@ -26,6 +27,7 @@ 8 horas Hasta nuevo aviso + 1800 3600 @@ -33,4 +35,5 @@ 28800 -1 - + + \ No newline at end of file diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 53e45ed11..d6fbc7cb7 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -254,4 +254,5 @@ Por favor, cuidado con estas opciones Incrementar tamaño de fuente Usar fuentes grandes en toda la aplicación - + + \ No newline at end of file diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml index 21b20afbe..eed87d35b 100644 --- a/res/values-eu/arrays.xml +++ b/res/values-eu/arrays.xml @@ -1,5 +1,6 @@ + Mugikorra Telefonoa @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 8b5d92544..2ca26c3d7 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -230,5 +230,6 @@ Uneko saioa ezarri da Informazio gehiago Orain ez + Erabiltzaile-interfazearen aukerak - + \ No newline at end of file diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index 978429068..ae140796a 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -1,5 +1,6 @@ + Mobile Téléphone @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index df9ab3f5b..e15ef416f 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -207,5 +207,6 @@ Votre correspondant vous a ajouté dans sa liste de contacts Ajouter également %s a lu les messages précédents. + Options d\'affichage - + \ No newline at end of file diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml index 95c990773..19424a783 100644 --- a/res/values-gl/arrays.xml +++ b/res/values-gl/arrays.xml @@ -1,5 +1,6 @@ + Móvil Teléfono @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index ae488614b..581164630 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -66,9 +66,9 @@ Imaxe recibida. Pulsa para ver Recurso O nome que identifica o cliente que estás a empregar - Aceptar arquivos + Aceptar arquivos De forma automática aceptar arquivos menores de… - Axustes de notificación + Axustes de notificación Notificacións Notifica cuando chega unha nova mensaxe Tremer @@ -125,4 +125,6 @@ Gardar As contrasinais non coinciden O identificador non é un identificador de Jabber válido - + Opcións de interfaz + + \ No newline at end of file diff --git a/res/values-he/arrays.xml b/res/values-he/arrays.xml index 1895dee53..28768d6c4 100644 --- a/res/values-he/arrays.xml +++ b/res/values-he/arrays.xml @@ -1,5 +1,6 @@ + נייד טלפון @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 65684cd75..fd8eaa0ba 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -219,4 +219,6 @@ בפרטי בפרטי אל %s שלח הודעה פרטית אל %s - + אפשרויות ממשק משתמש + + \ No newline at end of file diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml index 1a464a5a1..9ced79f49 100644 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -1,5 +1,6 @@ + Mobiel Telefoon @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 97b67224e..7b3faca99 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -153,7 +153,7 @@ Bevestig wachtwoord Wachtwoorden komen niet overeen Dit is geen geldig Jabber ID - Geen geheugen beschikbaar. Afbeelding is te groot + Geen geheugen beschikbaar. Afbeelding is te groot Wilt U %s toevoegen aan de contactenlijst op uw telefoon? online beschikbaar @@ -178,7 +178,6 @@ Onbekende OTR vingerafdruk OpenPGP encrypted messages found Ontvangen mislukt - Aan groepsconversatie deelnemen Contact uitnodigen Uw vingerafdruk @@ -229,4 +228,6 @@ Huidige sessie opgezet (Of houdt lang ingedrukt om de oorspronkelijke terug te zetten) beschikbaar - + UI Opties + + \ No newline at end of file diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml index d73bdef5a..d01d4eb9b 100644 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -1,5 +1,6 @@ + Мобильный Телефон @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 5009097aa..9f3992f28 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -229,5 +229,6 @@ Сохранить закладку Удалить закладку Такая закладка уже существует + Параметры интерфейса - + \ No newline at end of file diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml index c7cc9f2dd..890e2915f 100644 --- a/res/values-sv/arrays.xml +++ b/res/values-sv/arrays.xml @@ -1,5 +1,6 @@ + Mobile Phone @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index abd99dbcf..16ab59ee4 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -231,5 +231,6 @@ Generellt Publicera privat meddelande + UI inställningar - + \ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 1d2a5ac9b..1a4fd25d1 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,5 +1,6 @@ + Mobile Phone @@ -26,6 +27,7 @@ 8 hours until further notice + 1800 3600 @@ -33,4 +35,5 @@ 28800 -1 - + + \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 793b5604b..2354a5e8c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,6 +1,8 @@ - - - - + + + + + + \ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index e2d4dcbe4..fa7973d20 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -9,7 +9,7 @@ 14sp 20sp - + - + \ No newline at end of file -- cgit v1.2.3 From c9a342fc6e9d42fbe7b07a9fd16297ff7b5e1613 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 16:32:49 +0200 Subject: more formating --- res/layout/fragment_conversation.xml | 93 ++++++++++++++++++------------------ res/values/colors.xml | 2 + res/values/strings.xml | 13 ++--- res/xml/preferences.xml | 19 ++++---- 4 files changed, 64 insertions(+), 63 deletions(-) diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index 91921fb56..0f5f692e4 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -5,8 +5,6 @@ android:layout_height="match_parent" android:background="@color/secondarybackground" > - - - + + android:textColor="@color/primarytext" > + @@ -61,43 +60,43 @@ android:src="@drawable/ic_action_send_now_offline" /> - + - + - - + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index fdaff5da9..908b8b89a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,5 +1,6 @@ + #ff259b24 #ff0a7e07 #de000000 @@ -12,4 +13,5 @@ #ffe51c23 #ffff9800 #ff259b24 + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 0ede20395..75eb3b4d5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -250,10 +250,11 @@ Always send messages encrypted (execpt for conferences) Don’t save encrypted messages Warning: This could lead to message loss - Expert options - Please be very careful with those - Increase font size - Use larger font sizes across the entire app - Send button indicates status - Colorize send button to indicate a contacs status + Expert options + Please be very careful with those + Increase font size + Use larger font sizes across the entire app + Send button indicates status + Colorize send button to indicate a contacs status + \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 47508c9e2..7d0886bcf 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -62,18 +62,17 @@ android:summary="@string/pref_notification_grace_period_summary" android:title="@string/pref_notification_grace_period" /> - - + - + android:summary="@string/pref_use_larger_font_summary" + android:title="@string/pref_use_larger_font" /> + Date: Thu, 11 Sep 2014 18:02:09 +0200 Subject: check if market is available before starting to install openkey chain --- src/eu/siacs/conversations/ui/XmppActivity.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java index a3503048e..4ee515804 100644 --- a/src/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/eu/siacs/conversations/ui/XmppActivity.java @@ -2,6 +2,7 @@ package eu.siacs.conversations.ui; import java.io.FileNotFoundException; import java.lang.ref.WeakReference; +import java.util.List; import java.util.concurrent.RejectedExecutionException; import eu.siacs.conversations.Config; @@ -24,6 +25,8 @@ import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.DialogInterface.OnClickListener; import android.content.IntentSender.SendIntentException; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.content.Intent; import android.content.ServiceConnection; @@ -153,8 +156,20 @@ public abstract class XmppActivity extends Activity { public void onClick(DialogInterface dialog, int which) { Uri uri = Uri .parse("market://details?id=org.sufficientlysecure.keychain"); - Intent intent = new Intent(Intent.ACTION_VIEW, uri); - startActivity(intent); + Intent marketIntent = new Intent(Intent.ACTION_VIEW, + uri); + PackageManager manager = getApplicationContext() + .getPackageManager(); + List infos = manager + .queryIntentActivities(marketIntent, 0); + if (infos.size() > 0) { + startActivity(marketIntent); + } else { + uri = Uri.parse("http://www.openkeychain.org/"); + Intent browserIntent = new Intent( + Intent.ACTION_VIEW, uri); + startActivity(browserIntent); + } finish(); } }); -- cgit v1.2.3 From ca560ae4decff80454d7b9f394dbcd132da05724 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 12 Sep 2014 14:28:34 +0200 Subject: updated swedish translations. thank you Anders Sandblad --- res/values-sv/strings.xml | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 16ab59ee4..a3ed9112e 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -17,7 +17,6 @@ Inställningar Konferensdetaljer Kontaktdetaljer - Konversationer Dela med konversation Starta konversation Välj kontakt @@ -65,7 +64,6 @@ Vill du ta bort alla meddelanden i denna konversation?\n\nVarning: Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar. Ta bort meddelanden Avsluta denna konversation efter - Välj närvaro till kontakt Skicka meddelande i klartext Skicka OTR-krypterat meddelande Skicka OpenPGP-krypterat meddelande @@ -101,7 +99,6 @@ Konferensnotifieringar Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight Notifieringsfrist - Deaktivera notifieringar en kort stund efter att en carbon copy tagits emot Avancerade inställningar Skicka aldrig krasch-rapporter Genom att skicka in stack traces hjälper du utvecklarna av Conversations @@ -128,7 +125,6 @@ Generellt I/O-fel. Du kanske fick slut på plats? Applikationen du använde för att välja bilden gav inte tillräckliga rättigheter för att läsa filen.\n\nAnvänd en annan filhanterare för att välja bild Okänd - Tillfälligt deaktiverad Online Ansluter\u2026 Offline @@ -144,7 +140,6 @@ OpenPGP Ändra konto Ta bort - Deaktivera tillfälligt Aktivera Är du säker? Om du tar bort kontot kommer all konversationshistorik att försvinna @@ -208,7 +203,6 @@ Addera tillbaks %s har läst fram hit Nästa - Notera: Alla som kan se dina närvarouppdateringar kommer se denna bild. otillgänglig Publisera OpenPGP publik nyckel Ytterligare information @@ -232,5 +226,35 @@ Publicera privat meddelande UI inställningar + Aktivera + Varning: Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\nGå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar. + Inaktivera notifieringar + Begär tillgänglighetsuppdateringar från din kontakt först.\n\nDetta används för att se vilken klient/klienter din kontakt använder. + Konferensen kräver lösenord + Spara in krypterade meddelanden + Krypteringsinställningar + Färglägg skickaknappen för att indikera kontaktens status + Saknar tillgänglighetsuppdateringar från kontakt + Expertinställningar + Sänd alltid krypterade meddelanden (utom för konferenser) + Var försiktig med dem + Inaktivera notifieringar för denna konversation + Skickaknappen indikerar status + Fyll i lösenord + Notifieringar är inaktiverade + Tvinga kryptering + Är du säker på att du vill ta bort detta fingeravtryck? + Ignorera + Använd större teckenstorlek för hela applikationen + Öka teckenstorlek + Varning: Detta kan leda till att meddelanden förloras + Ta bort fingeravtryck + Begär nu + Conversations + Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild. + Välj tillgänglighet till kontakt + Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot + Tillfälligt inaktiverad + Inaktivera tillfälligt \ No newline at end of file -- cgit v1.2.3 From 73cba91c9b08ff512104897b32837f9824f1cd3e Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 12 Sep 2014 17:52:46 +0200 Subject: version bump to 0.7.1 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d9a5f44da..7cec02641 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="0.7.1" >