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

Started to improve call layout

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-19 16:16:55 +01:00
parent 060c4ca33a
commit 196fde1a93
4 changed files with 723 additions and 1291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/call/CallActivity.java
View file

@ -1013,10 +1013,12 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
routeSpeaker.setVisibility(View.INVISIBLE); routeSpeaker.setVisibility(View.INVISIBLE);
routeBluetooth.setVisibility(View.INVISIBLE); routeBluetooth.setVisibility(View.INVISIBLE);
routeEarpiece.setVisibility(View.INVISIBLE); routeEarpiece.setVisibility(View.INVISIBLE);
audioRoute.setSelected(false);
} else { } else {
routeSpeaker.setVisibility(View.VISIBLE); routeSpeaker.setVisibility(View.VISIBLE);
routeBluetooth.setVisibility(View.VISIBLE); routeBluetooth.setVisibility(View.VISIBLE);
routeEarpiece.setVisibility(View.VISIBLE); routeEarpiece.setVisibility(View.VISIBLE);
audioRoute.setSelected(true);
} }
} }

330
app/src/main/res/layout-land/call.xml
View file

@ -10,25 +10,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<RelativeLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/status"> android:layout_marginTop="40dp">
<LinearLayout <LinearLayout
android:id="@+id/fragmentContainer" android:id="@+id/fragmentContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" /> android:orientation="horizontal"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/menu">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent"
android:layout_marginBottom="60dp">
<LinearLayout <LinearLayout
android:id="@+id/conference_list" android:id="@+id/conference_list"
@ -44,33 +40,34 @@
android:id="@+id/active_call" android:id="@+id/active_call"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="visible" android:layout_alignParentTop="true"
android:layout_marginTop="40dp"> android:visibility="visible">
<LinearLayout <LinearLayout
android:id="@+id/active_call_info" android:id="@+id/active_call_info"
android:background="@color/colorH" android:background="@color/colorH"
android:alpha="0.8" android:alpha="0.8"
android:paddingBottom="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="80dp"
android:gravity="center_horizontal" android:layout_centerHorizontal="true"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/current_contact_name" android:id="@+id/current_contact_name"
style="@style/font5" style="@style/font5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom"/> android:paddingTop="5dp"
android:gravity="center"
android:layout_gravity="center"/>
<Chronometer <Chronometer
android:id="@+id/current_call_timer" android:id="@+id/current_call_timer"
style="@style/font2" style="@style/font2"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom"/> android:layout_gravity="center"/>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
@ -86,16 +83,16 @@
android:id="@+id/contact_picture" android:id="@+id/contact_picture"
android:src="@drawable/avatar" android:src="@drawable/avatar"
android:contentDescription="@string/content_description_contact_picture" android:contentDescription="@string/content_description_contact_picture"
android:layout_width="150dp" android:layout_width="200dp"
android:layout_height="150dp" android:layout_height="200dp"
android:adjustViewBounds="true"/> android:adjustViewBounds="true"/>
<ImageView <ImageView
android:id="@+id/mask" android:id="@+id/mask"
android:src="@drawable/avatar_mask_border" android:src="@drawable/avatar_mask_border"
android:contentDescription="@string/content_description_contact_picture" android:contentDescription="@string/content_description_contact_picture"
android:layout_width="150dp" android:layout_width="200dp"
android:layout_height="150dp" android:layout_height="200dp"
android:adjustViewBounds="true"/> android:adjustViewBounds="true"/>
</RelativeLayout> </RelativeLayout>
@ -145,8 +142,8 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_below="@+id/active_call_info" android:layout_below="@+id/active_call_info"
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>
</RelativeLayout>
</RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/calls_list" android:id="@+id/calls_list"
@ -183,43 +180,29 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</FrameLayout>
<org.linphone.ui.Numpad
android:id="@+id/numpad"
android:background="@color/colorF"
android:contentDescription="@string/content_description_numpad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_margin="10dp"
android:layout_above="@id/menu"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"/>
<LinearLayout <LinearLayout
android:id="@+id/menu" android:id="@+id/menu"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="60dp" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:gravity="bottom"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/main_bar" android:id="@+id/main_bar"
android:background="@color/colorF" android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_weight="1" android:layout_weight="0.5"
android:orientation="horizontal"> android:orientation="horizontal" >
<ImageView <ImageView
android:id="@+id/dialer" android:id="@+id/dialer"
android:src="@drawable/footer_dialer" android:src="@drawable/footer_dialer"
android:background="@color/colorC" android:background="@color/colorC"
android:contentDescription="@string/content_description_numpad" android:contentDescription="@string/content_description_numpad"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0.25"
android:padding="15dp" /> android:padding="15dp" />
<ImageView <ImageView
@ -227,16 +210,17 @@
android:src="@drawable/call_hangup" android:src="@drawable/call_hangup"
android:background="@drawable/hangup" android:background="@drawable/hangup"
android:contentDescription="@string/content_description_hang_up" android:contentDescription="@string/content_description_hang_up"
android:layout_width="match_parent" android:layout_gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="0.5"
android:padding="12dp"/> android:padding="12dp"/>
<RelativeLayout <RelativeLayout
android:background="@drawable/footer_button" android:background="@drawable/footer_button"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="0.25">
<ImageView <ImageView
android:id="@+id/chat" android:id="@+id/chat"
@ -257,24 +241,29 @@
android:layout_margin="15dp" android:layout_margin="15dp"
android:gravity="center" android:gravity="center"
android:visibility="gone"/> android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:id="@+id/secondary_bar"
android:layout_height="60dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_height="match_parent"
android:layout_weight="0.5"
android:gravity="bottom"
android:minHeight="60dp"
android:layout_toRightOf="@id/main_bar"
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="60dp"
android:layout_weight="1"> android:layout_weight="0.25">
<ImageView <ImageView
android:id="@+id/video" android:id="@+id/video"
android:src="@drawable/camera_default" android:src="@drawable/camera"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_switch_video" android:contentDescription="@string/content_description_switch_video"
android:padding="20dp" android:padding="20dp"
@ -294,183 +283,154 @@
<ImageView <ImageView
android:id="@+id/micro" android:id="@+id/micro"
android:src="@drawable/micro_default" android:src="@drawable/micro"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:padding="10dp" android:padding="10dp"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="60dp"
android:layout_weight="1" /> android:layout_weight="0.25" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.25">
<ImageView <ImageView
android:id="@+id/speaker" android:id="@+id/speaker"
android:src="@drawable/speaker_default" android:src="@drawable/speaker"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:padding="15dp" android:padding="15dp"
android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="60dp" />
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/audio_route" android:id="@+id/audio_route"
android:src="@drawable/routes_default" android:src="@drawable/routes"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_audio_route" android:contentDescription="@string/content_description_audio_route"
android:visibility="gone" android:visibility="gone"
android:padding="20dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageView
android:id="@+id/options"
android:src="@drawable/options_default"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_call_options"
android:padding="15dp" android:padding="15dp"
android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp" />
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/menu_bottom"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_above="@id/menu"
android:orientation="horizontal" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/route_bluetooth" android:id="@+id/route_bluetooth"
android:visibility="gone"
android:layout_above="@id/audio_route"
android:src="@drawable/route_bluetooth" android:src="@drawable/route_bluetooth"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_bluetooth" android:contentDescription="@string/content_description_bluetooth"
android:padding="15dp" android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp" />
android:layout_weight="1.4" />
<ImageView
android:id="@+id/add_call"
android:src="@drawable/options_add_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_add_call"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4" />
</LinearLayout>
<LinearLayout
android:id="@+id/menu_middle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_above="@id/menu_bottom"
android:orientation="horizontal" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/route_earpiece" android:id="@+id/route_earpiece"
android:visibility="gone"
android:layout_above="@id/route_bluetooth"
android:src="@drawable/route_earpiece" android:src="@drawable/route_earpiece"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_earpiece" android:contentDescription="@string/content_description_earpiece"
android:padding="15dp" android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp"/>
android:layout_weight="1.4"/>
<ImageView
android:id="@+id/transfer"
android:src="@drawable/options_transfer_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_transfer"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"/>
</LinearLayout>
<LinearLayout
android:layout_above="@id/menu_middle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/route_speaker" android:id="@+id/route_speaker"
android:visibility="gone"
android:layout_above="@id/route_earpiece"
android:src="@drawable/route_speaker" android:src="@drawable/route_speaker"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:visibility="invisible"
android:padding="15dp" android:padding="15dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp"/>
android:layout_weight="1.4"/>
<ImageView
android:id="@+id/conference"
android:src="@drawable/options_start_conference"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_conference"
android:visibility="invisible"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"/>
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.25">
<ImageView
android:id="@+id/options"
android:src="@drawable/options"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_call_options"
android:padding="15dp"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="60dp" />
<ImageView
android:id="@+id/add_call"
android:visibility="gone"
android:layout_above="@id/options"
android:src="@drawable/options_add_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_add_call"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
<ImageView
android:id="@+id/transfer"
android:visibility="gone"
android:layout_above="@id/add_call"
android:src="@drawable/options_transfer_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_transfer"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp"/>
<ImageView
android:id="@+id/conference"
android:visibility="gone"
android:layout_above="@id/transfer"
android:src="@drawable/options_start_conference"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_conference"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/main_bar"
android:layout_marginBottom="60dp">
<org.linphone.ui.Numpad
android:id="@+id/numpad"
android:visibility="gone"
android:background="@color/colorF"
android:contentDescription="@string/content_description_numpad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_centerInParent="true"/>
</RelativeLayout>
</FrameLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/side_menu_content" android:id="@+id/side_menu_content"
android:background="@color/colorH" android:background="@color/colorH"
android:layout_marginTop="40dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="left"> android:layout_gravity="left">
@ -485,7 +445,7 @@
android:id="@+id/status" android:id="@+id/status"
android:name="org.linphone.fragments.StatusFragment" android:name="org.linphone.fragments.StatusFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="40dp"
tools:layout="@layout/status" /> tools:layout="@layout/status" />
</RelativeLayout> </RelativeLayout>

495
app/src/main/res/layout-sw533dp-land/call.xml
View file

@ -1,495 +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:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment
android:id="@+id/status"
android:name="org.linphone.fragments.StatusFragment"
android:layout_width="match_parent"
android:layout_height="35dp"
tools:layout="@layout/status" />
<android.support.v4.widget.DrawerLayout
android:id="@+id/side_menu"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/status">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/status">
<LinearLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/menu">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/conference_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:visibility="gone">
</LinearLayout>
<RelativeLayout
android:id="@+id/active_call"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible">
<LinearLayout
android:id="@+id/active_call_info"
android:background="@color/colorH"
android:alpha="0.8"
android:paddingBottom="10dp"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/current_contact_name"
style="@style/font5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"/>
<Chronometer
android:id="@+id/current_call_timer"
style="@style/font2"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"/>
</LinearLayout>
<RelativeLayout
android:id="@+id/avatar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/active_call_info"
android:layout_margin="5dp"
android:paddingTop="10dp"
android:gravity="center_horizontal">
<ImageView
android:id="@+id/contact_picture"
android:src="@drawable/avatar"
android:contentDescription="@string/content_description_contact_picture"
android:layout_width="150dp"
android:layout_height="150dp"
android:adjustViewBounds="true"/>
<ImageView
android:id="@+id/mask"
android:src="@drawable/avatar_mask_border"
android:contentDescription="@string/content_description_contact_picture"
android:layout_width="150dp"
android:layout_height="150dp"
android:adjustViewBounds="true"/>
</RelativeLayout>
<LinearLayout
android:id="@+id/remote_pause"
android:background="@color/colorC"
android:alpha="0.9"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:src="@drawable/waiting_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView
android:text="@string/call_paused_by_remote"
style="@style/font16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
</LinearLayout>
<ImageView
android:id="@+id/pause"
android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause"
android:layout_width="80dp"
android:layout_height="80dp"
android:padding="10dp"
android:layout_below="@+id/active_call_info"
android:layout_alignParentRight="true"/>
<ImageView
android:id="@+id/switchCamera"
android:src="@drawable/switch_camera"
android:layout_width="80dp"
android:layout_height="80dp"
android:padding="10dp"
android:contentDescription="@string/content_description_switch_camera"
android:visibility="invisible"
android:layout_below="@+id/active_call_info"
android:layout_alignParentLeft="true"/>
</RelativeLayout>
<LinearLayout
android:id="@+id/calls_list"
android:background="@color/colorH"
android:layout_width="match_parent"
android:layout_weight="0.5"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:id="@+id/no_current_call"
android:background="@color/colorC"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_above="@id/calls_list"
android:gravity="center_vertical"
android:visibility="gone">
<ImageView
android:src="@drawable/waiting_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView
android:text="@string/no_current_call"
style="@style/font16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
</FrameLayout>
<org.linphone.ui.Numpad
android:id="@+id/numpad"
android:background="@color/colorF"
android:contentDescription="@string/content_description_numpad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_margin="10dp"
android:layout_above="@id/menu"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"/>
<LinearLayout
android:id="@+id/menu"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/main_bar"
android:background="@color/colorF"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_weight="1"
android:orientation="horizontal">
<ImageView
android:id="@+id/dialer"
android:src="@drawable/footer_dialer"
android:background="@color/colorC"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="15dp"
android:contentDescription="@string/content_description_numpad"/>
<ImageView
android:id="@+id/hang_up"
android:src="@drawable/call_hangup"
android:background="@drawable/hangup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:padding="12dp"
android:contentDescription="@string/content_description_hang_up"/>
<RelativeLayout
android:background="@drawable/footer_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<ImageView
android:id="@+id/chat"
android:src="@drawable/footer_chat"
android:background="@color/colorC"
android:contentDescription="@string/content_description_chat_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="15dp"
android:layout_centerInParent="true"/>
<TextView
android:id="@+id/missed_chats"
android:background="@drawable/unread_message_count_bg"
style="@style/font18"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:gravity="center"
android:visibility="gone"/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_weight="1"
android:orientation="horizontal">
<RelativeLayout
android:background="@drawable/button_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/video"
android:src="@drawable/camera_default"
android:background="@drawable/button_background"
android:padding="20dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/content_description_switch_video"/>
<ProgressBar
android:id="@+id/video_in_progress"
style="?android:attr/progressBarStyle"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</RelativeLayout>
<ImageView
android:id="@+id/micro"
android:src="@drawable/micro_default"
android:background="@drawable/button_background"
android:padding="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:contentDescription="@string/content_description_toggle_micro"/>
<ImageView
android:id="@+id/speaker"
android:src="@drawable/speaker_default"
android:background="@drawable/button_background"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:contentDescription="@string/content_description_toggle_speaker"/>
<ImageView
android:id="@+id/audio_route"
android:src="@drawable/routes_default"
android:background="@drawable/button_background"
android:visibility="gone"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:contentDescription="@string/content_description_audio_route"/>
<ImageView
android:id="@+id/options"
android:src="@drawable/options_default"
android:background="@drawable/button_background"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:contentDescription="@string/content_description_call_options"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/menu_bottom"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_above="@id/menu"
android:orientation="horizontal"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<ImageView
android:id="@+id/route_bluetooth"
android:src="@drawable/route_bluetooth"
android:background="@drawable/button_background"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"
android:contentDescription="@string/content_description_bluetooth"/>
<ImageView
android:id="@+id/add_call"
android:src="@drawable/options_add_call"
android:background="@drawable/button_background"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"
android:contentDescription="@string/content_description_add_call"/>
</LinearLayout>
<LinearLayout
android:id="@+id/menu_middle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_above="@id/menu_bottom"
android:orientation="horizontal" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<ImageView
android:id="@+id/route_earpiece"
android:src="@drawable/route_earpiece"
android:background="@drawable/button_background"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"
android:contentDescription="@string/content_description_earpiece"/>
<ImageView
android:id="@+id/transfer"
android:src="@drawable/options_transfer_call"
android:background="@drawable/button_background"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"
android:contentDescription="@string/content_description_transfer"/>
</LinearLayout>
<LinearLayout
android:layout_above="@id/menu_middle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"/>
<ImageView
android:id="@+id/route_speaker"
android:src="@drawable/route_speaker"
android:background="@drawable/button_background"
android:visibility="invisible"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"
android:contentDescription="@string/content_description_toggle_speaker"/>
<ImageView
android:id="@+id/conference"
android:src="@drawable/options_start_conference"
android:background="@drawable/button_background"
android:visibility="invisible"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.4"
android:contentDescription="@string/content_description_conference"/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/side_menu_content"
android:background="@color/colorH"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="left">
<include layout="@layout/incall_stats" android:id="@+id/incall_stats"/>
</RelativeLayout>
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

279
app/src/main/res/layout/call.xml
View file

@ -10,10 +10,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<RelativeLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/status"> android:layout_marginTop="40dp">
<LinearLayout <LinearLayout
android:id="@+id/fragmentContainer" android:id="@+id/fragmentContainer"
@ -24,8 +24,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="40dp" android:layout_marginBottom="120dp">
android:layout_above="@+id/menu">
<LinearLayout <LinearLayout
android:id="@+id/conference_list" android:id="@+id/conference_list"
@ -41,6 +40,7 @@
android:id="@+id/active_call" android:id="@+id/active_call"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:visibility="visible"> android:visibility="visible">
<LinearLayout <LinearLayout
@ -67,6 +67,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"/> android:layout_gravity="center"/>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
@ -141,6 +142,7 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_below="@+id/active_call_info" android:layout_below="@+id/active_call_info"
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
@ -182,20 +184,23 @@
<LinearLayout <LinearLayout
android:id="@+id/menu" android:id="@+id/menu"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:background="@color/colorF" android:id="@+id/secondary_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="0dp"
android:layout_weight="1"
android:gravity="bottom"
android:minHeight="60dp"
android:layout_above="@id/main_bar"
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="60dp"
android:layout_weight="1"> android:layout_weight="0.25">
<ImageView <ImageView
android:id="@+id/video" android:id="@+id/video"
@ -223,9 +228,14 @@
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:padding="10dp" android:padding="10dp"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="60dp"
android:layout_weight="1" /> android:layout_weight="0.25" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.25">
<ImageView <ImageView
android:id="@+id/speaker" android:id="@+id/speaker"
@ -233,20 +243,60 @@
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:padding="15dp" android:padding="15dp"
android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="60dp" />
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/audio_route" android:id="@+id/audio_route"
android:src="@drawable/routes_default" android:src="@drawable/routes"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_audio_route" android:contentDescription="@string/content_description_audio_route"
android:visibility="gone" android:visibility="gone"
android:padding="15dp" android:padding="15dp"
android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" />
<ImageView
android:id="@+id/route_bluetooth"
android:visibility="gone"
android:layout_above="@id/audio_route"
android:src="@drawable/route_bluetooth"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_bluetooth"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
<ImageView
android:id="@+id/route_earpiece"
android:visibility="gone"
android:layout_above="@id/route_bluetooth"
android:src="@drawable/route_earpiece"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_earpiece"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp"/>
<ImageView
android:id="@+id/route_speaker"
android:visibility="gone"
android:layout_above="@id/route_earpiece"
android:src="@drawable/route_speaker"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="0.25">
<ImageView <ImageView
android:id="@+id/options" android:id="@+id/options"
@ -254,9 +304,45 @@
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_call_options" android:contentDescription="@string/content_description_call_options"
android:padding="15dp" android:padding="15dp"
android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp" />
android:layout_weight="1" />
<ImageView
android:id="@+id/add_call"
android:visibility="gone"
android:layout_above="@id/options"
android:src="@drawable/options_add_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_add_call"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
<ImageView
android:id="@+id/transfer"
android:visibility="gone"
android:layout_above="@id/add_call"
android:src="@drawable/options_transfer_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_transfer"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp"/>
<ImageView
android:id="@+id/conference"
android:visibility="gone"
android:layout_above="@id/transfer"
android:src="@drawable/options_start_conference"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_conference"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="60dp"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -272,9 +358,9 @@
android:src="@drawable/footer_dialer" android:src="@drawable/footer_dialer"
android:background="@color/colorC" android:background="@color/colorC"
android:contentDescription="@string/content_description_numpad" android:contentDescription="@string/content_description_numpad"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.8" android:layout_weight="0.25"
android:padding="15dp" /> android:padding="15dp" />
<ImageView <ImageView
@ -283,16 +369,16 @@
android:background="@drawable/hangup" android:background="@drawable/hangup"
android:contentDescription="@string/content_description_hang_up" android:contentDescription="@string/content_description_hang_up"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.4" android:layout_weight="0.5"
android:padding="12dp"/> android:padding="12dp"/>
<RelativeLayout <RelativeLayout
android:background="@drawable/footer_button" android:background="@drawable/footer_button"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.8"> android:layout_weight="0.25">
<ImageView <ImageView
android:id="@+id/chat" android:id="@+id/chat"
@ -313,138 +399,18 @@
android:layout_margin="15dp" android:layout_margin="15dp"
android:gravity="center" android:gravity="center"
android:visibility="gone"/> android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <RelativeLayout
android:id="@+id/menu_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="match_parent"
android:layout_above="@id/menu" android:layout_above="@id/main_bar"
android:orientation="horizontal" > android:layout_marginBottom="120dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="0.5"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="0.5"/>
<ImageView
android:id="@+id/route_bluetooth"
android:src="@drawable/route_bluetooth"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_bluetooth"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5" />
<ImageView
android:id="@+id/add_call"
android:src="@drawable/options_add_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_add_call"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5" />
</LinearLayout>
<LinearLayout
android:id="@+id/menu_middle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_above="@id/menu_bottom"
android:orientation="horizontal" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="0.5"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="0.5"/>
<ImageView
android:id="@+id/route_earpiece"
android:src="@drawable/route_earpiece"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_earpiece"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"/>
<ImageView
android:id="@+id/transfer"
android:src="@drawable/options_transfer_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_transfer"
android:padding="15dp"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"/>
</LinearLayout>
<LinearLayout
android:layout_above="@id/menu_middle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="0.5"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="0.5"/>
<ImageView
android:id="@+id/route_speaker"
android:src="@drawable/route_speaker"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker"
android:visibility="invisible"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"/>
<ImageView
android:id="@+id/conference"
android:src="@drawable/options_start_conference"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_conference"
android:visibility="invisible"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"/>
</LinearLayout>
<org.linphone.ui.Numpad <org.linphone.ui.Numpad
android:id="@+id/numpad" android:id="@+id/numpad"
@ -452,15 +418,14 @@
android:contentDescription="@string/content_description_numpad" android:contentDescription="@string/content_description_numpad"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:layout_marginTop="10dp"
android:layout_marginTop="50dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_above="@id/menu" android:layout_centerInParent="true"/>
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"/>
</RelativeLayout> </RelativeLayout>
</FrameLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/side_menu_content" android:id="@+id/side_menu_content"
android:background="@color/colorH" android:background="@color/colorH"