@Override
protected void onResume() {
+ Log.d(LOG, "onResume");
super.onResume();
if (PreferenceActivity.prefsMightHaveChanged) {
PreferenceActivity.prefsMightHaveChanged = false;
if (initialSearchText != null) {
setSearchText(initialSearchText, true);
}
+ showKeyboard();
}
@Override
private void onClearSearchTextButton() {
setSearchText("", true);
+ showKeyboard();
+ }
+
+ private void showKeyboard() {
Log.d(LOG, "Trying to show soft keyboard.");
final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
return result;
}
- private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
- final HtmlEntry htmlEntry = row.getEntry();
- return getPossibleHtmlEntryView(htmlEntry.title, false, Collections.singletonList(htmlEntry), parent, result);
- }
-
- private TableLayout getPossibleHtmlEntryView(final String text, final boolean hasMainEntry, final List<HtmlEntry> htmlEntries, ViewGroup parent, final TableLayout result) {
+ private TableLayout getPossibleHtmlEntryView(final boolean isTokenRow, final String text, final boolean hasMainEntry, final List<HtmlEntry> htmlEntries, final String htmlTextToHighlight, ViewGroup parent, final TableLayout result) {
final Context context = parent.getContext();
final TableRow tableRow = new TableRow(result.getContext());
tableRow.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
: theme.tokenRowOtherBg);
- tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
+ if (isTokenRow) {
+ tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
+ } else {
+ tableRow.setPadding(mPaddingLarge, mPaddingDefault, mPaddingDefault, 0);
+ }
result.addView(tableRow);
-
final TextView textView = new TextView(context);
textView.setText(text);
// Doesn't work:
// textView.setTextColor(android.R.color.secondary_text_light);
- textView.setTextAppearance(context, theme.tokenRowFg);
textView.setTypeface(typeface);
- textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 5 * fontSizeSp / 4);
TableRow.LayoutParams lp = new TableRow.LayoutParams(0);
+ if (isTokenRow) {
+ textView.setTextAppearance(context, theme.tokenRowFg);
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
+ } else {
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+ }
lp.weight = 1.0f;
+
textView.setLayoutParams(lp);
tableRow.addView(textView);
public void onClick(View v) {
final String html = HtmlEntry.htmlBody(htmlEntries);
startActivity(HtmlDisplayActivity.getHtmlIntent(String.format(
- "<html><head></head><body>%s</body></html>", html), text));
+ "<html><head></head><body>%s</body></html>", html), htmlTextToHighlight, false));
}
});
tableRow.addView(button);
private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
final IndexEntry indexEntry = row.getIndexEntry();
- return getPossibleHtmlEntryView(indexEntry.token, row.hasMainEntry, indexEntry.htmlEntries, parent, result);
+ return getPossibleHtmlEntryView(true, indexEntry.token, row.hasMainEntry, indexEntry.htmlEntries, null, parent, result);
+ }
+
+ private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
+ final HtmlEntry htmlEntry = row.getEntry();
+ final TokenRow tokenRow = row.getTokenRow(true);
+ return getPossibleHtmlEntryView(false, getString(R.string.seeAlso, htmlEntry.title), false, Collections.singletonList(htmlEntry), tokenRow.getToken(), parent, result);
}
+
}
import android.app.Activity;\r
import android.content.Intent;\r
import android.os.Bundle;\r
-import android.view.ContextMenu;\r
-import android.view.ContextMenu.ContextMenuInfo;\r
-import android.view.MenuItem;\r
-import android.view.MenuItem.OnMenuItemClickListener;\r
+import android.util.Log;\r
import android.view.View;\r
import android.view.View.OnClickListener;\r
-import android.view.View.OnCreateContextMenuListener;\r
import android.webkit.WebView;\r
import android.widget.Button;\r
\r
import com.hughes.util.StringUtil;\r
\r
public final class HtmlDisplayActivity extends Activity {\r
+ \r
+ static final String LOG = "QuickDic";\r
+\r
\r
static final String HTML_RES = "html_res";\r
static final String HTML = "html";\r
static final String TEXT_TO_HIGHLIGHT = "textToHighlight";\r
+ static final String SHOW_OK_BUTTON = "showOKButton";\r
\r
public static Intent getHelpLaunchIntent() {\r
final Intent intent = new Intent();\r
return intent;\r
}\r
\r
- public static Intent getHtmlIntent(final String html, final String textToHighlight) {\r
+ public static Intent getHtmlIntent(final String html, final String textToHighlight, final boolean showOkButton) {\r
final Intent intent = new Intent();\r
intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
intent.putExtra(HTML, html);\r
intent.putExtra(TEXT_TO_HIGHLIGHT, textToHighlight);\r
+ intent.putExtra(SHOW_OK_BUTTON, showOkButton);\r
return intent;\r
}\r
\r
webView.loadData(html, "text/html", "utf-8");\r
\r
final String textToHighlight = getIntent().getStringExtra(TEXT_TO_HIGHLIGHT);\r
- if (textToHighlight != null && "".equals(textToHighlight)) {\r
- webView.findAllAsync(textToHighlight);\r
+ if (textToHighlight != null && !"".equals(textToHighlight)) {\r
+ Log.d(LOG, "Highlighting text: " + textToHighlight);\r
+ // This isn't working:\r
+ webView.findAll(textToHighlight);\r
+ //webView.showFindDialog(textToHighlight, false);\r
}\r
\r
final Button okButton = (Button) findViewById(R.id.okButton);\r
finish();\r
}\r
});\r
+ if (!getIntent().getBooleanExtra(SHOW_OK_BUTTON, true)) {\r
+ okButton.setVisibility(View.INVISIBLE);\r
+ }\r
}\r
\r
}\r