Skip to content

Commit

Permalink
.gitignore updated to allow for xml files
Browse files Browse the repository at this point in the history
  • Loading branch information
@bilhamil
bilhamil committed Dec 8, 2013
1 parent edce741 commit 4cbaeff
Show file tree
Hide file tree
Showing 16 changed files with 481 additions and 1 deletion.
1 change: 0 additions & 1 deletion .gitignore
View file
Expand Up @@ -10,7 +10,6 @@ Release/

*.sdf
*.opensdf
*.xml
*.ipch
*.filters
*.css
Expand Down
45 changes: 45 additions & 0 deletions AndroidClient/AndroidManifest.xml
View file
@@ -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>
6 changes: 6 additions & 0 deletions AndroidClient/res/drawable/button_default.xml
View file
@@ -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>
6 changes: 6 additions & 0 deletions AndroidClient/res/drawable/button_pressed.xml
View file
@@ -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>
7 changes: 7 additions & 0 deletions AndroidClient/res/drawable/buttonselector.xml
View file
@@ -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>

159 changes: 159 additions & 0 deletions AndroidClient/res/layout/activity_remote.xml
View file
@@ -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>
56 changes: 56 additions & 0 deletions AndroidClient/res/layout/password_dialog.xml
View file
@@ -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>
73 changes: 73 additions & 0 deletions AndroidClient/res/layout/splash.xml
View file
@@ -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>
8 changes: 8 additions & 0 deletions AndroidClient/res/menu/remote.xml
View file
@@ -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>
8 changes: 8 additions & 0 deletions AndroidClient/res/values-sw600dp/dimens.xml
View file
@@ -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>
9 changes: 9 additions & 0 deletions AndroidClient/res/values-sw720dp-land/dimens.xml
View file
@@ -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>

0 comments on commit 4cbaeff

Please sign in to comment.