Rename/Delete/add assets

This commit is contained in:
Margaux Clerc 2015-08-25 17:22:32 +02:00
parent 90d9193aa7
commit 641a32cbfa
14 changed files with 92 additions and 316 deletions

View file

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

View file

@ -1,8 +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:drawable="@drawable/back_over" />
<item
android:drawable="@drawable/back_default" />
</selector>

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#FFB1BDC4"
android:startColor="#FFE4EDF2"
android:angle="90"/>
</shape>

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:drawable="@color/colorE" />
<item android:state_enabled="false"
android:drawable="@color/colorF" />
<item
android:drawable="@color/colorF" />
</selector>

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap
xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/camera_default"
android:alpha="0.2" />

View file

@ -1,9 +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:drawable="@drawable/back_over" />
<item android:state_enabled="false"
android:drawable="@drawable/back_disabled" />
<item
android:drawable="@drawable/back_default" />
</selector>

View file

@ -1,177 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/landscape_background">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:layout_centerInParent="true"
android:src="@drawable/background_logo"/>
<!-- Hack to adjust perfectly on every screen the bottom of the fragment with the curved menu -->
<LinearLayout
android:id="@+id/mark"
android:background="@color/menu_button_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:gravity="bottom"
android:orientation="horizontal">
<ImageView
android:contentDescription="@string/content_description_mark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2"
android:scaleType="fitEnd"
android:src="@drawable/mark"
android:visibility="invisible" />
<ImageView
android:contentDescription="@string/content_description_mark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2"
android:scaleType="fitEnd"
android:src="@drawable/mark"
android:visibility="invisible" />
<ImageView
android:contentDescription="@string/content_description_mark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.24"
android:scaleType="fitEnd"
android:src="@drawable/mark"
android:visibility="invisible" />
<ImageView
android:contentDescription="@string/content_description_mark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2"
android:scaleType="fitEnd"
android:src="@drawable/mark"
android:visibility="invisible" />
<ImageView
android:contentDescription="@string/content_description_mark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2"
android:scaleType="fitEnd"
android:src="@drawable/mark"
android:visibility="invisible" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/mark"
android:layout_alignParentTop="true" >
<LinearLayout
android:baselineAligned="false"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingTop="40dp">
<LinearLayout
android:orientation="horizontal"
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.67" />
<LinearLayout
android:orientation="horizontal"
android:id="@+id/fragmentContainer2"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.33"
android:paddingBottom="10dp" />
</LinearLayout>
<fragment
android:id="@+id/status"
android:name="org.linphone.StatusFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/status" />
</FrameLayout>
<LinearLayout
android:id="@+id/menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2">
<include layout="@layout/menu_history_button" />
<TextView
android:id="@+id/missedCalls"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:background="@drawable/missed_calls_bg"
android:gravity="center"
android:textSize="20dp"
android:visibility="gone" />
</RelativeLayout>
<include layout="@layout/menu_contact_button" />
<ImageView
android:id="@+id/dialer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.245"
android:adjustViewBounds="true"
android:contentDescription="@string/content_description_dialer"
android:scaleType="fitXY"
android:src="@drawable/dialer" />
<RelativeLayout
android:id="@+id/completeChat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2">
<include layout="@layout/menu_chat_button" />
<TextView
android:id="@+id/missedChats"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:background="@drawable/missed_calls_bg"
android:gravity="center"
android:textSize="20dp"
android:visibility="gone" />
</RelativeLayout>
<include layout="@layout/menu_settings_button" />
</LinearLayout>
</RelativeLayout>

View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black">
<ListView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:drawSelectorOnTop="false"
android:cacheColorHint="@color/transparent"
android:scrollbarAlwaysDrawVerticalTrack="true" />
</RelativeLayout>

View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="75dp"
android:layout_margin="2dp"
android:gravity="center"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:id="@+id/contactPicture"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|top"
android:src="@drawable/avatar" />
</TableRow>

View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center_vertical"
android:padding="10dp">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/numoraddr"
android:layout_width="329dp"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:background="@drawable/resizable_textfield"
android:inputType="textEmailAddress"/>
<ImageView
android:contentDescription="@string/content_description_add"
android:id="@+id/add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/add_field_default"
android:paddingLeft="5dp"
android:gravity="right" />
</TableRow>

47
res/layout/dialog.xml Normal file
View file

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:gravity="center">
<TextView
android:id="@+id/customText"
style="@style/font14"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="20dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/cancel"
android:text="@string/cancel"
android:background="@drawable/resizable_cancel_button"
style="@style/font8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:padding="10dp"/>
<Button
android:id="@+id/delete"
android:text="@string/delete"
android:background="@drawable/resizable_confirm_delete_button"
style="@style/font15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:padding="10dp"/>
</LinearLayout>
</LinearLayout>

View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
android:id="@+id/settings"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true">
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/settings" />
<TextView
android:contentDescription="@string/content_description_settings"
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignBottom="@id/image"
android:paddingBottom="10dp"
android:textColor="@drawable/text_color"
android:text="@string/button_settings"
android:textSize="12sp" />
</RelativeLayout>

View file

@ -3,7 +3,7 @@
android:id="@+id/topLayout" android:id="@+id/topLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/background"> android:background="@color/colorH">
<include layout="@layout/status" android:id="@+id/statusBar" /> <include layout="@layout/status" android:id="@+id/statusBar" />
@ -15,12 +15,10 @@
android:background="@color/colorF"> android:background="@color/colorF">
<TextView <TextView
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/colorA"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/incoming" style="@style/font1"
android:textAllCaps="true" android:text="@string/outgoing_call"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:gravity="center"/> android:gravity="center"/>
@ -33,24 +31,21 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_above="@id/menu"> android:layout_above="@id/menu">
<LinearLayout <LinearLayout
android:id="@+id/incoming_caller_profile" android:id="@+id/incoming_caller_profile"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="10dp" android:paddingTop="10dp">
android:weightSum="1">
<ImageView <ImageView
android:id="@+id/incoming_picture" android:id="@+id/incoming_picture"
android:layout_width="259dp" android:layout_width="300dp"
android:layout_height="207dp" android:layout_height="300dp"
android:src="@drawable/avatar" android:src="@drawable/avatar"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"/>
android:layout_weight="1.30"/>
<TextView <TextView
android:id="@+id/incoming_caller_name" android:id="@+id/incoming_caller_name"
@ -58,17 +53,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textAlignment="center" android:textAlignment="center"
android:layout_marginBottom="20dp" style="@style/font5"/>
android:textColor="@android:color/black"
android:textSize="28sp" />
<TextView <TextView
android:id="@+id/incoming_caller_number" android:id="@+id/incoming_caller_number"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="wrap_content"
android:textColor="@android:color/black" style="@style/font2"
android:textSize="28sp" android:layout_gravity="center"/>
android:layout_gravity="center_horizontal"/>
</LinearLayout> </LinearLayout>
@ -85,33 +77,46 @@
<LinearLayout <LinearLayout
android:id="@+id/menu" android:id="@+id/menu"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="70dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:orientation="horizontal" > android:orientation="horizontal" >
<ImageView <ImageView
android:id="@+id/accept" android:id="@+id/micro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/colorD" android:background="@color/colorF"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/call_audio_start" /> android:src="@drawable/micro_default" />
<ImageView <ImageView
android:id="@+id/decline" android:id="@+id/speaker"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/footer_select" android:background="@color/colorF"
android:adjustViewBounds="true"
android:contentDescription="@string/content_description_pause"
android:scaleType="center"
android:src="@drawable/speaker_default" />
<ImageView
android:id="@+id/hangUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.7"
android:background="@drawable/call"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/call_hangup" /> android:src="@drawable/call_hangup" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>