Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework topbar

Browse source
This commit is contained in:
Margaux Clerc 2016-01-07 15:06:23 +01:00
parent 6e56bdbf1e
commit 003b21102b
16 changed files with 248 additions and 230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
res/layout/about.xml
View file

@ -5,34 +5,39 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <LinearLayout
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:orientation="horizontal"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp">
android:visibility="visible"
android:layout_alignParentTop="true"> <View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"/>
<TextView <TextView
android:id="@+id/menu_name" android:id="@+id/menu_name"
android:text="@string/about" android:text="@string/about"
style="@style/font1" style="@style/font1"
android:layout_width="wrap_content" android:singleLine="true"
android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerInParent="true" android:layout_weight="0.4"
android:gravity="center_vertical"/> android:gravity="center"
android:padding="15dp"/>
<ImageView <ImageView
android:id="@+id/cancel" android:id="@+id/cancel"
android:src="@drawable/dialer_back" android:src="@drawable/dialer_back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:layout_width="60dp" android:contentDescription="@string/content_description_edit"
android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="12dp" android:layout_weight="0.2"
android:layout_centerInParent="true" android:padding="15dp"/>
android:layout_alignParentRight="true"/> </LinearLayout>
</RelativeLayout>
<ImageView <ImageView
android:src="@drawable/linphone_logo_orange" android:src="@drawable/linphone_logo_orange"

2
res/layout/call.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/status" android:id="@+id/status"
android:name="org.linphone.StatusFragment" android:name="org.linphone.StatusFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="40dp"
tools:layout="@layout/status" /> tools:layout="@layout/status" />

54
res/layout/chat.xml
View file

@ -4,8 +4,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/colorH" > android:background="@color/colorH" >
<RelativeLayout <LinearLayout
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:orientation="horizontal"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp"> android:layout_height="60dp">
@ -14,19 +15,20 @@
android:id="@+id/back" android:id="@+id/back"
android:src="@drawable/back" android:src="@drawable/back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:layout_width="60dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_weight="0.2"
android:padding="20dp"/> android:padding="18dp"/>
<ImageView <TextView
android:id="@+id/edit" android:id="@+id/contact_name"
android:src="@drawable/edit_list_button" style="@style/font6"
android:background="@drawable/toolbar_button" android:ellipsize="end"
android:contentDescription="@string/content_description_edit" android:singleLine="true"
android:layout_width="60dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_weight="0.4"
android:layout_gravity="center"
android:padding="15dp"/> android:padding="15dp"/>
<ImageView <ImageView
@ -34,33 +36,31 @@
android:src="@drawable/call_alt_start" android:src="@drawable/call_alt_start"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_call" android:contentDescription="@string/content_description_call"
android:layout_toLeftOf="@id/edit" android:layout_width="0dp"
android:layout_width="60dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.2"
android:padding="15dp"/> android:padding="15dp"/>
<ImageView <ImageView
android:id="@+id/back_to_call" android:id="@+id/back_to_call"
android:src="@drawable/call_back" android:src="@drawable/call_back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:layout_toLeftOf="@id/edit" android:layout_width="0dp"
android:layout_width="60dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.2"
android:visibility="gone" android:visibility="gone"
android:padding="15dp"/> android:padding="15dp"/>
<TextView <ImageView
android:id="@+id/contact_name" android:id="@+id/edit"
style="@style/font6" android:src="@drawable/edit_list_button"
android:ellipsize="end" android:background="@drawable/toolbar_button"
android:singleLine="true" android:contentDescription="@string/content_description_edit"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toRightOf="@id/back" android:layout_weight="0.2"
android:layout_toLeftOf="@id/start_call" android:padding="15dp"/>
android:gravity="center_vertical" </LinearLayout>
android:paddingLeft="5dp"/>
</RelativeLayout>
<include layout="@layout/edit_list"/> <include layout="@layout/edit_list"/>
@ -132,6 +132,8 @@
android:layout_margin="10dp" android:layout_margin="10dp"
android:layout_below="@+id/top_bar"/> android:layout_below="@+id/top_bar"/>
<AutoCompleteTextView <AutoCompleteTextView
android:id="@+id/search_contact_field" android:id="@+id/search_contact_field"
android:background="@drawable/resizable_textfield" android:background="@drawable/resizable_textfield"

36
res/layout/chatlist.xml
View file

@ -5,43 +5,49 @@
android:background="@color/colorH" android:background="@color/colorH"
android:orientation="vertical" > android:orientation="vertical" >
<RelativeLayout <LinearLayout
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:orientation="horizontal"
android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp">
android:layout_gravity="top"
android:background="@color/colorF">
<ImageView <ImageView
android:id="@+id/new_discussion" android:id="@+id/new_discussion"
android:src="@drawable/chat_add" android:src="@drawable/chat_add"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_new_discussion" android:contentDescription="@string/content_description_new_discussion"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_weight="0.2"
android:padding="12dp"/> android:padding="15dp"/>
<ImageView <ImageView
android:id="@+id/back_in_call" android:id="@+id/back_in_call"
android:src="@drawable/call_back" android:src="@drawable/call_back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:layout_width="70dp" android:contentDescription="@string/content_description_call"
android:visibility="invisible"
android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="12dp" android:layout_weight="0.2"
android:visibility="gone" android:padding="15dp"/>
android:layout_toRightOf="@+id/new_discussion"/>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.4"/>
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list_button"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit" android:contentDescription="@string/content_description_edit"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_weight="0.2"
android:padding="12dp"/> android:padding="15dp"/>
</RelativeLayout> </LinearLayout>
<include layout="@layout/edit_list"/> <include layout="@layout/edit_list"/>

48
res/layout/contact.xml
View file

@ -5,44 +5,48 @@
android:background="@color/colorH" android:background="@color/colorH"
android:orientation="vertical" > android:orientation="vertical" >
<RelativeLayout <LinearLayout
android:orientation="horizontal"
android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp">
android:layout_gravity="bottom"
android:background="@color/colorF">
<ImageView <ImageView
android:id="@+id/back" android:id="@+id/back"
android:src="@drawable/back" android:src="@drawable/back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_back" android:contentDescription="@string/content_description_back"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_weight="0.2"
android:padding="18dp"/>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.4"/>
<ImageView
android:id="@+id/deleteContact"
android:src="@drawable/delete"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_delete"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:padding="15dp"/> android:padding="15dp"/>
<ImageView <ImageView
android:contentDescription="@string/content_description_edit"
android:id="@+id/editContact" android:id="@+id/editContact"
android:layout_alignParentRight="true"
android:padding="12dp"
android:src="@drawable/edit" android:src="@drawable/edit"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:layout_width="70dp" android:contentDescription="@string/content_description_edit"
android:layout_height="match_parent"/> android:layout_width="0dp"
<ImageView
android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteContact"
android:padding="12dp"
android:src="@drawable/delete"
android:background="@drawable/toolbar_button"
android:gravity="center"
android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toLeftOf="@+id/editContact"/> android:layout_weight="0.2"
android:padding="15dp"/>
</RelativeLayout> </LinearLayout>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"

50
res/layout/contact_edit.xml
View file

@ -5,46 +5,48 @@
android:background="@color/colorH" android:background="@color/colorH"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <LinearLayout
android:orientation="horizontal"
android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp">
android:layout_gravity="bottom"
android:background="@color/colorF">
<ImageView <ImageView
android:id="@+id/back" android:id="@+id/back"
android:src="@drawable/back" android:src="@drawable/back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_back" android:contentDescription="@string/content_description_back"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_weight="0.2"
android:padding="15dp"/> android:padding="18dp"/>
<View
<ImageView android:layout_width="0dp"
android:id="@+id/ok" android:layout_height="match_parent"
android:contentDescription="@string/content_description_valid" android:layout_weight="0.4"/>
android:layout_alignParentRight="true"
android:padding="15dp"
android:src="@drawable/valid"
android:background="@drawable/toolbar_button"
android:gravity="center"
android:layout_width="70dp"
android:layout_height="match_parent"/>
<ImageView <ImageView
android:id="@+id/deleteContact" android:id="@+id/deleteContact"
android:contentDescription="@string/content_description_delete"
android:padding="12dp"
android:src="@drawable/delete" android:src="@drawable/delete"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:gravity="center" android:contentDescription="@string/content_description_delete"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toLeftOf="@+id/ok"/> android:layout_weight="0.2"
android:padding="15dp"/>
</RelativeLayout> <ImageView
android:id="@+id/ok"
android:src="@drawable/valid"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:padding="18dp"/>
</LinearLayout>
<ScrollView <ScrollView
android:id="@+id/controlsScrollView" android:id="@+id/controlsScrollView"

66
res/layout/contacts_list.xml
View file

@ -5,90 +5,84 @@
android:background="@color/colorH" android:background="@color/colorH"
android:orientation="vertical" > android:orientation="vertical" >
<RelativeLayout <LinearLayout
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:orientation="horizontal"
android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp">
android:layout_gravity="bottom"
android:background="@color/colorF">
<RelativeLayout <RelativeLayout
android:id="@+id/all_contacts_layout" android:layout_width="0dp"
android:layout_width="70dp" android:layout_height="match_parent"
android:layout_height="wrap_content" android:layout_weight="0.2">
android:adjustViewBounds="true">
<ImageView <ImageView
android:id="@+id/all_contacts" android:id="@+id/all_contacts"
android:contentDescription="@string/content_description_all_contacts"
android:layout_alignParentLeft="true"
android:src="@drawable/contacts_all" android:src="@drawable/contacts_all"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:gravity="center" android:contentDescription="@string/content_description_all_contacts"
android:padding="12dp" android:padding="15dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<RelativeLayout <View
android:id="@+id/all_contacts_select" android:id="@+id/all_contacts_select"
android:contentDescription="@string/content_description_contacts"
android:background="@color/colorA" android:background="@color/colorA"
android:layout_alignRight="@id/all_contacts"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="5dp" android:layout_height="5dp"
android:layout_alignParentBottom="true"/> android:layout_alignParentBottom="true"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_toRightOf="@id/all_contacts_layout" android:layout_width="0dp"
android:layout_width="70dp" android:layout_height="match_parent"
android:layout_height="wrap_content" android:layout_weight="0.2">
android:adjustViewBounds="true">
<ImageView <ImageView
android:contentDescription="@string/content_description_linphone_contacts"
android:id="@+id/linphone_contacts" android:id="@+id/linphone_contacts"
android:src="@drawable/contacts_sip" android:src="@drawable/contacts_sip"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_linphone_contacts"
android:gravity="center" android:gravity="center"
android:padding="12dp" android:padding="15dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<RelativeLayout <View
android:id="@+id/linphone_contacts_select" android:id="@+id/linphone_contacts_select"
android:contentDescription="@string/content_description_contacts"
android:background="@color/colorA" android:background="@color/colorA"
android:layout_alignRight="@id/linphone_contacts"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="5dp" android:layout_height="5dp"
android:visibility="invisible" android:visibility="gone"
android:layout_alignParentBottom="true"/> android:layout_alignParentBottom="true"/>
</RelativeLayout> </RelativeLayout>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"/>
<ImageView <ImageView
android:id="@+id/newContact" android:id="@+id/newContact"
android:src="@drawable/contact_add" android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_new_contact" android:contentDescription="@string/content_description_edit"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toLeftOf="@id/edit" android:layout_weight="0.2"
android:padding="12dp"/> android:padding="15dp"/>
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list_button"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit" android:contentDescription="@string/content_description_edit"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_weight="0.2"
android:padding="12dp"/> android:padding="15dp"/>
</RelativeLayout> </LinearLayout>
<include layout="@layout/edit_list"/> <include layout="@layout/edit_list"/>

4
res/layout/dialer.xml
View file

@ -8,7 +8,7 @@
android:id="@+id/address_bar" android:id="@+id/address_bar"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_alignParentTop="true"> android:layout_alignParentTop="true">
@ -30,7 +30,7 @@
android:ellipsize="start" android:ellipsize="start"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
android:hint="@string/address_bar_hint" android:hint="@string/address_bar_hint"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="20dp" android:paddingLeft="20dp"
android:paddingRight="5dp" android:paddingRight="5dp"

48
res/layout/edit_list.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/edit_list" android:id="@+id/edit_list"
android:orientation="horizontal"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
@ -11,40 +12,45 @@
android:src="@drawable/cancel_edit" android:src="@drawable/cancel_edit"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid" android:contentDescription="@string/content_description_valid"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="12dp" android:layout_weight="0.2"
android:layout_alignParentLeft="true"/> android:padding="15dp"/>
<ImageView <View
android:id="@+id/delete" android:layout_width="0dp"
android:src="@drawable/delete"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid"
android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="12dp" android:layout_weight="0.4"/>
android:layout_alignParentRight="true"/>
<ImageView <ImageView
android:id="@+id/select_all" android:id="@+id/select_all"
android:src="@drawable/select_all" android:src="@drawable/select_all"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid" android:contentDescription="@string/content_description_valid"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="12dp" android:layout_weight="0.2"
android:layout_toLeftOf="@id/delete"/> android:padding="15dp"/>
<ImageView
android:id="@+id/delete"
android:src="@drawable/delete"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:padding="15dp"/>
<ImageView <ImageView
android:id="@+id/deselect_all" android:id="@+id/deselect_all"
android:src="@drawable/deselect_all" android:src="@drawable/deselect_all"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid" android:contentDescription="@string/content_description_valid"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="12dp" android:layout_weight="0.2"
android:layout_toLeftOf="@id/delete" android:visibility="gone"
android:visibility="gone"/> android:padding="15dp"/>
</RelativeLayout> </LinearLayout>

53
res/layout/history.xml
View file

@ -5,77 +5,74 @@
android:background="@color/colorH" android:background="@color/colorH"
android:orientation="vertical" > android:orientation="vertical" >
<RelativeLayout <LinearLayout
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:orientation="horizontal"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp">
android:layout_gravity="top">
<RelativeLayout <RelativeLayout
android:id="@+id/all_calls_layout" android:layout_width="0dp"
android:layout_width="70dp" android:layout_height="match_parent"
android:layout_height="match_parent"> android:layout_weight="0.2">
<ImageView <ImageView
android:id="@+id/all_calls" android:id="@+id/all_calls"
android:src="@drawable/history_all" android:src="@drawable/history_all"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_all_calls" android:contentDescription="@string/content_description_all_contacts"
android:gravity="center" android:padding="15dp"
android:padding="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<RelativeLayout <View
android:id="@+id/all_calls_select" android:id="@+id/all_calls_select"
android:background="@color/colorA" android:background="@color/colorA"
android:contentDescription="@string/content_description_contacts"
android:layout_alignRight="@id/all_calls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="5dp" android:layout_height="5dp"
android:layout_alignParentBottom="true"/> android:layout_alignParentBottom="true"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_toRightOf="@id/all_calls_layout" android:layout_width="0dp"
android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:adjustViewBounds="true"> android:layout_weight="0.2">
<ImageView <ImageView
android:id="@+id/missed_calls" android:id="@+id/missed_calls"
android:src="@drawable/history_missed" android:src="@drawable/history_missed"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_missed_calls" android:contentDescription="@string/content_description_linphone_contacts"
android:gravity="center" android:gravity="center"
android:padding="12dp" android:padding="15dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<RelativeLayout <View
android:id="@+id/missed_calls_select" android:id="@+id/missed_calls_select"
android:background="@color/colorA" android:background="@color/colorA"
android:contentDescription="@string/content_description_contacts"
android:layout_alignRight="@id/missed_calls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="5dp" android:layout_height="5dp"
android:layout_alignParentBottom="true" android:visibility="gone"
android:visibility="gone"/> android:layout_alignParentBottom="true"/>
</RelativeLayout> </RelativeLayout>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.4"/>
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list_button"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit" android:contentDescription="@string/content_description_edit"
android:layout_width="70dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_weight="0.2"
android:padding="12dp"/> android:padding="15dp"/>
</RelativeLayout> </LinearLayout>
<include layout="@layout/edit_list"/> <include layout="@layout/edit_list"/>

36
res/layout/history_detail.xml
View file

@ -5,34 +5,38 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<RelativeLayout
<LinearLayout
android:id="@+id/top_bar"
android:orientation="horizontal"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="60dp">
android:layout_gravity="bottom">
<ImageView <ImageView
android:id="@+id/back" android:id="@+id/back"
android:src="@drawable/back" android:src="@drawable/back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_back" android:layout_width="0dp"
android:padding="15dp" android:layout_height="match_parent"
android:layout_width="70dp" android:layout_weight="0.2"
android:layout_height="wrap_content" android:padding="18dp"/>
android:layout_alignParentLeft="true"/>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.6"/>
<ImageView <ImageView
android:id="@+id/add_contact" android:id="@+id/add_contact"
android:src="@drawable/contact_add" android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact" android:contentDescription="@string/content_description_edit"
android:padding="12dp" android:layout_width="0dp"
android:layout_width="70dp" android:layout_height="match_parent"
android:layout_height="wrap_content" android:layout_weight="0.2"
android:layout_alignParentRight="true"/> android:padding="15dp"/>
</LinearLayout>
</RelativeLayout>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"

10
src/org/linphone/ChatFragment.java
View file

@ -114,7 +114,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
private TextView contactName, remoteComposing; private TextView contactName, remoteComposing;
private ImageView back, backToCall; private ImageView back, backToCall;
private AutoCompleteTextView searchContactField; private AutoCompleteTextView searchContactField;
private RelativeLayout topBar, editList; private LinearLayout topBar, editList;
private LinearLayout textLayout; private LinearLayout textLayout;
private ListView messagesList; private ListView messagesList;
@ -158,9 +158,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
messagesList = (ListView) view.findViewById(R.id.chat_message_list); messagesList = (ListView) view.findViewById(R.id.chat_message_list);
searchContactField = (AutoCompleteTextView) view.findViewById(R.id.search_contact_field); searchContactField = (AutoCompleteTextView) view.findViewById(R.id.search_contact_field);
editList = (RelativeLayout) view.findViewById(R.id.edit_list); editList = (LinearLayout) view.findViewById(R.id.edit_list);
textLayout = (LinearLayout) view.findViewById(R.id.message_layout); textLayout = (LinearLayout) view.findViewById(R.id.message_layout);
topBar = (RelativeLayout) view.findViewById(R.id.top_bar); topBar = (LinearLayout) view.findViewById(R.id.top_bar);
sendMessage = (ImageView) view.findViewById(R.id.send_message); sendMessage = (ImageView) view.findViewById(R.id.send_message);
sendMessage.setOnClickListener(this); sendMessage.setOnClickListener(this);
@ -593,10 +593,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
if(LinphoneManager.getLc().isIncall()){ if(LinphoneManager.getLc().isIncall()){
backToCall.setVisibility(View.VISIBLE); backToCall.setVisibility(View.VISIBLE);
startCall.setVisibility(View.INVISIBLE); startCall.setVisibility(View.GONE);
} else { } else {
if(!newChatConversation) { if(!newChatConversation) {
backToCall.setVisibility(View.INVISIBLE); backToCall.setVisibility(View.GONE);
startCall.setVisibility(View.VISIBLE); startCall.setVisibility(View.VISIBLE);
} }
} }

9
src/org/linphone/ChatListFragment.java
View file

@ -57,6 +57,7 @@ import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
@ -70,7 +71,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
private ListView chatList; private ListView chatList;
private TextView noChatHistory; private TextView noChatHistory;
private ImageView edit, selectAll, deselectAll, delete, newDiscussion, contactPicture, cancel, backInCall; private ImageView edit, selectAll, deselectAll, delete, newDiscussion, contactPicture, cancel, backInCall;
private RelativeLayout editList, topbar; private LinearLayout editList, topbar;
private boolean isEditMode = false; private boolean isEditMode = false;
@Override @Override
@ -85,8 +86,8 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
noChatHistory = (TextView) view.findViewById(R.id.noChatHistory); noChatHistory = (TextView) view.findViewById(R.id.noChatHistory);
editList = (RelativeLayout) view.findViewById(R.id.edit_list); editList = (LinearLayout) view.findViewById(R.id.edit_list);
topbar = (RelativeLayout) view.findViewById(R.id.top_bar); topbar = (LinearLayout) view.findViewById(R.id.top_bar);
cancel = (ImageView) view.findViewById(R.id.cancel); cancel = (ImageView) view.findViewById(R.id.cancel);
cancel.setOnClickListener(this); cancel.setOnClickListener(this);
@ -201,7 +202,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
if (LinphoneManager.getLc().getCallsNb() > 0) { if (LinphoneManager.getLc().getCallsNb() > 0) {
backInCall.setVisibility(View.VISIBLE); backInCall.setVisibility(View.VISIBLE);
} else { } else {
backInCall.setVisibility(View.GONE); backInCall.setVisibility(View.INVISIBLE);
} }
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneActivity.instance()); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneActivity.instance());

14
src/org/linphone/ContactsListFragment.java
View file

@ -66,7 +66,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
private TextView noSipContact, noContact; private TextView noSipContact, noContact;
private ImageView allContacts, linphoneContacts, newContact, edit, selectAll, deselectAll, delete, cancel; private ImageView allContacts, linphoneContacts, newContact, edit, selectAll, deselectAll, delete, cancel;
private boolean onlyDisplayLinphoneContacts, isEditMode; private boolean onlyDisplayLinphoneContacts, isEditMode;
private RelativeLayout allContactsSelected, linphoneContactsSelected, editList, topbar; private View allContactsSelected, linphoneContactsSelected;
private LinearLayout editList, topbar;
private int lastKnownPosition; private int lastKnownPosition;
private AlphabetIndexer indexer; private AlphabetIndexer indexer;
private boolean editOnClick = false, editConsumed = false, onlyDisplayChatAddress = false; private boolean editOnClick = false, editConsumed = false, onlyDisplayChatAddress = false;
@ -110,11 +111,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
linphoneContacts = (ImageView) view.findViewById(R.id.linphone_contacts); linphoneContacts = (ImageView) view.findViewById(R.id.linphone_contacts);
linphoneContacts.setOnClickListener(this); linphoneContacts.setOnClickListener(this);
allContactsSelected = (RelativeLayout) view.findViewById(R.id.all_contacts_select); allContactsSelected = view.findViewById(R.id.all_contacts_select);
allContactsSelected.setOnClickListener(this); linphoneContactsSelected = view.findViewById(R.id.linphone_contacts_select);
linphoneContactsSelected = (RelativeLayout) view.findViewById(R.id.linphone_contacts_select);
linphoneContactsSelected.setOnClickListener(this);
newContact = (ImageView) view.findViewById(R.id.newContact); newContact = (ImageView) view.findViewById(R.id.newContact);
newContact.setOnClickListener(this); newContact.setOnClickListener(this);
@ -132,8 +130,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
delete = (ImageView) view.findViewById(R.id.delete); delete = (ImageView) view.findViewById(R.id.delete);
delete.setOnClickListener(this); delete.setOnClickListener(this);
editList = (RelativeLayout) view.findViewById(R.id.edit_list); editList = (LinearLayout) view.findViewById(R.id.edit_list);
topbar = (RelativeLayout) view.findViewById(R.id.top_bar); topbar = (LinearLayout) view.findViewById(R.id.top_bar);
cancel = (ImageView) view.findViewById(R.id.cancel); cancel = (ImageView) view.findViewById(R.id.cancel);
cancel.setOnClickListener(this); cancel.setOnClickListener(this);

13
src/org/linphone/HistoryListFragment.java
View file

@ -61,7 +61,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
private LayoutInflater mInflater; private LayoutInflater mInflater;
private TextView noCallHistory, noMissedCallHistory; private TextView noCallHistory, noMissedCallHistory;
private ImageView missedCalls, allCalls, edit, selectAll, deselectAll, delete, cancel; private ImageView missedCalls, allCalls, edit, selectAll, deselectAll, delete, cancel;
private RelativeLayout allCallsSelected, missedCallsSelected, editList, topBar; private View allCallsSelected, missedCallsSelected;
private LinearLayout editList, topBar;
private boolean onlyDisplayMissedCalls, isEditMode; private boolean onlyDisplayMissedCalls, isEditMode;
private List<LinphoneCallLog> mLogs; private List<LinphoneCallLog> mLogs;
@ -80,8 +81,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
delete = (ImageView) view.findViewById(R.id.delete); delete = (ImageView) view.findViewById(R.id.delete);
delete.setOnClickListener(this); delete.setOnClickListener(this);
editList = (RelativeLayout) view.findViewById(R.id.edit_list); editList = (LinearLayout) view.findViewById(R.id.edit_list);
topBar = (RelativeLayout) view.findViewById(R.id.top_bar); topBar = (LinearLayout) view.findViewById(R.id.top_bar);
cancel = (ImageView) view.findViewById(R.id.cancel); cancel = (ImageView) view.findViewById(R.id.cancel);
cancel.setOnClickListener(this); cancel.setOnClickListener(this);
@ -89,14 +90,12 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
allCalls = (ImageView) view.findViewById(R.id.all_calls); allCalls = (ImageView) view.findViewById(R.id.all_calls);
allCalls.setOnClickListener(this); allCalls.setOnClickListener(this);
allCallsSelected = (RelativeLayout) view.findViewById(R.id.all_calls_select); allCallsSelected = view.findViewById(R.id.all_calls_select);
allCallsSelected.setOnClickListener(this);
missedCalls = (ImageView) view.findViewById(R.id.missed_calls); missedCalls = (ImageView) view.findViewById(R.id.missed_calls);
missedCalls.setOnClickListener(this); missedCalls.setOnClickListener(this);
missedCallsSelected = (RelativeLayout) view.findViewById(R.id.missed_calls_select); missedCallsSelected = view.findViewById(R.id.missed_calls_select);
missedCallsSelected.setOnClickListener(this);
selectAll = (ImageView) view.findViewById(R.id.select_all); selectAll = (ImageView) view.findViewById(R.id.select_all);
selectAll.setOnClickListener(this); selectAll.setOnClickListener(this);

4
src/org/linphone/assistant/AssistantActivity.java
View file

@ -307,8 +307,8 @@ public class AssistantActivity extends Activity implements OnClickListener {
} }
public void loadLinphoneConfig(){ public void loadLinphoneConfig(){
LinphoneManager.getInstance().loadConfig(); //LinphoneManager.getInstance().loadConfig();
LinphoneManager.getInstance().restartLinphoneCore(); //LinphoneManager.getInstance().restartLinphoneCore();
} }
public void saveCreatedAccount(String username, String password, String displayName, String domain, TransportType transport) { public void saveCreatedAccount(String username, String password, String displayName, String domain, TransportType transport) {