* #31093: design improvements
diff --git a/res/layout/activity_holder.xml b/res/layout/activity_holder.xml
index 3232db8..1c000bd 100644
--- a/res/layout/activity_holder.xml
+++ b/res/layout/activity_holder.xml
@@ -1,13 +1,9 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/frag_container"
xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/frag_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingTop="?android:attr/actionBarSize"
tools:context=".ActivityHolder" >
-
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/activity_sflphone_home.xml b/res/layout/activity_sflphone_home.xml
index 70bb7d0..041709e 100644
--- a/res/layout/activity_sflphone_home.xml
+++ b/res/layout/activity_sflphone_home.xml
@@ -52,10 +52,21 @@
<android.support.v4.view.PagerTabStrip
android:id="@+id/pts_main"
+ android:paddingTop="?android:attr/actionBarSize"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.v4.view.ViewPager>
+ <!-- <ImageView -->
+ <!-- android:id="@+id/handle_circle" -->
+ <!-- android:layout_width="80dp" -->
+ <!-- android:layout_height="80dp" -->
+ <!-- android:layout_alignParentBottom="true" -->
+ <!-- android:layout_centerHorizontal="true" -->
+ <!-- android:gravity="center" -->
+ <!-- android:background="@drawable/drawer_disc_handle" -->
+ <!-- android:textStyle="bold" /> -->
+
<org.sflphone.views.CustomSlidingDrawer
android:id="@+id/custom_sliding_drawer"
android:layout_width="match_parent"
@@ -85,13 +96,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
android:layout_below="@+id/menu_top_shadow"
android:layout_centerInParent="true"
- android:layout_alignParentRight="true"
android:background="@color/sfl_dark_blue"
- android:src="@drawable/ic_action_group"
android:gravity="center"
android:singleLine="true"
+ android:src="@drawable/ic_action_group"
android:textStyle="bold" />
<ImageButton
@@ -111,7 +122,7 @@
android:id="@+id/contacts_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/lighter_gray" />
+ android:background="@color/sfl_dark_blue" />
</org.sflphone.views.CustomSlidingDrawer>
</RelativeLayout>
@@ -120,7 +131,6 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"
- android:background="@color/darker_gray"
android:choiceMode="singleChoice"
android:divider="@android:color/transparent"
android:dividerHeight="0dp" />
diff --git a/res/layout/activity_sflphone_preferences.xml b/res/layout/activity_sflphone_preferences.xml
index abfa690..498763c 100644
--- a/res/layout/activity_sflphone_preferences.xml
+++ b/res/layout/activity_sflphone_preferences.xml
@@ -35,4 +35,5 @@
android:id="@+id/preferences_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingTop="?android:attr/actionBarSize"
tools:context=".SFLPhonePreferencesActivity" />
diff --git a/res/layout/frag_account_creation.xml b/res/layout/frag_account_creation.xml
index bb4983a..e4a066c 100644
--- a/res/layout/frag_account_creation.xml
+++ b/res/layout/frag_account_creation.xml
@@ -3,10 +3,11 @@
android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/light" >
+ android:background="@color/light"
+ android:paddingTop="?android:attr/actionBarSize" >
<LinearLayout
- style="@style/LoginFormContainer"
+ style="@style/AccountFormContainer"
android:orientation="vertical" >
<EditText
@@ -14,9 +15,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_alias"
- android:typeface="monospace"
android:maxLines="1"
- android:singleLine="true" >
+ android:singleLine="true"
+ android:typeface="monospace" >
<requestFocus />
</EditText>
@@ -26,9 +27,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_hostname"
- android:typeface="monospace"
android:maxLines="1"
- android:singleLine="true" >
+ android:singleLine="true"
+ android:typeface="monospace" >
</EditText>
<EditText
@@ -36,9 +37,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_username"
- android:typeface="monospace"
android:maxLines="1"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:typeface="monospace" />
<EditText
android:id="@+id/password"
@@ -48,10 +49,10 @@
android:imeActionId="@+id/login"
android:imeActionLabel="@string/action_create_short"
android:imeOptions="actionUnspecified"
- android:typeface="sans"
android:inputType="textPassword"
android:maxLines="1"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:typeface="sans" />
<Button
android:id="@+id/create_button"
@@ -68,7 +69,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Dev Account" />
-
</LinearLayout>
</ScrollView>
\ No newline at end of file
diff --git a/res/layout/frag_call.xml b/res/layout/frag_call.xml
index 5eda907..fa623b6 100644
--- a/res/layout/frag_call.xml
+++ b/res/layout/frag_call.xml
@@ -2,7 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ android:paddingTop="?android:attr/actionBarSize" >
<RelativeLayout
style="?android:attr/actionBarSplitStyle"
diff --git a/res/layout/frag_contact_list.xml b/res/layout/frag_contact_list.xml
index 7d858ae..d6eb7ab 100644
--- a/res/layout/frag_contact_list.xml
+++ b/res/layout/frag_contact_list.xml
@@ -35,8 +35,7 @@
android:layout_height="match_parent"
android:focusable="false"
android:focusableInTouchMode="false"
- android:orientation="vertical"
- android:padding="10dp" >
+ android:orientation="vertical" >
<ListView
android:id="@+id/contacts_list"
@@ -44,8 +43,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
- android:focusable="true"
android:fastScrollEnabled="true"
+ android:focusable="true"
android:focusableInTouchMode="true" />
<TextView
@@ -54,8 +53,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
- android:textSize="40sp"
- android:text="@string/no_contact_found" />
-
+ android:text="@string/no_contact_found"
+ android:textSize="40sp" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/frag_contact_list_header.xml b/res/layout/frag_contact_list_header.xml
index 3c2dea2..60b31c0 100644
--- a/res/layout/frag_contact_list_header.xml
+++ b/res/layout/frag_contact_list_header.xml
@@ -1,10 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container"
- android:layout_width="200dp"
- android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/sfl_light_blue"
android:orientation="vertical" >
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:drawableLeft="@drawable/ic_action_important"
+ android:gravity="center_vertical"
+ android:text="@string/starred_contacts_title"
+ android:textStyle="bold" />
+
<org.sflphone.views.TACGridView
android:id="@+id/favorites_grid"
android:layout_width="match_parent"
@@ -13,5 +22,4 @@
android:numColumns="auto_fit"
android:stretchMode="spacingWidth" />
-
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/frag_dialing.xml b/res/layout/frag_dialing.xml
index 0b8ae82..3eb9249 100644
--- a/res/layout/frag_dialing.xml
+++ b/res/layout/frag_dialing.xml
@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:background="@drawable/item_call_selector" />
+ android:background="@drawable/item_contact_selector" />
<LinearLayout
android:id="@+id/keyboard_choice"
@@ -24,31 +24,36 @@
android:layout_marginTop="15dp"
android:weightSum="2" >
- <Button
+ <ImageButton
android:id="@+id/numeric_keyboard"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:text="123" />
+ android:background="@drawable/item_history_selector"
+ android:contentDescription="@string/dial_numeric_pad"
+ android:layout_marginRight="5dp"
+ android:src="@drawable/ic_action_dial_pad" />
- <Button
+ <ImageButton
android:id="@+id/alphabetic_keyboard"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:text="ABC" />
+ android:layout_marginLeft="5dp"
+ android:background="@drawable/item_history_selector"
+ android:contentDescription="@string/dial_alphabetic_pad"
+ android:src="@drawable/ic_action_keyboard" />
</LinearLayout>
<ImageButton
android:id="@+id/buttonCall"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_below="@+id/keyboard_choice"
android:layout_centerHorizontal="true"
- android:layout_margin="10dp"
android:adjustViewBounds="true"
- android:background="@drawable/call_button"
+ android:background="@drawable/item_contact_selector"
android:gravity="center_vertical"
- android:src="@drawable/ic_call" />
+ android:src="@drawable/ic_action_call" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/frag_home.xml b/res/layout/frag_home.xml
index 95b0623..2593d4b 100644
--- a/res/layout/frag_home.xml
+++ b/res/layout/frag_home.xml
@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="10dp"
- android:background="@drawable/item_call_selector" >
+ android:background="@drawable/item_history_selector" >
<LinearLayout
android:id="@+id/linear1"
@@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/calls_layouts"
android:layout_margin="10dp"
- android:background="@drawable/item_call_selector" >
+ android:background="@drawable/item_history_selector" >
<LinearLayout
android:id="@+id/linear2"
diff --git a/res/layout/frag_menu.xml b/res/layout/frag_menu.xml
index f6d429b..6c3a7fd 100644
--- a/res/layout/frag_menu.xml
+++ b/res/layout/frag_menu.xml
@@ -2,8 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#FFFFFF"
- android:orientation="vertical" >
+ android:background="@color/light"
+ android:orientation="vertical"
+ android:paddingTop="?android:attr/actionBarSize" >
<TextView
android:id="@+id/list_header_title"
@@ -12,8 +13,8 @@
android:layout_height="wrap_content"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
- android:text="@string/frag_menu_accounts_title"
- android:paddingTop="2dip" />
+ android:paddingTop="2dip"
+ android:text="@string/frag_menu_accounts_title" />
<Spinner
android:id="@+id/account_selection"
diff --git a/res/layout/header.xml b/res/layout/header.xml
index 3240f11..d81e34e 100644
--- a/res/layout/header.xml
+++ b/res/layout/header.xml
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/holo_orange_light"
+ android:background="@null"
android:clickable="false"
android:focusable="false"
android:orientation="vertical" >
@@ -13,6 +13,7 @@
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
+ android:textColor="@color/white"
android:paddingLeft="5dp"
android:textSize="14sp"
android:textStyle="bold" />
diff --git a/res/layout/item_calllist.xml b/res/layout/item_calllist.xml
index 6486e01..5796463 100644
--- a/res/layout/item_calllist.xml
+++ b/res/layout/item_calllist.xml
@@ -2,15 +2,14 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/item_call_selector" >
+ android:background="@drawable/item_history_selector" >
<RelativeLayout
android:id="@+id/call_entry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/num_participants" >
+ android:layout_centerVertical="true" >
<TextView
android:id="@+id/call_title"
@@ -45,26 +44,4 @@
android:textSize="12sp" />
</RelativeLayout>
- <!-- <TextView -->
- <!-- android:id="@+id/num_participants" -->
- <!-- android:layout_width="70dp" -->
- <!-- android:layout_height="70dp" -->
- <!-- android:layout_alignParentRight="true" -->
- <!-- android:layout_centerHorizontal="true" -->
- <!-- android:background="@drawable/call_button" -->
- <!-- android:gravity="center" -->
- <!-- android:text="0" -->
- <!-- android:textSize="30sp" /> -->
-
-
- <!-- <ImageButton -->
- <!-- android:id="@+id/expand_button" -->
- <!-- android:layout_width="wrap_content" -->
- <!-- android:layout_height="wrap_content" -->
- <!-- android:layout_alignParentRight="true" -->
- <!-- android:layout_centerVertical="true" -->
- <!-- android:background="@null" -->
- <!-- android:focusable="false" -->
- <!-- android:src="@drawable/up_arrow" /> -->
-
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_contact.xml b/res/layout/item_contact.xml
index fcab27c..7f74902 100644
--- a/res/layout/item_contact.xml
+++ b/res/layout/item_contact.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ Adrien Beraud <adrien.beraud@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -32,40 +33,55 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contactview"
- android:background="@drawable/item_call_selector"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:background="@drawable/item_contact_selector" >
<ImageView
android:id="@+id/photo"
android:layout_width="70dp"
android:layout_height="70dp"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop"
+ android:contentDescription="@string/contact_picture_description" />
<TextView
android:id="@+id/display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignTop="@+id/photo"
android:layout_alignBottom="@+id/photo"
- android:gravity="center_vertical"
+ android:layout_alignTop="@+id/photo"
+ android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/photo"
- android:layout_marginLeft="5dp"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:gravity="center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@color/white"
+ android:textSize="14sp" />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:showDividers="middle"
+ android:divider="@drawable/divider" >
-<!-- <ImageButton -->
-<!-- android:id="@+id/toggleButton1" -->
-<!-- android:layout_width="wrap_content" -->
-<!-- android:layout_height="wrap_content" -->
-<!-- android:layout_alignParentRight="true" -->
-<!-- android:layout_centerVertical="true" -->
-<!-- android:background="#CCCCCC" -->
-<!-- android:clickable="false" -->
-<!-- android:drawableLeft="@drawable/call_pause" -->
-<!-- android:focusable="false" -->
-<!-- android:gravity="left|center_vertical" -->
-<!-- android:src="@drawable/call_pause" /> -->
- -->
+ <ImageView
+ android:id="@+id/quick_call"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_margin="5dp"
+ android:contentDescription="@string/contact_quick_call_description"
+ android:src="@drawable/ic_action_call" />
+
+ <ImageView
+ android:id="@+id/quick_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_margin="5dp"
+ android:contentDescription="@string/contact_quick_msg_description"
+ android:src="@drawable/ic_action_chat" />
+ </LinearLayout>
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_contact_starred.xml b/res/layout/item_contact_starred.xml
index dac4011..6040bc0 100644
--- a/res/layout/item_contact_starred.xml
+++ b/res/layout/item_contact_starred.xml
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contactview"
- android:layout_margin="5dp"
+ android:padding="5dp"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ImageView
android:id="@+id/photo"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:scaleType="centerCrop"/>
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:scaleType="centerCrop"
+ android:layout_centerHorizontal="true"
+ android:contentDescription="@string/contact_picture_description"/>
<TextView
android:id="@+id/display_name"
@@ -18,9 +20,10 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
+ android:textColor="@color/white"
+ android:gravity="center"
android:layout_below="@+id/photo"
- android:singleLine="true"
- android:textSize="10sp" />
+ android:textSize="12sp" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_history.xml b/res/layout/item_history.xml
index 12440ab..2d7fc9b 100644
--- a/res/layout/item_history.xml
+++ b/res/layout/item_history.xml
@@ -34,7 +34,7 @@
android:id="@+id/contactview"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/item_call_selector" >
+ android:background="@drawable/item_history_selector" >
<ImageView
android:id="@+id/photo"
diff --git a/res/menu/account_creation.xml b/res/menu/account_creation.xml
index 505852f..0e71d51 100644
--- a/res/menu/account_creation.xml
+++ b/res/menu/account_creation.xml
@@ -3,7 +3,7 @@
<item
android:id="@+id/menuitem_create"
- android:showAsAction="ifRoom|withText"
+ android:showAsAction="always"
android:icon="@drawable/ic_action_new"
android:title="@string/ab_account_creation"/>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f4b9dc5..96f212d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -83,6 +83,7 @@
<!-- ContactList Fragment -->
<string name="no_contact_found">Aucun contact trouvé</string>
+ <string name="starred_contacts_title">Favoris</string>
<!-- TransferDFragment -->
<string name="transfer_to_another_call">Transfert avec un autre appel</string>
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index 4094f7c..dc9fc1b 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -3,6 +3,7 @@
<style name="AppTheme" parent="android:Theme.Holo.Light">
<item name="android:actionBarStyle">@style/MyActionBar</item>
<item name="android:actionMenuTextAppearance">@style/MyActionBar.MenuTextStyle</item>
+ <item name="android:windowActionBarOverlay">true</item>
</style>
<style name="MyActionBar" parent="@android:style/Widget.ActionBar">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cc74d60..49ca09f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -5,6 +5,8 @@
<!-- SFL colors -->
<color name="sfl_pantone631_blue">#56B0C9</color>
<color name="sfl_dark_blue">#00252b</color>
+ <color name="sfl_light_blue">#006f82</color>
+
<color name="lighter_gray">#ddd</color>
<color name="darker_gray">#aaa</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3e3b8e5..8cfadce 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,6 +83,7 @@
<!-- ContactList Fragment -->
<string name="no_contact_found">No contact found</string>
+ <string name="starred_contacts_title">Favorites</string>
<!-- Help -->
<string name="menu_item_help_gestures">Gestures</string>
diff --git a/res/values/strings_content_description.xml b/res/values/strings_content_description.xml
new file mode 100644
index 0000000..dc67274
--- /dev/null
+++ b/res/values/strings_content_description.xml
@@ -0,0 +1,10 @@
+<resources>
+
+ <!-- Strings for xml content description of images -->
+ <string name="contact_quick_call_description">Quick Call</string>
+ <string name="contact_quick_msg_description">Quick Message</string>
+ <string name="contact_picture_description">Contact Picture</string>
+ <string name="dial_numeric_pad">Numeric dialpad</string>
+ <string name="dial_alphabetic_pad">Alphabetic dialpad</string>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 55345e2..31c1ec5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -35,11 +35,10 @@
<style name="AppTheme" parent="android:Theme.Light" />
<style name="CallElementList">
- <item name="android:divider">#00000000</item>
<item name="android:dividerHeight">5dp</item>
</style>
- <style name="LoginFormContainer">
+ <style name="AccountFormContainer">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:padding">16dp</item>