diff --git a/plugin.xml b/plugin.xml index 02a32e6..5202947 100644 --- a/plugin.xml +++ b/plugin.xml @@ -63,12 +63,12 @@ - + - + diff --git a/src/Android/Library/res/anim/image_pop_in.xml b/src/android/Library/res/anim/image_pop_in.xml similarity index 100% rename from src/Android/Library/res/anim/image_pop_in.xml rename to src/android/Library/res/anim/image_pop_in.xml diff --git a/src/Android/Library/res/drawable-hdpi/icon.png b/src/android/Library/res/drawable-hdpi/icon.png similarity index 100% rename from src/Android/Library/res/drawable-hdpi/icon.png rename to src/android/Library/res/drawable-hdpi/icon.png diff --git a/src/Android/Library/res/drawable-hdpi/image_bg.9.png b/src/android/Library/res/drawable-hdpi/image_bg.9.png similarity index 100% rename from src/Android/Library/res/drawable-hdpi/image_bg.9.png rename to src/android/Library/res/drawable-hdpi/image_bg.9.png diff --git a/src/Android/Library/res/drawable-hdpi/loading_icon.png b/src/android/Library/res/drawable-hdpi/loading_icon.png similarity index 100% rename from src/Android/Library/res/drawable-hdpi/loading_icon.png rename to src/android/Library/res/drawable-hdpi/loading_icon.png diff --git a/src/Android/Library/res/drawable-ldpi/icon.png b/src/android/Library/res/drawable-ldpi/icon.png similarity index 100% rename from src/Android/Library/res/drawable-ldpi/icon.png rename to src/android/Library/res/drawable-ldpi/icon.png diff --git a/src/Android/Library/res/drawable-mdpi/ic_action_discard_dark.png b/src/android/Library/res/drawable-mdpi/ic_action_discard_dark.png similarity index 100% rename from src/Android/Library/res/drawable-mdpi/ic_action_discard_dark.png rename to src/android/Library/res/drawable-mdpi/ic_action_discard_dark.png diff --git a/src/Android/Library/res/drawable-mdpi/ic_action_discard_light.png b/src/android/Library/res/drawable-mdpi/ic_action_discard_light.png similarity index 100% rename from src/Android/Library/res/drawable-mdpi/ic_action_discard_light.png rename to src/android/Library/res/drawable-mdpi/ic_action_discard_light.png diff --git a/src/Android/Library/res/drawable-mdpi/ic_action_done_dark.png b/src/android/Library/res/drawable-mdpi/ic_action_done_dark.png similarity index 100% rename from src/Android/Library/res/drawable-mdpi/ic_action_done_dark.png rename to src/android/Library/res/drawable-mdpi/ic_action_done_dark.png diff --git a/src/Android/Library/res/drawable-mdpi/ic_action_done_light.png b/src/android/Library/res/drawable-mdpi/ic_action_done_light.png similarity index 100% rename from src/Android/Library/res/drawable-mdpi/ic_action_done_light.png rename to src/android/Library/res/drawable-mdpi/ic_action_done_light.png diff --git a/src/Android/Library/res/drawable-mdpi/ic_launcher.png b/src/android/Library/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from src/Android/Library/res/drawable-mdpi/ic_launcher.png rename to src/android/Library/res/drawable-mdpi/ic_launcher.png diff --git a/src/Android/Library/res/drawable-mdpi/icon.png b/src/android/Library/res/drawable-mdpi/icon.png similarity index 100% rename from src/Android/Library/res/drawable-mdpi/icon.png rename to src/android/Library/res/drawable-mdpi/icon.png diff --git a/src/Android/Library/res/drawable-xhdpi/ic_action_discard_dark.png b/src/android/Library/res/drawable-xhdpi/ic_action_discard_dark.png similarity index 100% rename from src/Android/Library/res/drawable-xhdpi/ic_action_discard_dark.png rename to src/android/Library/res/drawable-xhdpi/ic_action_discard_dark.png diff --git a/src/Android/Library/res/drawable-xhdpi/ic_action_discard_light.png b/src/android/Library/res/drawable-xhdpi/ic_action_discard_light.png similarity index 100% rename from src/Android/Library/res/drawable-xhdpi/ic_action_discard_light.png rename to src/android/Library/res/drawable-xhdpi/ic_action_discard_light.png diff --git a/src/Android/Library/res/drawable-xhdpi/ic_action_done_dark.png b/src/android/Library/res/drawable-xhdpi/ic_action_done_dark.png similarity index 100% rename from src/Android/Library/res/drawable-xhdpi/ic_action_done_dark.png rename to src/android/Library/res/drawable-xhdpi/ic_action_done_dark.png diff --git a/src/Android/Library/res/drawable-xhdpi/ic_action_done_light.png b/src/android/Library/res/drawable-xhdpi/ic_action_done_light.png similarity index 100% rename from src/Android/Library/res/drawable-xhdpi/ic_action_done_light.png rename to src/android/Library/res/drawable-xhdpi/ic_action_done_light.png diff --git a/src/Android/Library/res/drawable-xhdpi/ic_launcher.png b/src/android/Library/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from src/Android/Library/res/drawable-xhdpi/ic_launcher.png rename to src/android/Library/res/drawable-xhdpi/ic_launcher.png diff --git a/src/Android/Library/res/drawable/grid_background.xml b/src/android/Library/res/drawable/grid_background.xml similarity index 100% rename from src/Android/Library/res/drawable/grid_background.xml rename to src/android/Library/res/drawable/grid_background.xml diff --git a/src/Android/Library/res/layout/actionbar_custom_view_done_discard.xml b/src/android/Library/res/layout/actionbar_custom_view_done_discard.xml similarity index 100% rename from src/Android/Library/res/layout/actionbar_custom_view_done_discard.xml rename to src/android/Library/res/layout/actionbar_custom_view_done_discard.xml diff --git a/src/Android/Library/res/layout/actionbar_discard_button.xml b/src/android/Library/res/layout/actionbar_discard_button.xml similarity index 95% rename from src/Android/Library/res/layout/actionbar_discard_button.xml rename to src/android/Library/res/layout/actionbar_discard_button.xml index 3e72461..bbe6321 100644 --- a/src/Android/Library/res/layout/actionbar_discard_button.xml +++ b/src/android/Library/res/layout/actionbar_discard_button.xml @@ -20,7 +20,7 @@ android:layout_width="0dp" style="?android:actionButtonStyle" > diff --git a/src/Android/Library/res/layout/multiselectorgrid.xml b/src/android/Library/res/layout/multiselectorgrid.xml similarity index 100% rename from src/Android/Library/res/layout/multiselectorgrid.xml rename to src/android/Library/res/layout/multiselectorgrid.xml diff --git a/src/Android/Library/res/values-de/multiimagechooser_strings_de.xml b/src/android/Library/res/values-de/multiimagechooser_strings_de.xml similarity index 100% rename from src/Android/Library/res/values-de/multiimagechooser_strings_de.xml rename to src/android/Library/res/values-de/multiimagechooser_strings_de.xml diff --git a/src/Android/Library/res/values-es/multiimagechooser_strings_es.xml b/src/android/Library/res/values-es/multiimagechooser_strings_es.xml similarity index 100% rename from src/Android/Library/res/values-es/multiimagechooser_strings_es.xml rename to src/android/Library/res/values-es/multiimagechooser_strings_es.xml diff --git a/src/Android/Library/res/values-fr/multiimagechooser_strings_fr.xml b/src/android/Library/res/values-fr/multiimagechooser_strings_fr.xml similarity index 100% rename from src/Android/Library/res/values-fr/multiimagechooser_strings_fr.xml rename to src/android/Library/res/values-fr/multiimagechooser_strings_fr.xml diff --git a/src/Android/Library/res/values-hu/multiimagechooser_strings_hu.xml b/src/android/Library/res/values-hu/multiimagechooser_strings_hu.xml similarity index 100% rename from src/Android/Library/res/values-hu/multiimagechooser_strings_hu.xml rename to src/android/Library/res/values-hu/multiimagechooser_strings_hu.xml diff --git a/src/Android/Library/res/values-ja/multiimagechooser_strings_ja.xml b/src/android/Library/res/values-ja/multiimagechooser_strings_ja.xml similarity index 100% rename from src/Android/Library/res/values-ja/multiimagechooser_strings_ja.xml rename to src/android/Library/res/values-ja/multiimagechooser_strings_ja.xml diff --git a/src/Android/Library/res/values-ko/multiimagechooser_strings_ko.xml b/src/android/Library/res/values-ko/multiimagechooser_strings_ko.xml similarity index 100% rename from src/Android/Library/res/values-ko/multiimagechooser_strings_ko.xml rename to src/android/Library/res/values-ko/multiimagechooser_strings_ko.xml diff --git a/src/Android/Library/res/values/multiimagechooser_strings_en.xml b/src/android/Library/res/values/multiimagechooser_strings_en.xml similarity index 100% rename from src/Android/Library/res/values/multiimagechooser_strings_en.xml rename to src/android/Library/res/values/multiimagechooser_strings_en.xml diff --git a/src/Android/Library/res/values/themes.xml b/src/android/Library/res/values/themes.xml similarity index 100% rename from src/Android/Library/res/values/themes.xml rename to src/android/Library/res/values/themes.xml diff --git a/src/Android/Library/src/ImageFetcher.java b/src/android/Library/src/ImageFetcher.java similarity index 100% rename from src/Android/Library/src/ImageFetcher.java rename to src/android/Library/src/ImageFetcher.java diff --git a/src/Android/Library/src/MultiImageChooserActivity.java b/src/android/Library/src/MultiImageChooserActivity.java similarity index 93% rename from src/Android/Library/src/MultiImageChooserActivity.java rename to src/android/Library/src/MultiImageChooserActivity.java index 5a19146..e48dd5e 100644 --- a/src/Android/Library/src/MultiImageChooserActivity.java +++ b/src/android/Library/src/MultiImageChooserActivity.java @@ -37,9 +37,11 @@ import java.util.Set; import com.wymsee.apps.synconset.R; import android.app.Activity; import android.app.ActionBar; +import android.app.AlertDialog; import android.app.LoaderManager; import android.content.Context; import android.content.CursorLoader; +import android.content.DialogInterface; import android.content.Intent; import android.content.Loader; import android.database.Cursor; @@ -90,6 +92,7 @@ public class MultiImageChooserActivity extends Activity implements OnItemClickLi private SparseBooleanArray checkStatus = new SparseBooleanArray(); private int maxImages; + private int maxImageCount; private GridView gridView; @@ -105,6 +108,7 @@ public class MultiImageChooserActivity extends Activity implements OnItemClickLi fileNames.clear(); maxImages = getIntent().getIntExtra(MAX_IMAGES_KEY, NOLIMIT); + maxImageCount = maxImages; colWidth = getIntent().getIntExtra(COL_WIDTH_KEY, DEFAULT_COLUMN_WIDTH); @@ -340,14 +344,28 @@ public class MultiImageChooserActivity extends Activity implements OnItemClickLi boolean isChecked = !isChecked(position); if (maxImages == 0 && isChecked) { isChecked = false; + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("Maximum " + maxImageCount + " Photos"); + builder.setMessage("You can only select " + maxImageCount + " photos at a time."); + builder.setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + dialog.cancel(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); } if (isChecked) { if (fileNames.add(name)) { - maxImages--; - ImageView imageView = (ImageView)view; - imageView.setImageAlpha(128); - view.setBackgroundColor(selectedColor); + if (maxImageCount == 1) { + this.selectClicked(null); + } else { + maxImages--; + ImageView imageView = (ImageView)view; + imageView.setImageAlpha(128); + view.setBackgroundColor(selectedColor); + } } } else { if (fileNames.remove(name)) { @@ -389,7 +407,7 @@ public class MultiImageChooserActivity extends Activity implements OnItemClickLi } cl = new CursorLoader(MultiImageChooserActivity.this, MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - img.toArray(new String[img.size()]), null, null, null); + img.toArray(new String[img.size()]), null, null, "DATE_MODIFIED DESC"); return cl; } diff --git a/src/Android/com/synconset/ImagePicker/ImagePicker.java b/src/android/com/synconset/ImagePicker/ImagePicker.java similarity index 100% rename from src/Android/com/synconset/ImagePicker/ImagePicker.java rename to src/android/com/synconset/ImagePicker/ImagePicker.java