aboutsummaryrefslogtreecommitdiff
path: root/Client/BrzoDoLokacije/app/src/main/res/layout
diff options
context:
space:
mode:
authorbranislav.radivojevic <wafflemynxyt@gmail.com>2022-11-28 22:41:49 +0100
committerbranislav.radivojevic <wafflemynxyt@gmail.com>2022-11-28 22:41:49 +0100
commit6c44a9844b79aeb69befb277e3bd3daec44bc059 (patch)
tree8ea32aaf46edcd1ddc274b78e07a1b1861a586c4 /Client/BrzoDoLokacije/app/src/main/res/layout
parent68b86d96142eb1f9e42ba2d87a4277d014759c46 (diff)
parentf2e816ab9e625b0575f6e81fffb0ee7fceddc84e (diff)
Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
-rw-r--r--Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml33
1 files changed, 27 insertions, 6 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
index a446f9a..0e90fc7 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
@@ -228,22 +228,44 @@
<Button
android:id="@+id/btnActivityUserProfileFollow"
- android:layout_width="0dp"
+ android:layout_width="280dp"
android:layout_height="30dp"
android:layout_marginStart="16dp"
- android:layout_marginEnd="8dp"
+ android:clickable="true"
android:drawableLeft="@drawable/ic_outline_person_add_alt_24"
- android:text="PRATI"
android:insetTop="0dp"
android:insetBottom="0dp"
+ android:backgroundTint="@color/button_main"
+ android:text="PRATI"
+ android:visibility="visible"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.13"
app:shapeAppearanceOverlay="@style/Circular"
+ tools:ignore="TouchTargetSizeCheck" />
+
+ <Button
+
+ android:id="@+id/btnActivityUserProfileUnFollow"
+ android:layout_width="280dp"
+ android:layout_height="30dp"
+ android:layout_marginStart="16dp"
+ android:clickable="false"
+ android:drawableLeft="@drawable/ic_outline_person_remove_24"
+ android:insetTop="0dp"
+ android:insetBottom="0dp"
+ android:text="NE PRATI više"
+ android:backgroundTint="@color/unfollow"
+
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/activityUserProfileOpenChat"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.13"
+ app:shapeAppearanceOverlay="@style/Circular"
tools:ignore="TouchTargetSizeCheck" />
+
<ImageButton
android:id="@+id/activityUserProfileOpenChat"
android:layout_width="35dp"
@@ -252,11 +274,10 @@
android:layout_marginEnd="16dp"
android:height="40dp"
android:background="@drawable/rounded_button"
- android:backgroundTint="#4DB6AC"
+ android:backgroundTint="@color/button_main"
android:src="@drawable/ic_round_message_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileFollow"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:shapeAppearanceOverlay="@style/Circular"