Dodati fragmenti i aktivnost za prikaz praćenja i pratilaca. Omogućen prikaz pratilaca i praćenja.

5 files changed, 137 insertions, 65 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml
index 18c519b..7ee4cbe 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_show_followers_and_following.xml
@@ -2,67 +2,82 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+
+    android:padding="16dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Activities.ActivityShowFollowersAndFollowing">
 
-     <Button
-        android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_baseline_arrow_back"
-        android:text="Korisnik"
+    <!--
+       <View
+           android:id="@+id/divider"
+           android:layout_width="409dp"
+           android:layout_height="1dp"
+           android:layout_marginTop="4dp"
+           android:background="?android:attr/listDivider"
+           app:layout_constraintEnd_toEndOf="parent"
+           app:layout_constraintHorizontal_bias="1.0"
+           app:layout_constraintStart_toStartOf="parent"
+           app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndwingShowFollowers" />
 
-        android:textAllCaps="false"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+           <Button
+               android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowers"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_marginStart="16dp"
+               android:backgroundTint="#FFFFFF"
+               android:stateListAnimator="@null"
+               android:text="Pratioci"
+               android:textColor="@color/cardview_dark_background"
+               app:layout_constraintStart_toStartOf="parent"
+               app:layout_constraintTop_toBottomOf="@+id/btnActiShowFollowersAndFollowingBackToUser" />
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="409dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="4dp"
-        android:background="?android:attr/listDivider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingShowFollowers" />
+           <Button
+               android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowing"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_marginEnd="20dp"
+               android:backgroundTint="#FFFFFF"
+               android:stateListAnimator="@null"
+               android:text="Praćenja"
+               android:textColor="@color/cardview_dark_background"
+               app:layout_constraintEnd_toEndOf="parent"
+               app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser" />
+       -->
 
-    <Button
-        android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowers"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:backgroundTint="#FFFFFF"
-        android:stateListAnimator="@null"
-        android:text="Objave"
-        android:drawableBottom="@drawable/ic_baseline_circle_7"
-        android:textColor="@color/cardview_dark_background"
+    <ImageView
+        android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="4dp"
+        android:clickable="true"
+        android:src="@drawable/ic_baseline_arrow_back"
+        android:textAllCaps="false"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
 
-    <Button
-        android:id="@+id/btnActivityShowFollowersAndFollowingShowFollowing"
+    <TextView
+        android:id="@+id/tvActivityShowFollowersOrFollowingShow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="20dp"
-        android:backgroundTint="#FFFFFF"
-        android:stateListAnimator="@null"
-        android:text="Podaci"
-        android:drawableBottom="@drawable/ic_baseline_circle_7"
-        android:drawableTint="@color/white"
-        android:textColor="@color/cardview_dark_background"
+        android:layout_marginTop="4dp"
+        android:textSize="25dp"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser" />
+        app:layout_constraintHorizontal_bias="0.11"
+        app:layout_constraintStart_toEndOf="@+id/btnActivityShowFollowersAndFollowingBackToUser"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <FrameLayout
-        android:id="@+id/flActivityShowFollowerAndFollowing"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="16dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+               android:id="@+id/flActivityShowFollowerAndFollowing"
+               android:layout_width="match_parent"
+               android:layout_height="0dp"
+               android:layout_marginTop="16dp"
+               android:orientation="vertical"
+               app:layout_constraintBottom_toBottomOf="parent"
+               app:layout_constraintEnd_toEndOf="parent"
+               app:layout_constraintStart_toStartOf="parent"
+               app:layout_constraintTop_toBottomOf="@+id/btnActivityShowFollowersAndFollowingBackToUser"/>
+       </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 bb917cf..cbcafc5 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
@@ -166,26 +166,45 @@
             </TableRow>
 
 
-            <TableRow android:layout_marginTop="30dp">
+            <TableRow android:layout_marginTop="20dp">
 
                 <TextView
                     android:id="@+id/tvFragmentUserProfilePosts"
-                    android:layout_width="110dp"
+                    android:layout_width="105dp"
                     android:gravity="center"
-                    android:text="OBJAVE" />
+                    android:text="OBJAVE"
+                    android:stateListAnimator="@null"
+                    android:backgroundTint="@color/white"
+                    android:textColor="#757471"/>
 
-                <TextView
-                    android:id="@+id/tvFragmentUserProfileFollowers"
-                    android:layout_width="10dp"
+                <Button
+                    android:id="@+id/tvActivityUserProfileFollowers"
+                    android:layout_width="110dp"
+                    android:layout_height="28dp"
+                    android:layout_margin="0dp"
+                    android:backgroundTint="@color/white"
+                    android:clickable="true"
                     android:gravity="center"
-                    android:text="PRATIOCI" />
+                    android:padding="0dp"
+                    android:stateListAnimator="@null"
+                    android:text="PRATIOCI"
+                    android:textColor="#757471"
 
-                <TextView
-                    android:id="@+id/tvFragmentUserProfileFollow"
+                    tools:ignore="TouchTargetSizeCheck" />
 
+                <Button
+                    android:id="@+id/tvActivityUserProfileFollow"
                     android:layout_width="110dp"
+                    android:layout_height="28dp"
+                    android:layout_margin="0dp"
+                    android:backgroundTint="@color/white"
+                    android:clickable="true"
                     android:gravity="center"
-                    android:text="PRAĆENJA" />
+                    android:padding="0dp"
+                    android:stateListAnimator="@null"
+                    android:text="PRAĆENJA"
+                    android:textColor="#757471"
+                    tools:ignore="TouchTargetSizeCheck" />
             </TableRow>
 
             <TableRow
@@ -281,7 +300,7 @@
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintVertical_bias="0.0"
                         app:shapeAppearanceOverlay="@style/Circular"
-                        tools:ignore="SpeakableTextPresentCheck" />
+                        tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </TableRow>
         </TableLayout>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml
index bc43f1b..d0c6a2d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml
@@ -4,13 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tvFolloewItemUsername"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_marginBottom="10dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:elevation="10dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,8 +20,8 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/cvFragmentHomePageProfile"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_gravity="center"
 
             android:elevation="10dp"
@@ -58,13 +59,14 @@
         </TextView>
 
         <TextView
+            android:id="@+id/tvFollowerItemUsername"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Petar Petrovic"
             android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/materialButton"
-            app:layout_constraintHorizontal_bias="0.656"
+            app:layout_constraintHorizontal_bias="0.597"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvFollowerItemName"
             app:layout_constraintVertical_bias="0.0" />
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml
new file mode 100644
index 0000000..8b820bc
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_followers.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentUserFollowers">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvFragmentUserFollowers"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml
new file mode 100644
index 0000000..7558375
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_following.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentUserFollowing">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvFragmentUserFollowing"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ No newline at end of file