From 5256fc44d126cf9088cb58b1b9b38b51f66521fb Mon Sep 17 00:00:00 2001 From: Luke Johnstone Date: Tue, 21 Jun 2016 11:44:31 +0200 Subject: [PATCH 1/3] UPDATED: #gitignore #idea files --- .gitignore | 47 +++++++++++++++++++++++++++ .idea/.name | 1 + .idea/compiler.xml | 22 +++++++++++++ .idea/copyright/profiles_settings.xml | 3 ++ .idea/encodings.xml | 6 ++++ .idea/misc.xml | 46 ++++++++++++++++++++++++++ .idea/modules.xml | 10 ++++++ .idea/runConfigurations.xml | 12 +++++++ TedPicker.iml | 19 +++++++++++ app/app.iml | 14 ++++++-- build.gradle | 2 +- 11 files changed, 179 insertions(+), 3 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 TedPicker.iml diff --git a/.gitignore b/.gitignore index ccf2efe..04c4894 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,50 @@ proguard/ # Log Files *.log + + +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..9d22b6f --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +TedPicker \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..1a3eaff --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..dca30dd --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/TedPicker.iml b/TedPicker.iml new file mode 100644 index 0000000..df8c0d2 --- /dev/null +++ b/TedPicker.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 31c23a1..42ef70e 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -47,6 +47,7 @@ + @@ -54,6 +55,7 @@ + @@ -61,6 +63,7 @@ + @@ -68,6 +71,7 @@ + @@ -75,21 +79,27 @@ + + + + + + - + diff --git a/build.gradle b/build.gradle index 44b6832..ddd6ee3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0-beta6' + classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From afc4c1efed3313ddb858000a02ee6350b4270fc9 Mon Sep 17 00:00:00 2001 From: Luke Johnstone Date: Tue, 21 Jun 2016 11:46:30 +0200 Subject: [PATCH 2/3] UPDATED: #changed updatePicture to public, allows for overriding --- .../main/java/com/gun0912/tedpicker/ImagePickerActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tedpicker/src/main/java/com/gun0912/tedpicker/ImagePickerActivity.java b/tedpicker/src/main/java/com/gun0912/tedpicker/ImagePickerActivity.java index b64c485..2a147df 100755 --- a/tedpicker/src/main/java/com/gun0912/tedpicker/ImagePickerActivity.java +++ b/tedpicker/src/main/java/com/gun0912/tedpicker/ImagePickerActivity.java @@ -284,7 +284,7 @@ public boolean onOptionsItemSelected(MenuItem item) { } - private void updatePicture() { + public void updatePicture() { if (mSelectedImages.size() < mConfig.getSelectionMin()) { String text = String.format(getResources().getString(R.string.min_count_msg), mConfig.getSelectionMin()); From 24ee472fafb4ad0f69c72c0b6cbd0d76c9a8690e Mon Sep 17 00:00:00 2001 From: Luke Johnstone Date: Tue, 21 Jun 2016 11:46:46 +0200 Subject: [PATCH 3/3] UPDATED: #updated Gradle --- tedpicker/build.gradle | 2 +- tedpicker/tedpicker.iml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tedpicker/build.gradle b/tedpicker/build.gradle index 0566840..8df5678 100644 --- a/tedpicker/build.gradle +++ b/tedpicker/build.gradle @@ -40,7 +40,7 @@ dependencies { compile 'com.android.support:design:23.2.0' compile 'com.github.bumptech.glide:glide:3.6.1' - compile 'com.commonsware.cwac:camera:0.6.+' + compile 'com.commonsware.cwac:camera:0.6.12' } diff --git a/tedpicker/tedpicker.iml b/tedpicker/tedpicker.iml index 0f884df..9e859dc 100644 --- a/tedpicker/tedpicker.iml +++ b/tedpicker/tedpicker.iml @@ -48,6 +48,7 @@ + @@ -55,6 +56,7 @@ + @@ -62,6 +64,7 @@ + @@ -69,6 +72,7 @@ + @@ -76,6 +80,7 @@ + @@ -83,16 +88,18 @@ + + - +