Skip to content

S
SwapIt
Commit 086b4224 authored by Antek Grzanka's avatar Antek Grzanka
Browse files
Options

merge

parents 53a0ae14 9988b3e4
Hide whitespace changes
Inline Side-by-side
Showing with 942 additions and 203 deletions
peepers/.idea/misc.xml
View file @ 086b4224
...@@ -3,6 +3,30 @@ ...@@ -3,6 +3,30 @@
<component name="EntryPointsManager"> <component name="EntryPointsManager">
<entry_points version="2.0" /> <entry_points version="2.0" />
</component> </component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" /> <OptionsSetting value="true" id="Remove" />
......
peepers/.idea/vcs.xml
View file @ 086b4224
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="" /> <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component> </component>
</project> </project>
\ No newline at end of file
peepers/.idea/workspace.xml
View file @ 086b4224
...@@ -6,7 +6,19 @@ ...@@ -6,7 +6,19 @@
</shared> </shared>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="75b7d59c-6805-494e-bd00-d3d399205c20" name="Default" comment="" /> <list default="true" id="75b7d59c-6805-494e-bd00-d3d399205c20" 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/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/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/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$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.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" />
</list>
<ignored path="peepers.iws" /> <ignored path="peepers.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -30,7 +42,7 @@ ...@@ -30,7 +42,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java">
<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="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" /> <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -59,68 +71,81 @@ ...@@ -59,68 +71,81 @@
<file leaf-file-name="StreamCameraActivity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="StreamCameraActivity.java" pinned="false" current-in-tab="false">
<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="27.5"> <state vertical-scroll-proportion="0.0">
<caret line="62" column="60" selection-start-line="62" selection-start-column="60" selection-end-line="62" selection-end-column="60" /> <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CameraStreamer.java" pinned="false" current-in-tab="true"> <file leaf-file-name="CameraStreamer.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/CameraStreamer.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/CameraStreamer.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7247899"> <state vertical-scroll-proportion="0.0">
<caret line="57" column="51" selection-start-line="57" selection-start-column="51" selection-end-line="57" selection-end-column="51" /> <caret line="57" column="51" selection-start-line="57" selection-start-column="51" selection-end-line="57" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="vcs.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$/.idea/vcs.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-9.107142"> <state vertical-scroll-proportion="0.0">
<caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" /> <caret line="2" column="41" selection-start-line="2" selection-start-column="41" selection-end-line="2" selection-end-column="41" />
<folding /> <folding />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer">
<state />
</provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/build.gradle"> <entry file="file://$PROJECT_DIR$/.idea/workspace.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="4" column="29" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="29" /> <caret line="2194" column="21" selection-start-line="2194" selection-start-column="21" selection-end-line="2194" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="MJpegHttpStreamer.java" pinned="false" current-in-tab="false"> <file leaf-file-name="modules.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MJpegHttpStreamer.java"> <entry file="file://$PROJECT_DIR$/.idea/modules.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="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="MovingAverage.java" pinned="false" current-in-tab="false"> <file leaf-file-name="misc.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MovingAverage.java"> <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.8267223">
<caret line="32" column="10" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
<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="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" /> <caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer">
<state />
</provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
</component> </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="GradleLocalSettings"> <component name="GradleLocalSettings">
<option name="availableProjects"> <option name="availableProjects">
<map> <map>
...@@ -148,6 +173,547 @@ ...@@ -148,6 +173,547 @@
</option> </option>
<option name="availableTasks"> <option name="availableTasks">
<map> <map>
<entry key="$PROJECT_DIR$">
<value>
<list>
<ExternalTaskPojo>
<option name="description" value="Displays the components produced by root project 'peepers'. [incubating]" />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="components" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays all dependencies declared in root project 'peepers'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="dependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays the insight into a specific dependency in root project 'peepers'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="dependencyInsight" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays a help message." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="help" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Initializes a new Gradle build. [incubating]" />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="init" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays the configuration model of root project 'peepers'. [incubating]" />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="model" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays the sub-projects of root project 'peepers'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="projects" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays the properties of root project 'peepers'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="properties" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays the tasks runnable from root project 'peepers' (some of the displayed tasks may belong to subprojects)." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="tasks" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Generates Gradle wrapper files. [incubating]" />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="wrapper" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays the Android dependencies of the project." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="androidDependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles all variants of all applications and secondary packages." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="assemble" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles all the Test applications." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="assembleAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles all Debug builds." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="assembleDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles the android (on device) tests for the Debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="assembleDebugAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles the unit tests for the Debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="assembleDebugUnitTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles all Release builds." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="assembleRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles the unit tests for the Release build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="assembleReleaseUnitTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles and tests this project." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="build" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles and tests this project and all projects that depend on it." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="buildDependents" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Assembles and tests this project and all projects it depends on." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="buildNeeded" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Runs all checks." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="check" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="checkDebugManifest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="checkReleaseManifest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Deletes the build directory." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="clean" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugAidl" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugAndroidTestAidl" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugAndroidTestJava" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugAndroidTestNdk" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugAndroidTestRenderscript" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugAndroidTestSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugJava" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugNdk" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugRenderscript" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugUnitTestJava" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileDebugUnitTestSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileLint" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileReleaseAidl" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileReleaseJava" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileReleaseNdk" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileReleaseRenderscript" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileReleaseSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileReleaseUnitTestJava" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="compileReleaseUnitTestSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Installs and runs instrumentation tests for all flavors on connected devices." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="connectedAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Installs and runs the tests for Debug build on connected devices." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="connectedAndroidTestDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Runs all device checks on currently connected devices." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="connectedCheck" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Installs and runs instrumentation tests using all Device Providers." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="deviceAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Runs all device checks using Device Providers and Test Servers." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="deviceCheck" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="dexDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="dexDebugAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="dexRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugAndroidTestAssets" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugAndroidTestBuildConfig" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugAndroidTestResValues" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugAndroidTestResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugAndroidTestSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugAssets" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugBuildConfig" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugResValues" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateDebugSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateReleaseAssets" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateReleaseBuildConfig" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateReleaseResValues" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateReleaseResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="generateReleaseSources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Installs the Debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="installDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Installs the android (on device) tests for the Debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="installDebugAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="jarDebugClasses" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="jarReleaseClasses" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Runs lint on all variants." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="lint" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Runs lint on the Debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="lintDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Runs lint on the Release build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="lintRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Runs lint on just the fatal issues in the Release build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="lintVitalRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="mergeDebugAndroidTestAssets" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="mergeDebugAndroidTestResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="mergeDebugAssets" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="mergeDebugResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="mergeReleaseAssets" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="mergeReleaseResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="mockableAndroidJar" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="packageDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="packageDebugAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="packageRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preBuild" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preCompileDebugUnitTestJava" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preCompileReleaseUnitTestJava" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preDebugAndroidTestBuild" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preDebugBuild" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preDebugUnitTestBuild" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preDexDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preDexDebugAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preDexRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preReleaseBuild" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="preReleaseUnitTestBuild" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="prepareDebugAndroidTestDependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="prepareDebugDependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="prepareDebugUnitTestDependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="prepareReleaseDependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="prepareReleaseUnitTestDependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processDebugAndroidTestJavaRes" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processDebugAndroidTestManifest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processDebugAndroidTestResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processDebugJavaRes" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processDebugManifest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processDebugResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processDebugUnitTestJavaRes" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processReleaseJavaRes" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processReleaseManifest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processReleaseResources" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="processReleaseUnitTestJavaRes" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Displays the signing info for each variant." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="signingReport" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Run unit tests for all variants." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="test" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Run unit tests for the debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="testDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Run unit tests for the release build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="testRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Uninstall all applications." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="uninstallAll" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Uninstalls the Debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="uninstallDebug" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Uninstalls the android (on device) tests for the Debug build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="uninstallDebugAndroidTest" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="description" value="Uninstalls the Release build." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="uninstallRelease" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="validateDebugSigning" />
</ExternalTaskPojo>
<ExternalTaskPojo>
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="zipalignDebug" />
</ExternalTaskPojo>
</list>
</value>
</entry>
<entry key="$PROJECT_DIR$/app"> <entry key="$PROJECT_DIR$/app">
<value> <value>
<list> <list>
...@@ -889,8 +1455,13 @@ ...@@ -889,8 +1455,13 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<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/res/layout/activity_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" /> <option value="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/CameraStreamer.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/CameraStreamer.java" />
<option value="$PROJECT_DIR$/.idea/misc.xml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -899,7 +1470,7 @@ ...@@ -899,7 +1470,7 @@
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="65" /> <option name="x" value="65" />
<option name="y" value="1076" /> <option name="y" value="-4" />
<option name="width" value="1855" /> <option name="width" value="1855" />
<option name="height" value="1084" /> <option name="height" value="1084" />
</component> </component>
...@@ -913,6 +1484,9 @@ ...@@ -913,6 +1484,9 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectReloadState">
<option name="STATE" value="1" />
</component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1"> <navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages /> <flattenPackages />
...@@ -927,107 +1501,83 @@ ...@@ -927,107 +1501,83 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="PackagesPane" /> <pane id="ProjectPane">
<pane id="Scratches" />
<pane id="AndroidView">
<subPane> <subPane>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="res" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="res" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="layout" /> <option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="java" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="src" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="app" /> <option name="myItemId" value="main" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
</subPane>
</pane>
<pane id="ProjectPane">
<subPane>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="app" /> <option name="myItemId" value="res" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -1052,6 +1602,14 @@ ...@@ -1052,6 +1602,14 @@
<option name="myItemId" value="main" /> <option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layout" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -1063,50 +1621,80 @@ ...@@ -1063,50 +1621,80 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="app" /> <option name="myItemId" value=".idea" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="AndroidView">
<subPane>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="src" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="main" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="res" /> <option name="myItemId" value="res" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layout" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="peepers" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="app" /> <option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="src" /> <option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="main" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="res" /> <option name="myItemId" value="peepers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="layout" /> <option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
</subPane> </subPane>
...@@ -1256,6 +1844,9 @@ ...@@ -1256,6 +1844,9 @@
</configuration> </configuration>
</component> </component>
<component name="ShelveChangesManager" show_recycled="false" /> <component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="75b7d59c-6805-494e-bd00-d3d399205c20" name="Default" comment="" /> <changelist id="75b7d59c-6805-494e-bd00-d3d399205c20" name="Default" comment="" />
...@@ -1263,54 +1854,147 @@ ...@@ -1263,54 +1854,147 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1445695074093</updated> <updated>1445695074093</updated>
</task> </task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="65" y="1076" width="1855" height="1084" extended-state="6" /> <frame x="65" y="-4" width="1855" height="1084" extended-state="6" />
<editor active="false" /> <editor active="false" />
<layout> <layout>
<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="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" 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="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Find" 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.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" 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.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" 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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" 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="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" 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="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" 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.32943678" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4357067" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4357067" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" 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="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" 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="3" 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="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2498621" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2498621" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" 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.32943678" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" 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="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<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 />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/PeepersPreferenceActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/PeepersApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/CameraStreamer.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="57" column="51" selection-start-line="57" selection-start-column="51" selection-end-line="57" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="2" column="41" selection-start-line="2" selection-start-column="41" selection-end-line="2" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="2151" column="21" selection-start-line="2151" selection-start-column="21" selection-end-line="2151" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/modules.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MJpegHttpStreamer.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MJpegHttpStreamer.java">
<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="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" /> <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
<folding /> <folding>
<element signature="e#0#7782#0" expanded="false" />
<element signature="imports" expanded="false" />
<element signature="e#2556#2708#0" expanded="false" />
<element signature="e#2707#2708#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1318,7 +2002,11 @@ ...@@ -1318,7 +2002,11 @@
<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="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" /> <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
<folding /> <folding>
<element signature="e#0#1417#0" expanded="false" />
<element signature="e#1326#1327#0" expanded="false" />
<element signature="e#1372#1373#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1332,7 +2020,7 @@ ...@@ -1332,7 +2020,7 @@
</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="-9.107142"> <state vertical-scroll-proportion="0.0">
<caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" /> <caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" />
<folding /> <folding />
</state> </state>
...@@ -1352,7 +2040,7 @@ ...@@ -1352,7 +2040,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/MainActivity.java">
<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="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" /> <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1367,19 +2055,51 @@ ...@@ -1367,19 +2055,51 @@
</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="27.5"> <state vertical-scroll-proportion="0.0">
<caret line="62" column="60" selection-start-line="62" selection-start-column="60" selection-end-line="62" selection-end-column="60" /> <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/CameraStreamer.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/foxdogstudios/peepers/CameraStreamer.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7247899"> <state vertical-scroll-proportion="0.0">
<caret line="57" column="51" selection-start-line="57" selection-start-column="51" selection-end-line="57" selection-end-column="51" /> <caret line="57" column="51" selection-start-line="57" selection-start-column="51" selection-end-line="57" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="2" column="41" selection-start-line="2" selection-start-column="41" selection-end-line="2" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="2194" column="21" selection-start-line="2194" selection-start-column="21" selection-end-line="2194" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/modules.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.8267223">
<caret line="32" column="10" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
peepers/app/app.iml
View file @ 086b4224
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output /> <exclude-output />
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
......
peepers/app/src/main/AndroidManifest.xml
View file @ 086b4224
...@@ -30,17 +30,17 @@ ...@@ -30,17 +30,17 @@
android:name=".PeepersApplication" android:name=".PeepersApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/ic_launcher_peepers" android:icon="@drawable/ic_launcher_peepers"
android:label="@string/app_name" android:label="@string/app_name">
android:theme="@android:style/Theme.NoTitleBar" >
<activity <activity
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.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">
<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/MainActivity.java
View file @ 086b4224
...@@ -20,6 +20,7 @@ public class MainActivity extends Activity { ...@@ -20,6 +20,7 @@ public class MainActivity extends Activity {
EditText mEdit; EditText mEdit;
String myIp; String myIp;
TextView myIpView; TextView myIpView;
private MenuItem mSettingsMenuItem = null;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -32,26 +33,24 @@ public class MainActivity extends Activity { ...@@ -32,26 +33,24 @@ public class MainActivity extends Activity {
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(final Menu menu)
// Inflate the menu; this adds items to the action bar if it is present. {
getMenuInflater().inflate(R.menu.menu_main, menu); super.onCreateOptionsMenu(menu);
mSettingsMenuItem = menu.add(R.string.settings);
mSettingsMenuItem.setIcon(android.R.drawable.ic_menu_manage);
return true; return true;
} } // onCreateOptionsMenu(Menu)
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(final MenuItem item)
// Handle action bar item clicks here. The action bar will {
// automatically handle clicks on the Home/Up button, so long if (item != mSettingsMenuItem)
// as you specify a parent activity in AndroidManifest.xml. {
int id = item.getItemId(); return super.onOptionsItemSelected(item);
} // if
//noinspection SimplifiableIfStatement startActivity(new Intent(this, PeepersPreferenceActivity.class));
if (id == R.id.action_settings) { return true;
return true; } // onOptionsItemSelected(MenuItem)
}
return super.onOptionsItemSelected(item);
}
public void startView(View myView){ public void startView(View myView){
Intent intent = new Intent(MainActivity.this, StreamCameraActivity.class); Intent intent = new Intent(MainActivity.this, StreamCameraActivity.class);
......
peepers/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java
View file @ 086b4224
...@@ -37,17 +37,16 @@ import android.view.Menu; ...@@ -37,17 +37,16 @@ import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.View;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import org.apache.http.conn.util.InetAddressUtils;
public final class StreamCameraActivity extends Activity public final class StreamCameraActivity extends Activity
implements SurfaceHolder.Callback implements SurfaceHolder.Callback
{ {
private static final String TAG = StreamCameraActivity.class.getSimpleName();
private static final String WAKE_LOCK_TAG = "peepers"; private static final String WAKE_LOCK_TAG = "peepers";
private static final String PREF_CAMERA = "camera"; private static final String PREF_CAMERA = "camera";
...@@ -73,11 +72,12 @@ public final class StreamCameraActivity extends Activity ...@@ -73,11 +72,12 @@ public final class StreamCameraActivity extends Activity
private int mPort = PREF_PORT_DEF; private int mPort = PREF_PORT_DEF;
private int mJpegQuality = PREF_JPEG_QUALITY_DEF; private int mJpegQuality = PREF_JPEG_QUALITY_DEF;
private int mPrevieSizeIndex = PREF_PREVIEW_SIZE_INDEX_DEF; private int mPrevieSizeIndex = PREF_PREVIEW_SIZE_INDEX_DEF;
private TextView mIpAddressView = null;
private LoadPreferencesTask mLoadPreferencesTask = null;
private SharedPreferences mPrefs = null; private SharedPreferences mPrefs = null;
private MenuItem mSettingsMenuItem = null;
private WakeLock mWakeLock = null; private WakeLock mWakeLock = null;
private WebView myWebView = null;
private String clientAddressIp = "";
private Button webViewButton = null;
public StreamCameraActivity() public StreamCameraActivity()
{ {
...@@ -92,7 +92,7 @@ public final class StreamCameraActivity extends Activity ...@@ -92,7 +92,7 @@ public final class StreamCameraActivity extends Activity
Intent iin= getIntent(); Intent iin= getIntent();
Bundle b = iin.getExtras(); Bundle b = iin.getExtras();
String address = (String) b.get("ip"); clientAddressIp = b.get("ip") + ":8080"; // client ip
new LoadPreferencesTask().execute(); new LoadPreferencesTask().execute();
...@@ -101,36 +101,16 @@ public final class StreamCameraActivity extends Activity ...@@ -101,36 +101,16 @@ public final class StreamCameraActivity extends Activity
mPreviewDisplay.addCallback(this); mPreviewDisplay.addCallback(this);
mIpAddress = (String) b.get("myIp"); mIpAddress = (String) b.get("myIp");
mIpAddressView = (TextView) findViewById(R.id.ip_address);
updatePrefCacheAndUi(); updatePrefCacheAndUi();
final PowerManager powerManager = final PowerManager powerManager =
(PowerManager) getSystemService(POWER_SERVICE); (PowerManager) getSystemService(POWER_SERVICE);
mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK,
WAKE_LOCK_TAG); WAKE_LOCK_TAG);
myWebView = (WebView) findViewById(R.id.webview);
webViewButton = (Button) findViewById(R.id.client_mode);
WebView myWebView = (WebView) findViewById(R.id.webview);
String mDescText = "<head>\n" +
"\n" +
"</head>\n" +
"<body>\n" +
"\t<div style='width:50%;display:inline-block;height:auto'>\n" +
"\t\t<img style='width:100%' src='" + "http://" + address +"'/>\n" +
"\t</div>\n" +
"\t<div style='float:right;width:50%;display:inline-block;height:auto'> \n" +
"\t\t<img style='width:100%' src='" + "http://" + address +"'/>\n" +
"\t</div>\n" +
"\n" +
"</body>";
WebSettings settings = myWebView.getSettings();
settings.setDefaultTextEncodingName("utf-8");
settings.setJavaScriptEnabled(true);
myWebView.loadData(mDescText, "text/html; charset=utf-8",null);
} // onCreate(Bundle) } // onCreate(Bundle)
@Override @Override
...@@ -202,25 +182,7 @@ public final class StreamCameraActivity extends Activity ...@@ -202,25 +182,7 @@ public final class StreamCameraActivity extends Activity
} // if } // if
} // stopCameraStreamer() } // stopCameraStreamer()
@Override
public boolean onCreateOptionsMenu(final Menu menu)
{
super.onCreateOptionsMenu(menu);
mSettingsMenuItem = menu.add(R.string.settings);
mSettingsMenuItem.setIcon(android.R.drawable.ic_menu_manage);
return true;
} // onCreateOptionsMenu(Menu)
@Override
public boolean onOptionsItemSelected(final MenuItem item)
{
if (item != mSettingsMenuItem)
{
return super.onOptionsItemSelected(item);
} // if
startActivity(new Intent(this, PeepersPreferenceActivity.class));
return true;
} // onOptionsItemSelected(MenuItem)
private final class LoadPreferencesTask private final class LoadPreferencesTask
extends AsyncTask<Void, Void, SharedPreferences> extends AsyncTask<Void, Void, SharedPreferences>
...@@ -324,7 +286,6 @@ public final class StreamCameraActivity extends Activity ...@@ -324,7 +286,6 @@ public final class StreamCameraActivity extends Activity
{ {
mJpegQuality = 100; mJpegQuality = 100;
} // else if } // else if
mIpAddressView.setText("http://" + mIpAddress + ":" + mPort + "/");
} // updatePrefCacheAndUi() } // updatePrefCacheAndUi()
private boolean hasFlashLight() private boolean hasFlashLight()
...@@ -333,6 +294,31 @@ public final class StreamCameraActivity extends Activity ...@@ -333,6 +294,31 @@ public final class StreamCameraActivity extends Activity
PackageManager.FEATURE_CAMERA_FLASH); PackageManager.FEATURE_CAMERA_FLASH);
} // hasFlashLight() } // hasFlashLight()
public void showWebView(View myView){
webViewButton.setVisibility(View.INVISIBLE);
String mDescText = "<head>\n" +
"\n" +
"</head>\n" +
"<body>\n" +
"<style>\n" +
"* { margin: 0; padding: 0 }" +
"</style>\n" +
"\t<div style='width:50%;display:inline-block;height:auto'>\n" +
"\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" +
"\t</div>\n" +
"\t<div style='float:right;width:50%;display:inline-block;height:auto'> \n" +
"\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" +
"\t</div>\n" +
"\n" +
"</body>";
WebSettings settings = myWebView.getSettings();
settings.setDefaultTextEncodingName("utf-8");
settings.setJavaScriptEnabled(true);
myWebView.loadData(mDescText, "text/html; charset=utf-8",null);
}
} // class StreamCameraActivity } // class StreamCameraActivity
......
peepers/app/src/main/res/layout/activity_main.xml
View file @ 086b4224
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/input_address" android:id="@+id/input_address"
android:text="192.168.43.116:8080" android:text="192.168.43.116"
android:layout_alignEnd="@+id/go_to_view" /> android:layout_alignEnd="@+id/go_to_view" />
<TextView <TextView
...@@ -27,6 +27,6 @@ ...@@ -27,6 +27,6 @@
android:onClick="startView" android:onClick="startView"
android:text="Dupa" android:text="Dupa"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"></Button> android:layout_alignParentEnd="true"/>
</RelativeLayout> </RelativeLayout>
peepers/app/src/main/res/layout/main.xml
View file @ 086b4224
...@@ -15,25 +15,36 @@ ...@@ -15,25 +15,36 @@
limitations under the License. limitations under the License.
--> -->
<merge 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_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
android:layout_width="100dp"
android:layout_height="wrap_content"
android:text="Go!"
android:id="@+id/client_mode"
android:onClick="showWebView"
android:layout_centerInParent="true"
android:layout_alignParentBottom="true"
/>
</RelativeLayout>
<TextView
android:id="@+id/ip_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|top"
android:background="@android:color/black" />
</merge>
peepers/peepers.iml
View file @ 086b4224
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />
......
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