From df99f9a86672c4f6950f61b0a6de4f1434228d0f Mon Sep 17 00:00:00 2001
From: N1CK145 <nickas.gehlen@gmail.com>
Date: Thu, 21 Nov 2019 22:53:58 +0100
Subject: [PATCH] Added menu and Addressbook

---
 .../org/myhush/silentdragon/Addressbook.kt    | 42 ++-----------------
 .../java/org/myhush/silentdragon/Contact.kt   |  7 ----
 .../org/myhush/silentdragon/MainActivity.kt   |  2 +-
 .../myhush/silentdragon/chat/ChatActivity.kt  | 27 ++++++++++--
 app/src/main/res/menu/menu_chat.xml           |  7 ++++
 5 files changed, 34 insertions(+), 51 deletions(-)
 delete mode 100644 app/src/main/java/org/myhush/silentdragon/Contact.kt
 create mode 100644 app/src/main/res/menu/menu_chat.xml

diff --git a/app/src/main/java/org/myhush/silentdragon/Addressbook.kt b/app/src/main/java/org/myhush/silentdragon/Addressbook.kt
index df4eb38..a005191 100644
--- a/app/src/main/java/org/myhush/silentdragon/Addressbook.kt
+++ b/app/src/main/java/org/myhush/silentdragon/Addressbook.kt
@@ -1,43 +1,7 @@
 package org.myhush.silentdragon
 
-class Addressbook {
-    private val data = ArrayList<Contact>()
+object Addressbook {
+    class Contact(){ var firstName = ""; var lastName = ""; var zAddress = "" }
 
-    fun addContact(contact: Contact){
-        data.add(contact)
-    }
-
-    fun getContactByAddress(address: String): Contact? {
-        data.forEach {
-            if (it.zaddress == address)
-                return it
-        }
-        return null
-    }
-
-    fun getContactsByFirstName(firstName: String): ArrayList<Contact> {
-        val list = ArrayList<Contact>()
-        data.forEach {
-            if (it.firstName == firstName)
-                list.add(it)
-        }
-        return list
-    }
-
-    fun getContactsByLastName(lastName: String): ArrayList<Contact> {
-        val list = ArrayList<Contact>()
-        data.forEach {
-            if (it.lastName == lastName)
-                list.add(it)
-        }
-        return list    }
-
-    fun getContactsByFullName(firstName: String, lastName: String): ArrayList<Contact> {
-        val list = ArrayList<Contact>()
-        data.forEach {
-            if (it.firstName == firstName && it.lastName == lastName)
-                list.add(it)
-        }
-        return list
-    }
+    val contactList = ArrayList<Contact>()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/myhush/silentdragon/Contact.kt b/app/src/main/java/org/myhush/silentdragon/Contact.kt
deleted file mode 100644
index c3792f0..0000000
--- a/app/src/main/java/org/myhush/silentdragon/Contact.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.myhush.silentdragon
-
-class Contact {
-    var firstName = ""
-    var lastName = ""
-    var zaddress = ""
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/myhush/silentdragon/MainActivity.kt b/app/src/main/java/org/myhush/silentdragon/MainActivity.kt
index 9746ab0..13f2e24 100644
--- a/app/src/main/java/org/myhush/silentdragon/MainActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/MainActivity.kt
@@ -111,7 +111,7 @@ class MainActivity : AppCompatActivity(),
     private fun loadSharedPref() {
         var ref: SharedPreferences = getSharedPreferences("MainFile", 0)
 
-        DataModel.selectedCurrency = ref.getString("currency", "USD")
+        DataModel.selectedCurrency = ref.getString("currency", "USD")!!
     }
 
     private fun setMainStatus(status: String) {
diff --git a/app/src/main/java/org/myhush/silentdragon/chat/ChatActivity.kt b/app/src/main/java/org/myhush/silentdragon/chat/ChatActivity.kt
index 0548db5..5de122e 100644
--- a/app/src/main/java/org/myhush/silentdragon/chat/ChatActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/chat/ChatActivity.kt
@@ -1,9 +1,14 @@
 package org.myhush.silentdragon.chat
 
+import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
 import android.support.v4.app.FragmentTransaction
 import android.support.v7.app.AppCompatActivity
+import android.text.InputType
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.EditText
 import kotlinx.android.synthetic.main.activity_chat.*
 import org.myhush.silentdragon.MainActivity
 import org.myhush.silentdragon.R
@@ -21,9 +26,7 @@ class ChatActivity : AppCompatActivity() {
     }
 
     private fun restoreSoonChats() {
-        addMessage("Nil", "Armstrong")
-        addMessage("Peter", "Parker")
-        addMessage("Mark", "Zuckerberg")
+        addChat("Nil", "Armstrong")
     }
 
     private fun initListener(){
@@ -52,7 +55,7 @@ class ChatActivity : AppCompatActivity() {
         }
     }
 
-    fun addMessage(firstName: String, lastName: String){
+    private fun addChat(firstName: String, lastName: String){
         val fragment = ChatItemFragment()
         val fragTx: FragmentTransaction = supportFragmentManager.beginTransaction()
 
@@ -62,4 +65,20 @@ class ChatActivity : AppCompatActivity() {
         fragTx.add(R.id.ChatTable, fragment)
         fragTx.commit()
     }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        menuInflater.inflate(R.menu.menu_chat, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_addChat -> {
+                // TODO: Create "createContactActivity"
+                return true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
 }
diff --git a/app/src/main/res/menu/menu_chat.xml b/app/src/main/res/menu/menu_chat.xml
new file mode 100644
index 0000000..7b07646
--- /dev/null
+++ b/app/src/main/res/menu/menu_chat.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_addChat"
+        android:title="AddChat" />
+</menu>
\ No newline at end of file