Commit graph

60 commits

Author SHA1 Message Date
Brieuc Viel
71b9fc18e9 conflict merged and errors fixed 2016-04-13 16:47:31 +02:00
Brieuc Viel
79cac9f3cd Merge remote-tracking branch 'public/master' into obiane 2016-04-11 16:25:40 +02:00
Sylvain Berfini
8d65fab06c Fixed contact lookup for history & chat 2016-03-23 12:00:24 +01:00
Sylvain Berfini
a75da820ed Started rework of contacts 2016-03-23 12:00:24 +01:00
Margaux Clerc
d95bf87378 Rework disabled images and call activity button 2016-02-26 09:29:59 +01:00
Margaux Clerc
179546dacd Interface update and bug fixes 2016-02-22 11:16:39 +01:00
Margaux Clerc
1b207c8dc1 Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
	AndroidManifest.xml
	res/drawable-xhdpi/topbar_avatar.png
	res/drawable/assistant_button.xml
	res/layout-land/call.xml
	res/layout-land/call_incoming.xml
	res/layout-land/call_outgoing.xml
	res/layout-land/chatlist_cell.xml
	res/layout-land/main.xml
	res/layout/about.xml
	res/layout/assistant_account_creation.xml
	res/layout/assistant_linphone_login.xml
	res/layout/assistant_remote_provisioning_login.xml
	res/layout/assistant_topbar.xml
	res/layout/call.xml
	res/layout/call_incoming.xml
	res/layout/call_outgoing.xml
	res/layout/chat.xml
	res/layout/chatlist.xml
	res/layout/chatlist_cell.xml
	res/layout/conference_paused_row.xml
	res/layout/contact.xml
	res/layout/contact_edit.xml
	res/layout/contacts_list.xml
	res/layout/dialog.xml
	res/layout/edit_list.xml
	res/layout/history.xml
	res/layout/history_detail.xml
	res/layout/main.xml
	res/layout/side_menu_account_cell.xml
	res/mipmap-hdpi/ic_launcher.png
	res/mipmap-mdpi/ic_launcher.png
	res/mipmap-xhdpi/ic_launcher.png
	res/mipmap-xxhdpi/ic_launcher.png
	res/mipmap-xxxhdpi/ic_launcher.png
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fr/custom.xml
	res/values-fr/strings.xml
	res/values-he/strings.xml
	res/values-ja/strings.xml
	res/values-nl/strings.xml
	res/values-ru/strings.xml
	res/values-tr/strings.xml
	res/values/custom.xml
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	res/values/styles.xml
	src/org/linphone/CallActivity.java
	src/org/linphone/ChatFragment.java
	src/org/linphone/ChatListFragment.java
	src/org/linphone/ContactDetailsFragment.java
	src/org/linphone/ContactsListFragment.java
	src/org/linphone/HistoryDetailFragment.java
	src/org/linphone/HistoryListFragment.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/assistant/RemoteProvisioningActivity.java
2016-02-18 15:56:50 +01:00
Margaux Clerc
7687c00aac Update fragment when item list removed 2016-02-18 11:18:02 +01:00
Margaux Clerc
f68df2c584 Tablet: Fix new chat conversation and display first listview element 2016-02-17 15:19:26 +01:00
Margaux Clerc
45b365ecb1 Fix tests 2016-02-15 13:57:23 +01:00
Margaux Clerc
9ad4962aa0 Add missing strings 2016-02-09 10:28:56 +01:00
Margaux Clerc
2e0985d740 Fix avatar in notification and fix remove chatroom 2016-01-19 11:52:28 +01:00
Margaux Clerc
2f73b26325 Fix chatroom selection 2016-01-12 10:07:50 +01:00
Margaux Clerc
003b21102b Rework topbar 2016-01-11 10:31:16 +01:00
Margaux Clerc
594bc9fbf3 Fix image problem in chat list 2016-01-11 10:31:16 +01:00
Margaux Clerc
71926ccd16 Fix UI problems and linphone friend display name 2015-12-08 17:14:24 +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
756a183436 Add topbar in settings and about menu
add option for portrait orientation only
2015-11-17 10:24:16 +01:00
Margaux Clerc
c3072beae1 Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
	src/org/linphone/CallActivity.java
2015-11-09 14:16:42 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
92c066d239 Add chat in call 2015-11-05 15:40:47 +01:00
Margaux Clerc
a1f30e0531 Update Chat ui 2015-10-27 09:39:29 +01: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
cabecb97b2 Update UI contacts/dialer/chatlist and remove old assets 2015-08-03 12:25:05 +02:00
Margaux Clerc
219b3005f8 Rework views history/contacts/chat with the new design 2015-07-30 15:46:28 +02:00
Margaux Clerc
2950bc1d91 Drop support api < 14 2015-07-23 13:47:05 +02:00
Margaux Clerc
14c8510398 Fix contact picture 2015-04-23 14:28:57 +02:00
Margaux Clerc
82173a8985 Fix find contact again 2015-04-20 18:15:25 +02:00
Margaux Clerc
bd0c2df61e Add linphone friend management 2015-04-13 19:07:01 +02:00
Sylvain Berfini
5c2265956d Removed useless mHandler.post() now that everything runs in the same thread 2014-12-11 17:13:04 +01:00
Sylvain Berfini
10c4cdb902 Few changes (again) in the way of showing/hiding the status bar to fix ugly render when going to incall activity 2014-01-30 16:46:04 +01:00
Sylvain Berfini
a9c43923fc Fix crash until chat fragment was opened once 2013-10-30 15:17:00 +01:00
Sylvain Berfini
5ed2e63ca0 Improved chat messages performances 2013-08-20 12:13:20 +02:00
Sylvain Berfini
b187ec064c Import image messages done 2013-08-19 14:51:48 +02:00
Sylvain Berfini
7348384b68 Chat importing finished for text messages (todo images) + waiting dialog during import 2013-08-19 11:17:35 +02:00
Sylvain Berfini
4475002bcc Updated liblinphone + started import of previous database messages into the new one on update (pictures not included for now) 2013-08-14 16:55:03 +02:00
Jehan Monnier
c461dd3f1e update linphone factory to handle LinphoneAddress parsing error 2013-05-22 16:04:59 +02:00
Sylvain Berfini
28c428dfa0 Fix change chat on tablet drafts issues 2012-12-03 12:11:20 +01:00
Sylvain Berfini
5bad3c1abd Add animation for text too long 2012-11-30 14:44:37 +01:00
Sylvain Berfini
16003a7ddc Removed useless log 2012-11-27 12:24:22 +01:00
Sylvain Berfini
3ca83c62ab Display last message in chat list + fix push notif setting 2012-11-20 17:10:16 +01:00
Sylvain Berfini
27c9b4bf7d Fix FC depending on contact(s) 2012-10-10 17:22:17 +02:00
Sylvain Berfini
e0f4f4a2ee Reworked and lightened interface 2012-09-25 16:19:26 +02:00
Sylvain Berfini
f02038997f Display unread messages on chat list view 2012-09-24 12:10:36 +02:00
Sylvain Berfini
30753774c3 Display messages if lists are empty 2012-09-24 10:50:49 +02:00
Sylvain Berfini
bb4bb45ea7 small interface improvements 2012-09-21 11:34:07 +02:00
Sylvain Berfini
1358258d72 Improved interface for fast new chat field 2012-09-20 18:10:56 +02:00