Browse Source
Merge pull request #58 from N1CK145/chat
Fix validation check
chat
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
6 deletions
-
app/src/main/java/org/myhush/silentdragon/chat/ConversationActivity.kt
-
app/src/main/res/layout/activity_chat.xml
|
|
|
@ -1,15 +1,14 @@ |
|
|
|
package org.myhush.silentdragon.chat |
|
|
|
|
|
|
|
import android.content.Intent |
|
|
|
import android.support.v7.app.AppCompatActivity |
|
|
|
import android.os.Bundle |
|
|
|
import android.support.v4.app.FragmentTransaction |
|
|
|
import android.widget.EditText |
|
|
|
import android.widget.ImageButton |
|
|
|
import android.widget.TextView |
|
|
|
import kotlinx.android.synthetic.main.activity_conversation.* |
|
|
|
import org.myhush.silentdragon.DataModel |
|
|
|
import org.myhush.silentdragon.R |
|
|
|
import org.myhush.silentdragon.conversation_item_recive |
|
|
|
import org.myhush.silentdragon.conversation_item_send |
|
|
|
import org.myhush.silentdragon.* |
|
|
|
|
|
|
|
class ConversationActivity : AppCompatActivity() { |
|
|
|
var displayName = "" |
|
|
|
|
|
|
|
@ -10,10 +10,10 @@ |
|
|
|
android:id="@+id/swiperefreshChat" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="0dp" |
|
|
|
app:layout_constraintBottom_toTopOf="@+id/bottomNav" |
|
|
|
app:layout_constraintBottom_toTopOf="@+id/nav_view" |
|
|
|
app:layout_constraintEnd_toEndOf="parent" |
|
|
|
app:layout_constraintStart_toStartOf="parent" |
|
|
|
app:layout_constraintTop_toBottomOf="@+id/imageView2"> |
|
|
|
app:layout_constraintTop_toTopOf="parent"> |
|
|
|
|
|
|
|
<include |
|
|
|
android:id="@+id/include" |
|
|
|
|
GitHub