Resolved All Issues

oppia · Dec 16, 2024 · a6624fa · a6624fa
1 parent 061e0a7
commit a6624fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt
@@ -12,10 +12,10 @@ import org.oppia.android.app.model.PoliciesFragmentArguments
 import org.oppia.android.app.model.PolicyPage
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.databinding.PoliciesFragmentBinding
-import org.oppia.android.util.locale.LeftAlignedSymbolsSpan
 import org.oppia.android.util.parser.html.HtmlParser
 import org.oppia.android.util.parser.html.PolicyType
 import javax.inject.Inject
+import org.oppia.android.util.parser.html.LeftAlignedSymbolsSpan
 
 /** The presenter for [PoliciesFragment]. */
 @FragmentScope

diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel
@@ -46,6 +46,7 @@ kt_android_library(
     name = "list_item_leading_margin_span",
     srcs = [
         "ListItemLeadingMarginSpan.kt",
+        "LeftAlignedSymbolsSpan.kt",
     ],
     visibility = [
         "//app:__subpackages__",

diff --git a/...oid/util/locale/LeftAlignedSymbolsSpan.kt → ...til/parser/html/LeftAlignedSymbolsSpan.kt b/...oid/util/locale/LeftAlignedSymbolsSpan.kt → ...til/parser/html/LeftAlignedSymbolsSpan.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.util.locale
+package org.oppia.android.util.parser.html
 
 import android.graphics.Canvas
 import android.graphics.Paint

diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/ListItemLeadingMarginSpan.kt b/utility/src/main/java/org/oppia/android/util/parser/html/ListItemLeadingMarginSpan.kt
@@ -9,6 +9,7 @@ import android.text.Spanned
 import android.text.style.LeadingMarginSpan
 import androidx.core.view.ViewCompat
 import org.oppia.android.util.R
+import org.oppia.android.util.R.dimen.spacing_before_bullet
 import org.oppia.android.util.locale.OppiaLocale
 
 // TODO(#562): Add screenshot tests to check whether the drawing logic works correctly on all devices.
@@ -39,7 +40,7 @@ sealed class ListItemLeadingMarginSpan : LeadingMarginSpan {
     private val bulletRadius = resources.getDimensionPixelSize(R.dimen.bullet_radius)
 
     private val bulletDiameter by lazy { bulletRadius * 2 }
-    private val baseMargin = (16f * context.resources.displayMetrics.density).toInt()
+    private val baseMargin = context.resources.getDimensionPixelSize((spacing_before_bullet))
 
     private val isRtl by lazy {
       displayLocale.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL
@@ -118,8 +119,7 @@ sealed class ListItemLeadingMarginSpan : LeadingMarginSpan {
     private val displayLocale: OppiaLocale.DisplayLocale
   ) : ListItemLeadingMarginSpan() {
     private val resources = context.resources
-    private val baseMargin = (16f * context.resources.displayMetrics.density).toInt()
-
+    private val baseMargin = context.resources.getDimensionPixelSize((R.dimen.spacing_before_number_prefix))
     // Try to use a computed margin, but otherwise guess if there's no guaranteed spacing.
     private var computedLeadingMargin =
       2 * longestNumberedItemPrefix.length + baseMargin