From 7fe0a08bfa9aa3d89cc3de75d9588e4ec949776c Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sun, 10 Jan 2021 17:56:04 +0200
Subject: [PATCH] Main activity action bar, layout and spinner enhancements

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../kotlin/com/tutpro/baresip/MainActivity.kt |  1 +
 app/src/main/res/layout/account_spinner.xml   |  1 +
 app/src/main/res/layout/activity_main.xml     | 24 ++++++++++++++-----
 app/src/main/res/values/styles.xml            |  7 +++++-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index be0ded5d..240aa51a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,7 @@
         tools:targetApi="q">
         <activity
             android:name=".MainActivity"
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTask">
             <intent-filter>
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 6ad8cea2..affa833d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -84,6 +84,7 @@ class MainActivity : AppCompatActivity() {
         window.addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES)
 
         setContentView(binding.root)
+        setSupportActionBar(binding.toolbar)
 
         layout = binding.mainActivityLayout
         aorSpinner = binding.aorSpinner
diff --git a/app/src/main/res/layout/account_spinner.xml b/app/src/main/res/layout/account_spinner.xml
index feff19a7..6f234a7c 100644
--- a/app/src/main/res/layout/account_spinner.xml
+++ b/app/src/main/res/layout/account_spinner.xml
@@ -18,6 +18,7 @@
         <TextView
             android:id="@+id/spinnerText"
             android:textSize="18sp"
+            android:textColor="@color/colorSecondaryDark"
             android:paddingStart="8sp"
             android:paddingEnd="0sp" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7f02bf1b..ea585323 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,14 +3,23 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginBottom="10dp"
     tools:context=".MainActivity">
 
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/colorPrimary"
+        android:elevation="4dp"
+        android:theme="@style/MainActionBar" >
+    </androidx.appcompat.widget.Toolbar>
+
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true" >
+        android:fillViewport="true"
+        android:layout_below="@id/toolbar" >
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swipeRefresh"
@@ -33,8 +42,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@android:drawable/btn_dropdown"
-                    android:popupBackground="@android:drawable/btn_dropdown"
-                    android:spinnerMode="dropdown"/>
+                    android:spinnerMode="dropdown" />
 
                 <TextView
                     android:id="@+id/callTitle"
@@ -207,6 +215,7 @@
         android:layout_toStartOf="@id/contactsButton"
         android:layout_marginEnd="10dp"
         android:layout_alignParentBottom="true"
+        android:layout_marginBottom="5dp"
         android:visibility="invisible"
         android:contentDescription="@string/voicemail" >
     </ImageButton>
@@ -220,6 +229,7 @@
         android:layout_toStartOf="@id/messagesButton"
         android:layout_marginEnd="10dp"
         android:layout_alignParentBottom="true"
+        android:layout_marginBottom="5dp"
         android:contentDescription="@string/contacts" >
     </ImageButton>
 
@@ -232,6 +242,7 @@
         android:layout_toStartOf="@id/callsButton"
         android:layout_marginEnd="10dp"
         android:layout_alignParentBottom="true"
+        android:layout_marginBottom="5dp"
         android:contentDescription="@string/messages" >
     </ImageButton>
 
@@ -242,6 +253,7 @@
         android:layout_toStartOf="@id/dialpadButton"
         android:layout_marginEnd="10dp"
         android:layout_alignParentBottom="true"
+        android:layout_marginBottom="5dp"
         android:padding="0dp"
         android:background="@null"
         android:src="@drawable/calls"
@@ -252,9 +264,9 @@
         android:id="@+id/dialpadButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
+        android:layout_marginEnd="15dp"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="2dp"
+        android:layout_marginBottom="8dp"
         android:layout_alignParentEnd="true"
         android:background="@null"
         android:src="@drawable/dialpad_off"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 002dd1ec..51a5f404 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,7 +9,7 @@
         <item name="actionOverflowMenuStyle">@style/ActionBarMenu</item>
     </style>
 
-    <style name="Spinner" parent="Theme.AppCompat.DayNight">
+    <style name="Spinner" parent="ThemeOverlay.AppCompat.DayNight">
         <item name="android:dividerHeight">1dp</item>
         <item name="android:divider">@color/colorGray</item>
     </style>
@@ -23,6 +23,11 @@
         <item name="android:popupBackground">@color/colorPrimaryDark</item>
     </style>
 
+    <style name="MainActionBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
+        <item name="android:textColorPrimary">@color/colorWhite</item>
+        <item name="actionOverflowMenuStyle">@style/ActionBarMenu</item>
+    </style>
+
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>