Permalink
Browse files

优化部分代码,减少依赖项

  • Loading branch information...
1 parent 1cd52db commit 4df494e9cb2600fa586d2554d403d824509e5e24 @luck1991 luck1991 committed Jan 6, 2017
Showing with 328 additions and 698 deletions.
  1. +0 −3 .gitattributes
  2. +0 −2 .idea/gradle.xml
  3. +6 −0 .idea/inspectionProfiles/Project_Default.xml
  4. +7 −0 .idea/inspectionProfiles/profiles_settings.xml
  5. +3 −112 .idea/misc.xml
  6. +0 −1 .idea/modules.xml
  7. +0 −1 app/build.gradle
  8. +5 −7 app/src/main/java/com/luck/pictureselector/MainActivity.java
  9. +0 −1 app/src/main/java/com/luck/pictureselector/adapter/GridImageAdapter.java
  10. +3 −2 app/src/main/res/layout/activity_main.xml
  11. +2 −2 app/src/main/res/layout/layout_number.xml
  12. BIN {ucrop/src/main/res/drawable-xhdpi → app/src/main/res/mipmap-xhdpi}/back.png
  13. +3 −0 app/src/main/res/values/colors.xml
  14. 0 {ucrop → picture_library}/.gitattributes
  15. +22 −7 picture_library/build.gradle
  16. 0 {ucrop → picture_library}/gradle.properties
  17. +1 −1 picture_library/proguard-rules.pro
  18. +1 −1 ...ary/src/androidTest/java/{com/luck/picture → easyfoodbatch/luck/com/library}/ApplicationTest.java
  19. +1 −2 picture_library/src/main/AndroidManifest.xml
  20. +0 −57 picture_library/src/main/java/com/luck/picture/util/FileUtils.java
  21. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/UCrop.java
  22. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/UCropActivity.java
  23. +7 −9 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/adapter/AlbumDirectoryAdapter.java
  24. +5 −5 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/adapter/ImageGridAdapter.java
  25. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/callback/BitmapCropCallback.java
  26. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/callback/BitmapLoadCallback.java
  27. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/callback/CropBoundsChangeListener.java
  28. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/callback/OverlayViewChangeListener.java
  29. +1 −1 ...brary/src/main/java/com/{luck/picture → yalantis/ucrop}/decoration/GridSpacingItemDecoration.java
  30. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/decoration/RecycleViewDivider.java
  31. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/dialog/Indeterminate.java
  32. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/dialog/OptAnimationLoader.java
  33. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/dialog/SpinView.java
  34. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/dialog/SuccessTickView.java
  35. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/dialog/SweetAlertDialog.java
  36. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/entity/LocalMedia.java
  37. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/entity/LocalMediaFolder.java
  38. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/model/AspectRatio.java
  39. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/model/CropParameters.java
  40. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/model/ExifInfo.java
  41. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/model/ImageState.java
  42. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java
  43. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java
  44. +10 −20 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/ui/AlbumDirectoryActivity.java
  45. +2 −3 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/ui/BaseActivity.java
  46. +10 −11 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/ui/ImageGridActivity.java
  47. +2 −2 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/ui/ImagePreviewFragment.java
  48. +5 −5 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/ui/PreviewActivity.java
  49. +2 −2 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/ui/VideoPlayActivity.java
  50. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/BitmapLoadUtils.java
  51. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/util/Constants.java
  52. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/CubicEasing.java
  53. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/EglUtils.java
  54. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java
  55. +41 −0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/FileUtils.java
  56. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/ImageHeaderParser.java
  57. +4 −14 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/util/LocalMediaLoader.java
  58. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/util/Options.java
  59. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/RectUtils.java
  60. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/RotationGestureDetector.java
  61. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/util/ScreenUtils.java
  62. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/SelectedStateListDrawable.java
  63. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/util/SystemBarTintManager.java
  64. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/util/Utils.java
  65. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/view/CropImageView.java
  66. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/view/GestureCropImageView.java
  67. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/view/OverlayView.java
  68. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/view/TransformImageView.java
  69. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/view/UCropView.java
  70. 0 {ucrop → picture_library}/src/main/java/com/yalantis/ucrop/view/widget/AspectRatioTextView.java
  71. 0 ... → picture_library}/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java
  72. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/widget/PreviewViewPager.java
  73. +1 −1 picture_library/src/main/java/com/{luck/picture → yalantis/ucrop}/widget/SquareRelativeLayout.java
  74. 0 {ucrop → picture_library}/src/main/jni/Android.mk
  75. 0 {ucrop → picture_library}/src/main/jni/Application.mk
  76. 0 {ucrop → picture_library}/src/main/jni/CImg.h
  77. 0 {ucrop → picture_library}/src/main/jni/com_yalantis_ucrop_task_BitmapCropTask.h
  78. 0 {ucrop → picture_library}/src/main/jni/uCrop.cpp
  79. BIN {ucrop → picture_library}/src/main/jniLibs/arm64-v8a/libucrop.so
  80. BIN {ucrop → picture_library}/src/main/jniLibs/armeabi-v7a/libucrop.so
  81. BIN {ucrop → picture_library}/src/main/jniLibs/armeabi/libucrop.so
  82. BIN {ucrop → picture_library}/src/main/jniLibs/x86/libucrop.so
  83. BIN {ucrop → picture_library}/src/main/jniLibs/x86_64/libucrop.so
  84. 0 {ucrop → picture_library}/src/main/res/anim/ucrop_loader_circle_path.xml
  85. 0 {ucrop → picture_library}/src/main/res/anim/ucrop_loader_circle_scale.xml
  86. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_angle.png
  87. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_crop.png
  88. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_cross.png
  89. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_done.png
  90. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_next.png
  91. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_reset.png
  92. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_rotate.png
  93. BIN {ucrop → picture_library}/src/main/res/drawable-hdpi/ucrop_ic_scale.png
  94. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_angle.png
  95. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_crop.png
  96. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_cross.png
  97. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_done.png
  98. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_next.png
  99. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_reset.png
  100. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_rotate.png
  101. BIN {ucrop → picture_library}/src/main/res/drawable-ldpi/ucrop_ic_scale.png
  102. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_angle.png
  103. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_crop.png
  104. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_cross.png
  105. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_done.png
  106. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_next.png
  107. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_reset.png
  108. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_rotate.png
  109. BIN {ucrop → picture_library}/src/main/res/drawable-mdpi/ucrop_ic_scale.png
  110. BIN picture_library/src/main/res/{mipmap-xhdpi → drawable-xhdpi}/back.png
  111. BIN picture_library/src/main/res/{mipmap-xhdpi → drawable-xhdpi}/buybuybuy.png
  112. BIN picture_library/src/main/res/{mipmap-xhdpi → drawable-xhdpi}/def.png
  113. BIN picture_library/src/main/res/{mipmap-xhdpi → drawable-xhdpi}/ic_camera.png
  114. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/kprogresshud_spinner.png
  115. BIN picture_library/src/main/res/{mipmap-xhdpi → drawable-xhdpi}/sel.png
  116. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_angle.png
  117. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_crop.png
  118. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_cross.png
  119. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_done.png
  120. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_next.png
  121. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_reset.png
  122. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_rotate.png
  123. BIN {ucrop → picture_library}/src/main/res/drawable-xhdpi/ucrop_ic_scale.png
  124. BIN picture_library/src/main/res/{mipmap-xxhdpi → drawable-xxhdpi}/ic_check.png
  125. BIN picture_library/src/main/res/{mipmap-xxhdpi → drawable-xxhdpi}/ic_checked.png
  126. BIN picture_library/src/main/res/{mipmap-xxhdpi → drawable-xxhdpi}/ic_placeholder.png
  127. BIN picture_library/src/main/res/{mipmap-xxhdpi → drawable-xxhdpi}/more_1x.png
  128. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_angle.png
  129. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_crop.png
  130. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_cross.png
  131. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_done.png
  132. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_next.png
  133. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_reset.png
  134. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_rotate.png
  135. BIN {ucrop → picture_library}/src/main/res/drawable-xxhdpi/ucrop_ic_scale.png
  136. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_angle.png
  137. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_crop.png
  138. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_cross.png
  139. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_done.png
  140. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_next.png
  141. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_reset.png
  142. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_rotate.png
  143. BIN {ucrop → picture_library}/src/main/res/drawable-xxxhdpi/ucrop_ic_scale.png
  144. +1 −1 picture_library/src/main/res/drawable/check_green.xml
  145. +2 −2 picture_library/src/main/res/drawable/checkbox_checktor.xml
  146. +2 −2 picture_library/src/main/res/drawable/checkbox_selector.xml
  147. 0 {ucrop → picture_library}/src/main/res/drawable/dialog_custom_bg.xml
  148. +1 −1 picture_library/src/main/res/drawable/image_placeholder.xml
  149. +1 −1 picture_library/src/main/res/drawable/item_select_bg.xml
  150. 0 {ucrop → picture_library}/src/main/res/drawable/ucrop_shadow_upside.xml
  151. 0 {ucrop → picture_library}/src/main/res/drawable/ucrop_vector_loader.xml
  152. 0 {ucrop → picture_library}/src/main/res/drawable/ucrop_vector_loader_animated.xml
  153. +1 −1 picture_library/src/main/res/layout/activity_album.xml
  154. +2 −2 picture_library/src/main/res/layout/activity_image_grid.xml
  155. +6 −6 picture_library/src/main/res/layout/activity_image_preview.xml
  156. +2 −4 picture_library/src/main/res/layout/activity_video_play.xml
  157. +3 −3 picture_library/src/main/res/layout/album_folder_item.xml
  158. 0 {ucrop → picture_library}/src/main/res/layout/alert_dialog.xml
  159. +4 −4 picture_library/src/main/res/layout/image_grid_item.xml
  160. +4 −4 picture_library/src/main/res/layout/item_camera.xml
  161. 0 {ucrop → picture_library}/src/main/res/layout/ucrop_activity_photobox.xml
  162. 0 {ucrop → picture_library}/src/main/res/layout/ucrop_view.xml
  163. +4 −4 picture_library/src/main/res/layout/widget_toolbar.xml
  164. 0 {ucrop → picture_library}/src/main/res/menu/ucrop_menu_activity.xml
  165. BIN picture_library/src/main/res/mipmap-xhdpi/ucrop_ic_cross.png
  166. BIN picture_library/src/main/res/mipmap-xhdpi/ucrop_ic_done.png
  167. 0 {ucrop → picture_library}/src/main/res/values-fr/strings.xml
  168. 0 {ucrop → picture_library}/src/main/res/values-nl/strings.xml
  169. 0 {ucrop → picture_library}/src/main/res/values-sk/strings.xml
  170. +0 −6 picture_library/src/main/res/values-w820dp/dimens.xml
  171. +32 −0 picture_library/src/main/res/values-zh-rTW/strings.xml
  172. +6 −3 picture_library/src/main/res/{values-zh-rCN → values-zh}/strings.xml
  173. +24 −14 picture_library/src/main/res/values/attrs.xml
  174. +16 −18 picture_library/src/main/res/values/colors.xml
  175. +18 −19 picture_library/src/main/res/values/dimens.xml
  176. 0 {ucrop → picture_library}/src/main/res/values/public.xml
  177. +9 −2 picture_library/src/main/res/values/strings.xml
  178. +36 −24 picture_library/src/main/res/values/styles.xml
  179. 0 {ucrop → picture_library}/src/main/res/values/values.xml
  180. +1 −1 ...re_library/src/test/java/{com/luck/picture → easyfoodbatch/luck/com/library}/ExampleUnitTest.java
  181. +1 −1 settings.gradle
  182. +0 −1 ucrop/.gitignore
  183. +0 −40 ucrop/build.gradle
  184. +0 −17 ucrop/proguard-rules.pro
  185. +0 −2 ucrop/src/main/AndroidManifest.xml
  186. +0 −39 ucrop/src/main/res/anim/modal_in.xml
  187. +0 −18 ucrop/src/main/res/anim/modal_out.xml
  188. +0 −5 ucrop/src/main/res/color/ucrop_scale_text_view_selector.xml
  189. +0 −9 ucrop/src/main/res/drawable/ucrop_vector_ic_crop.xml
  190. +0 −11 ucrop/src/main/res/values-zh-rTW/strings.xml
  191. +0 −8 ucrop/src/main/res/values-zh/strings.xml
  192. +0 −35 ucrop/src/main/res/values/attrs.xml
  193. +0 −20 ucrop/src/main/res/values/colors.xml
  194. +0 −25 ucrop/src/main/res/values/dimens.xml
  195. +0 −11 ucrop/src/main/res/values/strings.xml
  196. +0 −54 ucrop/src/main/res/values/styles.xml
View
@@ -1,3 +0,0 @@
-*.c++ linguist-language=java
-*.c linguist-language=java
-*.h linguist-language=java
View
@@ -11,15 +11,13 @@
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/picture_library" />
- <option value="$PROJECT_DIR$/ucrop" />
</set>
</option>
<option name="myModules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/picture_library" />
- <option value="$PROJECT_DIR$/ucrop" />
</set>
</option>
</GradleProjectSettings>
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+ <profile version="1.0">
+ <option name="myName" value="Project Default" />
+ <inspection_tool class="AndroidLintResourceName" enabled="false" level="ERROR" enabled_by_default="false" />
+ </profile>
+</component>
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+ <settings>
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
+ </settings>
+</component>
View
@@ -34,118 +34,6 @@
</value>
</option>
</component>
- <component name="ProjectInspectionProfilesVisibleTreeState">
- <entry key="Project Default">
- <profile-state>
- <expanded-state>
- <State>
- <id />
- </State>
- <State>
- <id>Android</id>
- </State>
- <State>
- <id>Android &gt; Lint &gt; Correctness</id>
- </State>
- <State>
- <id>Android &gt; Lint &gt; Performance</id>
- </State>
- <State>
- <id>C/C++</id>
- </State>
- <State>
- <id>Class structureJava</id>
- </State>
- <State>
- <id>Control flow issuesJava</id>
- </State>
- <State>
- <id>CorrectnessLintAndroid</id>
- </State>
- <State>
- <id>Error handlingJava</id>
- </State>
- <State>
- <id>General</id>
- </State>
- <State>
- <id>Groovy</id>
- </State>
- <State>
- <id>HTML</id>
- </State>
- <State>
- <id>ImportsJava</id>
- </State>
- <State>
- <id>Internationalization issues</id>
- </State>
- <State>
- <id>Internationalization issuesJava</id>
- </State>
- <State>
- <id>J2ME issuesJava</id>
- </State>
- <State>
- <id>JSON</id>
- </State>
- <State>
- <id>Java</id>
- </State>
- <State>
- <id>Javadoc issuesJava</id>
- </State>
- <State>
- <id>LintAndroid</id>
- </State>
- <State>
- <id>Manifest</id>
- </State>
- <State>
- <id>OtherGroovy</id>
- </State>
- <State>
- <id>Portability issuesJava</id>
- </State>
- <State>
- <id>Potentially confusing code constructsGroovy</id>
- </State>
- <State>
- <id>Probable bugsJava</id>
- </State>
- <State>
- <id>Properties Files</id>
- </State>
- <State>
- <id>Properties FilesJava</id>
- </State>
- <State>
- <id>RELAX NG</id>
- </State>
- <State>
- <id>Resource management issuesJava</id>
- </State>
- <State>
- <id>Threading issuesJava</id>
- </State>
- <State>
- <id>Unused codeC/C++</id>
- </State>
- <State>
- <id>Validity issuesGroovy</id>
- </State>
- <State>
- <id>XML</id>
- </State>
- </expanded-state>
- <selected-state>
- <State>
- <id>Android</id>
- </State>
- </selected-state>
- </profile-state>
- </entry>
- </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@@ -162,6 +50,9 @@
<component name="ProjectType">
<option name="id" value="Android" />
</component>
+ <component name="SvnConfiguration" myUseAcceleration="nothing">
+ <configuration useDefault="false">$USER_HOME$/.subversion</configuration>
+ </component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
View
@@ -5,7 +5,6 @@
<module fileurl="file://$PROJECT_DIR$/PictureSelector.iml" filepath="$PROJECT_DIR$/PictureSelector.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/picture_library/picture_library.iml" filepath="$PROJECT_DIR$/picture_library/picture_library.iml" />
- <module fileurl="file://$PROJECT_DIR$/ucrop/ucrop.iml" filepath="$PROJECT_DIR$/ucrop/ucrop.iml" />
</modules>
</component>
</project>
View
@@ -22,6 +22,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
- compile 'com.android.support:appcompat-v7:23.4.0'
compile project(':picture_library')
}
@@ -9,15 +9,13 @@
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.RadioGroup;
-import android.widget.Toast;
-
-import com.luck.picture.ui.AlbumDirectoryActivity;
-import com.luck.picture.ui.ImageGridActivity;
-import com.luck.picture.util.Constants;
-import com.luck.picture.util.LocalMediaLoader;
-import com.luck.picture.util.Options;
import com.luck.pictureselector.adapter.GridImageAdapter;
import com.luck.pictureselector.util.FullyGridLayoutManager;
+import com.yalantis.ucrop.ui.AlbumDirectoryActivity;
+import com.yalantis.ucrop.ui.ImageGridActivity;
+import com.yalantis.ucrop.util.Constants;
+import com.yalantis.ucrop.util.LocalMediaLoader;
+import com.yalantis.ucrop.util.Options;
import java.util.ArrayList;
import java.util.List;
@@ -11,7 +11,6 @@
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.luck.pictureselector.R;
-
import java.util.ArrayList;
import java.util.List;
@@ -92,14 +92,14 @@
android:id="@+id/rb_single"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:checked="true"
android:text="单选" />
<RadioButton
android:id="@+id/rb_multiple"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15sp"
+ android:checked="true"
android:text="多选" />
</RadioGroup>
@@ -190,14 +190,15 @@
android:id="@+id/rb_preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:checked="true"
android:text="预览图片" />
<RadioButton
android:id="@+id/rb_preview_false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15sp"
- android:checked="true"
+
android:text="禁止预览" />
</RadioGroup>
@@ -3,8 +3,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingBottom="@dimen/margin_text"
- android:paddingTop="@dimen/margin_text">
+ android:paddingBottom="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_horizontal_margin">
<ImageButton
android:id="@+id/minus"
@@ -5,4 +5,7 @@
<color name="colorAccent">#FF4081</color>
<color name="bar_grey">#393a3e</color>
<color name="color_f6">#f6f6f6</color>
+ <color name="white">#FFFFFF</color>
+ <color name="transparent">#00000000</color>
+ <color name="black">#000000</color>
</resources>
File renamed without changes.
@@ -1,28 +1,43 @@
apply plugin: 'com.android.library'
+//apply from: '../mavenpush.gradle'
+
android {
compileSdkVersion 23
- buildToolsVersion "23.0.3"
+ buildToolsVersion '23.0.3'
defaultConfig {
- minSdkVersion 16
+ minSdkVersion 14
targetSdkVersion 23
- versionCode 1
- versionName "1.0"
+ versionCode 22
+ versionName "2.2.0-native"
+
+ vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
+ lintOptions {
+ abortOnError false
+ }
+
+ resourcePrefix 'ucrop_'
+
+ sourceSets.main {
+ jni.srcDirs = [];
+ }
+
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.commit451:PhotoView:1.2.4'
- compile project(':ucrop')
}
File renamed without changes.
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
-# in /Users/luck/Documents/android-sdk-macosx-2/tools/proguard/proguard-android.txt
+# in /Users/oleksii/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
@@ -1,4 +1,4 @@
-package com.luck.picture;
+package easyfoodbatch.luck.com.library;
import android.app.Application;
import android.test.ApplicationTestCase;
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.luck.picture">
+ package="com.yalantis.ucrop">
<application
android:allowBackup="true"
@@ -27,5 +27,4 @@
android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="portrait" />
</application>
-
</manifest>
Oops, something went wrong.

0 comments on commit 4df494e

Please sign in to comment.