Margaux Clerc
|
72328025d2
|
Fix merge
|
2015-12-08 17:13:12 +01:00 |
|
Margaux Clerc
|
96e27f63f3
|
Fix merge
|
2015-11-30 14:29:39 +01:00 |
|
Margaux Clerc
|
8793a506e3
|
Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
res/drawable-xhdpi/checkbox_checked.png
res/drawable-xhdpi/checkbox_unchecked.png
res/drawable-xhdpi/resizable_textfield.9.png
res/drawable/avatar_mask_chat.xml
res/layout/about.xml
res/layout/call.xml
res/layout/call_inactive_row.xml
res/layout/chat.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/layout/chatlist.xml
res/layout/contact.xml
res/layout/contacts_list.xml
res/layout/dialer.xml
res/layout/history.xml
res/layout/history_detail.xml
res/layout/main.xml
res/layout/search_contact_cell.xml
res/layout/side_menu_account_cell.xml
res/layout/side_menu_item_cell.xml
res/layout/side_menu_main_account.xml
res/values/non_localizable_custom.xml
res/values/strings.xml
res/values/styles.xml
src/org/linphone/ChatFragment.java
src/org/linphone/ContactsListFragment.java
src/org/linphone/DialerFragment.java
src/org/linphone/HistoryDetailFragment.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphoneService.java
|
2015-11-30 14:29:14 +01:00 |
|
Margaux Clerc
|
a836e839b3
|
Update the chat view
|
2015-11-20 16:51:50 +01:00 |
|
Margaux Clerc
|
410f168acf
|
Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
AndroidManifest.xml
res/drawable/status_level.xml
res/layout/call.xml
res/layout/chat.xml
res/layout/chat_bubble_outgoing.xml
res/layout/contact_control_row.xml
res/layout/search_contact_cell.xml
res/values/strings.xml
src/org/linphone/CallActivity.java
src/org/linphone/ChatFragment.java
src/org/linphone/ContactDetailsFragment.java
src/org/linphone/LinphoneService.java
|
2015-11-16 09:06:12 +01:00 |
|
Margaux Clerc
|
18c2eef5b8
|
Improve chat view and new conversation
|
2015-11-13 15:09:45 +01:00 |
|
Margaux Clerc
|
0da770e015
|
Add chat edition for deleting chat message
fix new conversation
|
2015-11-10 17:57:26 +01:00 |
|
Margaux Clerc
|
c86bf1e990
|
Fix chat in call and in call view
|
2015-11-09 14:46:22 +01:00 |
|
Margaux Clerc
|
b6722d7a65
|
Add chat in call and fix call problems
|
2015-11-09 14:31:40 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
ed380d7144
|
Remove old assets and colors
|
2015-10-15 10:59:47 +02:00 |
|
Margaux Clerc
|
c6035e841f
|
Add chat view and otger stuff
|
2015-09-18 18:57:49 +02:00 |
|
Margaux Clerc
|
c3dc710337
|
Merge remote-tracking branch 'linphone/master' into 3.0.X
Conflicts:
AndroidManifest.xml
res/layout/chat_bubble_alt_incoming.xml
res/layout/chat_bubble_alt_outgoing.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/values/strings.xml
src/org/linphone/ContactsManager.java
src/org/linphone/compatibility/ApiFivePlus.java
src/org/linphone/ui/BubbleChat.java
|
2015-09-10 18:58:01 +02:00 |
|
Margaux Clerc
|
af3a159f8d
|
Add new items for chat
|
2015-09-01 15:12:45 +02:00 |
|
Margaux Clerc
|
3eca96e3c5
|
Rework Incall view/Chat view/Edit Contact view
|
2015-08-25 17:23:07 +02:00 |
|
Margaux Clerc
|
f3f79a7a5b
|
Chat update
|
2015-08-03 14:46:51 +02:00 |
|
Margaux Clerc
|
219b3005f8
|
Rework views history/contacts/chat with the new design
|
2015-07-30 15:46:28 +02:00 |
|
Sylvain Berfini
|
b6771b24dc
|
Improved scrollToEnd and thumbnail bitmap for chat view
|
2015-05-18 11:02:44 +02:00 |
|
Margaux Clerc
|
95ae7734a4
|
Add chat view landscape
|
2015-01-29 17:07:54 +01:00 |
|
Sylvain Berfini
|
053b54e710
|
Reworked chat view, way easier to maintain now
Conflicts:
res/layout-FR/chat.xml
res/layout-RU/chat.xml
res/layout-small/chat.xml
res/layout/chat.xml
|
2014-09-16 11:06:16 +02:00 |
|
Margaux Clerc
|
1dc8f0f927
|
improve chatFragment display
|
2014-08-12 15:47:39 +02:00 |
|
Sylvain Berfini
|
623ec93c7f
|
Display when a remote contact is writing a message using rfc3994 and send local composing notifications
|
2014-01-06 16:53:36 +01:00 |
|
Sylvain Berfini
|
aa2cdb51ec
|
Updated texts color value to be able to change it quickly depending on background color
|
2013-10-08 14:27:57 +02:00 |
|
Sylvain Berfini
|
71fda6cced
|
Improve chat display for long conversations
|
2013-04-02 16:05:44 +02:00 |
|
Sylvain Berfini
|
447a8a50c0
|
Added cursor in text fields
|
2013-03-22 11:10:08 +01:00 |
|
Sylvain Berfini
|
97a470bfd2
|
XML boolean to authorize or not multiline chat messages
|
2012-09-26 14:10:43 +02:00 |
|
Sylvain Berfini
|
e0f4f4a2ee
|
Reworked and lightened interface
|
2012-09-25 16:19:26 +02:00 |
|
Sylvain Berfini
|
faae53581a
|
Added text to chat fragment
|
2012-09-21 16:52:02 +02:00 |
|
Sylvain Berfini
|
a0caddeb8b
|
Interface improved
|
2012-09-20 11:52:32 +02:00 |
|
Sylvain Berfini
|
59b79eb7c1
|
Updated default and wizard settings
|
2012-09-18 16:40:52 +02:00 |
|
Sylvain Berfini
|
167ba0d174
|
Improved camera taken pictures method + improved progress bar + new tablet images
|
2012-09-18 14:46:20 +02:00 |
|
Sylvain Berfini
|
fa402009b1
|
New icons/interface + improved pictures sending via chat
|
2012-09-17 17:53:43 +02:00 |
|
Sylvain Berfini
|
735ce7389d
|
Improved settings for API > 14 + some changes on History new list
|
2012-08-09 15:46:41 +02:00 |
|
Sylvain Berfini
|
9a77d2f070
|
Improved chat view
|
2012-07-26 14:18:52 +02:00 |
|
Sylvain Berfini
|
717ef64ff5
|
Smaller header for chat
|
2012-07-25 17:48:48 +02:00 |
|
Sylvain Berfini
|
572bcb8cf4
|
Improved layouts + pause fix
|
2012-07-25 16:46:45 +02:00 |
|
Sylvain Berfini
|
d2325290ef
|
Added shadows to contact pictures
|
2012-07-23 17:51:35 +02:00 |
|
Sylvain Berfini
|
babcbef93e
|
Merge remote-tracking branch 'newui/newUI' into newUI
Conflicts:
AndroidManifest.xml
build.xml
src/org/linphone/DialerActivity.java
src/org/linphone/IncallActivity.java
src/org/linphone/LinphoneManager.java
src/org/linphone/LinphoneService.java
src/org/linphone/LinphoneSimpleListener.java
src/org/linphone/LinphoneUtils.java
src/org/linphone/VideoCallActivity.java
src/org/linphone/core/LinphoneCallImpl.java
src/org/linphone/core/LinphoneCoreImpl.java
|
2012-07-11 11:53:33 +02:00 |
|
Sylvain Berfini
|
ebca161b7e
|
Fix some issues + multiple audio calls started
|
2012-07-10 16:10:54 +02:00 |
|
Sylvain Berfini
|
4883c016a2
|
Refactoring on drawables' names
|
2012-07-03 13:41:39 +02:00 |
|
Sylvain Berfini
|
476abbbf87
|
Own implementation of sliders to answer or not an incoming call
|
2012-06-22 18:26:07 +02:00 |
|
Sylvain Berfini
|
1ae90b9629
|
Some issues fixed + chat notification + account assistant started
|
2012-06-21 16:44:23 +02:00 |
|