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

fix headers alignment between contact and history views

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2014-08-01 11:25:59 +02:00
parent 1b48f530a2
commit 7b0ae3830e
3 changed files with 364 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

270
res/layout/contacts_list.xml
View file

@ -1,138 +1,138 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/background" android:background="@drawable/background"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/toolsbar_background">
<TextView
android:visibility="invisible"
android:paddingTop="20dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_all_contacts"
android:id="@+id/allContacts"
android:background="@drawable/contacts_all"
android:text="@string/button_all_contacts"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13sp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_linphone_contacts"
android:id="@+id/linphoneContacts"
android:background="@drawable/contacts_sip"
android:text="@string/button_sip_contacts"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13sp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_add_contact"
android:id="@+id/newContact"
android:background="@drawable/contacts_add_contact"
android:text="@string/button_add_contact"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13sp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_cancel"
android:id="@+id/clearSearchField"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/list_delete"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:paddingLeft="5dp"
android:paddingRight="5dp"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/searchField"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:background="@drawable/chat_fast_address_background"
android:gravity="center"
android:layout_toLeftOf="@id/clearSearchField"
android:paddingRight="5dp"
android:inputType="textPersonName"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/contactsList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent"
android:fastScrollAlwaysVisible="true"
android:fastScrollEnabled="true"
android:dividerHeight="1dp" />
<TextView
android:id="@+id/noSipContact"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerVertical="true"
android:text="@string/no_sip_contact"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView
android:id="@+id/noContact"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerVertical="true"
android:text="@string/no_contact"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
</RelativeLayout>
</LinearLayout> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/toolsbar_background">
<TextView
android:visibility="invisible"
android:paddingTop="20dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_all_contacts"
android:id="@+id/allContacts"
android:background="@drawable/contacts_all"
android:text="@string/button_all_contacts"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13sp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_linphone_contacts"
android:id="@+id/linphoneContacts"
android:background="@drawable/contacts_sip"
android:text="@string/button_sip_contacts"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13sp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_add_contact"
android:id="@+id/newContact"
android:background="@drawable/contacts_add_contact"
android:text="@string/button_add_contact"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13sp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_cancel"
android:id="@+id/clearSearchField"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/list_delete"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:paddingLeft="5dp"
android:paddingRight="5dp"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/searchField"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:background="@drawable/chat_fast_address_background"
android:gravity="center"
android:layout_toLeftOf="@id/clearSearchField"
android:paddingRight="5dp"
android:inputType="textPersonName"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/contactsList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent"
android:fastScrollAlwaysVisible="true"
android:fastScrollEnabled="true"
android:dividerHeight="1dp" />
<TextView
android:id="@+id/noSipContact"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerVertical="true"
android:text="@string/no_sip_contact"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView
android:id="@+id/noContact"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerVertical="true"
android:text="@string/no_contact"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
</RelativeLayout>
</LinearLayout>

224
res/layout/history.xml
View file

@ -1,115 +1,115 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/background" android:background="@drawable/background"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/toolsbar_background">
<TextView
android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteAll"
android:background="@drawable/history_delete"
android:text="@string/button_delete_all"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_all_calls"
android:id="@+id/allCalls"
android:background="@drawable/history_all"
android:text="@string/button_all_call"
android:gravity="center"
android:paddingTop="15dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_missed_calls"
android:id="@+id/missedCalls"
android:background="@drawable/history_missed"
android:text="@string/button_missed_call"
android:gravity="center"
android:paddingTop="15dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_edit"
android:id="@+id/edit"
android:background="@drawable/history_edit"
android:text="@string/button_edit"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_validate"
android:id="@+id/ok"
android:background="@drawable/history_ok"
android:text="@string/button_ok"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_button"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
</LinearLayout>
<ExpandableListView
android:id="@+id/historyList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent"
android:dividerHeight="1dp" />
<TextView
android:id="@+id/noCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView
android:id="@+id/noMissedCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_missed_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
</LinearLayout> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/toolsbar_background">
<TextView
android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteAll"
android:background="@drawable/history_delete"
android:text="@string/button_delete_all"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_all_calls"
android:id="@+id/allCalls"
android:background="@drawable/history_all"
android:text="@string/button_all_call"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_missed_calls"
android:id="@+id/missedCalls"
android:background="@drawable/history_missed"
android:text="@string/button_missed_call"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_edit"
android:id="@+id/edit"
android:background="@drawable/history_edit"
android:text="@string/button_edit"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_validate"
android:id="@+id/ok"
android:background="@drawable/history_ok"
android:text="@string/button_ok"
android:gravity="center"
android:paddingTop="20dp"
android:textColor="@drawable/text_button"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
</LinearLayout>
<ExpandableListView
android:id="@+id/historyList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent"
android:dividerHeight="1dp" />
<TextView
android:id="@+id/noCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView
android:id="@+id/noMissedCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_missed_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
</LinearLayout>

234
res/layout/history_simple.xml
View file

@ -1,120 +1,120 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/background" android:background="@drawable/background"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/toolsbar_background">
<TextView
android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteAll"
android:background="@drawable/history_delete"
android:text="@string/button_delete_all"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_all_calls"
android:id="@+id/allCalls"
android:background="@drawable/history_all"
android:text="@string/button_all_call"
android:gravity="center"
android:paddingTop="15dp"
android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_missed_calls"
android:id="@+id/missedCalls"
android:background="@drawable/history_missed"
android:text="@string/button_missed_call"
android:gravity="center"
android:paddingTop="15dp"
android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_edit"
android:id="@+id/edit"
android:background="@drawable/history_edit"
android:text="@string/button_edit"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_validate"
android:id="@+id/ok"
android:background="@drawable/history_ok"
android:text="@string/button_ok"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_button"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
</LinearLayout>
<ListView
android:id="@+id/historyList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent"
android:dividerHeight="1dp" />
<TextView
android:id="@+id/noCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView
android:id="@+id/noMissedCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_missed_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
</LinearLayout> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/toolsbar_background">
<TextView
android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteAll"
android:background="@drawable/history_delete"
android:text="@string/button_delete_all"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_all_calls"
android:id="@+id/allCalls"
android:background="@drawable/history_all"
android:text="@string/button_all_call"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_missed_calls"
android:id="@+id/missedCalls"
android:background="@drawable/history_missed"
android:text="@string/button_missed_call"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_edit"
android:id="@+id/edit"
android:background="@drawable/history_edit"
android:text="@string/button_edit"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
<TextView
android:contentDescription="@string/content_description_validate"
android:id="@+id/ok"
android:background="@drawable/history_ok"
android:text="@string/button_ok"
android:gravity="center"
android:paddingTop="20dp"
android:textSize="13dp"
android:textColor="@drawable/text_button"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:layout_weight="1"/>
</LinearLayout>
<ListView
android:id="@+id/historyList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent"
android:dividerHeight="1dp" />
<TextView
android:id="@+id/noCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView
android:id="@+id/noMissedCallHistory"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_missed_call_history"
android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/>
</LinearLayout>