diff options
3 files changed, 26 insertions, 16 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt index efbfd7a..aafd313 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt @@ -88,7 +88,6 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener { ws=SignalRListener.getInstance(this@ChatActivity) setListeners() setRecyclerView() - requestNewMessages() swipeRefreshLayout = binding.swipeContainer swipeRefreshLayout?.setOnRefreshListener(this@ChatActivity) swipeRefreshLayout?.setColorSchemeResources( @@ -97,11 +96,12 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener { R.color.dark_blue_transparent, R.color.purple_700 ) - swipeRefreshLayout?.post(kotlinx.coroutines.Runnable { - swipeRefreshLayout?.isRefreshing=true - requestNewMessages() - }) + } + override fun onResume() { + super.onResume() + clickedChat=null + requestNewMessages() } fun launchNotificationPermissionPrompt(){ diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt index 56f7900..1ed6542 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt @@ -42,16 +42,6 @@ class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Cha override fun onBindViewHolder(holder: ViewHolder, position: Int){ //sets components of particular item holder.bind(items[position]) - holder.itemView.setOnClickListener { - val intent: Intent = Intent(activity, ChatActivityConversation::class.java) - intent.putExtra("userId",items[position].userId) - intent.putExtra("username",holder.itemView.tvUsername.text) - intent.putExtra("pfp",holder.itemView.ivUserImage.drawable.toBitmap(200,200)) - db.readContact(items[position].userId) - items[position].read=true - holder.itemView.tvUsername.typeface= Typeface.DEFAULT - activity.startActivity(intent) - } } override fun getItemCount() = items.size inner class ViewHolder(itemView : ChatPreviewBinding) : RecyclerView.ViewHolder(itemView.root){ @@ -106,6 +96,16 @@ class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Cha } } + itemView.setOnClickListener { + val intent: Intent = Intent(activity, ChatActivityConversation::class.java) + intent.putExtra("userId",items[position].userId) + intent.putExtra("username",itemView.tvUsername.text) + intent.putExtra("pfp",itemView.ivUserImage.drawable.toBitmap(200,200)) + db.readContact(items[position].userId) + items[position].read=true + setRead() + activity.startActivity(intent) + } } } fun isDifferentDays(c1:Calendar,c2:Calendar):Boolean{ @@ -127,5 +127,16 @@ class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Cha itemView.readIndicator.background= ContextCompat.getDrawable(activity,R.color.dark_blue_transparent) itemView.readIndicator.invalidate() } + + fun setRead(){ + itemView.tvUsername.typeface= Typeface.DEFAULT + itemView.tvUsername.invalidate() + itemView.tvLastMessage.typeface= Typeface.DEFAULT + itemView.tvLastMessage.invalidate() + itemView.tvLastMessageDate.typeface= Typeface.DEFAULT + itemView.tvLastMessageDate.invalidate() + itemView.readIndicator.background= ContextCompat.getDrawable(activity,R.color.white) + itemView.readIndicator.invalidate() + } } }
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt index 041eebb..f1ce85e 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt @@ -175,7 +175,6 @@ class DBHelper : ) Log.d("main",cal.time.toString()) - readContact(userId) return msg } return null |