conversation: allow to select number to use
Issue: #78218
Change-Id: I476e5aec3b6c22308bdc5256396a8ce051899d52
diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_dialer_sip_black_24dp.png b/ring-android/app/src/main/res/drawable-hdpi/ic_dialer_sip_black_24dp.png
new file mode 100644
index 0000000..ce6d9dc
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-hdpi/ic_dialer_sip_black_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-hdpi/ring_logo_24dp.png b/ring-android/app/src/main/res/drawable-hdpi/ring_logo_24dp.png
new file mode 100644
index 0000000..1063e67
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-hdpi/ring_logo_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_dialer_sip_black_24dp.png b/ring-android/app/src/main/res/drawable-mdpi/ic_dialer_sip_black_24dp.png
new file mode 100644
index 0000000..a4b5a27
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-mdpi/ic_dialer_sip_black_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/ring_logo_24dp.png b/ring-android/app/src/main/res/drawable-mdpi/ring_logo_24dp.png
new file mode 100644
index 0000000..0d86cb5
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-mdpi/ring_logo_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_dialer_sip_black_24dp.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_dialer_sip_black_24dp.png
new file mode 100644
index 0000000..44b1470
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-xhdpi/ic_dialer_sip_black_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ring_logo_24dp.png b/ring-android/app/src/main/res/drawable-xhdpi/ring_logo_24dp.png
new file mode 100644
index 0000000..a0d2ba6
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-xhdpi/ring_logo_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_dialer_sip_black_24dp.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_dialer_sip_black_24dp.png
new file mode 100644
index 0000000..d911ebd
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-xxhdpi/ic_dialer_sip_black_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ring_logo_24dp.png b/ring-android/app/src/main/res/drawable-xxhdpi/ring_logo_24dp.png
new file mode 100644
index 0000000..6991785
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-xxhdpi/ring_logo_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-xxxhdpi/ic_dialer_sip_black_24dp.png b/ring-android/app/src/main/res/drawable-xxxhdpi/ic_dialer_sip_black_24dp.png
new file mode 100644
index 0000000..d458d5d
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-xxxhdpi/ic_dialer_sip_black_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/drawable-xxxhdpi/ring_logo_24dp.png b/ring-android/app/src/main/res/drawable-xxxhdpi/ring_logo_24dp.png
new file mode 100644
index 0000000..b8e90ea
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable-xxxhdpi/ring_logo_24dp.png
Binary files differ
diff --git a/ring-android/app/src/main/res/layout/frag_conversation.xml b/ring-android/app/src/main/res/layout/frag_conversation.xml
index b2f8ee6..6b44ebb 100644
--- a/ring-android/app/src/main/res/layout/frag_conversation.xml
+++ b/ring-android/app/src/main/res/layout/frag_conversation.xml
@@ -1,68 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical" android:layout_width="match_parent"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:orientation="vertical"
tools:context=".client.ConversationActivity">
<ListView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
android:id="@+id/hist_list"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
android:layout_weight="1"
- android:transcriptMode="alwaysScroll"
- android:stackFromBottom="true"
- android:divider="@null"
android:background="#ebeff0"
+ android:clipToPadding="false"
+ android:divider="@null"
android:listSelector="@android:color/transparent"
+ android:paddingBottom="8dp"
+ android:paddingTop="8dp"
+ android:stackFromBottom="true"
+ android:transcriptMode="alwaysScroll"
tools:listitem="@layout/item_textmsg" />
<RelativeLayout
+ android:id="@+id/ongoingcall_pane"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:background="#e3c1c1"
- android:id="@+id/ongoingcall_pane">
+ android:background="#e3c1c1">
<TextView
+ android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="Ongoing call"
- android:id="@+id/textView2"
- android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
- android:layout_margin="10dp" />
+ android:layout_centerVertical="true"
+ android:layout_margin="10dp"
+ android:text="@string/ongoing_call"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@color/text_color_primary" />
</RelativeLayout>
<ImageView
+ android:id="@+id/divider"
android:layout_width="fill_parent"
android:layout_height="1dp"
- android:id="@+id/divider"
android:layout_gravity="center_horizontal"
android:background="#bdbdbd" />
<LinearLayout
- android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="48dp"
android:background="@android:color/white"
- android:elevation="6dp">
+ android:orientation="horizontal">
- <EditText
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/msg_input_txt"
- android:layout_weight="1" />
-
- <ImageButton
+ <Spinner
+ android:id="@+id/number_selector"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
+ tools:listitem="@layout/item_number_selected"
+ android:visibility="visible" />
+
+ <EditText
+ android:id="@+id/msg_input_txt"
+ android:layout_width="0dp"
+ android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:hyphenationFrequency="normal"
+ android:imeOptions="actionSend"
+ android:inputType="textShortMessage" />
+
+ <ImageButton
android:id="@+id/msg_send"
- android:src="@drawable/ic_send_black_24dp"
- android:tint="@android:color/darker_gray"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
android:background="@android:color/transparent"
- android:padding="8dp" />
+ android:contentDescription="@string/send_message"
+ android:padding="8dp"
+ android:src="@drawable/ic_send_black_24dp"
+ android:tint="@android:color/darker_gray" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_number.xml b/ring-android/app/src/main/res/layout/item_number.xml
new file mode 100644
index 0000000..755a4c0
--- /dev/null
+++ b/ring-android/app/src/main/res/layout/item_number.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/call_entry"
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:descendantFocusability="blocksDescendants"
+ android:padding="8dp">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/number_icon"
+ android:layout_alignParentLeft="true"
+ android:src="@drawable/ic_dialer_sip_black_24dp"
+ android:layout_alignParentStart="true"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_alignParentTop="false"
+ android:layout_centerVertical="true" />
+
+ <TextView
+ android:id="@+id/number_txt"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:marqueeRepeatLimit="marquee_forever"
+ android:scrollHorizontally="true"
+ android:singleLine="true"
+ android:textSize="16sp"
+ android:textColor="@color/text_color_primary"
+ android:layout_marginTop="2dp"
+ android:layout_toRightOf="@+id/number_icon"
+ android:text="+15142792035"
+ android:layout_alignParentTop="true" />
+
+ <TextView
+ android:id="@+id/number_label_txt"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textSize="12sp"
+ android:textColor="@color/text_color_secondary"
+ android:text="Inde"
+ android:layout_below="@+id/number_txt"
+ android:layout_toRightOf="@+id/number_icon"
+ android:layout_toEndOf="@+id/imageView4" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_number_selected.xml b/ring-android/app/src/main/res/layout/item_number_selected.xml
new file mode 100644
index 0000000..4314742
--- /dev/null
+++ b/ring-android/app/src/main/res/layout/item_number_selected.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/call_entry"
+ android:layout_width="wrap_content"
+ android:layout_height="56dp"
+ android:descendantFocusability="blocksDescendants"
+ android:padding="8dp">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/number_icon"
+ android:layout_alignParentLeft="true"
+ android:src="@drawable/ic_dialer_sip_black_24dp"
+ android:layout_alignParentStart="true"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_alignParentTop="false"
+ android:layout_centerVertical="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/menu/conversation_actions.xml b/ring-android/app/src/main/res/menu/conversation_actions.xml
index 601faf4..9d7f1c9 100644
--- a/ring-android/app/src/main/res/menu/conversation_actions.xml
+++ b/ring-android/app/src/main/res/menu/conversation_actions.xml
@@ -5,11 +5,11 @@
android:id="@+id/conv_action_videocall"
android:icon="@drawable/ic_videocam_white_24dp"
android:title="Video call"
- android:showAsAction="always"
+ app:showAsAction="always"
/>
<item
android:id="@+id/conv_action_audiocall"
android:icon="@drawable/ic_call_white_24dp"
android:title="Audio call"
- android:showAsAction="always"/>
+ app:showAsAction="always"/>
</menu>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index e727e9b..ce6280c 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -117,6 +117,7 @@
<string name="copyright">Copyright \u00A9 2004–2015 Savoir-Faire Linux Inc.</string>
<string name="web_site">Website</string>
<string name="help_gestures"> This view will help users with different interactions during calls. Different actions will be described; Long press, fling, swype etc.</string>
+ <string name="ongoing_call">Ongoing call</string>
<string name="hist_in_call">Incoming call of %1$s</string>
<string name="hist_out_call">Outgoing call of %1$s</string>
