From 05612cf3bbb09d66f3f167bc9428cbf072c4ef07 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 12 Dec 2022 23:08:38 +0100 Subject: Dodate provere za isInitialized i dodat override za onresume. --- .../brzodolokacije/Fragments/FragmentUserFollowers.kt | 11 +++++++++++ .../brzodolokacije/Fragments/FragmentUserFollowing.kt | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowers.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowers.kt index fe2dce3..f2c817a 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowers.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowers.kt @@ -91,6 +91,8 @@ class FragmentUserFollowers : Fragment() { fun searchText(){ if(searchBar.text==null || searchBar.text.isNullOrEmpty() || searchBar.text.toString().trim()=="") return + if(!this::followers.isInitialized) + return var text=searchBar.text.toString().trim() searchedFollowers= mutableListOf() for(user in followers){ @@ -159,4 +161,13 @@ class FragmentUserFollowers : Fragment() { } }) } + override fun onResume() { + super.onResume() + if(showMy=="yes"){ + getFollowersWithoutId() + } + else if(showMy=="no") { + getFollowers() + } + } } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowing.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowing.kt index 2406da8..0508c13 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowing.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserFollowing.kt @@ -89,6 +89,8 @@ class FragmentUserFollowing : Fragment() { if(searchBar.text==null || searchBar.text.isNullOrEmpty() || searchBar.text.toString().trim()=="") return var text=searchBar.text.toString().trim() + if(!this::following.isInitialized) + return searchedFollowing= mutableListOf() for(user in following){ if(user.username.contains(text)) @@ -149,4 +151,14 @@ class FragmentUserFollowing : Fragment() { }) } + override fun onResume() { + super.onResume() + if(showMy=="yes"){ + getFollowingWithoutId() + } + else if(showMy=="no") { + getFollowing() + } + } + } \ No newline at end of file -- cgit v1.2.3