Skip to content

S
SwapIt
Commit 9988b3e4 authored by Eryk Leniart's avatar Eryk Leniart
Browse files
Options

Layout

parent 874917f4
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 35 deletions
peepers/.idea/workspace.xml
View file @ 9988b3e4
...@@ -11,17 +11,8 @@ ...@@ -11,17 +11,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2250d3d-8479-4b08-b370-6845aeb5f737" name="Default" comment=""> <list default="true" id="e2250d3d-8479-4b08-b370-6845aeb5f737" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/main.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/main.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/peepers.iml" afterPath="$PROJECT_DIR$/peepers.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="peepers.iws" /> <ignored path="peepers.iws" />
...@@ -67,8 +58,8 @@ ...@@ -67,8 +58,8 @@
<file leaf-file-name="StreamCameraActivity.java" pinned="false" current-in-tab="true"> <file leaf-file-name="StreamCameraActivity.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.101886794"> <state vertical-scroll-proportion="0.1981132">
<caret line="237" column="18" selection-start-line="237" selection-start-column="18" selection-end-line="237" selection-end-column="18" /> <caret line="303" column="29" selection-start-line="303" selection-start-column="29" selection-end-line="303" selection-end-column="29" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -77,8 +68,8 @@ ...@@ -77,8 +68,8 @@
<file leaf-file-name="main.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="main.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-20.51724"> <state vertical-scroll-proportion="-8.103448">
<caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" /> <caret line="34" column="44" selection-start-line="34" selection-start-column="44" selection-end-line="34" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -90,8 +81,8 @@ ...@@ -90,8 +81,8 @@
<file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-8.206897"> <state vertical-scroll-proportion="-6.448276">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <caret line="17" column="44" selection-start-line="17" selection-start-column="44" selection-end-line="17" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -104,7 +95,7 @@ ...@@ -104,7 +95,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> <caret line="33" column="17" selection-start-line="33" selection-start-column="17" selection-end-line="33" selection-end-column="17" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1523,10 +1514,10 @@ ...@@ -1523,10 +1514,10 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/main.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/main.xml" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1647,7 +1638,7 @@ ...@@ -1647,7 +1638,7 @@
<property name="settings.editor.selected.configurable" value="vcs.Git" /> <property name="settings.editor.selected.configurable" value="vcs.Git" />
<property name="settings.editor.splitter.proportion" value="0.2" /> <property name="settings.editor.splitter.proportion" value="0.2" />
<property name="recentsLimit" value="5" /> <property name="recentsLimit" value="5" />
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="68d2133f" /> <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="ZX1C223KKF" />
</component> </component>
<component name="RunManager" selected="Android Application.app"> <component name="RunManager" selected="Android Application.app">
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
...@@ -1807,6 +1798,13 @@ ...@@ -1807,6 +1798,13 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1445709635309</updated> <updated>1445709635309</updated>
</task> </task>
<task id="LOCAL-00001" summary="muhahahahhaa">
<created>1445717651064</created>
<option name="number" value="00001" />
<option name="project" value="LOCAL" />
<updated>1445717651064</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
...@@ -1817,11 +1815,11 @@ ...@@ -1817,11 +1815,11 @@
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879046" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879046" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879046" sideWeight="0.5030257" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879046" sideWeight="0.4969743" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879046" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879046" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
...@@ -1845,6 +1843,10 @@ ...@@ -1845,6 +1843,10 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="muhahahahhaa" />
<option name="LAST_COMMIT_MESSAGE" value="muhahahahhaa" />
</component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager /> <breakpoint-manager />
<watches-manager /> <watches-manager />
...@@ -1862,8 +1864,8 @@ ...@@ -1862,8 +1864,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-8.206897"> <state vertical-scroll-proportion="-6.448276">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <caret line="17" column="44" selection-start-line="17" selection-start-column="44" selection-end-line="17" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1873,8 +1875,8 @@ ...@@ -1873,8 +1875,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-20.51724"> <state vertical-scroll-proportion="-8.103448">
<caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" /> <caret line="34" column="44" selection-start-line="34" selection-start-column="44" selection-end-line="34" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1885,15 +1887,15 @@ ...@@ -1885,15 +1887,15 @@
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> <caret line="33" column="17" selection-start-line="33" selection-start-column="17" selection-end-line="33" selection-end-column="17" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.101886794"> <state vertical-scroll-proportion="0.1981132">
<caret line="237" column="18" selection-start-line="237" selection-start-column="18" selection-end-line="237" selection-end-column="18" /> <caret line="303" column="29" selection-start-line="303" selection-start-column="29" selection-end-line="303" selection-end-column="29" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
peepers/app/src/main/AndroidManifest.xml
View file @ 9988b3e4
...@@ -35,13 +35,12 @@ ...@@ -35,13 +35,12 @@
android:name=".StreamCameraActivity" android:name=".StreamCameraActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:theme="@android:style/Theme.NoTitleBar"> android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
</activity> </activity>
<activity android:name=".PeepersPreferenceActivity" /> <activity android:name=".PeepersPreferenceActivity" />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/title_activity_main" android:label="@string/title_activity_main">
android:theme="@android:style/Theme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
......
peepers/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java
View file @ 9988b3e4
...@@ -301,6 +301,9 @@ public final class StreamCameraActivity extends Activity ...@@ -301,6 +301,9 @@ public final class StreamCameraActivity extends Activity
"\n" + "\n" +
"</head>\n" + "</head>\n" +
"<body>\n" + "<body>\n" +
"<style>\n" +
"* { margin: 0; padding: 0 }" +
"</style>\n" +
"\t<div style='width:50%;display:inline-block;height:auto'>\n" + "\t<div style='width:50%;display:inline-block;height:auto'>\n" +
"\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" + "\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" +
"\t</div>\n" + "\t</div>\n" +
......
peepers/app/src/main/res/layout/main.xml
View file @ 9988b3e4
...@@ -17,17 +17,23 @@ ...@@ -17,17 +17,23 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="#000000">
<SurfaceView <SurfaceView
android:id="@+id/camera" android:id="@+id/camera"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:background="#000000"/>
<WebView <WebView
android:id="@+id/webview" android:id="@+id/webview"
android:layout_width="fill_parent" android:layout_centerInParent="true"
android:layout_height="fill_parent" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#000000"
android:layout_centerVertical="true"
/>
<Button <Button
android:layout_width="100dp" android:layout_width="100dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment