iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow text selection while keeping image context menus

Browse Source
This commit is contained in:
Andrew Dolgov 2013-11-21 12:15:53 +04:00
parent e6295be411
commit 2d6b858726
2 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/org/fox/ttrss/ArticleFragment.java
View File

@ -1,5 +1,6 @@
package org.fox.ttrss; package org.fox.ttrss;
import java.lang.reflect.Method;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
@ -29,6 +30,7 @@ import android.util.TypedValue;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -160,10 +162,30 @@ public class ArticleFragment extends Fragment {
} }
} }
WebView web = (WebView)view.findViewById(R.id.content); final WebView web = (WebView)view.findViewById(R.id.content);
if (web != null) { if (web != null) {
registerForContextMenu(web);
web.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
HitTestResult result = ((WebView)v).getHitTestResult();
if (result != null && (result.getType() == HitTestResult.IMAGE_TYPE || result.getType() == HitTestResult.SRC_IMAGE_ANCHOR_TYPE)) {
registerForContextMenu(web);
m_activity.openContextMenu(web);
unregisterForContextMenu(web);
return true;
} else {
if (m_activity.isCompatMode()) {
KeyEvent shiftPressEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0);
shiftPressEvent.dispatch(web);
}
return false;
}
}
});
// prevent flicker in ics // prevent flicker in ics
if (!m_prefs.getBoolean("webview_hardware_accel", true) || useTitleWebView) { if (!m_prefs.getBoolean("webview_hardware_accel", true) || useTitleWebView) {
@ -232,10 +254,10 @@ public class ArticleFragment extends Fragment {
articleContent = doc.toString(); articleContent = doc.toString();
} }
String align = m_prefs.getBoolean("justify_article_text", true) ? "text-align : justify;" : ""; if (m_prefs.getBoolean("justify_article_text", true)) {
cssOverride += "body { text-align : justify; } ";
cssOverride += "body { "+align+" } "; }
switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) { switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) {
case 0: case 0:

30
src/org/fox/ttrss/offline/OfflineArticleFragment.java
View File

@ -30,6 +30,7 @@ import android.util.TypedValue;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
@ -174,11 +175,30 @@ public class OfflineArticleFragment extends Fragment {
comments.setVisibility(View.GONE); comments.setVisibility(View.GONE);
} }
WebView web = (WebView)view.findViewById(R.id.content); final WebView web = (WebView)view.findViewById(R.id.content);
if (web != null) { if (web != null) {
registerForContextMenu(web); web.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
HitTestResult result = ((WebView)v).getHitTestResult();
if (result != null && (result.getType() == HitTestResult.IMAGE_TYPE || result.getType() == HitTestResult.SRC_IMAGE_ANCHOR_TYPE)) {
registerForContextMenu(web);
m_activity.openContextMenu(web);
unregisterForContextMenu(web);
return true;
} else {
if (m_activity.isCompatMode()) {
KeyEvent shiftPressEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0);
shiftPressEvent.dispatch(web);
}
return false;
}
}
});
web.setWebChromeClient(new WebChromeClient() { web.setWebChromeClient(new WebChromeClient() {
@Override @Override
@ -260,9 +280,9 @@ public class OfflineArticleFragment extends Fragment {
articleContent = doc.toString(); articleContent = doc.toString();
} }
String align = m_prefs.getBoolean("justify_article_text", true) ? "text-align : justified" : ""; if (m_prefs.getBoolean("justify_article_text", true)) {
cssOverride += "body { text-align : justify; } ";
cssOverride += "body { "+align+" } "; }
switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) { switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) {
case 0: case 0: