From 900f7ba7a97824c560c6a75bf0328c38d6387fcd Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Mon, 12 Dec 2022 16:57:54 +0100
Subject: Omogućen pregled pratilaca i praćenja klikom na broj istih.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Activities/ActivityUserProfile.kt               | 21 +++++++++++++++++++++
 .../brzodolokacije/Fragments/FragmentProfile.kt     | 20 ++++++++++++++++++++
 .../brzodolokacije/Services/RetrofitHelper.kt       |  4 ++--
 .../src/main/res/layout/activity_user_profile.xml   |  4 +++-
 .../app/src/main/res/layout/fragment_profile.xml    |  5 ++++-
 5 files changed, 50 insertions(+), 4 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
index bb1688a..0bbcf79 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
@@ -143,6 +143,27 @@ class ActivityUserProfile : AppCompatActivity(),OnRefreshListener {
             showUserPostsFragment()
         }
 
+        followersNumber.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString("userId", userObject._id.toString())
+            bundle.putString("show","followers")
+            bundle.putString("showMy","no")
+            val intent = Intent(this@ActivityUserProfile,ActivityShowFollowersAndFollowing::class.java)
+            intent.putExtras(bundle)
+            startActivity(intent)
+
+        }
+
+        followingNumber.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString("userId", userObject._id.toString())
+            bundle.putString("show","following")
+            bundle.putString("showMy","no")
+            val intent = Intent(this@ActivityUserProfile,ActivityShowFollowersAndFollowing::class.java)
+            intent.putExtras(bundle)
+            startActivity(intent)
+        }
+
         swipeRefreshLayout = findViewById<View>(R.id.ProfileSwipeRefresh) as SwipeRefreshLayout
         swipeRefreshLayout.setOnRefreshListener(this@ActivityUserProfile)
         swipeRefreshLayout.setColorSchemeResources(
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
index 73ed1fa..9759002 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
@@ -147,6 +147,26 @@ class FragmentProfile : Fragment(com.example.brzodolokacije.R.layout.fragment_pr
         swipeRefreshLayout?.post(kotlinx.coroutines.Runnable {
             swipeRefreshLayout?.isRefreshing=true
         })
+
+
+        followersNumber.setOnClickListener{
+            val bundle = Bundle()
+            bundle.putString("userId","error")
+            bundle.putString("show","followers")
+            bundle.putString("showMy","yes")
+            val intent = Intent(activity, ActivityShowFollowersAndFollowing::class.java)
+            intent.putExtras(bundle)
+            startActivity(intent)
+        }
+        followingNumber.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString("userId","error")
+            bundle.putString("show","following")
+            bundle.putString("showMy","yes")
+            val intent = Intent(activity,ActivityShowFollowersAndFollowing::class.java)
+            intent.putExtras(bundle)
+            startActivity(intent)
+        }
         return view
     }
     fun openMyPosts(){
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
index 43c2109..88685e4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
@@ -7,8 +7,8 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 
 object RetrofitHelper {
-    val baseUrl="http://10.0.2.2:5279"
-    //val baseUrl="http://147.91.204.115:10082"
+    //val baseUrl="http://10.0.2.2:5279"
+    val baseUrl="http://147.91.204.115:10082"
     private var retrofit_noauth: IBackendApi? = null
     private var retrofit_auth: IBackendApi? = null
 
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 82423c3..f6d2b69 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
@@ -216,7 +216,7 @@
                             android:gravity="center"
                             android:padding="0dp"
                             android:stateListAnimator="@null"
-                            android:text="PRAĆENJA"
+                            android:text="PRATI"
                             android:textColor="#757471"
                             tools:ignore="TouchTargetSizeCheck" />
                     </LinearLayout>
@@ -240,6 +240,7 @@
                             android:textStyle="bold" />
 
                         <TextView
+                            android:clickable="true"
                             android:layout_width="110dp"
                             android:layout_height="wrap_content"
                             android:id="@+id/tvActivityUserProfileFollowersNo"
@@ -249,6 +250,7 @@
                             android:textStyle="bold" />
 
                         <TextView
+                            android:clickable="true"
                             android:id="@+id/tvActivityUserProfileFollowNo"
                             android:layout_width="110dp"
                             android:layout_height="wrap_content"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
index 8d09153..b5988e0 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
@@ -201,7 +201,7 @@
                             android:gravity="center"
                             android:textSize="15sp"
                             android:textColor="#757471"
-                            android:text="PRAĆENJA" />
+                            android:text="PRATI" />
                     </LinearLayout>
                 </TableRow>
 
@@ -214,6 +214,7 @@
                     <LinearLayout>
 
                         <TextView
+
                             android:id="@+id/tvFragmentProfilePostsNo"
                             android:layout_width="110dp"
                             android:layout_height="wrap_content"
@@ -224,6 +225,7 @@
                             android:textStyle="bold" />
 
                         <TextView
+                            android:clickable="true"
                             android:id="@+id/tvFragmentProfileFollowersNo"
                             android:layout_width="110dp"
                             android:layout_height="wrap_content"
@@ -234,6 +236,7 @@
                             android:textStyle="bold" />
 
                         <TextView
+                            android:clickable="true"
                             android:id="@+id/tvFragmentProfileFollowNo"
                             android:layout_width="110dp"
                             android:layout_height="wrap_content"
-- 
cgit v1.2.3