From 9d1a284a9afd9f7a6e4cf2653327cbd9068f049a Mon Sep 17 00:00:00 2001
From: Andrej Rasevic <andrej@rasevicengineering.com>
Date: Tue, 27 Nov 2018 15:57:23 -0500
Subject: [PATCH] adding .gitignore
---
.gitignore | 38 +++++
.idea/workspace.xml | 350 ++++++++++++++++++++++++++++++--------------
2 files changed, 277 insertions(+), 111 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2a0b276
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# Mac files
+.DS_Store
+
+# generated files
+bin/
+gen/
+
+# Ignore gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Eclipse prefs files
+.prefs
+
+# Android Studio
+*.iml
+.idea
+.gradle
+build/
+
+#NDK
+obj/
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 85ac235..8d965a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,10 +6,7 @@
</shared>
</component>
<component name="ChangeListManager">
- <list default="true" id="574a439d-ccf0-45d8-8e20-6ff4a36a09fd" name="Default" comment="">
- <change beforePath="$PROJECT_DIR$/LocationLab.docx" afterPath="$PROJECT_DIR$/LocationLab.docx" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java" />
- </list>
+ <list default="true" id="574a439d-ccf0-45d8-8e20-6ff4a36a09fd" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -30,8 +27,8 @@
</system>
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="PlaceBadgeDetailActivity.java" pinned="false" current-in-tab="true">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="PlaceBadgeDetailActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
@@ -43,10 +40,20 @@
</provider>
</entry>
</file>
+ <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/.gitignore">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="349">
+ <caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="PlaceDownloaderTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceDownloaderTask.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="263">
+ <state relative-caret-position="266">
<caret line="41" column="59" lean-forward="false" selection-start-line="41" selection-start-column="59" selection-end-line="41" selection-end-column="59" />
<folding />
</state>
@@ -56,7 +63,7 @@
<file leaf-file-name="PlaceRecord.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceRecord.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1250">
+ <state relative-caret-position="76">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
@@ -66,7 +73,7 @@
<file leaf-file-name="PlaceViewAdapter.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="67">
+ <state relative-caret-position="76">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding />
</state>
@@ -76,12 +83,9 @@
<file leaf-file-name="PlaceViewActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2185">
+ <state relative-caret-position="2204">
<caret line="138" column="48" lean-forward="false" selection-start-line="138" selection-start-column="48" selection-end-line="138" selection-end-column="48" />
- <folding>
- <element signature="e#4217#4254#0" expanded="true" />
- <element signature="e#4436#4481#0" expanded="true" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -90,6 +94,11 @@
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ <option name="RECENT_BRANCH_BY_REPOSITORY">
+ <map>
+ <entry key="$PROJECT_DIR$" value="Lab10_LocationLab_Master" />
+ </map>
+ </option>
</component>
<component name="GradleLocalSettings">
<option name="myGradleHomes">
@@ -2103,7 +2112,6 @@
<map>
<entry key="$USER_HOME$/cmsc436-arasevic" value="PREVIEW" />
<entry key="$USER_HOME$/cmsc436-arasevic/cmsc436-arasevic" value="PREVIEW" />
- <entry key="$PROJECT_DIR$/../../../../cmsc436-arasevic" value="PREVIEW" />
<entry key="$PROJECT_DIR$" value="RE_IMPORT" />
</map>
</option>
@@ -2113,6 +2121,7 @@
<list>
<option value="$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java" />
+ <option value="$PROJECT_DIR$/.gitignore" />
</list>
</option>
</component>
@@ -2122,6 +2131,7 @@
<option name="width" value="1266" />
<option name="height" value="737" />
</component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
@@ -2138,75 +2148,19 @@
</navigator>
<panes>
<pane id="Scope" />
- <pane id="Scratches" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- </path>
- <path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- </path>
- <path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="course" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="course" type="462c0819:PsiDirectoryNode" />
- <item name="labs" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="lab10_locationlab" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab10_locationlab" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="course" type="462c0819:PsiDirectoryNode" />
- <item name="labs" type="462c0819:PsiDirectoryNode" />
- <item name="locationlab" type="462c0819:PsiDirectoryNode" />
+ <item name="cmsc436Fall2018-student" type="b2602c69:ProjectViewProjectNode" />
+ <item name="cmsc436Fall2018-student" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
- <pane id="PackagesPane" />
+ <pane id="Scratches" />
<pane id="AndroidView" />
</panes>
</component>
@@ -2412,8 +2366,9 @@
<item index="1" class="java.lang.String" itemvalue="Android Instrumented Tests.Tests in 'course.labs.locationlab.tests'" />
</list>
<recent_temporary>
- <list size="1">
+ <list size="2">
<item index="0" class="java.lang.String" itemvalue="Android Instrumented Tests.Tests in 'course.labs.locationlab.tests'" />
+ <item index="1" class="java.lang.String" itemvalue="Android Instrumented Tests.Tests in 'course.labs.locationlab.tests'" />
</list>
</recent_temporary>
</component>
@@ -2452,36 +2407,59 @@
</component>
<component name="ToolWindowManager">
<frame x="68" y="23" width="1266" height="737" extended-state="0" />
+ <editor active="true" />
<layout>
+ <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
- <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" 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" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+ <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" 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="true" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" 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" show_stripe_button="true" 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" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+ <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+ <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
+ <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" 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" show_stripe_button="true" weight="0.25" 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" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -2492,44 +2470,129 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider editor-type-id="android-manifest">
- <state />
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" 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/java/course/labs/locationlab/PlaceDownloaderTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="266">
+ <caret line="41" column="59" lean-forward="false" selection-start-line="41" selection-start-column="59" selection-end-line="41" selection-end-column="59" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceRecord.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="76">
+ <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+ <folding />
+ </state>
</provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewAdapter.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="76">
+ <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2204">
+ <caret line="138" column="48" lean-forward="false" selection-start-line="138" selection-start-column="48" selection-end-line="138" selection-end-column="48" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
+ <provider editor-type-id="android-manifest">
+ <state />
+ </provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/MockLocationProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index.html" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index-all.html" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceDownloaderTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="266">
+ <caret line="41" column="59" lean-forward="false" selection-start-line="41" selection-start-column="59" selection-end-line="41" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index.html">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceRecord.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-277">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="76">
+ <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewAdapter.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="76">
+ <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2204">
+ <caret line="138" column="48" lean-forward="false" selection-start-line="138" selection-start-column="48" selection-end-line="138" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index-all.html">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="137">
+ <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-252">
+ <state relative-caret-position="-7">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
+ <provider editor-type-id="android-manifest">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/MockLocationProvider.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="129">
+ <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+ </state>
+ </provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index.html" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index-all.html" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceDownloaderTask.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="263">
+ <state relative-caret-position="266">
<caret line="41" column="59" lean-forward="false" selection-start-line="41" selection-start-column="59" selection-end-line="41" selection-end-column="59" />
<folding />
</state>
@@ -2537,7 +2600,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceRecord.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1250">
+ <state relative-caret-position="76">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
@@ -2545,7 +2608,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewAdapter.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="67">
+ <state relative-caret-position="76">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding />
</state>
@@ -2553,15 +2616,40 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2185">
+ <state relative-caret-position="2204">
<caret line="138" column="48" lean-forward="false" selection-start-line="138" selection-start-column="48" selection-end-line="138" selection-end-column="48" />
- <folding>
- <element signature="e#4217#4254#0" expanded="true" />
- <element signature="e#4436#4481#0" expanded="true" />
- </folding>
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="137">
+ <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-7">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="android-manifest">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/MockLocationProvider.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="129">
+ <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index.html" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/index-all.html" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceBadgeDetailActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
@@ -2572,6 +2660,46 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceDownloaderTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="266">
+ <caret line="41" column="59" lean-forward="false" selection-start-line="41" selection-start-column="59" selection-end-line="41" selection-end-column="59" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceRecord.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="76">
+ <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewAdapter.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="76">
+ <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/course/labs/locationlab/PlaceViewActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2204">
+ <caret line="138" column="48" lean-forward="false" selection-start-line="138" selection-start-column="48" selection-end-line="138" selection-end-column="48" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.gitignore">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="349">
+ <caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
--
GitLab