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

Updated text colors

Browse source
This commit is contained in:
Sylvain Berfini 2012-09-21 15:56:37 +02:00
parent 5cf596a5bf
commit 8e5ea16ef4
9 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/drawable/text_color.xml
View file

@ -3,6 +3,6 @@
<item android:state_pressed="true" <item android:state_pressed="true"
android:color="@color/text_over" /> android:color="@color/text_over" />
<item android:state_selected="true" <item android:state_selected="true"
android:color="@color/text_selected" /> android:color="@color/text_selected" />
<item android:color="@color/text_default" /> <item android:color="@color/text_default" />
</selector> </selector>

10
res/drawable/text_incall_button_color.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:color="@color/text_button_over" />
<item android:state_selected="true"
android:color="@color/text_button_selected" />
<item android:state_enabled="false"
android:color="@color/text_button_disabled" />
<item android:color="@color/text_button" />
</selector>

5
res/drawable/switch_button_text_color.xml → res/drawable/text_switch_button_color.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" <item android:state_enabled="false"
android:color="@color/text_button" /> android:color="@color/text_switch" />
<item android:color="@color/text_switch_selected" />
<item android:color="@color/text_button_selected" />
</selector> </selector>

12
res/layout-land/incall.xml
View file

@ -96,7 +96,7 @@
android:text="@string/button_transfer" android:text="@string/button_transfer"
android:gravity="center" android:gravity="center"
android:paddingTop="50dp" android:paddingTop="50dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
@ -151,7 +151,7 @@
android:text="@string/button_add_call" android:text="@string/button_add_call"
android:gravity="center" android:gravity="center"
android:paddingTop="50dp" android:paddingTop="50dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
@ -195,7 +195,7 @@
android:text="@string/button_video" android:text="@string/button_video"
android:gravity="center" android:gravity="center"
android:paddingTop="35dp" android:paddingTop="35dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
@ -206,7 +206,7 @@
android:text="@string/button_micro" android:text="@string/button_micro"
android:gravity="center" android:gravity="center"
android:paddingTop="35dp" android:paddingTop="35dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
@ -226,7 +226,7 @@
android:text="@string/button_speaker" android:text="@string/button_speaker"
android:gravity="center" android:gravity="center"
android:paddingTop="35dp" android:paddingTop="35dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
@ -237,7 +237,7 @@
android:text="@string/button_options" android:text="@string/button_options"
android:gravity="center" android:gravity="center"
android:paddingTop="35dp" android:paddingTop="35dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />

4
res/layout/contacts_list.xml
View file

@ -17,7 +17,7 @@
android:text="@string/button_all_contacts" android:text="@string/button_all_contacts"
android:gravity="center" android:gravity="center"
android:paddingTop="25dp" android:paddingTop="25dp"
android:textColor="@drawable/switch_button_text_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@ -31,7 +31,7 @@
android:text="@string/button_sip_contacts" android:text="@string/button_sip_contacts"
android:gravity="center" android:gravity="center"
android:paddingTop="25dp" android:paddingTop="25dp"
android:textColor="@drawable/switch_button_text_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"

4
res/layout/history.xml
View file

@ -32,7 +32,7 @@
android:text="@string/button_all_call" android:text="@string/button_all_call"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textColor="@drawable/switch_button_text_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@ -46,7 +46,7 @@
android:text="@string/button_missed_call" android:text="@string/button_missed_call"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textColor="@drawable/switch_button_text_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"

4
res/layout/history_simple.xml
View file

@ -32,7 +32,7 @@
android:text="@string/button_all_call" android:text="@string/button_all_call"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textColor="@drawable/switch_button_text_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@ -46,7 +46,7 @@
android:text="@string/button_missed_call" android:text="@string/button_missed_call"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textColor="@drawable/switch_button_text_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"

12
res/layout/incall.xml
View file

@ -83,7 +83,7 @@
android:text="@string/button_transfer" android:text="@string/button_transfer"
android:gravity="center" android:gravity="center"
android:paddingTop="50dp" android:paddingTop="50dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="1" android:layout_weight="1"
@ -120,7 +120,7 @@
android:text="@string/button_add_call" android:text="@string/button_add_call"
android:gravity="center" android:gravity="center"
android:paddingTop="50dp" android:paddingTop="50dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="1" android:layout_weight="1"
@ -140,7 +140,7 @@
android:text="@string/button_video" android:text="@string/button_video"
android:gravity="center" android:gravity="center"
android:paddingTop="45dp" android:paddingTop="45dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="1" /> android:layout_weight="1" />
@ -151,7 +151,7 @@
android:text="@string/button_micro" android:text="@string/button_micro"
android:gravity="center" android:gravity="center"
android:paddingTop="45dp" android:paddingTop="45dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="1" /> android:layout_weight="1" />
@ -162,7 +162,7 @@
android:text="@string/button_speaker" android:text="@string/button_speaker"
android:gravity="center" android:gravity="center"
android:paddingTop="45dp" android:paddingTop="45dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="1" /> android:layout_weight="1" />
@ -173,7 +173,7 @@
android:text="@string/button_options" android:text="@string/button_options"
android:gravity="center" android:gravity="center"
android:paddingTop="45dp" android:paddingTop="45dp"
android:textColor="@color/text_button" android:textColor="@drawable/text_incall_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="1" /> android:layout_weight="1" />

7
res/values/color.xml
View file

@ -7,8 +7,13 @@
<color name="text_default">#ff5b656f</color> <color name="text_default">#ff5b656f</color>
<color name="text_header">#ff7e8e9e</color> <color name="text_header">#ff7e8e9e</color>
<color name="text_switch_selected">#ffffff</color>
<color name="text_switch">#ff41484f</color>
<color name="text_button">#ff41484f</color> <color name="text_button">#ff41484f</color>
<color name="text_button_selected">#ffffff</color> <color name="text_button_disabled">#ffa6b3bf</color>
<color name="text_button_selected">#ff41484f</color>
<color name="text_button_over">#ffcf4c29</color>
<color name="numpad_background_bottom">#ffe4edf2</color> <color name="numpad_background_bottom">#ffe4edf2</color>
<color name="numpad_background_dialer">#ffd8d8d8</color> <color name="numpad_background_dialer">#ffd8d8d8</color>