From c76ef0fa37ee8b8c26700c0f1d97a7a03b19747d Mon Sep 17 00:00:00 2001 From: johan Date: Fri, 28 Jun 2024 16:49:43 +0200 Subject: [PATCH] Fixed bug --- .../dedis/popstellar/ui/lao/socialmedia/ChirpListAdapter.kt | 4 +++- .../popstellar/ui/lao/socialmedia/ChirpListAdapterTest.kt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapter.kt b/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapter.kt index 984cea1798..3e14ce4829 100644 --- a/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapter.kt +++ b/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapter.kt @@ -195,7 +195,9 @@ class ChirpListAdapter( itemText.text = text // Changes the color of the profile if the chirps comes from another LAO - if (chirp.laoId != laoViewModel.laoId) { + if (chirp.laoId == laoViewModel.laoId) { + itemProfile.imageTintList = context.getColorStateList(R.color.colorAccent) + } else { itemProfile.imageTintList = context.getColorStateList(R.color.gray) } diff --git a/fe2-android/app/src/test/ui/robolectric/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapterTest.kt b/fe2-android/app/src/test/ui/robolectric/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapterTest.kt index 4e28eb23bc..b41a115a04 100644 --- a/fe2-android/app/src/test/ui/robolectric/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapterTest.kt +++ b/fe2-android/app/src/test/ui/robolectric/com/github/dedis/popstellar/ui/lao/socialmedia/ChirpListAdapterTest.kt @@ -333,10 +333,10 @@ class ChirpListAdapterTest { val view1 = chirpListAdapter.getView(0, null, layout) Assert.assertNotNull(view1) - // The chirp of our LAO should have an unmodified color (null in this case) + // The chirp of our LAO should be blue val profile1 = view1.findViewById(R.id.social_media_profile) Assert.assertNotNull(profile1) - Assert.assertNull(profile1.imageTintList) + Assert.assertEquals(context.getColor(R.color.colorAccent), profile1.imageTintList?.defaultColor) // Get the view for the second chirp in the list. val view2 = chirpListAdapter.getView(1, null, layout)