Merge pull request #123 from CSE-110-Winter-2024/ui-hotfix

Fix UI so that it correctly displays letters with list items
CSE-110-Winter-2024 · Mar 15, 2024 · c1317b2 · c1317b2
2 parents a54e193 + 80e1cef
commit c1317b2
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 7 deletions.
diff --git a/app/src/main/java/edu/ucsd/cse110/successorator/ui/GoalListAdapter.java b/app/src/main/java/edu/ucsd/cse110/successorator/ui/GoalListAdapter.java
@@ -53,22 +53,42 @@ public View getView(int position, View convertView, ViewGroup parent) {
             binding.background.setBackgroundColor(Color.WHITE);
         }
 
-        /*
-        Logic for color of the list context icon
-         */
+        // Logic for letter shown inside
         if (goal.context() == Context.HOME) {
-            binding.imageView.setColorFilter(Color.parseColor("#faf04d"));
+            binding.listItemLetter.setText("H");
         }
         if (goal.context() == Context.WORK) {
-            binding.imageView.setColorFilter(Color.parseColor("#31c7f8"));
+            binding.listItemLetter.setText("W");
         }
         if (goal.context() == Context.SCHOOL) {
-            binding.imageView.setColorFilter(Color.parseColor("#c95bf9"));
+            binding.listItemLetter.setText("S");
         }
         if (goal.context() == Context.ERRANDS) {
-            binding.imageView.setColorFilter(Color.parseColor("#a2cb84"));
+            binding.listItemLetter.setText("E");
         }
 
+        /*
+        Logic for color of the list context icon
+         */
+        if (goal.completed()) {
+            binding.imageView.setColorFilter(Color.parseColor("#aba8a7"));
+        }
+        else {
+            if (goal.context() == Context.HOME) {
+                binding.imageView.setColorFilter(Color.parseColor("#faf04d"));
+            }
+            if (goal.context() == Context.WORK) {
+                binding.imageView.setColorFilter(Color.parseColor("#31c7f8"));
+            }
+            if (goal.context() == Context.SCHOOL) {
+                binding.imageView.setColorFilter(Color.parseColor("#c95bf9"));
+            }
+            if (goal.context() == Context.ERRANDS) {
+                binding.imageView.setColorFilter(Color.parseColor("#a2cb84"));
+            }
+        }
+
+
 
         return binding.getRoot();
     }

diff --git a/app/src/main/res/layout/list_item_goal.xml b/app/src/main/res/layout/list_item_goal.xml
@@ -26,4 +26,16 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.523"
         app:tint="@color/black" />
+
+    <TextView
+        android:id="@+id/listItemLetter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="H"
+        android:textAlignment="center"
+        android:textColor="#000000"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView"
+        app:layout_constraintEnd_toEndOf="@+id/imageView"
+        app:layout_constraintStart_toStartOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="@+id/imageView" />
 </androidx.constraintlayout.widget.ConstraintLayout>