diff options
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/libraries/appcompat_v7_22_0_0.xml | 2 | ||||
| -rw-r--r-- | .idea/libraries/support_v4_22_0_0.xml | 8 | ||||
| -rw-r--r-- | .idea/workspace.xml | 50 |
3 files changed, 31 insertions, 29 deletions
diff --git a/.idea/libraries/appcompat_v7_22_0_0.xml b/.idea/libraries/appcompat_v7_22_0_0.xml index d59dc81..d8a9f53 100644 --- a/.idea/libraries/appcompat_v7_22_0_0.xml +++ b/.idea/libraries/appcompat_v7_22_0_0.xml @@ -4,8 +4,8 @@ <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/annotations.zip!/" /> </ANNOTATIONS> <CLASSES> - <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/res" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/classes.jar!/" /> + <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/res" /> </CLASSES> <JAVADOC /> <SOURCES /> diff --git a/.idea/libraries/support_v4_22_0_0.xml b/.idea/libraries/support_v4_22_0_0.xml index b42fb44..f5c469c 100644 --- a/.idea/libraries/support_v4_22_0_0.xml +++ b/.idea/libraries/support_v4_22_0_0.xml @@ -1,11 +1,13 @@ <component name="libraryTable"> <library name="support-v4-22.0.0"> <CLASSES> - <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/classes.jar!/" /> - <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/res" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/libs/internal_impl-22.0.0.jar!/" /> + <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/res" /> + <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/classes.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$USER_HOME$/Android/Sdk/extras/android/m2repository/com/android/support/support-v4/22.0.0/support-v4-22.0.0-sources.jar!/" /> + </SOURCES> </library> </component>
\ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e9ec8b4..89f2b1d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -39,21 +39,21 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="FullscreenActivity.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="FullscreenActivity.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="1.2471043" vertical-offset="22" max-vertical-offset="645"> - <caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" /> + <state vertical-scroll-proportion="0.0" vertical-offset="22" max-vertical-offset="645"> + <caret line="19" column="41" selection-start-line="19" selection-start-column="41" selection-end-line="19" selection-end-column="41" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Car.java" pinned="false" current="false" current-in-tab="false"> + <file leaf-file-name="Car.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1425" max-vertical-offset="2475"> - <caret line="95" column="33" selection-start-line="95" selection-start-column="33" selection-end-line="95" selection-end-column="33" /> + <state vertical-scroll-proportion="0.516129" vertical-offset="566" max-vertical-offset="2235"> + <caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" /> <folding /> </state> </provider> @@ -1341,8 +1341,8 @@ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Coordinate.java" /> - <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java" /> </list> </option> </component> @@ -1462,8 +1462,8 @@ <property name="MemberChooser.showClasses" value="true" /> <property name="MemberChooser.copyJavadoc" value="false" /> <property name="recentsLimit" value="5" /> - <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="YT910NKK39" /> - <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="5_1_480_800_mdpi_lollipop" /> + <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="" /> + <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="3_2_320_480_mdpi_lollipop" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="FullScreen" value="false" /> </component> @@ -1639,7 +1639,7 @@ </component> <component name="ToolWindowManager"> <frame x="53" y="24" width="1313" height="744" extended-state="6" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="Palette	" 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="Changes" 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" /> @@ -1649,17 +1649,18 @@ <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="2" 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="7" 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.54531" sideWeight="0.5003934" order="7" 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="2" side_tool="true" content_ui="tabs" /> - <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.54531" sideWeight="0.5" order="7" 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.3290938" 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="false" weight="0.54531" sideWeight="0.4996066" order="7" 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="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="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="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="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="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24940991" 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.3290938" sideWeight="0.5" order="2" 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.24940991" 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.3290938" sideWeight="0.4996066" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Memory Monitor" 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="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" /> @@ -1667,7 +1668,6 @@ <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="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="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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290938" sideWeight="0.5" order="7" 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> </component> @@ -1867,14 +1867,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1284" max-vertical-offset="2475"> - <caret line="95" column="33" selection-start-line="95" selection-start-column="33" selection-end-line="95" selection-end-column="33" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.5868726" vertical-offset="223" max-vertical-offset="885"> @@ -1884,8 +1876,16 @@ </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="1.2471043" vertical-offset="22" max-vertical-offset="645"> - <caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" /> + <state vertical-scroll-proportion="0.0" vertical-offset="22" max-vertical-offset="645"> + <caret line="19" column="41" selection-start-line="19" selection-start-column="41" selection-end-line="19" selection-end-column="41" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.516129" vertical-offset="566" max-vertical-offset="2235"> + <caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" /> <folding /> </state> </provider> |