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

Remove old assets and colors

Browse source
This commit is contained in:
Margaux Clerc 2015-10-15 10:59:47 +02:00
parent e2e23ab38a
commit ed380d7144
16 changed files with 48 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
res/drawable/text_button.xml
View file

@ -1,10 +0,0 @@
<?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>

10
res/drawable/text_color.xml
View file

@ -1,10 +0,0 @@
<?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_over" />
<item android:state_selected="true"
android:color="@color/text_selected" />
<item android:state_enabled="false"
android:color="@color/text_disabled" />
<item android:color="@color/text_default" />
</selector>

10
res/drawable/text_incall_button_color.xml
View file

@ -1,10 +0,0 @@
<?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>

6
res/drawable/text_switch_button_color.xml
View file

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

4
res/layout/about.xml
View file

@ -28,7 +28,7 @@
android:text="@string/about_text" android:text="@string/about_text"
android:gravity="center" android:gravity="center"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/text_contrast" android:textColor="@color/colorB"
android:id="@+id/AboutText"/> android:id="@+id/AboutText"/>
<TextView <TextView
@ -38,7 +38,7 @@
android:autoLink="web" android:autoLink="web"
android:gravity="center" android:gravity="center"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/text_contrast" android:textColor="@color/colorB"
android:id="@+id/AboutLink"/> android:id="@+id/AboutLink"/>
<LinearLayout <LinearLayout

4
res/layout/chat.xml
View file

@ -74,7 +74,6 @@
android:id="@+id/sendPicture" android:id="@+id/sendPicture"
android:padding="5dp" android:padding="5dp"
android:scaleType="center" android:scaleType="center"
android:textColor="@drawable/text_color"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
@ -132,8 +131,7 @@
android:id="@+id/remoteComposing" android:id="@+id/remoteComposing"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/colorB"
android:textColor="@color/text_contrast"
android:text="@string/remote_composing" android:text="@string/remote_composing"
android:layout_above="@id/footer"/> android:layout_above="@id/footer"/>

2
res/layout/chatlist.xml
View file

@ -50,7 +50,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="@string/no_chat_history" android:text="@string/no_chat_history"
android:textColor="@drawable/text_color" android:textColor="@color/colorB"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
</LinearLayout> </LinearLayout>

15
res/layout/chatlist_cell.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="85dp" android:layout_height="80dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
@ -27,7 +27,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/text_selected" android:textColor="@color/colorB"
android:text="@string/draft" android:text="@string/draft"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" /> android:layout_marginRight="5dp" />
@ -41,12 +41,13 @@
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:gravity="center">
<RelativeLayout <RelativeLayout
android:id="@+id/avatar_layout" android:id="@+id/avatar_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true">
<ImageView <ImageView
@ -72,6 +73,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/avatar_layout" android:layout_below="@id/avatar_layout"
android:layout_marginTop="5dp"
android:singleLine="true"
style="@style/font2"/> style="@style/font2"/>
</RelativeLayout> </RelativeLayout>
@ -92,8 +95,7 @@
style="@style/font6" style="@style/font6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:layout_marginRight="30dp"/>
android:textColor="@color/text_contrast"/>
<TextView <TextView
android:id="@+id/unreadMessages" android:id="@+id/unreadMessages"
@ -102,6 +104,7 @@
android:background="@drawable/chat_list_indicator" android:background="@drawable/chat_list_indicator"
style="@style/font18" style="@style/font18"
android:gravity="center" android:gravity="center"
android:singleLine="true"
android:layout_above="@+id/lastMessage" android:layout_above="@+id/lastMessage"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/> android:layout_alignParentEnd="true"/>

3
res/layout/contact_cell.xml
View file

@ -64,12 +64,11 @@
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:lines="1" android:lines="1"
style="@style/font6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/avatar_layout" android:layout_toRightOf="@id/avatar_layout"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/text_contrast"
android:layout_marginLeft="10dp" /> android:layout_marginLeft="10dp" />
<ImageView <ImageView

4
res/layout/contacts_list.xml
View file

@ -142,7 +142,7 @@
android:gravity="center" android:gravity="center"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/no_sip_contact" android:text="@string/no_sip_contact"
android:textColor="@drawable/text_color" android:textColor="@color/colorB"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView <TextView
@ -153,7 +153,7 @@
android:gravity="center" android:gravity="center"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/no_contact" android:text="@string/no_contact"
android:textColor="@drawable/text_color" android:textColor="@color/colorB"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
</RelativeLayout> </RelativeLayout>

1
res/layout/dialer.xml
View file

@ -30,6 +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:textColorHint="@color/colorE"
android:paddingLeft="20dp" android:paddingLeft="20dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:layout_toLeftOf="@id/Erase" android:layout_toLeftOf="@id/Erase"

31
res/layout/incall_stats.xml
View file

@ -1,8 +1,8 @@
<?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:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TableLayout <TableLayout
android:id="@+id/callStats" android:id="@+id/callStats"
@ -11,8 +11,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:paddingRight="5dp" android:paddingRight="5dp">
android:background="@android:color/black">
<TableRow <TableRow
android:layout_width="match_parent" android:layout_width="match_parent"
@ -24,7 +23,7 @@
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:id="@+id/call_stats_title" android:id="@+id/call_stats_title"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/text_default" android:textColor="@color/colorB"
android:textSize="18sp"/> android:textSize="18sp"/>
</TableRow> </TableRow>
@ -39,7 +38,7 @@
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:text="@string/call_stats_codec" android:text="@string/call_stats_codec"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
@ -48,7 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
</TableRow> </TableRow>
@ -63,7 +62,7 @@
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:text="@string/call_stats_upload" android:text="@string/call_stats_upload"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
@ -72,7 +71,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
</TableRow> </TableRow>
@ -86,7 +85,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:text="@string/call_stats_download" android:text="@string/call_stats_download"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textStyle="bold" android:textStyle="bold"
android:textSize="12sp"/> android:textSize="12sp"/>
@ -96,7 +95,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
</TableRow> </TableRow>
@ -111,7 +110,7 @@
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:text="@string/call_stats_ice" android:text="@string/call_stats_ice"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
@ -120,7 +119,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
</TableRow> </TableRow>
@ -136,7 +135,7 @@
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:text="@string/call_stats_video_resolution" android:text="@string/call_stats_video_resolution"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
<TextView <TextView
@ -145,7 +144,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:textColor="@android:color/white" android:textColor="@color/colorB"
android:textSize="12sp"/> android:textSize="12sp"/>
</TableRow> </TableRow>

2
res/layout/toast.xml
View file

@ -3,7 +3,7 @@
android:id="@+id/toastRoot" android:id="@+id/toastRoot"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/popup" android:background="@color/colorB"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView

2
res/layout/zrtp_dialog.xml
View file

@ -3,7 +3,7 @@
android:id="@+id/toastRoot" android:id="@+id/toastRoot"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/zrtp_popup" android:background="@color/colorB"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView

6
res/values/attrs.xml
View file

@ -13,9 +13,5 @@
<attr name="content" format="reference" /> <attr name="content" format="reference" />
<attr name="direction" /> <attr name="direction" />
</declare-styleable> </declare-styleable>
<declare-styleable name="AvatarWithShadow">
<attr name="picture" format="reference" />
</declare-styleable>
</resources> </resources>

59
res/values/color.xml
View file

@ -1,51 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- NEW COLORS --> <color name="colorA">#ff5e00</color>
<color name="colorA">#ff5e00</color> <color name="colorB">#000000</color>
<color name="colorB">#000000</color> <color name="colorC">#444444</color>
<color name="colorC">#444444</color> <color name="colorD">#808080</color>
<color name="colorD">#808080</color> <color name="colorE">#c4c4c4</color>
<color name="colorE">#c4c4c4</color> <color name="colorF">#e1e1e1</color>
<color name="colorF">#e1e1e1</color> <color name="colorG">#f3f3f3</color>
<color name="colorG">#f3f3f3</color> <color name="colorH">#ffffff</color>
<color name="colorH">#ffffff</color> <color name="colorI">#ff0000</color>
<color name="colorI">#ff0000</color> <color name="colorJ">#ffa645</color>
<color name="colorJ">#ffa645</color> <color name="colorK">#3eb5c0</color>
<color name="colorK">#3eb5c0</color> <color name="colorL">#96c11f</color>
<color name="colorL">#96c11f</color> <color name="colorAB">#ffeee5</color>
<color name="colorAB">#ffeee5</color>
<!-- end -->
<color name="main_app_color">#ffcf4c29</color>
<color name="text_selected">#ffcf4c29</color>
<color name="text_over">#ffb9c4cb</color>
<color name="text_default">#ff5b656f</color>
<color name="text_disabled">#ffa6b3bf</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_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_dialer">#ffd8d8d8</color>
<color name="numpad_background_top">#ffb1bdc3</color>
<color name="missed_calls_background">#ffcf4c29</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="landscape_background">#CCCCCC</color>
<color name="text_contrast">#ff000000</color> <!-- If background is white, set to black, else set to white -->
<color name="menu_button_background">#ff262a2e</color>
</resources> </resources>