Get rid of the final html help view and switch it to native.

3 files changed, 13 insertions, 125 deletions

diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java
index 3df8b2f..998dfe0 100644
--- a/app/src/main/java/org/connectbot/HelpActivity.java
+++ b/app/src/main/java/org/connectbot/HelpActivity.java
@@ -17,30 +17,20 @@
 
 package org.connectbot;
 
-import java.io.IOException;
-
 import android.app.AlertDialog;
 import android.content.Intent;
-import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.LinearLayout;
 
 /**
  * @author Kenny Root
  *
  */
 public class HelpActivity extends AppCompatActivity {
-	public final static String TAG = "CB.HelpActivity";
-
-	public final static String HELPDIR = "help";
-	public final static String SUFFIX = ".html";
-
 	private LayoutInflater inflater = null;
 
 
@@ -49,35 +39,16 @@ public class HelpActivity extends AppCompatActivity {
 		super.onCreate(icicle);
 		setContentView(R.layout.act_help);
 
-		AssetManager am = this.getAssets();
-		LinearLayout content = (LinearLayout) findViewById(R.id.topics);
-
-		try {
-			for (String name : am.list(HELPDIR)) {
-				if (name.endsWith(SUFFIX)) {
-					Button button = new Button(this);
-					final String topic = name.substring(0, name.length() - SUFFIX.length());
-					button.setText(topic);
-
-					button.setOnClickListener(new OnClickListener() {
-						public void onClick(View v) {
-							Intent intent = new Intent(HelpActivity.this, HelpTopicActivity.class);
-							intent.putExtra(Intent.EXTRA_TITLE, topic);
-							HelpActivity.this.startActivity(intent);
-						}
-					});
-
-					content.addView(button);
-				}
+		Button hintsButton = (Button) findViewById(R.id.hints_button);
+		hintsButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				Intent intent = new Intent(HelpActivity.this, HintsActivity.class);
+				HelpActivity.this.startActivity(intent);
 			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			Log.e(TAG, "couldn't get list of help assets", e);
-		}
+		});
 
 		inflater = LayoutInflater.from(this);
-		Button shortcutsButton = new Button(this);
-		shortcutsButton.setText(getResources().getString(R.string.keyboard_shortcuts));
+		Button shortcutsButton = (Button) findViewById(R.id.shortcuts_button);
 		shortcutsButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				final View shortcuts = inflater.inflate(R.layout.dia_keyboard_shortcuts, null, false);
@@ -87,16 +58,13 @@ public class HelpActivity extends AppCompatActivity {
 						.show();
 			}
 		});
-		content.addView(shortcutsButton);
 
-		Button eulaButton = new Button(this);
-		eulaButton.setText(getResources().getString(R.string.terms_and_conditions));
+		Button eulaButton = (Button) findViewById(R.id.eula_button);
 		eulaButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				Intent intent = new Intent(HelpActivity.this, EulaActivity.class);
 				HelpActivity.this.startActivity(intent);
 			}
 		});
-		content.addView(eulaButton);
 	}
 }
diff --git a/app/src/main/java/org/connectbot/HelpTopicActivity.java b/app/src/main/java/org/connectbot/HintsActivity.java
index 9f5573a..25bc691 100644
--- a/app/src/main/java/org/connectbot/HelpTopicActivity.java
+++ b/app/src/main/java/org/connectbot/HintsActivity.java
@@ -1,6 +1,6 @@
 /*
  * ConnectBot: simple, powerful, open-source SSH client for Android
- * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ * Copyright 2015 Kenny Root, Jeffrey Sharkey
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,32 +17,14 @@
 
 package org.connectbot;
 
-import org.connectbot.util.HelpTopicView;
-
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
-/**
- * @author Kenny Root
- *
- */
-public class HelpTopicActivity extends AppCompatActivity {
-	public final static String TAG = "CB.HelpActivity";
+public class HintsActivity extends AppCompatActivity {
 
 	@Override
-	public void onCreate(Bundle icicle) {
-		super.onCreate(icicle);
-		setContentView(R.layout.act_help_topic);
-
-		String topic = getIntent().getStringExtra(Intent.EXTRA_TITLE);
-
-		this.setTitle(String.format("%s: %s",
-				getResources().getText(R.string.title_help),
-				topic));
-
-		HelpTopicView helpTopic = (HelpTopicView) findViewById(R.id.topic_text);
-
-		helpTopic.setTopic(topic);
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.act_hints);
 	}
 }
diff --git a/app/src/main/java/org/connectbot/util/HelpTopicView.java b/app/src/main/java/org/connectbot/util/HelpTopicView.java
deleted file mode 100644
index 0cbc267..0000000
--- a/app/src/main/java/org/connectbot/util/HelpTopicView.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * ConnectBot: simple, powerful, open-source SSH client for Android
- * Copyright 2007 Kenny Root, Jeffrey Sharkey
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.connectbot.util;
-
-import org.connectbot.HelpActivity;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-
-/**
- * @author Kenny Root
- *
- */
-public class HelpTopicView extends WebView {
-	public HelpTopicView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		initialize();
-	}
-
-	public HelpTopicView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		initialize();
-	}
-
-	public HelpTopicView(Context context) {
-		super(context);
-		initialize();
-	}
-
-	private void initialize() {
-		WebSettings wSet = getSettings();
-		wSet.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
-		wSet.setUseWideViewPort(false);
-	}
-
-	public HelpTopicView setTopic(String topic) {
-		String path = String.format("file:///android_asset/%s/%s%s",
-				HelpActivity.HELPDIR, topic, HelpActivity.SUFFIX);
-		loadUrl(path);
-
-		computeScroll();
-
-		return this;
-	}
-}