From e60085f398afc2fcbe5f06ebf0222c6310fddb57 Mon Sep 17 00:00:00 2001
From: Joshua Bahnsen <archrival@gmail.com>
Date: Wed, 17 Jul 2013 00:18:17 -0700
Subject: [PATCH] Further fixes for Android Studio

---
 .idea/compiler.xml   | 19 +++++++++++++++++++
 .idea/encodings.xml  |  6 +++++-
 .idea/modules.xml    |  4 ++--
 Subsonic-Android.iml |  6 +++---
 menudrawer.iml       | 10 +++++++---
 project.properties   |  5 +++--
 pulltorefresh.iml    | 10 +++++++---
 7 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af471..5a367df9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,14 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/menudrawer/library/target/generated-sources/r" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/menudrawer/samples/target/generated-sources/r" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/menudrawer/samples/gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.3.1/gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/menudrawer/library/gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/pulltorefresh/library/gen" includeSubdirectories="true" />
+    </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -17,7 +25,18 @@
       <profile default="true" name="Default" enabled="false">
         <processorPath useClasspath="true" />
       </profile>
+      <profile default="false" name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+      </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="menudrawer" target="1.6" />
+      <module name="menudrawer-parent" target="1.6" />
+      <module name="samples" target="1.6" />
+    </bytecodeTargetLevel>
   </component>
 </project>
 
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index e206d70d..5cc19196 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="file://$PROJECT_DIR$/menudrawer" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/menudrawer/library" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/menudrawer/samples" charset="UTF-8" />
+  </component>
 </project>
 
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1c3f4a81..97015b21 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Subsonic-Android.iml" filepath="$PROJECT_DIR$/Subsonic-Android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Android-PullToRefresh/library/library.iml" filepath="$PROJECT_DIR$/Android-PullToRefresh/library/library.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android-menudrawer-master/library/library1.iml" filepath="$PROJECT_DIR$/android-menudrawer-master/library/library1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/menudrawer.iml" filepath="$PROJECT_DIR$/menudrawer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/pulltorefresh.iml" filepath="$PROJECT_DIR$/pulltorefresh.iml" />
     </modules>
   </component>
 </project>
diff --git a/Subsonic-Android.iml b/Subsonic-Android.iml
index 150c41cd..75cee36d 100644
--- a/Subsonic-Android.iml
+++ b/Subsonic-Android.iml
@@ -19,10 +19,10 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="library1" />
-    <orderEntry type="module" module-name="library" />
+    <orderEntry type="module" module-name="menudrawer" />
+    <orderEntry type="module" module-name="pulltorefresh" />
   </component>
 </module>
 
diff --git a/menudrawer.iml b/menudrawer.iml
index 5a731f9e..060936c9 100644
--- a/menudrawer.iml
+++ b/menudrawer.iml
@@ -3,15 +3,19 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/menudrawer/library/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/menudrawer/library/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/menudrawer/library/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/menudrawer/library/res" />
         <option name="LIBRARY_PROJECT" value="true" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    <content url="file://$MODULE_DIR$/menudrawer">
+      <sourceFolder url="file://$MODULE_DIR$/menudrawer/library/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/menudrawer/library/gen" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/project.properties b/project.properties
index 2a4b3910..98a497ac 100644
--- a/project.properties
+++ b/project.properties
@@ -10,6 +10,7 @@
 # Project target.
 target=android-17
 android.library=false
+android.library.reference.1=menudrawer
+android.library.reference.2=pulltorefresh
+
 
-android.library.reference.1=pulltorefresh/library
-android.library.reference.2=menudrawer/library
diff --git a/pulltorefresh.iml b/pulltorefresh.iml
index 5a731f9e..92ae1e41 100644
--- a/pulltorefresh.iml
+++ b/pulltorefresh.iml
@@ -3,15 +3,19 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/pulltorefresh/library/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/pulltorefresh/library/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/pulltorefresh/library/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/pulltorefresh/library/res" />
         <option name="LIBRARY_PROJECT" value="true" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    <content url="file://$MODULE_DIR$/pulltorefresh">
+      <sourceFolder url="file://$MODULE_DIR$/pulltorefresh/library/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/pulltorefresh/library/gen" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />