Merge pull request #282 from khorimoto/edit-host-activity-integration

Integrate EditHostActivity into the app.

3 files changed, 64 insertions, 0 deletions

diff --git a/app/src/main/res/menu/edit_host_activity_add_menu.xml b/app/src/main/res/menu/edit_host_activity_add_menu.xml
new file mode 100644
index 0000000..e793cf4
--- /dev/null
+++ b/app/src/main/res/menu/edit_host_activity_add_menu.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ ConnectBot: simple, powerful, open-source SSH client for Android
+  ~ 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.
+  ~ 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.
+  -->
+
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:connectbot="http://schemas.android.com/apk/res-auto"
+	>
+
+	<item android:id="@+id/save"
+		android:icon="@drawable/ic_add"
+		android:title="@string/hostpref_add_host"
+        connectbot:showAsAction="always|withText"
+		/>
+
+</menu>
diff --git a/app/src/main/res/menu/edit_host_activity_edit_menu.xml b/app/src/main/res/menu/edit_host_activity_edit_menu.xml
new file mode 100644
index 0000000..564e211
--- /dev/null
+++ b/app/src/main/res/menu/edit_host_activity_edit_menu.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ ConnectBot: simple, powerful, open-source SSH client for Android
+  ~ 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.
+  ~ 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.
+  -->
+
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:connectbot="http://schemas.android.com/apk/res-auto"
+	>
+
+	<item android:id="@+id/save"
+		android:icon="@drawable/ic_add"
+		android:title="@string/hostpref_edit_host"
+        connectbot:showAsAction="always|withText"
+		/>
+
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index baf2db4..7d44f8d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -643,5 +643,9 @@
 	<string name="expand">Expand</string>
 	<!-- Label for checkbox which, when check, makes SSL authorization require confirmation. -->
 	<string name="hostpref_authagent_with_confirmation">require confirmation</string>
+	<!-- Text for button which, when clicked, adds a new host. -->
+	<string name="hostpref_add_host">Add host</string>
+	<!-- Text for button which, when clicked, saves an existing host. -->
+	<string name="hostpref_edit_host">Save host</string>
 
 </resources>