From 4cbaeffe9e19a0c3f767e1faf5bcb3a4a7cf7d80 Mon Sep 17 00:00:00 2001
From: William Hamilton <luin.uial@gmail.com>
Date: Sat, 7 Dec 2013 18:59:19 -0600
Subject: [PATCH] .gitignore updated to allow for xml files

---
 .gitignore                                    |   1 -
 AndroidClient/AndroidManifest.xml             |  45 +++++
 AndroidClient/res/drawable/button_default.xml |   6 +
 AndroidClient/res/drawable/button_pressed.xml |   6 +
 AndroidClient/res/drawable/buttonselector.xml |   7 +
 AndroidClient/res/layout/activity_remote.xml  | 159 ++++++++++++++++++
 AndroidClient/res/layout/password_dialog.xml  |  56 ++++++
 AndroidClient/res/layout/splash.xml           |  73 ++++++++
 AndroidClient/res/menu/remote.xml             |   8 +
 AndroidClient/res/values-sw600dp/dimens.xml   |   8 +
 .../res/values-sw720dp-land/dimens.xml        |   9 +
 AndroidClient/res/values-v11/styles.xml       |   4 +
 AndroidClient/res/values/colors.xml           |  13 ++
 AndroidClient/res/values/dimens.xml           |   7 +
 AndroidClient/res/values/strings.xml          |  23 +++
 AndroidClient/res/values/styles.xml           |  57 +++++++
 16 files changed, 481 insertions(+), 1 deletion(-)
 create mode 100644 AndroidClient/AndroidManifest.xml
 create mode 100644 AndroidClient/res/drawable/button_default.xml
 create mode 100644 AndroidClient/res/drawable/button_pressed.xml
 create mode 100644 AndroidClient/res/drawable/buttonselector.xml
 create mode 100644 AndroidClient/res/layout/activity_remote.xml
 create mode 100644 AndroidClient/res/layout/password_dialog.xml
 create mode 100644 AndroidClient/res/layout/splash.xml
 create mode 100644 AndroidClient/res/menu/remote.xml
 create mode 100644 AndroidClient/res/values-sw600dp/dimens.xml
 create mode 100644 AndroidClient/res/values-sw720dp-land/dimens.xml
 create mode 100644 AndroidClient/res/values-v11/styles.xml
 create mode 100644 AndroidClient/res/values/colors.xml
 create mode 100644 AndroidClient/res/values/dimens.xml
 create mode 100644 AndroidClient/res/values/strings.xml
 create mode 100644 AndroidClient/res/values/styles.xml

diff --git a/.gitignore b/.gitignore
index 20f4104..2719aa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ Release/
 
 *.sdf
 *.opensdf
-*.xml
 *.ipch
 *.filters
 *.css
diff --git a/AndroidClient/AndroidManifest.xml b/AndroidClient/AndroidManifest.xml
new file mode 100644
index 0000000..b84c4e3
--- /dev/null
+++ b/AndroidClient/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.bilhamil.obsremote"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="17" />
+
+    <uses-permission android:name="android.permission.INTERNET">
+    </uses-permission>
+    
+    <application
+        android:name = "com.bilhamil.obsremote.OBSRemoteApplication"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.bilhamil.obsremote.activities.Remote"
+            android:label="@string/app_name" >
+            
+        </activity>
+        
+        <activity
+            android:name="com.bilhamil.obsremote.activities.Splash"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
+        <service android:name=".WebSocketService"
+                 android:exported="false"
+                 android:icon="@drawable/ic_launcher"
+                 android:label="@string/service_name">
+            
+        </service>
+        
+    </application>
+
+</manifest>
diff --git a/AndroidClient/res/drawable/button_default.xml b/AndroidClient/res/drawable/button_default.xml
new file mode 100644
index 0000000..0aac224
--- /dev/null
+++ b/AndroidClient/res/drawable/button_default.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" android:padding="10dp">
+<solid android:color="@color/buttonbackground"/>
+    <corners android:radius="5dp"/>
+<stroke android:width="1px" android:color="@color/darkgray"/>
+</shape>
diff --git a/AndroidClient/res/drawable/button_pressed.xml b/AndroidClient/res/drawable/button_pressed.xml
new file mode 100644
index 0000000..d2fee87
--- /dev/null
+++ b/AndroidClient/res/drawable/button_pressed.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" android:padding="10dp">
+<solid android:color="@color/buttonbackgroundpressed"/>
+    <corners android:radius="5dp"/>
+<stroke android:width="1px" android:color="@color/datorange"/>
+</shape>
diff --git a/AndroidClient/res/drawable/buttonselector.xml b/AndroidClient/res/drawable/buttonselector.xml
new file mode 100644
index 0000000..03b3f86
--- /dev/null
+++ b/AndroidClient/res/drawable/buttonselector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+   <item android:drawable="@drawable/button_pressed"
+         android:state_pressed="true" />
+   <item android:drawable="@drawable/button_default" />
+</selector>
+
diff --git a/AndroidClient/res/layout/activity_remote.xml b/AndroidClient/res/layout/activity_remote.xml
new file mode 100644
index 0000000..86be5f1
--- /dev/null
+++ b/AndroidClient/res/layout/activity_remote.xml
@@ -0,0 +1,159 @@
+<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:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".Remote" 
+    android:background="@color/darkgray">
+
+    <Button
+        android:id="@+id/startbutton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:text="@string/startstreaming" />
+
+    <RelativeLayout
+        android:id="@+id/statspanel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="0dp" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:orientation="vertical" >
+
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5" >
+
+                <TextView
+                    android:id="@+id/timeLbl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:text="Time Running:" />
+
+                <TextView
+                    android:id="@+id/textView4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentTop="true"
+                    android:text="TextView" />
+
+                <TextView
+                    android:id="@+id/textView5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_toLeftOf="@+id/textView4"
+                    android:text="TextView" />
+
+                <TextView
+                    android:id="@+id/timeValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_toRightOf="@+id/timeLbl"
+                    android:text="00:00:00" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5" >
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/columns"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/statspanel"
+        android:layout_alignLeft="@+id/button1"
+        android:layout_alignRight="@+id/button1"
+        android:layout_below="@+id/button1"
+        android:orientation="horizontal" >
+
+        <RelativeLayout
+            android:id="@+id/ScenesColumn"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.50" >
+
+            <TextView
+                android:id="@+id/ScenesText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
+                android:gravity="center_horizontal"
+                android:text="@string/scenes"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/textgray" />
+
+            <ListView
+                android:id="@+id/ScenesListView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/textView1" >
+
+            </ListView>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/SourcesColumn"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.50" >
+
+            <TextView
+                android:id="@+id/SourcesText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:gravity="center_horizontal"
+                android:text="@string/sources"
+                android:textAppearance="?android:attr/textAppearanceSmall" 
+                android:textColor="@color/textgray"/>
+
+            <ListView
+                android:id="@+id/listView1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/TextView01" >
+
+            </ListView>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/AndroidClient/res/layout/password_dialog.xml b/AndroidClient/res/layout/password_dialog.xml
new file mode 100644
index 0000000..5acbc94
--- /dev/null
+++ b/AndroidClient/res/layout/password_dialog.xml
@@ -0,0 +1,56 @@
+<?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="wrap_content"
+    android:background="@color/darkgray">
+
+    <TextView
+        android:id="@+id/authErrorView"
+         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:textColor="@color/errorred"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/password"
+        android:inputType="textPassword"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:hint="@string/password"/>
+
+    
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+        
+        <CheckBox
+	        android:id="@+id/rememberPassword"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentRight="true"
+	        android:text="@string/savepassword"
+	       	android:textColor="@color/textgray"/>
+
+<!--         <TextView -->
+<!--             android:id="@+id/textView2" -->
+<!--             android:layout_width="wrap_content" -->
+<!--             android:layout_height="wrap_content" -->
+<!--             android:layout_alignBaseline="@+id/checkBox1" -->
+<!--             android:layout_alignBottom="@+id/checkBox1" -->
+<!--             android:layout_toLeftOf="@+id/checkBox1" -->
+<!--             android:text="@string/savepassword" -->
+<!--             style="@style/DialogBaseTheme"/> -->
+        
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndroidClient/res/layout/splash.xml b/AndroidClient/res/layout/splash.xml
new file mode 100644
index 0000000..89da632
--- /dev/null
+++ b/AndroidClient/res/layout/splash.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" 
+    android:background="@color/darkgray">
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/hostentry"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/splashheader"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:contentDescription="@string/logo"
+        android:src="@drawable/remotelogo" />
+ 
+    <EditText
+        android:id="@+id/hostentry"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+		android:layout_above="@+id/splashconnectbutton"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="20dp"
+        android:layout_toRightOf="@+id/hostLabel"
+		android:text="@string/hostname"
+		android:inputType="text"
+		
+		style="@style/TextFieldStyle"
+        />
+
+    <TextView
+        android:id="@+id/splashheader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="25dp"
+        android:text="@string/app_name"
+        android:textColor="@color/textgray"
+        android:textSize="45sp" />
+
+    <Button
+        android:id="@+id/splashconnectbutton"
+        style="@style/ButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/hostLabel"
+        android:layout_alignParentBottom="true"
+        android:layout_alignRight="@+id/hostentry"
+        android:layout_marginBottom="17dp"
+        android:clickable="true"
+        android:text="@string/connect" 
+        android:onClick="connect"/>
+
+    <TextView
+        android:id="@+id/hostLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/hostentry"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/imageView1"
+        android:text="@string/hostlabel"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="5dp"
+        android:textAppearance="@style/RemoteText" />
+
+</RelativeLayout>
diff --git a/AndroidClient/res/menu/remote.xml b/AndroidClient/res/menu/remote.xml
new file mode 100644
index 0000000..5e4b11a
--- /dev/null
+++ b/AndroidClient/res/menu/remote.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:title="@string/action_settings"/>
+
+</menu>
diff --git a/AndroidClient/res/values-sw600dp/dimens.xml b/AndroidClient/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000..44f01db
--- /dev/null
+++ b/AndroidClient/res/values-sw600dp/dimens.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <!--
+         Customize dimensions originally defined in res/values/dimens.xml (such as
+         screen margins) for sw600dp devices (e.g. 7" tablets) here.
+    -->
+
+</resources>
diff --git a/AndroidClient/res/values-sw720dp-land/dimens.xml b/AndroidClient/res/values-sw720dp-land/dimens.xml
new file mode 100644
index 0000000..61e3fa8
--- /dev/null
+++ b/AndroidClient/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,9 @@
+<resources>
+
+    <!--
+         Customize dimensions originally defined in res/values/dimens.xml (such as
+         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
+    -->
+    <dimen name="activity_horizontal_margin">128dp</dimen>
+
+</resources>
diff --git a/AndroidClient/res/values-v11/styles.xml b/AndroidClient/res/values-v11/styles.xml
new file mode 100644
index 0000000..145b958
--- /dev/null
+++ b/AndroidClient/res/values-v11/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="DialogBaseTheme" parent="android:Theme.Holo.Light.Dialog" />
+</resources>
diff --git a/AndroidClient/res/values/colors.xml b/AndroidClient/res/values/colors.xml
new file mode 100644
index 0000000..85b069d
--- /dev/null
+++ b/AndroidClient/res/values/colors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="darkgray">#222222</color>
+    <color name="textgray">#dddddd</color>
+    <color name="textfieldgray">#777777</color>
+    
+    <color name="buttonbackground">#666666</color>
+    <color name="buttonbackgroundpressed">#888888</color>
+
+    
+    <color name="datorange">#ff9900</color>
+    <color name="errorred">#801414</color>
+</resources>
diff --git a/AndroidClient/res/values/dimens.xml b/AndroidClient/res/values/dimens.xml
new file mode 100644
index 0000000..55c1e59
--- /dev/null
+++ b/AndroidClient/res/values/dimens.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/AndroidClient/res/values/strings.xml b/AndroidClient/res/values/strings.xml
new file mode 100644
index 0000000..8d41970
--- /dev/null
+++ b/AndroidClient/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">OBS Remote</string>
+    <string name="service_name">OBS Remote Websocket Connection</string>
+    <string name="action_settings">Settings</string>
+    <string name="hello_world">Hello world!</string>
+	<string name="scenes">Scenes</string>
+	<string name="sources">Sources</string>
+	<string name="startstreaming">Start Streaming</string>
+	<string name="logo">OBS Remote Logo</string>
+	<string name="connect">Connect</string>
+	<string name="hostlabel">OBS Host: </string>
+	<string name="hostname">hostname</string>
+	<string name="password">password</string>
+	<string name="savepassword">Remember Password</string>
+	<string name="authenticate">Authenticate</string>
+	<string name="ok">OK</string>
+	<string name="cancel">Cancel</string>
+	
+	
+</resources>
+
diff --git a/AndroidClient/res/values/styles.xml b/AndroidClient/res/values/styles.xml
new file mode 100644
index 0000000..19deb83
--- /dev/null
+++ b/AndroidClient/res/values/styles.xml
@@ -0,0 +1,57 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+    
+    <style name="ButtonStyle">
+        <item name="android:background">@drawable/buttonselector</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">20dp</item>
+        <item name="android:paddingTop">7dp</item>
+        <item name="android:paddingBottom">7dp</item>
+                
+        <item name="android:textSize">20sp</item> 
+        <item name="android:textColor">@color/textgray</item> 
+        <item name="android:textStyle">bold</item>
+        <item name="android:typeface">sans</item>
+    </style>
+
+    <style name="RemoteText" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textSize">20sp</item> 
+        <item name="android:textColor">@color/textgray</item> 
+        <item name="android:textStyle">bold</item>
+        <item name="android:typeface">sans</item>
+    </style>
+    
+    <style name="TextFieldStyle">
+        
+        <item name="android:textSize">20sp</item> 
+        <item name="android:textColor">@android:color/black</item> 
+        <item name="android:textStyle">normal</item>
+        <item name="android:typeface">monospace</item>
+        
+        <item name="android:paddingLeft">5dp</item>
+                
+        <item name="android:background">@color/textfieldgray</item> 
+      
+    </style>
+    
+    <style name="DialogBaseTheme" parent="android:Theme.Dialog"/>
+    
+    
+    
+</resources>