Merge Chat Tab from UltraSonic

6 files changed, 154 insertions, 0 deletions

diff --git a/subsonic-android/res/layout/chat.xml b/subsonic-android/res/layout/chat.xml
new file mode 100644
index 00000000..fdeb5b36
--- /dev/null
+++ b/subsonic-android/res/layout/chat.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical" >
+
+	<include layout="@layout/tab_progress" />
+
+	<ListView
+		android:id="@+id/chat_entries"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0"
+		android:textFilterEnabled="true" />
+
+	<LinearLayout 
+		android:layout_height="4dip" 
+		android:layout_width="fill_parent" 
+		android:layout_marginTop="4dip"/>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="bottom" >
+
+		<EditText
+			android:id="@+id/chat_edittext"
+			android:layout_width="0dip"
+			android:layout_height="40dip"
+			android:layout_weight="1"
+			android:autoLink="all"
+			android:hint="@string/chat.send_a_message"
+			android:inputType="textEmailAddress|textMultiLine"            
+			android:linksClickable="true"
+			android:paddingBottom="10dip"
+			android:paddingTop="10dip" />
+
+		<ImageButton
+			android:id="@+id/chat_send"
+			android:layout_width="60dip"
+			android:layout_height="40dip"
+			android:src="?attr/chat_send" />
+
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/subsonic-android/res/layout/chat_item.xml b/subsonic-android/res/layout/chat_item.xml
new file mode 100644
index 00000000..b44631d1
--- /dev/null
+++ b/subsonic-android/res/layout/chat_item.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical" >
+
+	<TextView
+		android:id="@+id/chat_username"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="6dip"
+		android:layout_marginRight="6dip"
+		android:ellipsize="marquee"
+		android:singleLine="true"
+		android:text="User"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorSecondary"/>
+
+	<LinearLayout
+		android:id="@+id/chat_message_layout"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="2dip"
+		android:orientation="horizontal" >
+
+		<TextView
+			android:id="@+id/chat_time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:singleLine="true"
+			android:text="00:00"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+
+		<TextView
+			android:id="@+id/chat_message"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:layout_marginRight="6dip"
+			android:autoLink="all"
+			android:linksClickable="true"
+			android:singleLine="false"
+			android:text="Message Text Goes Here"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/subsonic-android/res/layout/chat_item_reverse.xml b/subsonic-android/res/layout/chat_item_reverse.xml
new file mode 100644
index 00000000..62695521
--- /dev/null
+++ b/subsonic-android/res/layout/chat_item_reverse.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical" >
+
+	<TextView
+		android:id="@+id/chat_username"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginRight="6dip"
+		android:gravity="right"
+		android:layout_gravity="right"
+		android:ellipsize="marquee"
+		android:singleLine="true"
+		android:text="User"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorSecondary"/>
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="2dip"
+		android:orientation="horizontal"
+		android:layout_gravity="right" >
+
+		<TextView
+			android:id="@+id/chat_time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:singleLine="true"
+			android:gravity="right"
+			android:text="00:00"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+
+		<TextView
+			android:id="@+id/chat_message"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="6dip"
+			android:layout_marginRight="6dip"
+			android:autoLink="all"
+			android:linksClickable="true"
+			android:singleLine="false"
+			android:gravity="right"
+			android:text="Chat message"
+			android:textAppearance="?android:attr/textAppearanceMedium" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/subsonic-android/res/values/attrs.xml b/subsonic-android/res/values/attrs.xml
index e5d8984f..8f669cd2 100644
--- a/subsonic-android/res/values/attrs.xml
+++ b/subsonic-android/res/values/attrs.xml
@@ -7,4 +7,6 @@
     <attr name="media_button_repeat_off" format="reference"/>
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
+	<attr name="chat" format="reference"/> 
+	<attr name="chat_send" format="reference" /> 
 </resources>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 0ba2b5c0..30bf5230 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -28,6 +28,7 @@
     <string name="button_bar.search">Search</string>

     <string name="button_bar.playlists">Playlists</string>

     <string name="button_bar.now_playing">Playing</string>

+	<string name="button_bar.chat">Chat</string>

 

     <string name="main.welcome_title">Welcome!</string>

     <string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve

@@ -319,6 +320,8 @@
     <string name="changelog_ok_button">OK</string>

     <string name="changelog_show_full">More…</string>

 

+	<string name="chat.send_a_message">Send a message</string> 

+

     <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string>

 

     <plurals name="select_album_n_songs">

diff --git a/subsonic-android/res/values/themes.xml b/subsonic-android/res/values/themes.xml
index 1e31b312..e48c3edc 100644
--- a/subsonic-android/res/values/themes.xml
+++ b/subsonic-android/res/values/themes.xml
@@ -10,6 +10,8 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
 		<item name="media_button_start">@drawable/media_start_light</item>
 		<item name="media_button_stop">@drawable/media_stop_light</item>
+		<item name="chat">@drawable/ic_menu_chat_light</item> 
+		<item name="chat_send">@drawable/ic_menu_chat_send_light</item> 
 	</style>
 	<style name="Theme.DSub.Dark" parent="Theme.Sherlock">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
@@ -23,6 +25,8 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
 		<item name="media_button_start">@drawable/media_start</item>
 		<item name="media_button_stop">@drawable/media_stop</item>
+		<item name="chat">@drawable/ic_menu_chat_dark</item> 
+		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item> 
 	</style>
 	<style name="Theme.DSub.Holo" parent="Theme.Sherlock">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
@@ -36,6 +40,8 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
 		<item name="media_button_start">@drawable/media_start</item>
 		<item name="media_button_stop">@drawable/media_stop</item>
+		<item name="chat">@drawable/ic_menu_chat_dark</item> 
+		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
 	</style>
 	
 	<style name="Theme.DSub.Light.Fullscreen" parent="Theme.DSub.Light">