aboutsummaryrefslogtreecommitdiff
path: root/Client/BrzoDoLokacije/app/src/main/res/layout
diff options
context:
space:
mode:
authorJelena Petrovic <jelenapetrovic.7119@gmail.com>2022-11-22 03:13:17 +0100
committerJelena Petrovic <jelenapetrovic.7119@gmail.com>2022-11-22 03:13:17 +0100
commite3b16511aba89dd4905c3150e0bcaecd46664215 (patch)
treed28dd5c5943117c0371905e73c8e96c2d6d271c3 /Client/BrzoDoLokacije/app/src/main/res/layout
parent0a96c7acb76791f02dc47250b43b6600bf3adb0e (diff)
poslate poruke se odmah vide u cetu, razlikuju se primljene od poslatih poruka #37
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml3
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml23
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml23
3 files changed, 41 insertions, 8 deletions
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 5afcd86..72060f7 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
@@ -62,7 +62,8 @@
android:id="@+id/rvMain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:layout_constraintBottom_toBottomOf="parent">
+ app:layout_constraintBottom_toBottomOf="parent"
+ >
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
index 2210fa0..2342779 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
@@ -2,16 +2,25 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/rounded_cyan_button"
- android:id="@+id/clMessage">
-
- <TextView
+ android:clipToOutline="true"
+ android:id="@+id/clMessage"
+ android:layout_margin="@dimen/text_padding"
+ android:layout_gravity="end">
+ <androidx.cardview.widget.CardView
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"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:cardBackgroundColor="@color/cardview_dark_background">
+ <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.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_other.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml
new file mode 100644
index 0000000..647127c
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml
@@ -0,0 +1,23 @@
+<?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"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:background="@drawable/rounded_cyan_button"
+ android:id="@+id/clMessage"
+ android:layout_margin="@dimen/text_padding"
+ android:clipToOutline="true">
+
+ <androidx.cardview.widget.CardView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:cardBackgroundColor="@color/dark_blue_transparent">
+ <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.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file