aboutsummaryrefslogtreecommitdiff
path: root/Client/BrzoDoLokacije/app/src/main/res/layout
diff options
context:
space:
mode:
authorJelena Petrovic <jelenapetrovic.7119@gmail.com>2022-11-22 00:00:44 +0100
committerJelena Petrovic <jelenapetrovic.7119@gmail.com>2022-11-22 00:00:44 +0100
commit9a00d5a73d1854ed496f25a721926be26fc6cc45 (patch)
tree3aebd9f444b0247b99efb96607290cd9779719d7 /Client/BrzoDoLokacije/app/src/main/res/layout
parent66ad4ba5365eb6a07843c59f5c65f78999015385 (diff)
prikaz liste cetova i poruka u cetu, slanje i prikaz dobijenih poruka #37
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml4
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml49
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml17
3 files changed, 54 insertions, 16 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
index 694e972..9e28d6d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
@@ -32,7 +32,7 @@
</ImageButton>
-<!-- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:id="@+id/swipeContainer"
@@ -46,6 +46,6 @@
app:layout_constraintTop_toTopOf="parent" >
</androidx.recyclerview.widget.RecyclerView>
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>-->
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
index ea7d3e7..5afcd86 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
@@ -5,26 +5,30 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Activities.ChatActivityConversation">
+
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topBanner"
android:layout_width="match_parent"
- android:clickable="true"
android:layout_height="50dp"
+ android:elevation="5dp"
android:background="@color/dark_blue_transparent"
+ android:clickable="true"
app:layout_constraintStart_toStartOf="parent">
+
<TextView
+ android:id="@+id/tvFragmentTitle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:textSize="40dp"
- android:id="@+id/tvFragmentTitle"
android:text="Chat"
- android:textColor="@color/white"/>
+ android:textColor="@color/white"
+ android:textSize="40dp" />
+
<androidx.cardview.widget.CardView
android:id="@+id/cvParentUsername"
android:layout_width="match_parent"
android:layout_height="40dp"
- android:layout_marginTop="10dp"
android:layout_marginStart="16dp"
+ android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:elevation="0dp"
app:cardCornerRadius="20dp"
@@ -39,25 +43,42 @@
android:layout_height="match_parent"
android:background="@drawable/rounded_white_button_login"
android:hint=" kome slati poruku?"
- android:paddingLeft="15dp"
- android:inputType="textPersonName" />
+ android:inputType="textPersonName"
+ android:paddingLeft="15dp" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/messagesContainer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toTopOf="@id/cvParentMessageEdit"
+ app:layout_constrainedHeight="true">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvMain"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toBottomOf="parent">
+
+ </androidx.recyclerview.widget.RecyclerView>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
<androidx.cardview.widget.CardView
android:id="@+id/cvParentMessageEdit"
android:layout_width="match_parent"
android:layout_height="40dp"
- android:layout_marginTop="10dp"
android:layout_marginStart="16dp"
+ android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:elevation="0dp"
app:cardCornerRadius="20dp"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintBottom_toBottomOf="parent">
+ app:layout_constraintStart_toStartOf="parent">
<com.google.android.material.textfield.TextInputEditText
@@ -66,8 +87,8 @@
android:layout_height="match_parent"
android:background="@drawable/rounded_white_button_login"
android:hint=" poruka"
- android:paddingLeft="15dp"
- android:inputType="textPersonName" />
+ android:inputType="textPersonName"
+ android:paddingLeft="15dp" />
<ImageButton
android:id="@+id/btnSendMessage"
@@ -75,8 +96,8 @@
android:layout_height="50dp"
android:layout_gravity="right"
android:scaleType="centerCrop"
- app:cornerRadius="16dp"
- android:src="@drawable/post_comment" />
+ android:src="@drawable/post_comment"
+ app:cornerRadius="16dp" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
new file mode 100644
index 0000000..2210fa0
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/rounded_cyan_button"
+ android:id="@+id/clMessage">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/white"
+ android:id="@+id/tvMessage"
+ android:text="blabla"
+ android:padding="@dimen/component_padding"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file