aboutsummaryrefslogtreecommitdiff
path: root/Client/BrzoDoLokacije/app/src/main/res/layout
diff options
context:
space:
mode:
authorTAMARA JERINIC <tamara.jerinic@gmail.com>2022-11-29 15:02:28 +0100
committerTAMARA JERINIC <tamara.jerinic@gmail.com>2022-11-29 15:02:28 +0100
commit7043ee8562caa9108715854b5fd0633dc1d06b83 (patch)
tree298a1f34909278ecc3a48afc23db5e8f03929f0a /Client/BrzoDoLokacije/app/src/main/res/layout
parent27afef68aab5dbfcf8d1317a4c69f68c841a2f38 (diff)
Povezano slanje poruka sa početne strane. Izmenjen izgled activity_chat fajla.
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml68
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml3
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml2
3 files changed, 46 insertions, 27 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 9e28d6d..680bada 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
@@ -5,47 +5,65 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Activities.ChatActivity">
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/topBanner"
- android:layout_width="match_parent"
- android:clickable="true"
- android:layout_height="50dp"
- android:background="@color/dark_blue_transparent"
- app:layout_constraintStart_toStartOf="parent">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:textSize="40dp"
- android:id="@+id/tvFragmentTitle"
- android:text="Chat"
- android:textColor="@color/white"/>
-
- </androidx.constraintlayout.widget.ConstraintLayout>
+
<ImageButton
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
android:id="@+id/addNewMessage"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
android:clickable="true"
+ android:elevation="50dp"
android:focusable="true"
- app:layout_constraintTop_toBottomOf="@id/topBanner"
- android:src="@drawable/button_chat">
+ android:backgroundTint="@color/unfollow"
+ android:src="@drawable/ic_baseline_add_message_24"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
- </ImageButton>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <ImageView
+ android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser"
+ android:layout_width="35dp"
+ android:layout_height="35dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:clickable="true"
+ android:src="@drawable/ic_baseline_arrow_back"
+ android:textAllCaps="false"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
+
+ <TextView
+ android:id="@+id/tvActivityShowFollowersOrFollowingShow"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_width="match_parent"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="268dp"
+ android:text="Poruke"
+ android:textSize="25dp"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeContainer"
- app:layout_constraintTop_toBottomOf="@id/addNewMessage">
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tvActivityShowFollowersOrFollowingShow"
+ app:layout_constraintVertical_bias="1.0"
+ tools:layout_editor_absoluteX="-27dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvMain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" >
+ app:layout_constraintTop_toTopOf="parent">
</androidx.recyclerview.widget.RecyclerView>
+
+
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
index 0752536..f39acf2 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
@@ -127,11 +127,12 @@
</FrameLayout>
<ImageView
- android:id="@+id/imageView12"
+ android:id="@+id/ivFragmentHomePageChat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_marginEnd="20dp"
+ android:clickable="true"
android:src="@drawable/ic_round_chat_24"
app:layout_constraintEnd_toStartOf="@+id/cvFragmentHomePageProfile"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
index f940efd..2d32b2d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
@@ -28,7 +28,7 @@
android:layout_marginStart="1dp"
android:layout_marginEnd="1dp"
android:elevation="3dp"
- android:scaleType="fitXY"
+ android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="@+id/imageView9"
app:layout_constraintEnd_toEndOf="@id/imageView9"
app:layout_constraintStart_toStartOf="@id/imageView9"