Changed sample chat icon to SD logo

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

@@ -17,9 +17,7 @@ class ChatActivity : AppCompatActivity() {
         setContentView(R.layout.activity_chat)
 
         initListener()
-        restoreSoonChats()
-        //TODO: restoreSoonChats()
-        //TODO: restoreSoonChats()
+        restoreSoonChats() // TODO: @N1CK145
     }
 
     private fun restoreSoonChats() {

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

@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import org.myhush.silentdragon.DataModel
 import org.myhush.silentdragon.R
 
 class ChatItemFragment : Fragment() {
@@ -27,6 +28,9 @@ class ChatItemFragment : Fragment() {
     private fun initListener() {
         v?.setOnClickListener {
             val intent = Intent(activity, ConversationActivity::class.java)
+
+            intent.putExtra("displayName", "$firstName $lastName") // Send some information
+
             startActivity(intent)
         }
     }

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

@@ -8,27 +8,24 @@ import android.util.AttributeSet
 import android.view.View
 import android.view.Window
 import android.widget.TextView
+import kotlinx.android.synthetic.main.fragment_conversation_item_send.*
 import org.myhush.silentdragon.R
 import org.myhush.silentdragon.conversation_item_recive
 import org.myhush.silentdragon.conversation_item_send
 
 class ConversationActivity : AppCompatActivity() {
-    var displayName = "Peter Parker"
+    var displayName = ""
     var messages = HashMap<Boolean, String>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_conversation)
         findViewById<TextView>(R.id.textViewContactName2)
+        displayName = intent.extras.get("displayName").toString()
 
         restoreChat()
     }
 
-    override fun onCreateView(name: String?, context: Context?, attrs: AttributeSet?): View? {
-        return super.onCreateView(name, context, attrs)
-        requestWindowFeature(Window.FEATURE_NO_TITLE)
-    }
-
     private fun restoreChat(){
         addMessage("Lorem Ipsum", true)
         addMessage("Lorem Ipsum", true)
@@ -43,10 +40,12 @@ class ConversationActivity : AppCompatActivity() {
 
         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)
         }
         fragTx.commit()

app/src/main/res/layout/activity_conversation.xml

@@ -38,6 +38,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            tools:src="@mipmap/ic_launcher_dragon_foreground"
             tools:visibility="visible" />
     </android.support.constraint.ConstraintLayout>
 
@@ -53,22 +54,7 @@
             android:id="@+id/MessageList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <fragment
-                android:id="@+id/fragment2"
-                android:name="org.myhush.silentdragon.conversation_item_send"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_conversation_item_send" />
-
-            <fragment
-                android:id="@+id/fragment"
-                android:name="org.myhush.silentdragon.conversation_item_recive"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                tools:layout="@layout/fragment_conversation_item_recive" />
-        </LinearLayout>
+            android:orientation="vertical"/>
     </ScrollView>
 
     <android.support.constraint.ConstraintLayout
@@ -91,13 +77,13 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <EditText
-            android:id="@+id/UserInput"
+            android:id="@+id/userInput"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginStart="10dp"
             android:ems="10"
+            android:hint="Click to send a message..."
             android:inputType="textPersonName"
-            android:text="Send a message...."
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/buttonSend"
             app:layout_constraintStart_toStartOf="parent"