From f0cef365731a80ae588072334615967bc744c0e3 Mon Sep 17 00:00:00 2001
From: Greg Alexander <gitgreg@galexander.org>
Date: Sat, 21 Sep 2019 15:41:09 -0400
Subject: [PATCH] moved the options menu into the main_tv layout
 (non-functional).

---
 NOTES                                         |  8 ++
 .../java/org/galexander/sshd/SimpleSSHD.java  |  2 +-
 app/src/main/res/layout/main_tv.xml           | 85 +++++++++++++++++++
 app/src/main/res/menu/main_menu.xml           |  2 +
 4 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/main_tv.xml

diff --git a/NOTES b/NOTES
index 6ea0519..860e3e1 100644
--- a/NOTES
+++ b/NOTES
@@ -1005,8 +1005,16 @@ there's no three-dots menu button, so no way to get to Settings.
 Anyways, there's a whole laundry list of things to do to get into the app
 store and to get shown in the regular launcher.
 
+...
+
+Luckily, even though the list of requirements is long, it is largely
+irrelevant or redundant, so I'm just about there.
+
 
 XXX - android TV support
+ - make buttons work
+ - doc should start a WebView instead of a URL??
+ - about shouldn't use Dialog??
 
 
 XXX - figure out how to force a refresh on eink devices (onyx boox) when the password is displayed (Roman)
diff --git a/app/src/main/java/org/galexander/sshd/SimpleSSHD.java b/app/src/main/java/org/galexander/sshd/SimpleSSHD.java
index 9dd71d8..7a9cf74 100644
--- a/app/src/main/java/org/galexander/sshd/SimpleSSHD.java
+++ b/app/src/main/java/org/galexander/sshd/SimpleSSHD.java
@@ -42,7 +42,7 @@ public class SimpleSSHD extends Activity
 		super.onCreate(savedInstanceState);
 		app_private = getFilesDir().toString();
 		Prefs.init(this);
-		setContentView(R.layout.main);
+		setContentView(is_tv ? R.layout.main_tv : R.layout.main);
 		log_view = (EditText)findViewById(R.id.log);
 		startstop_view = (Button)findViewById(R.id.startstop);
 		ip_view = (TextView)findViewById(R.id.ip);
diff --git a/app/src/main/res/layout/main_tv.xml b/app/src/main/res/layout/main_tv.xml
new file mode 100644
index 0000000..504fd66
--- /dev/null
+++ b/app/src/main/res/layout/main_tv.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginTop="27dp"
+    android:layout_marginBottom="27dp"
+    android:layout_marginLeft="48dp"
+    android:layout_marginRight="48dp"
+    android:background="#ff000000">
+    <LinearLayout
+	android:orientation="vertical"
+	android:layout_width="1dp"
+	android:layout_weight="4"
+	android:layout_height="fill_parent">
+	<TextView android:id="@+id/ip"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:textAppearance="?android:attr/textAppearanceMedium"
+	    android:typeface="monospace"
+	    android:background="#ff112266"
+	    android:textColor="#ffffffff"
+	    android:text="IP: XXX" />
+	<EditText android:id="@+id/log"
+	    android:layout_width="fill_parent"
+	    android:layout_height="1dp"
+	    android:layout_weight="1"
+	    android:ellipsize="start"
+	    android:editable="false"
+	    android:textAppearance="?android:attr/textAppearanceSmall"
+	    android:typeface="monospace"
+	    android:gravity="top"
+	    android:singleLine="false"
+	    android:background="#ff000000"
+	    android:textColor="#ffffffff" />
+	<Button android:id="@+id/startstop"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_gravity="center"
+	    android:text="Start"
+	    android:textAppearance="?android:attr/textAppearanceLarge"
+	    android:onClick="startstop_clicked" />
+    </LinearLayout>
+    <LinearLayout
+	android:orientation="vertical"
+	android:layout_width="1dp"
+	android:layout_weight="1"
+	android:layout_height="fill_parent">
+	<Button
+	    android:layout_width="fill_parent"
+	    android:layout_height="1dp"
+	    android:layout_weight="1"
+	    android:textAppearance="?android:attr/textAppearanceLarge"
+	    android:text="Settings"
+	    android:onClick="settings_clicked" />
+	<Button
+	    android:layout_width="fill_parent"
+	    android:layout_height="1dp"
+	    android:layout_weight="1"
+	    android:textAppearance="?android:attr/textAppearanceLarge"
+	    android:text="Copy App-private Path"
+	    android:onClick="copypriv_clicked" />
+	<Button
+	    android:layout_width="fill_parent"
+	    android:layout_height="1dp"
+	    android:layout_weight="1"
+	    android:textAppearance="?android:attr/textAppearanceLarge"
+	    android:text="Reset Keys"
+	    android:onClick="resetkeys_clicked" />
+	<Button
+	    android:layout_width="fill_parent"
+	    android:layout_height="1dp"
+	    android:layout_weight="1"
+	    android:textAppearance="?android:attr/textAppearanceLarge"
+	    android:text="Documentation"
+	    android:onClick="doc_clicked" />
+	<Button
+	    android:layout_width="fill_parent"
+	    android:layout_height="1dp"
+	    android:layout_weight="1"
+	    android:textAppearance="?android:attr/textAppearanceLarge"
+	    android:text="About"
+	    android:onClick="about_clicked" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index 65e3b4c..02ade90 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- NB: if you change this file, you should also change the right-hand
+button list in res/layout/main_tv.xml -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/settings"
           android:icon="@android:drawable/ic_menu_manage"