From 16edbf9ae243d4c8d687b0aeb9b461c012dcb074 Mon Sep 17 00:00:00 2001
From: Iordan Iordanov <iiordanov@gmail.com>
Date: Sun, 31 Mar 2024 12:59:59 -0400
Subject: [PATCH] Show default settings icon on Android TV.

---
 .../bVNC/protocol/RemoteConnection.java       |  2 +-
 .../opaque/ConnectionGridActivity.java        | 14 +++++++------
 .../main/res/layout/grid_view_activity.xml    | 20 ++++++++++++++++---
 .../res/menu/grid_view_activity_actions.xml   |  6 +++---
 bVNC/src/main/res/values/strings.xml          |  2 +-
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/bVNC/src/main/java/com/iiordanov/bVNC/protocol/RemoteConnection.java b/bVNC/src/main/java/com/iiordanov/bVNC/protocol/RemoteConnection.java
index 505656d6a..e987a3c6f 100644
--- a/bVNC/src/main/java/com/iiordanov/bVNC/protocol/RemoteConnection.java
+++ b/bVNC/src/main/java/com/iiordanov/bVNC/protocol/RemoteConnection.java
@@ -60,7 +60,7 @@
 
 abstract public class RemoteConnection implements KeyInputHandler, InputCarriable {
 
-    private final static String TAG = "RemoteCanvas";
+    private final static String TAG = "RemoteConnection";
 
     // Connection parameters
     public Connection connection;
diff --git a/bVNC/src/main/java/com/undatech/opaque/ConnectionGridActivity.java b/bVNC/src/main/java/com/undatech/opaque/ConnectionGridActivity.java
index 54bf7531b..953757ad6 100644
--- a/bVNC/src/main/java/com/undatech/opaque/ConnectionGridActivity.java
+++ b/bVNC/src/main/java/com/undatech/opaque/ConnectionGridActivity.java
@@ -91,6 +91,7 @@ public class ConnectionGridActivity extends FragmentActivity implements GetTextF
     private EditText search;
     private boolean togglingMasterPassword = false;
     private AppCompatImageButton addNewConnection = null;
+    private AppCompatImageButton editDefaultSettings = null;
 
     private RateOrShareFragment rateOrShareFragment = new RateOrShareFragment();
 
@@ -162,12 +163,9 @@ public void afterTextChanged(Editable s) {
         FileUtils.logFilesInPrivateStorage(this);
         FileUtils.deletePrivateFileIfExisting(this, ".config/freerdp/licenses");
         addNewConnection = findViewById(R.id.addNewConnection);
-        addNewConnection.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                addNewConnection();
-            }
-        });
+        addNewConnection.setOnClickListener(v -> addNewConnection());
+        editDefaultSettings = findViewById(R.id.editDefaultSettings);
+        editDefaultSettings.setOnClickListener(v -> editDefaultSettings());
     }
 
     private ConnectionLoader getConnectionLoader(Context context) {
@@ -347,6 +345,10 @@ public void copyLogcat(MenuItem menuItem) {
      * @param menuItem
      */
     public void editDefaultSettings(MenuItem menuItem) {
+        editDefaultSettings();
+    }
+
+    public void editDefaultSettings() {
         android.util.Log.d(TAG, "editDefaultSettings selected.");
         if (Utils.isOpaque(this)) {
             Intent intent = new Intent(ConnectionGridActivity.this, GeneralUtils.getClassByName("com.undatech.opaque.AdvancedSettingsActivity"));
diff --git a/bVNC/src/main/res/layout/grid_view_activity.xml b/bVNC/src/main/res/layout/grid_view_activity.xml
index 485b0f15e..4a62f440f 100644
--- a/bVNC/src/main/res/layout/grid_view_activity.xml
+++ b/bVNC/src/main/res/layout/grid_view_activity.xml
@@ -20,7 +20,19 @@
             android:layout_weight="0.90"
             android:hint="@string/search_connections"
             android:padding="10dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"></EditText>
+            android:textAppearance="?android:attr/textAppearanceMedium">
+        </EditText>
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/editDefaultSettings"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.10"
+            android:contentDescription="@string/action_edit_default_settings"
+            android:title="@string/action_edit_default_settings"
+            android:background="?android:selectableItemBackground"
+            app:srcCompat="@android:drawable/ic_menu_preferences">
+        </androidx.appcompat.widget.AppCompatImageButton>
 
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/addNewConnection"
@@ -30,7 +42,8 @@
             android:contentDescription="@string/action_new_connection"
             android:title="@string/action_new_connection"
             android:background="?android:selectableItemBackground"
-            app:srcCompat="@drawable/ic_add_connection_48"></androidx.appcompat.widget.AppCompatImageButton>
+            app:srcCompat="@drawable/ic_add_connection_48">
+        </androidx.appcompat.widget.AppCompatImageButton>
     </LinearLayout>
 
     <GridView
@@ -39,5 +52,6 @@
         android:layout_height="fill_parent"
         android:gravity="top|center"
         android:numColumns="2"
-        android:stretchMode="columnWidth"></GridView>
+        android:stretchMode="columnWidth">
+    </GridView>
 </LinearLayout>
diff --git a/bVNC/src/main/res/menu/grid_view_activity_actions.xml b/bVNC/src/main/res/menu/grid_view_activity_actions.xml
index 151e1d36c..620144890 100644
--- a/bVNC/src/main/res/menu/grid_view_activity_actions.xml
+++ b/bVNC/src/main/res/menu/grid_view_activity_actions.xml
@@ -38,10 +38,10 @@
 
     <item
         android:id="@+id/actionEditDefaultSettings"
-        android:icon="@android:drawable/ic_menu_manage"
+        android:icon="@android:drawable/ic_menu_preferences"
         android:onClick="editDefaultSettings"
-        android:showAsAction="ifRoom"
+        android:showAsAction="never"
         android:title="@string/action_edit_default_settings"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
         tools:ignore="AppCompatResource" />
 </menu>
diff --git a/bVNC/src/main/res/values/strings.xml b/bVNC/src/main/res/values/strings.xml
index 1c5822991..f7ea72723 100644
--- a/bVNC/src/main/res/values/strings.xml
+++ b/bVNC/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="audio_initialized">Audio initialized</string>
     <string name="action_import_settings">Import Settings</string>
     <string name="action_new_connection">New Connection ✚</string>
-    <string name="action_edit_default_settings">Edit Default Settings</string>
+    <string name="action_edit_default_settings">Edit Default Settings ⚙</string>
     <string name="action_export_settings">Export Settings</string>
     <string name="action_delete_connection">Delete Connection</string>
     <string name="action_rate_or_share_app">Get Help, Rate, Share</string>