# HG changeset patch # User Carl Byington # Date 1407350941 25200 # Node ID b12705abba3e0374e1474e38b8bd28099115928b # Parent b919cd3d6e2fbf59eaa04a8b036cbc915157d778 wizard and help present help pages in the same order diff -r b919cd3d6e2f -r b12705abba3e src/com/five_ten_sg/connectbot/HelpActivity.java --- a/src/com/five_ten_sg/connectbot/HelpActivity.java Wed Aug 06 11:34:32 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/HelpActivity.java Wed Aug 06 11:49:01 2014 -0700 @@ -48,7 +48,7 @@ try { String[] topics = getResources().getStringArray(R.array.list_wizard_topics); - for (String topic : topics) { + for (final String topic : topics) { Button button = new Button(this); button.setText(topic); button.setOnClickListener(new OnClickListener() { diff -r b919cd3d6e2f -r b12705abba3e src/com/five_ten_sg/connectbot/util/HelpTopicView.java --- a/src/com/five_ten_sg/connectbot/util/HelpTopicView.java Wed Aug 06 11:34:32 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/util/HelpTopicView.java Wed Aug 06 11:49:01 2014 -0700 @@ -28,6 +28,9 @@ * */ public class HelpTopicView extends WebView { + public final static String HELPDIR = "help"; + public final static String SUFFIX = ".html"; + public HelpTopicView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); initialize(); @@ -50,8 +53,7 @@ } public HelpTopicView setTopic(String topic) { - String path = String.format("file:///android_asset/%s/%s%s", - HelpActivity.HELPDIR, topic, HelpActivity.SUFFIX); + String path = String.format("file:///android_asset/%s/%s%s", HELPDIR, topic, SUFFIX); loadUrl(path); computeScroll(); return this;