diff --git a/assets/android/images/res-hdpi/no_media.png b/assets/android/images/res-hdpi/no_media.png new file mode 100644 index 0000000..4b21a8c Binary files /dev/null and b/assets/android/images/res-hdpi/no_media.png differ diff --git a/assets/android/images/res-hdpi/overlay.png b/assets/android/images/res-hdpi/overlay.png new file mode 100644 index 0000000..3ea3cc9 Binary files /dev/null and b/assets/android/images/res-hdpi/overlay.png differ diff --git a/assets/android/images/res-hdpi/warning.png b/assets/android/images/res-hdpi/warning.png new file mode 100644 index 0000000..1f38472 Binary files /dev/null and b/assets/android/images/res-hdpi/warning.png differ diff --git a/assets/android/images/res-xhdpi/no_media.png b/assets/android/images/res-xhdpi/no_media.png new file mode 100644 index 0000000..3f42068 Binary files /dev/null and b/assets/android/images/res-xhdpi/no_media.png differ diff --git a/assets/android/images/res-xhdpi/overlay.png b/assets/android/images/res-xhdpi/overlay.png new file mode 100644 index 0000000..b796966 Binary files /dev/null and b/assets/android/images/res-xhdpi/overlay.png differ diff --git a/assets/android/images/res-xhdpi/warning.png b/assets/android/images/res-xhdpi/warning.png new file mode 100644 index 0000000..3e560cb Binary files /dev/null and b/assets/android/images/res-xhdpi/warning.png differ diff --git a/assets/android/images/res-xxhdpi/no_media.png b/assets/android/images/res-xxhdpi/no_media.png new file mode 100644 index 0000000..1b23d40 Binary files /dev/null and b/assets/android/images/res-xxhdpi/no_media.png differ diff --git a/assets/android/images/res-xxhdpi/overlay.png b/assets/android/images/res-xxhdpi/overlay.png new file mode 100644 index 0000000..3f0cdd9 Binary files /dev/null and b/assets/android/images/res-xxhdpi/overlay.png differ diff --git a/assets/android/images/res-xxhdpi/warning.png b/assets/android/images/res-xxhdpi/warning.png new file mode 100644 index 0000000..63397f4 Binary files /dev/null and b/assets/android/images/res-xxhdpi/warning.png differ diff --git a/assets/iphone/images/no_media.png b/assets/iphone/images/no_media.png new file mode 100644 index 0000000..dfbd37a Binary files /dev/null and b/assets/iphone/images/no_media.png differ diff --git a/assets/iphone/images/no_media@2x.png b/assets/iphone/images/no_media@2x.png new file mode 100644 index 0000000..f1c521d Binary files /dev/null and b/assets/iphone/images/no_media@2x.png differ diff --git a/assets/iphone/images/no_media@3x.png b/assets/iphone/images/no_media@3x.png new file mode 100644 index 0000000..6b97aa4 Binary files /dev/null and b/assets/iphone/images/no_media@3x.png differ diff --git a/assets/iphone/images/overlay.png b/assets/iphone/images/overlay.png new file mode 100644 index 0000000..4bf6037 Binary files /dev/null and b/assets/iphone/images/overlay.png differ diff --git a/assets/iphone/images/overlay@2x.png b/assets/iphone/images/overlay@2x.png new file mode 100644 index 0000000..3788eeb Binary files /dev/null and b/assets/iphone/images/overlay@2x.png differ diff --git a/assets/iphone/images/overlay@3x.png b/assets/iphone/images/overlay@3x.png new file mode 100644 index 0000000..8abc3f7 Binary files /dev/null and b/assets/iphone/images/overlay@3x.png differ diff --git a/assets/iphone/images/warning.png b/assets/iphone/images/warning.png new file mode 100644 index 0000000..a799980 Binary files /dev/null and b/assets/iphone/images/warning.png differ diff --git a/assets/iphone/images/warning@2x.png b/assets/iphone/images/warning@2x.png new file mode 100644 index 0000000..42f2a5f Binary files /dev/null and b/assets/iphone/images/warning@2x.png differ diff --git a/assets/iphone/images/warning@3x.png b/assets/iphone/images/warning@3x.png new file mode 100644 index 0000000..b4d47e3 Binary files /dev/null and b/assets/iphone/images/warning@3x.png differ diff --git a/example/tiapp.xml b/example/tiapp.xml index 2a5c993..2fea2bb 100644 --- a/example/tiapp.xml +++ b/example/tiapp.xml @@ -48,5 +48,5 @@ false false - 3.5.0.GA + 6.0.0.GA diff --git a/module/.classpath b/module/.classpath new file mode 100644 index 0000000..0d3c3a4 --- /dev/null +++ b/module/.classpath @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/module/.project b/module/.project index 3a50588..2b089d8 100644 --- a/module/.project +++ b/module/.project @@ -15,8 +15,14 @@ + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature com.appcelerator.titanium.mobile.module.nature com.aptana.projects.webnature diff --git a/module/android/.classpath b/module/android/.classpath deleted file mode 100644 index 4d6ff29..0000000 --- a/module/android/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/module/android/build.properties b/module/android/build.properties index 6c8581b..dd24c96 100644 --- a/module/android/build.properties +++ b/module/android/build.properties @@ -1,4 +1,4 @@ -titanium.platform=/Users/nils/Library/Application Support/Titanium/mobilesdk/osx/3.5.0.GA/android -android.platform=/opt/android-sdk/platforms/android-19 -google.apis=/opt/android-sdk/add-ons/addon-google_apis-google-19/ -android.ndk=/opt/android-ndk/ \ No newline at end of file +titanium.platform=/Users/InGrowth/Library/Application Support/Titanium/mobilesdk/osx/6.0.0.GA/android +android.platform=/Users/InGrowth/Library/android-sdk-macosx/platforms/android-23 +google.apis=/Users/InGrowth/Library/android-sdk-macosx/add-ons/addon-google_apis-google-23 +android.ndk=/Users/InGrowth/Library/android-sdk-macosx/ndk-bundle \ No newline at end of file diff --git a/module/android/java-sources.txt b/module/android/java-sources.txt new file mode 100644 index 0000000..e1b2bc4 --- /dev/null +++ b/module/android/java-sources.txt @@ -0,0 +1,8 @@ +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/src/ti/mediapicker/TiMediaPickerModule.java" +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/build/generated/java/ti/mediapicker/TiMediaPickerBootstrap.java" +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/build/generated/r/android/support/compat/R.java" +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/build/generated/r/android/support/design/R.java" +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/build/generated/r/android/support/v7/appcompat/R.java" +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/build/generated/r/android/support/v7/cardview/R.java" +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/build/generated/r/ti/mediapicker/R.java" +"/Users/ingrowth/Documents/Projects/TiMediaPicker/module/android/build/generated/r/ti/modules/titanium/ui/R.java" \ No newline at end of file diff --git a/module/android/manifest b/module/android/manifest index a5e9ff1..3417a0c 100644 --- a/module/android/manifest +++ b/module/android/manifest @@ -2,16 +2,17 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.0.4 -apiversion: 2 +version: 2.0.0 +apiversion: 4 description: - author: Nils (github.com/lowb1rd) license: - copyright: 2014 Nils +architectures: arm64-v8a armeabi-v7a x86 # these should not be edited -name: TiMediaPicker +name: timediapicker moduleid: ti.mediapicker guid: eebf3061-a7c1-4f22-b665-87ea9771c0b0 platform: android -minsdk: 3.5.0.GA +minsdk: 7.0.0 diff --git a/module/android/src/ti/mediapicker/TiMediaPickerModule.java b/module/android/src/ti/mediapicker/TiMediaPickerModule.java index de30e9c..f36a140 100644 --- a/module/android/src/ti/mediapicker/TiMediaPickerModule.java +++ b/module/android/src/ti/mediapicker/TiMediaPickerModule.java @@ -170,7 +170,7 @@ public void getAssetGroups(KrollDict options) KrollDict dd = new KrollDict(); dd.put("items", d); - successCallback.callAsync((KrollObject)successCallback,dd); + successCallback.callAsync(getKrollObject(), dd); } @Kroll.method public void getPhotos(KrollDict options) @@ -224,7 +224,7 @@ public void getPhotos(KrollDict options) KrollDict ddd = new KrollDict(); Object[] o = dd.toArray(); ddd.put("items", o); - successCallback.callAsync((KrollObject)successCallback,ddd); + successCallback.callAsync(getKrollObject(), ddd); } @Kroll.method @@ -254,7 +254,7 @@ public void getThumb(KrollDict options) { if (cursor == null || cursor.getCount() == 0) { d.put("created", 1); - //createCallback.callAsync((KrollObject)createCallback,new KrollDict()); + //createCallback.callAsync(getKrollObject(), new KrollDict()); // create thumb Bitmap thumb = MediaStore.Images.Thumbnails.getThumbnail(activity.getContentResolver(), id, MediaStore.Images.Thumbnails.MINI_KIND, null); @@ -278,7 +278,7 @@ public void getThumb(KrollDict options) { } //return d; - successCallback.callAsync((KrollObject)successCallback,d); + successCallback.callAsync(getKrollObject(), d); } @@ -337,6 +337,6 @@ public void getImageByURL(KrollDict options, KrollDict payload) { long length = file.length(); d.put("size", length); - successCallback.callAsync((KrollObject)successCallback,d); + successCallback.callAsync(getKrollObject() ,d); } } \ No newline at end of file diff --git a/module/android/timodule.xml b/module/android/timodule.xml index 6affb2f..613b5fb 100644 --- a/module/android/timodule.xml +++ b/module/android/timodule.xml @@ -7,6 +7,11 @@ + + + + + diff --git a/ti.mediapicker-android-1.0.2.zip b/ti.mediapicker-android-1.0.2.zip deleted file mode 100644 index 9e6ea80..0000000 Binary files a/ti.mediapicker-android-1.0.2.zip and /dev/null differ diff --git a/ti.mediapicker-android-1.0.4.zip b/ti.mediapicker-android-1.0.4.zip new file mode 100644 index 0000000..871a076 Binary files /dev/null and b/ti.mediapicker-android-1.0.4.zip differ diff --git a/ti.mediapicker-android-1.1.4.zip b/ti.mediapicker-android-1.1.4.zip new file mode 100644 index 0000000..632fa74 Binary files /dev/null and b/ti.mediapicker-android-1.1.4.zip differ diff --git a/ti.mediapicker-android-2.0.0.zip b/ti.mediapicker-android-2.0.0.zip new file mode 100644 index 0000000..69142ab Binary files /dev/null and b/ti.mediapicker-android-2.0.0.zip differ