Skip to content

Commit 097b51b

Browse files
maxmemaxme
committed
Squashed 'libs/editor/' changes from d99856b..69aaa8a
69aaa8a rename Media/Image events adc9012 Replace optional listener by a onTrackableEvent method in the main listener cd16322 move EditorFragmentOptionalListener to a subclass 4b144de remove analytics - use an optional listener instead git-subtree-dir: libs/editor git-subtree-split: 69aaa8aa8ee30816d72f14acb340f7645a368d40
1 parent c0c935f commit 097b51b

File tree

5 files changed

+54
-32
lines changed

5 files changed

+54
-32
lines changed

‎WordPressEditor/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ android {
4848
dependencies {
4949
compile 'com.android.support:appcompat-v7:23.1.1'
5050
compile 'com.android.support:support-v4:23.1.1'
51-
compile 'org.wordpress:analytics:1.2.0'
5251
compile 'org.wordpress:utils:1.7.0'
5352

5453
// Test libraries

‎WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
import org.json.JSONException;
3434
import org.json.JSONObject;
35-
import org.wordpress.android.analytics.AnalyticsTracker;
36-
import org.wordpress.android.analytics.AnalyticsTracker.Stat;
3735
import org.wordpress.android.util.AppLog;
3836
import org.wordpress.android.util.AppLog.T;
3937
import org.wordpress.android.util.JSONUtils;
@@ -389,7 +387,7 @@ protected void initJsEditor() {
389387
public void onClick(View v) {
390388
int id = v.getId();
391389
if (id == R.id.format_bar_button_html) {
392-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_HTML);
390+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.HTML_BUTTON_TAPPED);
393391

394392
// Don't switch to HTML mode if currently uploading media
395393
if (!mUploadingMediaIds.isEmpty()) {
@@ -431,7 +429,7 @@ public void onClick(View v) {
431429
mWebView.execJavaScriptFromString("ZSSEditor.getField('zss_field_content').focus();");
432430
}
433431
} else if (id == R.id.format_bar_button_media) {
434-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_IMAGE);
432+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED);
435433
((ToggleButton) v).setChecked(false);
436434

437435
if (mSourceView.getVisibility() == View.VISIBLE) {
@@ -446,10 +444,10 @@ public void onClick(View v) {
446444
if (!((ToggleButton) v).isChecked()) {
447445
// The link button was checked when it was pressed; remove the current link
448446
mWebView.execJavaScriptFromString("ZSSEditor.unlink();");
449-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_UNLINK);
447+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.UNLINK_BUTTON_TAPPED);
450448
return;
451449
}
452-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_LINK);
450+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.LINK_BUTTON_TAPPED);
453451

454452
((ToggleButton) v).setChecked(false);
455453

@@ -740,13 +738,13 @@ public void run() {
740738
if (URLUtil.isNetworkUrl(mediaUrl)) {
741739
String mediaId = mediaFile.getMediaId();
742740
mWebView.execJavaScriptFromString("ZSSEditor.insertImage('" + mediaUrl + "', '" + mediaId + "');");
743-
AnalyticsTracker.track(Stat.EDITOR_ADDED_PHOTO_VIA_WP_MEDIA_LIBRARY);
741+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.NETWORK_IMAGE_ADDED);
744742
} else {
745743
String id = mediaFile.getMediaId();
746744
mWebView.execJavaScriptFromString("ZSSEditor.insertLocalImage(" + id + ", '" + mediaUrl + "');");
747745
mWebView.execJavaScriptFromString("ZSSEditor.setProgressOnImage(" + id + ", " + 0 + ");");
748746
mUploadingMediaIds.add(id);
749-
AnalyticsTracker.track(Stat.EDITOR_ADDED_PHOTO_VIA_LOCAL_LIBRARY);
747+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.LOCAL_IMAGE_ADDED);
750748
}
751749
}
752750
});
@@ -834,7 +832,7 @@ public void onMediaUploadFailed(final String mediaId) {
834832
mWebView.post(new Runnable() {
835833
@Override
836834
public void run() {
837-
AnalyticsTracker.track(Stat.EDITOR_UPLOAD_MEDIA_FAILED);
835+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.UPLOAD_IMAGE_FAILED);
838836
mWebView.execJavaScriptFromString("ZSSEditor.markImageUploadFailed(" + mediaId + ");");
839837
mFailedMediaIds.add(mediaId);
840838
mUploadingMediaIds.remove(mediaId);
@@ -993,7 +991,7 @@ public void onClick(DialogInterface dialog, int id) {
993991
mWebView.post(new Runnable() {
994992
@Override
995993
public void run() {
996-
AnalyticsTracker.track(Stat.EDITOR_UPLOAD_MEDIA_RETRIED);
994+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.UPLOAD_IMAGE_RETRIED);
997995
mWebView.execJavaScriptFromString("ZSSEditor.unmarkImageUploadFailed(" + mediaId + ");");
998996
mWebView.execJavaScriptFromString("ZSSEditor.setProgressOnImage(" + mediaId + ", " + 0 + ");");
999997
mFailedMediaIds.remove(mediaId);
@@ -1008,7 +1006,7 @@ public void run() {
10081006
if (fragmentManager.findFragmentByTag(ImageSettingsDialogFragment.IMAGE_SETTINGS_DIALOG_TAG) != null) {
10091007
return;
10101008
}
1011-
AnalyticsTracker.track(Stat.EDITOR_EDITED_IMAGE);
1009+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.IMAGE_EDITED);
10121010
ImageSettingsDialogFragment imageSettingsDialogFragment = new ImageSettingsDialogFragment();
10131011
imageSettingsDialogFragment.setTargetFragment(this,
10141012
ImageSettingsDialogFragment.IMAGE_SETTINGS_DIALOG_REQUEST_CODE);
@@ -1175,28 +1173,28 @@ private void clearFormatBarButtons() {
11751173

11761174
private void onFormattingButtonClicked(ToggleButton toggleButton) {
11771175
String tag = toggleButton.getTag().toString();
1178-
trackFormattingButtonClicked(toggleButton);
1176+
buttonTappedListener(toggleButton);
11791177
if (mWebView.getVisibility() == View.VISIBLE) {
11801178
mWebView.execJavaScriptFromString("ZSSEditor.set" + StringUtils.capitalize(tag) + "();");
11811179
} else {
11821180
applyFormattingHtmlMode(toggleButton, tag);
11831181
}
11841182
}
11851183

1186-
private void trackFormattingButtonClicked(ToggleButton toggleButton) {
1184+
private void buttonTappedListener(ToggleButton toggleButton) {
11871185
int id = toggleButton.getId();
11881186
if (id == R.id.format_bar_button_bold) {
1189-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_BOLD);
1187+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.BOLD_BUTTON_TAPPED);
11901188
} else if (id == R.id.format_bar_button_italic) {
1191-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_ITALIC);
1189+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.ITALIC_BUTTON_TAPPED);
11921190
} else if (id == R.id.format_bar_button_ol) {
1193-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_ORDERED_LIST);
1191+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.OL_BUTTON_TAPPED);
11941192
} else if (id == R.id.format_bar_button_ul) {
1195-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_UNORDERED_LIST);
1193+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.UL_BUTTON_TAPPED);
11961194
} else if (id == R.id.format_bar_button_quote) {
1197-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_BLOCKQUOTE);
1195+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.BLOCKQUOTE_BUTTON_TAPPED);
11981196
} else if (id == R.id.format_bar_button_strikethrough) {
1199-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_STRIKETHROUGH);
1197+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.STRIKETHROUGH_BUTTON_TAPPED);
12001198
}
12011199
}
12021200

‎WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.app.Activity;
44
import android.app.Fragment;
55
import android.os.Bundle;
6-
76
import android.text.Spanned;
87

98
import com.android.volley.toolbox.ImageLoader;
@@ -12,7 +11,6 @@
1211
import org.wordpress.android.util.helpers.MediaGallery;
1312

1413
import java.util.HashMap;
15-
import java.util.Map;
1614

1715
public abstract class EditorFragmentAbstract extends Fragment {
1816
public abstract void setTitle(CharSequence text);
@@ -131,5 +129,26 @@ public interface EditorFragmentListener {
131129
String onAuthHeaderRequested(String url);
132130
// TODO: remove saveMediaFile, it's currently needed for the legacy editor
133131
void saveMediaFile(MediaFile mediaFile);
132+
void onTrackableEvent(TrackableEvent event);
133+
}
134+
135+
public enum TrackableEvent {
136+
HTML_BUTTON_TAPPED,
137+
UNLINK_BUTTON_TAPPED,
138+
LINK_BUTTON_TAPPED,
139+
MEDIA_BUTTON_TAPPED,
140+
NETWORK_IMAGE_ADDED,
141+
LOCAL_IMAGE_ADDED,
142+
UPLOAD_IMAGE_FAILED,
143+
UPLOAD_IMAGE_RETRIED,
144+
IMAGE_EDITED,
145+
BOLD_BUTTON_TAPPED,
146+
ITALIC_BUTTON_TAPPED,
147+
OL_BUTTON_TAPPED,
148+
UL_BUTTON_TAPPED,
149+
BLOCKQUOTE_BUTTON_TAPPED,
150+
STRIKETHROUGH_BUTTON_TAPPED,
151+
UNDERLINE_BUTTON_TAPPED,
152+
MORE_BUTTON_TAPPED
134153
}
135154
}

‎WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
import com.android.volley.VolleyError;
5555
import com.android.volley.toolbox.ImageLoader;
5656

57-
import org.wordpress.android.analytics.AnalyticsTracker;
58-
import org.wordpress.android.analytics.AnalyticsTracker.Stat;
5957
import org.wordpress.android.editor.legacy.EditLinkActivity;
6058
import org.wordpress.android.editor.legacy.WPEditImageSpan;
6159
import org.wordpress.android.util.AppLog;
@@ -415,22 +413,22 @@ private void createLinkFromSelection(String linkURL, String linkText) {
415413
public void onClick(View v) {
416414
int id = v.getId();
417415
if (id == R.id.bold) {
418-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_BOLD);
416+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.BOLD_BUTTON_TAPPED);
419417
onFormatButtonClick(mBoldToggleButton, TAG_FORMAT_BAR_BUTTON_STRONG);
420418
} else if (id == R.id.em) {
421-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_ITALIC);
419+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.ITALIC_BUTTON_TAPPED);
422420
onFormatButtonClick(mEmToggleButton, TAG_FORMAT_BAR_BUTTON_EM);
423421
} else if (id == R.id.underline) {
424-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_UNDERLINE);
422+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.UNDERLINE_BUTTON_TAPPED);
425423
onFormatButtonClick(mUnderlineToggleButton, TAG_FORMAT_BAR_BUTTON_UNDERLINE);
426424
} else if (id == R.id.strike) {
427-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_STRIKETHROUGH);
425+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.STRIKETHROUGH_BUTTON_TAPPED);
428426
onFormatButtonClick(mStrikeToggleButton, TAG_FORMAT_BAR_BUTTON_STRIKE);
429427
} else if (id == R.id.bquote) {
430-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_BLOCKQUOTE);
428+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.BLOCKQUOTE_BUTTON_TAPPED);
431429
onFormatButtonClick(mBquoteToggleButton, TAG_FORMAT_BAR_BUTTON_QUOTE);
432430
} else if (id == R.id.more) {
433-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_MORE);
431+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.MORE_BUTTON_TAPPED);
434432
mSelectionEnd = mContentEditText.getSelectionEnd();
435433
Editable str = mContentEditText.getText();
436434
if (str != null) {
@@ -439,7 +437,7 @@ public void onClick(View v) {
439437
str.insert(mSelectionEnd, "\n<!--more-->\n");
440438
}
441439
} else if (id == R.id.link) {
442-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_LINK);
440+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.LINK_BUTTON_TAPPED);
443441
mSelectionStart = mContentEditText.getSelectionStart();
444442
mStyleStart = mSelectionStart;
445443
mSelectionEnd = mContentEditText.getSelectionEnd();
@@ -457,7 +455,7 @@ public void onClick(View v) {
457455
}
458456
startActivityForResult(i, ACTIVITY_REQUEST_CODE_CREATE_LINK);
459457
} else if (id == R.id.addPictureButton) {
460-
AnalyticsTracker.track(Stat.EDITOR_TAPPED_IMAGE);
458+
mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED);
461459
mEditorFragmentListener.onAddMediaClicked();
462460
if (isAdded()) {
463461
getActivity().openContextMenu(mAddPictureButton);

‎example/src/main/java/org/wordpress/example/EditorExampleActivity.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111

1212
import org.wordpress.android.editor.EditorFragmentAbstract;
1313
import org.wordpress.android.editor.EditorFragmentAbstract.EditorFragmentListener;
14+
import org.wordpress.android.editor.EditorFragmentAbstract.TrackableEvent;
1415
import org.wordpress.android.editor.EditorMediaUploadListener;
1516
import org.wordpress.android.editor.ImageSettingsDialogFragment;
17+
import org.wordpress.android.util.AppLog;
18+
import org.wordpress.android.util.AppLog.T;
1619
import org.wordpress.android.util.ToastUtils;
1720
import org.wordpress.android.util.helpers.MediaFile;
1821

@@ -195,6 +198,11 @@ public void saveMediaFile(MediaFile mediaFile) {
195198
// TODO
196199
}
197200

201+
@Override
202+
public void onTrackableEvent(TrackableEvent event) {
203+
AppLog.d(T.EDITOR, "Trackable event: " + event);
204+
}
205+
198206
private void simulateFileUpload(final String mediaId, final String mediaUrl) {
199207
Thread thread = new Thread() {
200208
@Override

0 commit comments

Comments
 (0)