EditLinkActivity is now independent from the EditPostActivity

wordpress-mobile · Feb 13, 2015 · 8f9d5e4 · 8f9d5e4
1 parent 1d7067e
commit 8f9d5e4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 25 deletions.
diff --git a/WordPressEditor/src/main/AndroidManifest.xml b/WordPressEditor/src/main/AndroidManifest.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.wordpress.android.editor" >
-
+    <application>
+        <activity android:name=".legacy.EditLinkActivity" />
+    </application>>
 </manifest>
diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java
@@ -151,9 +151,4 @@ public CharSequence getContent() {
     public void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader) {
         // TODO
     }
-
-    @Override
-    public void createLinkFromSelection(String link, String text) {
-        // 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
@@ -13,7 +13,6 @@ public abstract class EditorFragmentAbstract extends Fragment {
     public abstract CharSequence getTitle();
     public abstract CharSequence getContent();
     public abstract void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader);
-    public abstract void createLinkFromSelection(String link, String text);
 
     protected EditorFragmentListener mEditorFragmentListener;
     protected boolean mFeaturedImageSupported;
@@ -59,7 +58,7 @@ public void setLocalDraft(boolean isLocalDraft) {
     public interface EditorFragmentListener {
         public void onEditorFragmentInitialized();
         public void onSettingsClicked();
-        public void onAddMediaButtonClicked();
+        public void onAddMediaClicked();
         // TODO: remove saveMediaFile, it's currently needed for the legacy editor - we should have something like
         // "EditorFragmentAbstract.getFeaturedImage()" returning the remote id
         public void saveMediaFile(MediaFile mediaFile);

diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java
@@ -282,7 +282,22 @@ public void onAnimationRepeat(Animation animation) {
         }
     }
 
-    // TODO: call MediaPicker-Android instead (see EditPostActivity.onAddMediaButtonClicked)
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == LegacyEditorFragment.ACTIVITY_REQUEST_CODE_CREATE_LINK) {
+            Bundle extras = data.getExtras();
+            if (extras == null) {
+                return;
+            }
+            String linkURL = extras.getString("linkURL");
+            String linkText = extras.getString("linkText");
+            createLinkFromSelection(linkURL, linkText);
+        }
+    }
+
+    // TODO: call MediaPicker-Android instead (see EditPostActivity.onAddMediaClicked)
     /*
     @Override
     public boolean onContextItemSelected(MenuItem item) {
@@ -320,48 +335,50 @@ public void onConfigurationChanged(Configuration newConfig) {
         mFullViewBottom = mRootView.getBottom();
     }
 
-    public void createLinkFromSelection(String linkURL, String linkText) {
+    private void createLinkFromSelection(String linkURL, String linkText) {
         try {
             if (linkURL != null && !linkURL.equals("http://") && !linkURL.equals("")) {
                 if (mSelectionStart > mSelectionEnd) {
                     int temp = mSelectionEnd;
                     mSelectionEnd = mSelectionStart;
                     mSelectionStart = temp;
                 }
-                Editable str = mContentEditText.getText();
-                if (str == null)
+                Editable editable = mContentEditText.getText();
+                if (editable == null) {
                     return;
+                }
                 if (mIsLocalDraft) {
                     if (linkText == null) {
                         if (mSelectionStart < mSelectionEnd) {
-                            str.delete(mSelectionStart, mSelectionEnd);
+                            editable.delete(mSelectionStart, mSelectionEnd);
                         }
-                        str.insert(mSelectionStart, linkURL);
-                        str.setSpan(new URLSpan(linkURL), mSelectionStart, mSelectionStart + linkURL.length(),
+                        editable.insert(mSelectionStart, linkURL);
+                        editable.setSpan(new URLSpan(linkURL), mSelectionStart, mSelectionStart + linkURL.length(),
                                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                         mContentEditText.setSelection(mSelectionStart + linkURL.length());
                     } else {
                         if (mSelectionStart < mSelectionEnd) {
-                            str.delete(mSelectionStart, mSelectionEnd);
+                            editable.delete(mSelectionStart, mSelectionEnd);
                         }
-                        str.insert(mSelectionStart, linkText);
-                        str.setSpan(new URLSpan(linkURL), mSelectionStart, mSelectionStart + linkText.length(),
+                        editable.insert(mSelectionStart, linkText);
+                        editable.setSpan(new URLSpan(linkURL), mSelectionStart, mSelectionStart + linkText.length(),
                                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                         mContentEditText.setSelection(mSelectionStart + linkText.length());
                     }
                 } else {
                     if (linkText == null) {
-                        if (mSelectionStart < mSelectionEnd)
-                            str.delete(mSelectionStart, mSelectionEnd);
+                        if (mSelectionStart < mSelectionEnd) {
+                            editable.delete(mSelectionStart, mSelectionEnd);
+                        }
                         String urlHTML = "<a href=\"" + linkURL + "\">" + linkURL + "</a>";
-                        str.insert(mSelectionStart, urlHTML);
+                        editable.insert(mSelectionStart, urlHTML);
                         mContentEditText.setSelection(mSelectionStart + urlHTML.length());
                     } else {
                         if (mSelectionStart < mSelectionEnd) {
-                            str.delete(mSelectionStart, mSelectionEnd);
+                            editable.delete(mSelectionStart, mSelectionEnd);
                         }
                         String urlHTML = "<a href=\"" + linkURL + "\">" + linkText + "</a>";
-                        str.insert(mSelectionStart, urlHTML);
+                        editable.insert(mSelectionStart, urlHTML);
                         mContentEditText.setSelection(mSelectionStart + urlHTML.length());
                     }
                 }

diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/legacy/EditLinkActivity.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/legacy/EditLinkActivity.java
@@ -58,7 +58,6 @@ public void onClick(View v) {
                 mIntent.putExtras(bundle);
                 setResult(RESULT_OK, mIntent);
                 finish();
-
             }
         });
 

diff --git a/example/src/main/java/org/wordpress/example/EditorExampleActivity.java b/example/src/main/java/org/wordpress/example/EditorExampleActivity.java
@@ -46,7 +46,7 @@ public void onSettingsClicked() {
     }
 
     @Override
-    public void onAddMediaButtonClicked() {
+    public void onAddMediaClicked() {
         // TODO
     }