commit

app/src/main/java/org/myhush/silentdragon/Addressbook.kt

@@ -1,7 +1,26 @@
 package org.myhush.silentdragon
 
 object Addressbook {
-    class Contact(){ var firstName = ""; var lastName = ""; var zAddress = "" }
+    class Contact {
+        var addressList: ArrayList<String> = ArrayList()
+        var firstName = ""
+        var lastName = ""
+
+        constructor(firstName: String, lastName: String){
+            this.firstName = firstName
+            this.lastName = lastName
+        }
+        constructor(firstName: String, lastName: String, address: String){
+            this.firstName = firstName
+            this.lastName = lastName
+            this.addressList.add(address)
+        }
+        constructor(firstName: String, lastName: String, addressList: ArrayList<String>){
+            this.firstName = firstName
+            this.lastName = lastName
+            this.addressList = addressList
+        }
+    }
 
     val contactList = ArrayList<Contact>()
 }

app/src/main/java/org/myhush/silentdragon/chat/ChatActivity.kt

@@ -1,14 +1,11 @@
 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
@@ -16,7 +13,6 @@ import org.myhush.silentdragon.ReceiveActivity
 import org.myhush.silentdragon.SendActivity
 
 class ChatActivity : AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_chat)

app/src/main/java/org/myhush/silentdragon/chat/ConversationActivity.kt

@@ -15,7 +15,7 @@ import org.myhush.silentdragon.conversation_item_send
 
 class ConversationActivity : AppCompatActivity() {
     var displayName = ""
-    var messages = HashMap<Boolean, String>()
+    var messages: ArrayList<Message> = ArrayList()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -27,26 +27,27 @@ class ConversationActivity : AppCompatActivity() {
     }
 
     private fun restoreChat(){
-        //addMessage("Lorem Ipsum", true)
-        //addMessage("Lorem Ipsum", true)
-        //addMessage("Lorem Ipsum", false)
-        //addMessage("Lorem Ipsum", true)
+        val m1 = Message("Test", "XXXXX", "YYYYYY", 99999999)
+        //attachMessage(m1)
     }
 
 
 
-    fun addMessage(message: String, recived: Boolean){
+    fun attachMessage(message: Message){
         val fragTx: FragmentTransaction = supportFragmentManager.beginTransaction()
 
-        if(recived){
-            val fragment = conversation_item_recive()
-            fragment.message.text = message
-            fragTx.add(R.id.MessageList, fragment)
-
-        }else{
-            val fragment = conversation_item_send()
-            fragment.message.text = message
-            fragTx.add(R.id.MessageList, fragment)
+        when (message.messageType){
+            MessageType.SEND -> {
+                val fragment = conversation_item_send()
+                fragment.message.text = message.memo
+                fragTx.add(R.id.MessageList, fragment)
+            }
+
+            MessageType.RECIEVE -> {
+                val fragment = conversation_item_recive()
+                fragment.message.text = message.memo
+                fragTx.add(R.id.MessageList, fragment)
+            }
         }
         fragTx.commit()
     }

app/src/main/java/org/myhush/silentdragon/chat/Message.kt

@@ -0,0 +1,24 @@
+package org.myhush.silentdragon.chat
+
+enum class MessageType{
+    SEND,
+    RECIEVE
+}
+
+class Message {
+    var memo = ""
+    var fromAddress = ""
+    var toAddress = ""
+    var messageType = MessageType.SEND
+    var dateTime: Long = 0
+
+    constructor(memo: String, toAddress: String, fromAddress: String){
+        this.memo = memo
+        this.fromAddress = fromAddress
+    }
+    constructor(memo: String, toAddress: String, fromAddress: String, dateTime: Long){
+        this.memo = memo
+        this.fromAddress = fromAddress
+        this.dateTime = dateTime
+    }
+}