Fix #5150: Correct home screen topic grid misalignment after returning from lesson

app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java

@@ -6,63 +6,56 @@
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.databinding.BindingAdapter;
 
-/** Holds all custom binding adapters that set margin values. */
+/**
+ * Holds all custom binding adapters that set margin values.
+ */
 public final class MarginBindingAdapters {
 
-  /** Sets the start margin for a view, accounting for RTL scenarios. */
+  /**
+   * Sets the start margin for a view, accounting for RTL scenarios.
+   */
   @BindingAdapter("layoutMarginStart")
   public static void setLayoutMarginStart(@NonNull View view, float marginStart) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
       MarginLayoutParamsCompat.setMarginStart(params, (int) marginStart);
-      view.requestLayout();
+      view.setLayoutParams(params);
     }
   }
 
-  /** Sets the end margin for a view, accounting for RTL scenarios. */
+  /**
+   * Sets the end margin for a view, accounting for RTL scenarios.
+   */
   @BindingAdapter("layoutMarginEnd")
   public static void setLayoutMarginEnd(@NonNull View view, float marginEnd) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
       MarginLayoutParamsCompat.setMarginEnd(params, (int) marginEnd);
-      view.requestLayout();
+      view.setLayoutParams(params);
     }
   }
 
-  /** Used to set a margin-top for views. */
+  /**
+   * Used to set a margin-top for views.
+   */
   @BindingAdapter("layoutMarginTop")
   public static void setLayoutMarginTop(@NonNull View view, float marginTop) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
       params.topMargin = (int) marginTop;
       view.setLayoutParams(params);
-      view.requestLayout();
     }
   }
 
-  /** Used to set a margin-bottom for views. */
+  /**
+   * Used to set a margin-bottom for views.
+   */
   @BindingAdapter("layoutMarginBottom")
   public static void setLayoutMarginBottom(@NonNull View view, float marginBottom) {
     if (view.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
       params.bottomMargin = (int) marginBottom;
       view.setLayoutParams(params);
-      view.requestLayout();
-    }
-  }
-
-  /** Used to set a margin for views. */
-  @BindingAdapter("layoutMargin")
-  public static void setLayoutMargin(@NonNull View view, float margin) {
-    if (view.getLayoutParams() instanceof MarginLayoutParams) {
-      MarginLayoutParams params = (MarginLayoutParams) view.getLayoutParams();
-      params.setMargins(
-          (int) margin,
-          (int) margin,
-          (int) margin,
-          (int) margin
-      );
-      view.requestLayout();
     }
   }
 }

app/src/sharedTest/java/org/oppia/android/app/databinding/MarginBindingAdaptersTest.kt

@@ -5,6 +5,7 @@ import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.view.View
+import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
@@ -112,8 +113,11 @@ class MarginBindingAdaptersTest {
   @get:Rule
   val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
 
-  @Inject lateinit var context: Context
-  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject
+  lateinit var context: Context
+
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   @get:Rule
   val oppiaTestRule = OppiaTestRule()
@@ -292,6 +296,78 @@ class MarginBindingAdaptersTest {
     assertThat(textView.marginEnd.toFloat()).isWithin(TOLERANCE).of(40f)
   }
 
+  @Config(qualifiers = "port")
+  @Test
+  fun testMarginBindableAdapters_layoutParamsSettingPreservesMargins() {
+    val textView = activityRule.scenario.runWithActivity {
+      val textView: TextView = it.findViewById(R.id.test_margin_text_view)
+
+      // Set initial margins
+      setLayoutMarginStart(textView, /* marginStart= */ 24f)
+      setLayoutMarginEnd(textView, /* marginEnd= */ 40f)
+      setLayoutMarginTop(textView, /* marginTop= */ 16f)
+      setLayoutMarginBottom(textView, /* marginBottom= */ 32f)
+
+      return@runWithActivity textView
+    }
+
+    // Verify that the margins are correctly set after method calls
+    assertThat(textView.marginStart.toFloat()).isWithin(TOLERANCE).of(24f)
+    assertThat(textView.marginEnd.toFloat()).isWithin(TOLERANCE).of(40f)
+
+    val layoutParams = textView.layoutParams as ViewGroup.MarginLayoutParams
+    assertThat(layoutParams.topMargin.toFloat()).isWithin(TOLERANCE).of(16f)
+    assertThat(layoutParams.bottomMargin.toFloat()).isWithin(TOLERANCE).of(32f)
+  }
+
+  @Config(qualifiers = "land")
+  @Test
+  fun testMarginBindableAdapters_layoutParamsSettingPreservesMargins_landscape() {
+    val textView = activityRule.scenario.runWithActivity {
+      val textView: TextView = it.findViewById(R.id.test_margin_text_view)
+
+      // Set initial margins
+      setLayoutMarginStart(textView, /* marginStart= */ 24f)
+      setLayoutMarginEnd(textView, /* marginEnd= */ 40f)
+      setLayoutMarginTop(textView, /* marginTop= */ 16f)
+      setLayoutMarginBottom(textView, /* marginBottom= */ 32f)
+
+      return@runWithActivity textView
+    }
+
+    // Verify that the margins are correctly set after method calls
+    assertThat(textView.marginStart.toFloat()).isWithin(TOLERANCE).of(24f)
+    assertThat(textView.marginEnd.toFloat()).isWithin(TOLERANCE).of(40f)
+
+    val layoutParams = textView.layoutParams as ViewGroup.MarginLayoutParams
+    assertThat(layoutParams.topMargin.toFloat()).isWithin(TOLERANCE).of(16f)
+    assertThat(layoutParams.bottomMargin.toFloat()).isWithin(TOLERANCE).of(32f)
+  }
+
+  @Config(qualifiers = "sw600dp-port")
+  @Test
+  fun testMarginBindableAdapters_layoutParamsSettingPreservesMargins_tablet() {
+    val textView = activityRule.scenario.runWithActivity {
+      val textView: TextView = it.findViewById(R.id.test_margin_text_view)
+
+      // Set initial margins
+      setLayoutMarginStart(textView, /* marginStart= */ 24f)
+      setLayoutMarginEnd(textView, /* marginEnd= */ 40f)
+      setLayoutMarginTop(textView, /* marginTop= */ 16f)
+      setLayoutMarginBottom(textView, /* marginBottom= */ 32f)
+
+      return@runWithActivity textView
+    }
+
+    // Verify that the margins are correctly set after method calls
+    assertThat(textView.marginStart.toFloat()).isWithin(TOLERANCE).of(24f)
+    assertThat(textView.marginEnd.toFloat()).isWithin(TOLERANCE).of(40f)
+
+    val layoutParams = textView.layoutParams as ViewGroup.MarginLayoutParams
+    assertThat(layoutParams.topMargin.toFloat()).isWithin(TOLERANCE).of(16f)
+    assertThat(layoutParams.bottomMargin.toFloat()).isWithin(TOLERANCE).of(32f)
+  }
+
   private fun testMarginBindableAdapters_topAndBottomIsCorrect() {
     activityRule.scenario.runWithActivity {
       val textView: TextView = it.findViewById(R.id.test_margin_text_view)