From 713736d83ab3e8524bd6f98922629c8f127110aa Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 30 Nov 2022 05:52:32 +0200
Subject: [PATCH] - Distribute action buttons evenly at the bottom of main
 activity - Use colorSecondaryDark as text view hint color

---
 .../kotlin/com/tutpro/baresip/MainActivity.kt |   6 +-
 app/src/main/res/layout/activity_main.xml     | 142 +++++++++++-------
 2 files changed, 93 insertions(+), 55 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index aef997d4..360719ff 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -57,6 +57,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var holdButton: ImageButton
     private lateinit var transferButton: ImageButton
     private lateinit var voicemailButton: ImageButton
+    private lateinit var voicemailButtonSpace: Space
     private lateinit var contactsButton: ImageButton
     private lateinit var messagesButton: ImageButton
     private lateinit var callsButton: ImageButton
@@ -151,6 +152,7 @@ class MainActivity : AppCompatActivity() {
         infoButton = binding.info
         onHoldNotice = binding.onHoldNotice
         voicemailButton = binding.voicemailButton
+        voicemailButtonSpace = binding.voicemailButtonSpace
         contactsButton = binding.contactsButton
         messagesButton = binding.messagesButton
         callsButton = binding.callsButton
@@ -1927,8 +1929,10 @@ class MainActivity : AppCompatActivity() {
             else
                 voicemailButton.setImageResource(R.drawable.voicemail)
             voicemailButton.visibility = View.VISIBLE
+            voicemailButtonSpace.visibility = View.VISIBLE
         } else {
-            voicemailButton.visibility = View.INVISIBLE
+            voicemailButton.visibility = View.GONE
+            voicemailButtonSpace.visibility =View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d6095741..f0495f3f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -93,7 +93,8 @@
                         android:layout_weight = "1"
                         android:inputType="textEmailAddress"
                         android:textSize="20sp"
-                        android:hint="@string/callee" >
+                        android:hint="@string/callee"
+                        android:textColorHint="@color/colorSecondaryDark" >
                         <!-- <requestFocus /> -->
                     </AutoCompleteTextView>
 
@@ -238,6 +239,7 @@
                             android:singleLine="true"
                             android:scrollHorizontally="true"
                             android:hint="@string/dtmf"
+                            android:textColorHint="@color/colorSecondaryDark"
                             android:importantForAutofill="no"
                             android:inputType="phone"
                             android:digits="0123456789#*"
@@ -285,65 +287,97 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="end"
+        android:gravity="center"
         android:layout_alignParentBottom="true" >
 
-    <ImageButton
-        android:id="@+id/voicemailButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@null"
-        android:src="@drawable/voicemail"
-        android:layout_marginEnd="10dp"
-        android:layout_marginBottom="5dp"
-        android:visibility="invisible"
-        android:contentDescription="@string/voicemail" >
-    </ImageButton>
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" >
+        </Space>
 
-    <ImageButton
-        android:id="@+id/contactsButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@null"
-        android:src="@drawable/contacts"
-        android:layout_marginEnd="10dp"
-        android:layout_marginBottom="5dp"
-        android:contentDescription="@string/contacts" >
-    </ImageButton>
+        <ImageButton
+            android:id="@+id/voicemailButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:gravity="center_horizontal|center_vertical"
+            android:src="@drawable/voicemail"
+            android:visibility="gone"
+            android:contentDescription="@string/voicemail" >
+        </ImageButton>
 
-    <ImageButton
-        android:id="@+id/messagesButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@null"
-        android:src="@drawable/messages"
-        android:layout_marginEnd="10dp"
-        android:layout_marginBottom="5dp"
-        android:contentDescription="@string/messages" >
-    </ImageButton>
+        <Space
+            android:id="@+id/voicemailButtonSpace"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"
+            android:visibility="gone" >
+        </Space>
 
-    <ImageButton
-        android:id="@+id/callsButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        android:layout_marginBottom="5dp"
-        android:padding="0dp"
-        android:background="@null"
-        android:src="@drawable/calls"
-        android:contentDescription="@string/call_history" >
-    </ImageButton>
+        <ImageButton
+            android:id="@+id/contactsButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:gravity="center_horizontal|center_vertical"
+            android:src="@drawable/contacts"
+            android:contentDescription="@string/contacts" >
+        </ImageButton>
 
-    <ImageButton
-        android:id="@+id/dialpadButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
-        android:layout_marginBottom="8dp"
-        android:background="@null"
-        android:src="@drawable/dialpad_off"
-        android:contentDescription="@string/dialpad" >
-    </ImageButton>
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" >
+        </Space>
+
+        <ImageButton
+            android:id="@+id/messagesButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:gravity="center_horizontal|center_vertical"
+            android:src="@drawable/messages"
+            android:contentDescription="@string/messages" >
+        </ImageButton>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" >
+        </Space>
+
+        <ImageButton
+            android:id="@+id/callsButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:gravity="center_horizontal|center_vertical"
+            android:src="@drawable/calls"
+            android:contentDescription="@string/call_history" >
+        </ImageButton>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" >
+        </Space>
+
+        <ImageButton
+            android:id="@+id/dialpadButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:gravity="center_horizontal|center_vertical"
+            android:src="@drawable/dialpad_off"
+            android:contentDescription="@string/dialpad" >
+        </ImageButton>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" >
+        </Space>
 
     </LinearLayout>