aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.idea/workspace.xml305
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/Board.java7
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/Car.java34
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java20
4 files changed, 266 insertions, 100 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 89f2b1d..44c669b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -42,38 +42,47 @@
<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="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 vertical-scroll-proportion="0.0" vertical-offset="346" max-vertical-offset="795">
+ <caret line="48" column="64" selection-start-line="48" selection-start-column="64" selection-end-line="48" selection-end-column="64" />
+ <folding>
+ <element signature="e#2099#2387#0" expanded="true" />
+ <element signature="e#2376#2377#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="Board.java" pinned="false" current="true" current-in-tab="true">
+ <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.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" />
+ <state vertical-scroll-proportion="0.5407855" vertical-offset="451" max-vertical-offset="795">
+ <caret line="53" column="124" selection-start-line="53" selection-start-column="124" selection-end-line="53" selection-end-column="124" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Coordinate.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Coordinate.java">
+ <file leaf-file-name="Car.java" pinned="false" current="false" current-in-tab="false">
+ <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="240" max-vertical-offset="585">
- <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
- <folding />
+ <state vertical-scroll-proportion="0.0" vertical-offset="715" max-vertical-offset="2355">
+ <caret line="66" column="51" selection-start-line="66" selection-start-column="51" selection-end-line="66" selection-end-column="51" />
+ <folding>
+ <element signature="e#1261#1262#0" expanded="true" />
+ <element signature="e#1300#1301#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="MoveListener.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/MoveListener.java">
+ <file leaf-file-name="activity_fullscreen.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_fullscreen.xml">
+ <provider editor-type-id="android-designer">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
- <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <state vertical-scroll-proportion="-4.6153846" vertical-offset="0" max-vertical-offset="300">
+ <caret line="8" column="29" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" />
<folding />
</state>
</provider>
@@ -1335,14 +1344,14 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_fullscreen.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/util/MoveListener.java" />
<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/Board.java" />
+ <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_fullscreen.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/Car.java" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java" />
</list>
</option>
</component>
@@ -1378,6 +1387,27 @@
<sortByType />
</navigator>
<panes>
+ <pane id="PackagesPane" />
+ <pane id="ProjectPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RushHour" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RushHour" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RushHour" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
<pane id="Scope" />
<pane id="AndroidView">
<subPane>
@@ -1396,6 +1426,10 @@
<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>
<PATH>
<PATH_ELEMENT>
@@ -1429,25 +1463,14 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- </subPane>
- </pane>
- <pane id="PackagesPane" />
- <pane id="ProjectPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RushHour" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="RushHour" />
- <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="RushHour" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
@@ -1462,7 +1485,7 @@
<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="" />
+ <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="emulator-5554 YT910NKK39" />
<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" />
@@ -1643,29 +1666,29 @@
<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="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" />
- <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="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="Designer" active="false" anchor="right" 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="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" 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="15" 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="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.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="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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" 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="4" 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="10" 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.54531" sideWeight="0.5003934" order="9" 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="3" 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.3290938" sideWeight="0.5" order="13" 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.41017488" sideWeight="0.4996066" order="14" 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="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="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" 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="11" 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.19984265" 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="Memory Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" 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" />
<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="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="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" />
@@ -1693,9 +1716,50 @@
<component name="editorHistoryManager">
<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="0.0" vertical-offset="285" max-vertical-offset="720">
+ <caret line="19" column="41" selection-start-line="19" selection-start-column="41" selection-end-line="19" selection-end-column="41" />
+ <folding>
+ <element signature="e#2099#2387#0" expanded="true" />
+ <element signature="e#2376#2377#0" expanded="true" />
+ </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.0" vertical-offset="870" max-vertical-offset="2280">
+ <caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
+ <folding>
+ <element signature="e#1261#1262#0" expanded="true" />
+ <element signature="e#1300#1301#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Coordinate.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="585">
+ <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/MoveListener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
+ <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </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="0.0" vertical-offset="0" 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" />
- <folding />
+ <folding>
+ <element signature="e#2099#2387#0" expanded="true" />
+ <element signature="e#2376#2377#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1703,7 +1767,10 @@
<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" />
- <folding />
+ <folding>
+ <element signature="e#1261#1262#0" expanded="true" />
+ <element signature="e#1300#1301#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1727,7 +1794,10 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" 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" />
- <folding />
+ <folding>
+ <element signature="e#2099#2387#0" expanded="true" />
+ <element signature="e#2376#2377#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1735,7 +1805,10 @@
<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 />
+ <folding>
+ <element signature="e#1261#1262#0" expanded="true" />
+ <element signature="e#1300#1301#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1759,7 +1832,10 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="720">
<caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
- <folding />
+ <folding>
+ <element signature="e#2099#2387#0" expanded="true" />
+ <element signature="e#2376#2377#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1774,7 +1850,10 @@
<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 />
+ <folding>
+ <element signature="e#1261#1262#0" expanded="true" />
+ <element signature="e#1300#1301#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1798,7 +1877,10 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="735">
<caret line="38" column="59" selection-start-line="38" selection-start-column="59" selection-end-line="38" selection-end-column="59" />
- <folding />
+ <folding>
+ <element signature="e#2099#2387#0" expanded="true" />
+ <element signature="e#2376#2377#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1813,14 +1895,10 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="2235">
<caret line="138" column="17" selection-start-line="138" selection-start-column="17" selection-end-line="138" selection-end-column="17" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/view/ViewGroup.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.33103448" vertical-offset="93909" max-vertical-offset="107310">
- <caret line="6391" column="15" selection-start-line="6391" selection-start-column="15" selection-end-line="6391" selection-end-column="15" />
+ <folding>
+ <element signature="e#1261#1262#0" expanded="true" />
+ <element signature="e#1300#1301#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1832,60 +1910,123 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_fullscreen.xml">
- <provider editor-type-id="android-designer">
- <state />
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.3488372" vertical-offset="0" max-vertical-offset="602">
+ <caret line="14" column="47" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
+ <folding />
+ </state>
</provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Coordinate.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.32490975" vertical-offset="0" max-vertical-offset="300">
- <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+ <state vertical-scroll-proportion="0.3986711" vertical-offset="0" max-vertical-offset="602">
+ <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/MoveListener.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
+ <state vertical-scroll-proportion="0.19933555" vertical-offset="0" max-vertical-offset="602">
<caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/view/ViewDebug.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.3488372" vertical-offset="0" max-vertical-offset="602">
- <caret line="14" column="47" selection-start-line="14" selection-start-column="47" selection-end-line="14" selection-end-column="47" />
+ <state vertical-scroll-proportion="0.33139536" vertical-offset="531" max-vertical-offset="23700">
+ <caret line="93" column="16" selection-start-line="93" selection-start-column="16" selection-end-line="93" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Coordinate.java">
+ <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/widget/RelativeLayout.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="585">
- <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="17151" max-vertical-offset="26565">
+ <caret line="1197" column="64" selection-start-line="1197" selection-start-column="64" selection-end-line="1197" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java">
+ <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/view/View.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5868726" vertical-offset="223" max-vertical-offset="885">
- <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+ <state vertical-scroll-proportion="0.41860464" vertical-offset="165486" max-vertical-offset="306960">
+ <caret line="11375" column="37" selection-start-line="11375" selection-start-column="37" selection-end-line="11375" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/widget/GridLayout.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.33139536" vertical-offset="1581" max-vertical-offset="42195">
+ <caret line="160" column="13" selection-start-line="160" selection-start-column="13" selection-end-line="160" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/widget/LinearLayout.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="27126" max-vertical-offset="27855">
+ <caret line="1891" column="15" selection-start-line="1891" selection-start-column="15" selection-end-line="1891" selection-end-column="15" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/widget/TableLayout.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0" vertical-offset="9891" max-vertical-offset="11175">
+ <caret line="705" column="15" selection-start-line="705" selection-start-column="15" selection-end-line="705" selection-end-column="15" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_fullscreen.xml">
+ <provider editor-type-id="android-designer">
+ <state />
+ </provider>
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-4.6153846" vertical-offset="0" max-vertical-offset="300">
+ <caret line="8" column="29" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" />
+ <folding />
</state>
</provider>
</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="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" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="346" max-vertical-offset="795">
+ <caret line="48" column="64" selection-start-line="48" selection-start-column="64" selection-end-line="48" selection-end-column="64" />
+ <folding>
+ <element signature="e#2099#2387#0" expanded="true" />
+ <element signature="e#2376#2377#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/Android/Sdk/sources/android-21/android/view/ViewGroup.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.33139536" vertical-offset="53436" max-vertical-offset="107310">
+ <caret line="3652" column="16" selection-start-line="3652" selection-start-column="16" selection-end-line="3652" selection-end-column="16" />
<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" />
+ <state vertical-scroll-proportion="0.0" vertical-offset="715" max-vertical-offset="2355">
+ <caret line="66" column="51" selection-start-line="66" selection-start-column="51" selection-end-line="66" selection-end-column="51" />
+ <folding>
+ <element signature="e#1261#1262#0" expanded="true" />
+ <element signature="e#1300#1301#0" expanded="true" />
+ </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.5407855" vertical-offset="451" max-vertical-offset="795">
+ <caret line="53" column="124" selection-start-line="53" selection-start-column="124" selection-end-line="53" selection-end-column="124" />
<folding />
</state>
</provider>
diff --git a/app/src/main/java/com/camilstaps/rushhour/Board.java b/app/src/main/java/com/camilstaps/rushhour/Board.java
index 7ea52de..f59cc59 100644
--- a/app/src/main/java/com/camilstaps/rushhour/Board.java
+++ b/app/src/main/java/com/camilstaps/rushhour/Board.java
@@ -2,6 +2,7 @@ package com.camilstaps.rushhour;
import android.content.Context;
import android.util.Log;
+import android.view.ViewGroup;
import android.widget.RelativeLayout;
import java.util.HashSet;
@@ -46,9 +47,11 @@ public class Board {
cars.add(car);
}
- public void addToLayout(Context context, RelativeLayout layout) {
+ public void addToLayout(Context context, ViewGroup layout) {
+ Log.d("Board", Integer.toString(layout.getWidth()));
+
for (Car car : cars) {
- layout.addView(car.getImageView(context));
+ layout.addView(car.getImageView(context, (layout.getWidth() - layout.getPaddingLeft() - layout.getPaddingRight()) / DIMENSION));
}
}
diff --git a/app/src/main/java/com/camilstaps/rushhour/Car.java b/app/src/main/java/com/camilstaps/rushhour/Car.java
index 9d2c45a..4b0d99b 100644
--- a/app/src/main/java/com/camilstaps/rushhour/Car.java
+++ b/app/src/main/java/com/camilstaps/rushhour/Car.java
@@ -2,12 +2,14 @@ package com.camilstaps.rushhour;
import android.content.Context;
import android.graphics.Color;
+import android.util.Log;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
+import android.widget.TableLayout;
/**
* Created by camilstaps on 16-4-15.
@@ -23,6 +25,9 @@ public class Car {
private MoveListener moveListener;
+ private float widthPerCell;
+ private int calculatedWidth, calculatedHeight;
+
ImageView iv;
public Car(Coordinate start, Coordinate end) {
@@ -51,23 +56,26 @@ public class Car {
return (SIZE + MARGIN) * (endCoordinate.getY() - startCoordinate.getY()) + SIZE;
}
- public void setImageViewMargins() {
- ViewGroup.MarginLayoutParams marginParams = new ViewGroup.MarginLayoutParams(getWidth(), getHeight());
- marginParams.setMargins(startCoordinate.getX() * (SIZE + MARGIN), startCoordinate.getY() * (SIZE + MARGIN), MARGIN, MARGIN);
- RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(marginParams);
- iv.setLayoutParams(layoutParams);
+ public void setLayoutParams() {
+ ViewGroup.MarginLayoutParams marginParams = new RelativeLayout.LayoutParams(calculatedWidth, calculatedHeight);
+ marginParams.setMargins((int) (startCoordinate.getX() * (widthPerCell + MARGIN) + MARGIN), (int) (startCoordinate.getY() * (widthPerCell + MARGIN) + MARGIN), MARGIN, MARGIN);
+ iv.setLayoutParams(marginParams);
}
- public ImageView getImageView(Context context) {
+ public ImageView getImageView(Context context, float widthPerCell) {
+
+ Log.d("Car", Float.toString(widthPerCell));
+
+ this.widthPerCell = widthPerCell - MARGIN;
+ calculatedWidth = (int) ((endCoordinate.getX() - startCoordinate.getX() + 1) * (this.widthPerCell + MARGIN) - MARGIN);
+ calculatedHeight = (int) ((endCoordinate.getY() - startCoordinate.getY() + 1) * (this.widthPerCell + MARGIN) - MARGIN);
iv = new ImageView(context);
iv.setBackgroundColor(colour);
- int width = getWidth();
- int height = getHeight();
- iv.setMinimumWidth(width);
- iv.setMinimumHeight(height);
+ iv.setMinimumWidth(calculatedWidth);
+ iv.setMinimumHeight(calculatedHeight);
- setImageViewMargins();
+ setLayoutParams();
final GestureDetector gdt = new GestureDetector(new GestureListener());
iv.setOnTouchListener(new View.OnTouchListener() {
@@ -101,14 +109,14 @@ public class Car {
startCoordinate.move(offset, 0);
endCoordinate.move(offset, 0);
- setImageViewMargins();
+ setLayoutParams();
}
public void moveVertically(int offset) {
startCoordinate.move(0, offset);
endCoordinate.move(0, offset);
- setImageViewMargins();
+ setLayoutParams();
}
public Coordinate wouldMoveTo(int offset) {
diff --git a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
index e5366f7..614176a 100644
--- a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
@@ -3,6 +3,10 @@ package com.camilstaps.rushhour;
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
+import android.util.Log;
+import android.view.ViewTreeObserver;
+import android.widget.GridLayout;
+import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.camilstaps.rushhour.util.SystemUiHider;
@@ -21,9 +25,10 @@ public class FullscreenActivity extends Activity {
setContentView(R.layout.activity_fullscreen);
- RelativeLayout boardLayout = (RelativeLayout) findViewById(R.id.board);
+ final RelativeLayout boardLayout = (RelativeLayout) findViewById(R.id.board);
+ Log.d("FA", boardLayout.toString());
- Board board = new Board();
+ final Board board = new Board();
board.add(new Car(new Coordinate(0,0), new Coordinate(2,0), Color.YELLOW));
board.add(new Car(new Coordinate(3,0), new Coordinate(3,1), Color.rgb(128,223,182)));
board.add(new Car(new Coordinate(4,0), new Coordinate(4,2), Color.rgb(198, 134,221)));
@@ -37,6 +42,15 @@ public class FullscreenActivity extends Activity {
board.add(new Car(new Coordinate(5,4), new Coordinate(5,5), Color.rgb(219,202,161)));
board.add(new Car(new Coordinate(0,5), new Coordinate(2,5), Color.rgb(25,195,167)));
- board.addToLayout(this, boardLayout);
+ ViewTreeObserver vto = boardLayout.getViewTreeObserver();
+ vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ boardLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+ board.addToLayout(getBaseContext(), boardLayout);
+ }
+ });
+
+ //board.addToLayout(this, boardLayout);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-14 06:23:07 +0000