Updated PR based on review

ooni · Dec 2, 2023 · a4ede2f · a4ede2f
1 parent c2376ec
commit a4ede2f
Show file tree

Hide file tree

Showing 5 changed files with 184 additions and 178 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -103,7 +103,6 @@ dependencies {
 
 // AndroidX
     implementation libs.androidx.appcompat
-    //implementation libs.androidx.core
     implementation libs.androidx.constraintlayout
     implementation libs.androidx.lifecycle.process
     implementation libs.androidx.preference

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
@@ -93,7 +93,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                         return false;
                 }
             });
-			// TODO(aanorbel): Fix change in state(theme change from notification) changing the selected item.
+            /* TODO(aanorbel): Fix change in state(theme change from notification) changes the selected item.
+                The proper fix would be to track the selected item as well as other properties in a `ViewModel`. */
             binding.bottomNavigation.setSelectedItemId(getIntent().getIntExtra(RES_ITEM, R.id.dashboard));
 			/* Check if we are restoring the activity from a saved state first.
 			 * If we have a message to show, show it as a snackbar.

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/adapters/DashboardAdapter.kt b/app/src/main/java/org/openobservatory/ooniprobe/adapters/DashboardAdapter.kt
@@ -48,9 +48,9 @@ class DashboardAdapter(
         val item = items[position]
         when (holder.itemViewType) {
             VIEW_TYPE_TITLE -> {
-				val separator = holder as CardGroupTitleViewHolder
-				separator.binding.root.text = item as String
-			}
+                val separator = holder as CardGroupTitleViewHolder
+                separator.binding.root.text = item as String
+            }
 
             VIEW_TYPE_CARD -> {
                 val cardHolder = holder as CardViewHolder
@@ -72,7 +72,10 @@ class DashboardAdapter(
                         holder.binding.apply {
                             title.setTextColor(resources.getColor(R.color.disabled_test_text))
                             desc.setTextColor(resources.getColor(R.color.disabled_test_text))
-                            icon.setColorFilter(resources.getColor(R.color.disabled_test_text), PorterDuff.Mode.SRC_IN)
+                            icon.setColorFilter(
+                                resources.getColor(R.color.disabled_test_text),
+                                PorterDuff.Mode.SRC_IN
+                            )
                         }
                     } else {
                         holder.itemView.setOnClickListener(onClickListener)
@@ -94,13 +97,14 @@ class DashboardAdapter(
     }
 
     /**
-     * ViewHolder for dashboard item group
+     * ViewHolder for a dashboard item group.
      * @param binding
      */
-    class CardGroupTitleViewHolder(var binding: ItemSeperatorBinding) : RecyclerView.ViewHolder(binding.root)
+    class CardGroupTitleViewHolder(var binding: ItemSeperatorBinding) :
+        RecyclerView.ViewHolder(binding.root)
 
     /**
-     * ViewHolder for dashboard item
+     * ViewHolder for dashboard item.
      * @param binding
      */
     class CardViewHolder(var binding: ItemTestsuiteBinding) : RecyclerView.ViewHolder(binding.root)