From d8479750cb4712c84b5b8423b00062d6105c8c98 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Wed, 11 Feb 2015 16:52:35 +0100 Subject: [PATCH] split methods to be usable on MediaFile instead of WPImageSpan --- WordPressEditor/build.gradle | 6 ++++++ .../java/org/wordpress/android/editor/EditorFragment.java | 6 ++++++ .../wordpress/android/editor/EditorFragmentAbstract.java | 3 +++ settings.gradle | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle index 83c74dad85ad..d29339355225 100644 --- a/WordPressEditor/build.gradle +++ b/WordPressEditor/build.gradle @@ -43,6 +43,12 @@ dependencies { debugCompile project(path:':libs:utils:WordPressUtils', configuration: 'debug') } +configurations.all { + // Exclude packaged wordpress sub projects, force the use of the source project + // (eg. use :libs:utils:WordPressUtils instead of 'org.wordpress:utils') + exclude group: 'org.wordpress', module: 'utils' +} + signing { required { project.properties.containsKey("signing.keyId") && project.properties.containsKey("signing.secretKeyRingFile") diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java index b14ab2adde8f..12b8f3ca6688 100644 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java @@ -15,6 +15,7 @@ import org.wordpress.android.util.AppLog; import org.wordpress.android.util.AppLog.T; +import org.wordpress.android.util.helpers.MediaFile; import java.io.BufferedReader; import java.io.IOException; @@ -143,4 +144,9 @@ public CharSequence getContent() { // TODO return null; } + + @Override + public void appendMediaFile(MediaFile mediaFile) { + // TODO + } } diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java index 4113ab6c45a7..617698f74250 100644 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java @@ -3,11 +3,14 @@ import android.app.Activity; import android.app.Fragment; +import org.wordpress.android.util.helpers.MediaFile; + public abstract class EditorFragmentAbstract extends Fragment { public abstract void setTitle(CharSequence text); public abstract void setContent(CharSequence text); public abstract CharSequence getTitle(); public abstract CharSequence getContent(); + public abstract void appendMediaFile(MediaFile mediaFile); protected EditorFragmentListener mEditorFragmentListener; diff --git a/settings.gradle b/settings.gradle index 36ada701a1fb..22852583301f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ include ':WordPressEditor' include ':example' -include ':libs:WordPressUtils' +include ':libs:utils:WordPressUtils'