Merge pull request #5 from donglua/developer

完善文档和Demo
donglua · Jul 3, 2015 · 3b25962 · 3b25962
2 parents 7c5f236 + 1fc19b3
commit 3b25962
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 9 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/PhotoPicker.iml b/PhotoPicker.iml
@@ -4,6 +4,7 @@
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>

diff --git a/PhotoPicker/PhotoPicker-PhotoPicker.iml b/PhotoPicker/PhotoPicker-PhotoPicker.iml
@@ -13,8 +13,11 @@
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />

diff --git a/README.md b/README.md
@@ -55,9 +55,12 @@ startActivityForResult(intent, REQUEST_CODE);
     >
     ...
 
-    <activity android:name="me.iwf.photopicker.PhotoPickerActivity" />
+    <activity android:name="me.iwf.photopicker.PhotoPickerActivity"
+      android:theme="@style/Theme.AppCompat.NoActionBar" 
+       />
 
-    <activity android:name="me.iwf.photopicker.PhotoPagerActivity" />
+    <activity android:name="me.iwf.photopicker.PhotoPagerActivity"
+      android:theme="@style/Theme.AppCompat.NoActionBar"/>
 
   </application>
 </manifest>

diff --git a/photopickerdemo/build.gradle b/photopickerdemo/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "me.iwf.PhotoPickerDemo"
         minSdkVersion 10
         targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1.0"
     }
     buildTypes {
         release {

diff --git a/photopickerdemo/photopickerdemo.iml b/photopickerdemo/photopickerdemo.iml
@@ -13,8 +13,11 @@
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />