f-key list for direct mode

sleekweasel · Jan 11, 2020 · 2d2dfad · 2d2dfad
1 parent f792f55
commit 2d2dfad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/app/src/main/java/com/littlefluffytoys/beebdroid/Beebdroid.java b/app/src/main/java/com/littlefluffytoys/beebdroid/Beebdroid.java
@@ -628,6 +628,7 @@ private void setController(ControllerInfo controllerInfo) {
 
     public void showKeyboard(KeyboardState keyboardState) {
         Utils.setVisible(this, R.id.keyboard, keyboardState == KeyboardState.SCREEN_KEYBOARD);
+        Utils.setVisible(this, R.id.keyboard_help, keyboardState != KeyboardState.BLUETOOTH_KBD);
         Utils.setVisible(this, R.id.controller, keyboardState == KeyboardState.CONTROLLER);
         Utils.setVisible(this, R.id.kb_bt_alt, keyboardState == KeyboardState.BLUETOOTH_KBD);
         final ImageView btnInput = (ImageView) findViewById(R.id.btnInput);
@@ -773,9 +774,9 @@ int lookup(int keycode) {
             case KeyEvent.KEYCODE_CAPS_LOCK:
                 return BBCKEY_CAPS;
             case KeyEvent.KEYCODE_F10:
-                return BBCKEY_AT;
-            case KeyEvent.KEYCODE_F11:
                 return BBCKEY_SHIFTLOCK;
+            case KeyEvent.KEYCODE_F11:
+                return BBCKEY_AT;
             case KeyEvent.KEYCODE_F12:
                 return BBCKEY_UNDERSCORE;
             case KeyEvent.KEYCODE_DPAD_UP:

diff --git a/app/src/main/res/layout-land/activity_beebdroid.xml b/app/src/main/res/layout-land/activity_beebdroid.xml
@@ -92,8 +92,13 @@
 		android:layout_alignParentLeft="true"
 		android:text="\nAlt+...\n\n`=Caps\n1=ShLk\n2=TKbd\n3=£\nSpc=Cpy"
 		/>
-	<!--  Alt-\u2190\u2191\u2192\u2193" -->
-<TextView 
+	<TextView
+		android:layout_width="26pt"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/lock"
+		android:layout_alignParentLeft="true"
+		android:text="f10=ShLock f11=@ f12=£/_ AltRt=Copy"/>
+	<TextView
 	android:id="@+id/fps"
 	android:layout_width="fill_parent"
 	android:layout_height="48dp"

diff --git a/app/src/main/res/layout/activity_beebdroid.xml b/app/src/main/res/layout/activity_beebdroid.xml
@@ -27,6 +27,12 @@
 				android:layout_height="wrap_content"
 				android:text="Alt-`=Caps Alt-1=ShLk Alt-2=TKbd\nAlt-3=£ Alt-Spc=Copy"
 				/>
+			<TextView
+				android:id="@+id/keyboard_help"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="f10=ShLock f11=@ f12=£/_ AltRt=Copy"
+				/>
 			<!-- narf="Alt-\u2190\u2191\u2192\u2193" -->
 			<TextView
 				android:layout_width="wrap_content"