From bfc0b2445f8e8ae2d017bc421c559e0076e0ad6e Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 19 Nov 2018 05:56:27 +0200
Subject: [PATCH] added account title to chat(s) and calls pages

---
 .../main/kotlin/com/tutpro/baresip/CallsActivity.kt   | 10 +++++++---
 .../main/kotlin/com/tutpro/baresip/ChatActivity.kt    |  5 ++++-
 .../main/kotlin/com/tutpro/baresip/ChatsActivity.kt   |  6 +++++-
 app/src/main/res/layout/activity_calls.xml            | 11 ++++++++++-
 app/src/main/res/layout/activity_chat.xml             |  8 ++++++++
 app/src/main/res/layout/activity_chats.xml            | 10 +++++++++-
 6 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
index 9390a09d..c13e2c96 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
@@ -10,6 +10,7 @@ import android.util.Log
 import android.view.MenuItem
 import android.widget.AdapterView
 import android.widget.ListView
+import android.widget.TextView
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -28,15 +29,18 @@ class CallsActivity : AppCompatActivity() {
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_calls)
 
-        val listView = findViewById(R.id.calls) as ListView
+        setContentView(R.layout.activity_calls)
 
         val aor = intent.extras.getString("aor")
         val ua = Account.findUa(aor)!!
 
-        aorGenerateHistory(aor)
+        val headerView = findViewById(R.id.account) as TextView
+        val headerText = "Account ${aor.substringAfter(":")}"
+        headerView.text = headerText
 
+        val listView = findViewById(R.id.calls) as ListView
+        aorGenerateHistory(aor)
         val adapter = CallListAdapter(this, uaHistory)
         listView.adapter = adapter
         listView.isLongClickable = true
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
index 882690d0..5dfc0f9f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
@@ -57,9 +57,12 @@ class ChatActivity : AppCompatActivity() {
         }
         setTitle("Chat with $chatPeer")
 
-        chatMessages = uaPeerMessages(aor, peerUri)
+        val headerView = findViewById(R.id.account) as TextView
+        val headerText = "Account ${aor.substringAfter(":")}"
+        headerView.text = headerText
 
         val listView = findViewById(R.id.messages) as ListView
+        chatMessages = uaPeerMessages(aor, peerUri)
         mlAdapter = MessageListAdapter(this, chatMessages)
         listView.adapter = mlAdapter
         listView.isLongClickable = true
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
index 5dbf4373..ab4f0403 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
@@ -34,8 +34,12 @@ class ChatsActivity: AppCompatActivity() {
         plusButton = findViewById(R.id.plusButton) as ImageButton
 
         aor = intent.extras.getString("aor")
-        uaMessages = uaMessages(aor)
 
+        val headerView = findViewById(R.id.account) as TextView
+        val headerText = "Account ${aor.substringAfter(":")}"
+        headerView.text = headerText
+
+        uaMessages = uaMessages(aor)
         clAdapter = ChatListAdapter(this, uaMessages)
         listView.adapter = clAdapter
         listView.isLongClickable = true
diff --git a/app/src/main/res/layout/activity_calls.xml b/app/src/main/res/layout/activity_calls.xml
index 8754b14a..32dda72f 100644
--- a/app/src/main/res/layout/activity_calls.xml
+++ b/app/src/main/res/layout/activity_calls.xml
@@ -9,10 +9,19 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".CallsActivity">
 
+    <TextView
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal" >
+    </TextView>
+
     <ListView
         android:id="@+id/calls"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        android:layout_height="fill_parent"
+        android:layout_below="@id/account" >
+    </ListView>
 
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index fcf02723..32115a82 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -9,11 +9,19 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".ChatActivity" >
 
+    <TextView
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal" >
+    </TextView>
+
     <ListView
         android:id="@+id/messages"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
         android:transcriptMode="alwaysScroll"
+        android:layout_below="@id/account"
         android:layout_above="@id/text" >
     </ListView>
 
diff --git a/app/src/main/res/layout/activity_chats.xml b/app/src/main/res/layout/activity_chats.xml
index 3daf6591..148ddb8c 100644
--- a/app/src/main/res/layout/activity_chats.xml
+++ b/app/src/main/res/layout/activity_chats.xml
@@ -9,10 +9,18 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".ChatsActivity" >
 
+    <TextView
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal" >
+    </TextView>
+
     <ListView
         android:id="@+id/chats"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="fill_parent"
+        android:layout_below="@+id/account">
     </ListView>
 
     <AutoCompleteTextView