Fix part of #4044: Prepare for supporting math expressions (math utility refactor)

app/BUILD.bazel

@@ -546,8 +546,8 @@ android_library(
         ":views",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_activity_injector_provider",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_resource_handler",
-        "//model:interaction_object_java_proto_lite",
-        "//model:thumbnail_java_proto_lite",
+        "//model/src/main/proto:interaction_object_java_proto_lite",
+        "//model/src/main/proto:thumbnail_java_proto_lite",
         "//third_party:androidx_annotation_annotation",
         "//third_party:androidx_constraintlayout_constraintlayout",
         "//third_party:androidx_core_core",
@@ -578,8 +578,8 @@ kt_android_library(
     deps = [
         ":dagger",
         "//domain/src/main/java/org/oppia/android/domain/audio:cellular_audio_dialog_controller",
-        "//model:question_java_proto_lite",
-        "//model:topic_java_proto_lite",
+        "//model/src/main/proto:question_java_proto_lite",
+        "//model/src/main/proto:topic_java_proto_lite",
         "//third_party:androidx_recyclerview_recyclerview",
     ],
 )
@@ -686,7 +686,7 @@ android_library(
         ":view_models",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_activity_injector_provider",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_resource_handler",
-        "//model:thumbnail_java_proto_lite",
+        "//model/src/main/proto:thumbnail_java_proto_lite",
         "//third_party:androidx_annotation_annotation",
         "//third_party:androidx_constraintlayout_constraintlayout",
         "//third_party:androidx_lifecycle_lifecycle-livedata-core",
@@ -738,8 +738,8 @@ kt_android_library(
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions:logger_module",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:worker_module",
+        "//model/src/main/proto:arguments_java_proto_lite",
         "//domain/src/main/java/org/oppia/android/domain/profile:profile_management_controller",
-        "//model:arguments_java_proto_lite",
         "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
         "//third_party:androidx_databinding_databinding-adapters",
         "//third_party:androidx_databinding_databinding-common",

app/src/main/java/org/oppia/android/app/activity/BUILD.bazel

@@ -75,6 +75,6 @@ kt_android_library(
         "//app:app_visibility",
     ],
     deps = [
-        "//model:profile_java_proto_lite",
+        "//model/src/main/proto:profile_java_proto_lite",
     ],
 )

app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt

@@ -16,7 +16,7 @@ import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandle
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.utility.toAccessibleAnswerString
 import org.oppia.android.domain.translation.TranslationController
-import org.oppia.android.domain.util.toAnswerString
+import org.oppia.android.util.math.toAnswerString
 
 /** [StateItemViewModel] for the ratio expression input interaction. */
 class RatioExpressionInputInteractionViewModel(

config/config_proto_assets.bzl

@@ -23,8 +23,8 @@ def generate_supported_languages_configuration_from_text_proto(
         names = [supported_language_text_proto_file_name],
         proto_dep_name = "languages",
         proto_type_name = "SupportedLanguages",
-        name_prefix = name,
+        name_prefix = "supported_languages",
         asset_dir = "languages",
-        proto_dep_bazel_target_prefix = "//model",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",
     )

config/src/java/org/oppia/android/config/BUILD.bazel

@@ -10,7 +10,7 @@ _SUPPORTED_LANGUAGES_CONFIG_ASSETS = generate_proto_binary_assets(
     asset_dir = "languages",
     name_prefix = "supported_languages_config_assets",
     names = ["supported_languages"],
-    proto_dep_bazel_target_prefix = "//model",
+    proto_dep_bazel_target_prefix = "//model/src/main/proto",
     proto_dep_name = "languages",
     proto_package = "model",
     proto_type_name = "SupportedLanguages",
@@ -21,7 +21,7 @@ _SUPPORTED_REGIONS_CONFIG_ASSETS = generate_proto_binary_assets(
     asset_dir = "languages",
     name_prefix = "supported_regions_config_assets",
     names = ["supported_regions"],
-    proto_dep_bazel_target_prefix = "//model",
+    proto_dep_bazel_target_prefix = "//model/src/main/proto",
     proto_dep_name = "languages",
     proto_package = "model",
     proto_type_name = "SupportedRegions",

data/BUILD.bazel

@@ -14,7 +14,7 @@ TEST_DEPS = [
     "//data/src/main/java/org/oppia/android/data/backends/gae:prod_module",
     "//data/src/main/java/org/oppia/android/data/backends/gae/model",
     "//data/src/main/java/org/oppia/android/data/persistence:cache_store",
-    "//model:test_models",
+    "//model/src/main/proto:test_models",
     "//testing",
     "//testing/src/main/java/org/oppia/android/testing/network",
     "//testing/src/main/java/org/oppia/android/testing/network:test_module",

data/src/main/java/org/oppia/android/data/backends/gae/BUILD.bazel

@@ -17,7 +17,7 @@ kt_android_library(
     deps = [
         ":constants",
         ":network_config_annotations",
-        "//model:arguments_java_proto_lite",
+        "//model/src/main/proto:arguments_java_proto_lite",
         "//third_party:com_squareup_okhttp3_okhttp",
         "//third_party:javax_inject_javax_inject",
         "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions",

data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel

@@ -12,7 +12,7 @@ kt_android_library(
     visibility = ["//:oppia_api_visibility"],
     deps = [
         ":dagger",
-        "//model:profile_java_proto_lite",
+        "//model/src/main/proto:profile_java_proto_lite",
         "//utility",
         "//utility/src/main/java/org/oppia/android/util/data:async_data_subscription_manager",
         "//utility/src/main/java/org/oppia/android/util/data:async_result",

domain/BUILD.bazel

@@ -112,18 +112,19 @@ kt_android_library(
         "//domain/src/main/java/org/oppia/android/domain/util:asset",
         "//domain/src/main/java/org/oppia/android/domain/util:extensions",
         "//domain/src/main/java/org/oppia/android/domain/util:retriever",
-        "//model:exploration_checkpoint_java_proto_lite",
-        "//model:onboarding_java_proto_lite",
-        "//model:platform_parameter_java_proto_lite",
-        "//model:question_java_proto_lite",
-        "//model:topic_java_proto_lite",
+        "//model/src/main/proto:exploration_checkpoint_java_proto_lite",
+        "//model/src/main/proto:onboarding_java_proto_lite",
+        "//model/src/main/proto:platform_parameter_java_proto_lite",
+        "//model/src/main/proto:question_java_proto_lite",
+        "//model/src/main/proto:topic_java_proto_lite",
         "//third_party:androidx_work_work-runtime-ktx",
         "//utility/src/main/java/org/oppia/android/util/caching:topic_list_to_cache",
         "//utility/src/main/java/org/oppia/android/util/data:data_providers",
         "//utility/src/main/java/org/oppia/android/util/extensions:bundle_extensions",
         "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions",
         "//utility/src/main/java/org/oppia/android/util/logging:event_logger",
         "//utility/src/main/java/org/oppia/android/util/logging:log_uploader",
+        "//utility/src/main/java/org/oppia/android/util/math:extensions",
         "//utility/src/main/java/org/oppia/android/util/networking:network_connection_util",
         "//utility/src/main/java/org/oppia/android/util/parser/html:exploration_html_parser_entity_type",
         "//utility/src/main/java/org/oppia/android/util/parser/image:image_parsing_annonations",
@@ -151,7 +152,7 @@ kt_android_library(
         "src/test/java/org/oppia/android/domain/classify/InteractionObjectTestBuilder.kt",
     ],
     deps = [
-        "//model:question_java_proto_lite",
+        "//model/src/main/proto:question_java_proto_lite",
     ],
 )
 

domain/domain_assets.bzl

@@ -32,53 +32,53 @@ def generate_assets_list_from_text_protos(
         names = topic_list_file_names,
         proto_dep_name = "topic",
         proto_type_name = "TopicIdList",
-        name_prefix = name,
+        name_prefix = "topic_id_list",
         asset_dir = "src/main/assets",
-        proto_dep_bazel_target_prefix = "//model",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",
     ) + generate_proto_binary_assets(
         name = name,
         names = topic_file_names,
         proto_dep_name = "topic",
         proto_type_name = "TopicRecord",
-        name_prefix = name,
+        name_prefix = "topic_record",
         asset_dir = "src/main/assets",
-        proto_dep_bazel_target_prefix = "//model",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",
     ) + generate_proto_binary_assets(
         name = name,
         names = subtopic_file_names,
         proto_dep_name = "topic",
         proto_type_name = "SubtopicRecord",
-        name_prefix = name,
+        name_prefix = "subtopic_record",
         asset_dir = "src/main/assets",
-        proto_dep_bazel_target_prefix = "//model",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",
     ) + generate_proto_binary_assets(
         name = name,
         names = story_file_names,
         proto_dep_name = "topic",
         proto_type_name = "StoryRecord",
-        name_prefix = name,
+        name_prefix = "story_record",
         asset_dir = "src/main/assets",
-        proto_dep_bazel_target_prefix = "//model",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",
     ) + generate_proto_binary_assets(
         name = name,
         names = skills_file_names,
         proto_dep_name = "topic",
         proto_type_name = "ConceptCardList",
-        name_prefix = name,
+        name_prefix = "concept_card_list",
         asset_dir = "src/main/assets",
-        proto_dep_bazel_target_prefix = "//model",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",
     ) + generate_proto_binary_assets(
         name = name,
         names = exploration_file_names,
         proto_dep_name = "exploration",
         proto_type_name = "Exploration",
-        name_prefix = name,
+        name_prefix = "exploration",
         asset_dir = "src/main/assets",
-        proto_dep_bazel_target_prefix = "//model",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",
     )

domain/src/main/java/org/oppia/android/domain/audio/BUILD.bazel

@@ -33,7 +33,7 @@ kt_android_library(
     deps = [
         "//data/src/main/java/org/oppia/android/data/persistence:cache_store",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger",
-        "//model:topic_java_proto_lite",
+        "//model/src/main/proto:topic_java_proto_lite",
         "//third_party:javax_inject_javax_inject",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
     ],

domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt

@@ -6,9 +6,9 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.approximatelyEquals
-import org.oppia.android.domain.util.toFloat
-import org.oppia.android.domain.util.toSimplestForm
+import org.oppia.android.util.math.approximatelyEquals
+import org.oppia.android.util.math.toDouble
+import org.oppia.android.util.math.toSimplestForm
 import javax.inject.Inject
 
 /**
@@ -36,6 +36,7 @@ class FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider
     input: Fraction,
     writtenTranslationContext: WrittenTranslationContext
   ): Boolean {
-    return answer.toFloat().approximatelyEquals(input.toFloat()) && answer == input.toSimplestForm()
+    return answer.toDouble().approximatelyEquals(input.toDouble()) &&
+      answer == input.toSimplestForm()
   }
 }

domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt

@@ -6,8 +6,8 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.approximatelyEquals
-import org.oppia.android.domain.util.toFloat
+import org.oppia.android.util.math.approximatelyEquals
+import org.oppia.android.util.math.toDouble
 import javax.inject.Inject
 
 /**
@@ -34,6 +34,6 @@ class FractionInputIsEquivalentToRuleClassifierProvider @Inject constructor(
     input: Fraction,
     writtenTranslationContext: WrittenTranslationContext
   ): Boolean {
-    return answer.toFloat().approximatelyEquals(input.toFloat())
+    return answer.toDouble().approximatelyEquals(input.toDouble())
   }
 }

domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt

@@ -6,7 +6,7 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.toFloat
+import org.oppia.android.util.math.toDouble
 import javax.inject.Inject
 
 /**
@@ -33,6 +33,6 @@ class FractionInputIsGreaterThanRuleClassifierProvider @Inject constructor(
     input: Fraction,
     writtenTranslationContext: WrittenTranslationContext
   ): Boolean {
-    return answer.toFloat() > input.toFloat()
+    return answer.toDouble() > input.toDouble()
   }
 }

domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt

@@ -6,7 +6,7 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.toFloat
+import org.oppia.android.util.math.toDouble
 import javax.inject.Inject
 
 /**
@@ -33,6 +33,6 @@ class FractionInputIsLessThanRuleClassifierProvider @Inject constructor(
     input: Fraction,
     writtenTranslationContext: WrittenTranslationContext
   ): Boolean {
-    return answer.toFloat() < input.toFloat()
+    return answer.toDouble() < input.toDouble()
   }
 }

domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt

@@ -7,7 +7,7 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.approximatelyEquals
+import org.oppia.android.util.math.approximatelyEquals
 import javax.inject.Inject
 
 /**

domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt

@@ -6,8 +6,8 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.approximatelyEquals
-import org.oppia.android.domain.util.toFloat
+import org.oppia.android.util.math.approximatelyEquals
+import org.oppia.android.util.math.toDouble
 import javax.inject.Inject
 
 /**
@@ -47,7 +47,7 @@ class NumberWithUnitsIsEquivalentToRuleClassifierProvider @Inject constructor(
   private fun extractRealValue(number: NumberWithUnits): Double {
     return when (number.numberTypeCase) {
       NumberWithUnits.NumberTypeCase.REAL -> number.real
-      NumberWithUnits.NumberTypeCase.FRACTION -> number.fraction.toFloat().toDouble()
+      NumberWithUnits.NumberTypeCase.FRACTION -> number.fraction.toDouble()
       else -> throw IllegalArgumentException("Invalid number type: ${number.numberTypeCase.name}")
     }
   }

domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt

@@ -5,7 +5,7 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.approximatelyEquals
+import org.oppia.android.util.math.approximatelyEquals
 import javax.inject.Inject
 
 /**

domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt

@@ -6,7 +6,7 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.domain.classify.RuleClassifier
 import org.oppia.android.domain.classify.rules.GenericRuleClassifier
 import org.oppia.android.domain.classify.rules.RuleClassifierProvider
-import org.oppia.android.domain.util.toSimplestForm
+import org.oppia.android.util.math.toSimplestForm
 import javax.inject.Inject
 
 /**

domain/src/main/java/org/oppia/android/domain/locale/BUILD.bazel

@@ -17,7 +17,7 @@ kt_android_library(
         ":display_locale_impl",
         ":language_config_retriever",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger",
-        "//model:languages_java_proto_lite",
+        "//model/src/main/proto:languages_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/data:async_result",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
         "//utility/src/main/java/org/oppia/android/util/locale:oppia_locale",
@@ -64,7 +64,7 @@ kt_android_library(
         "//domain:domain_testing_visibility",
     ],
     deps = [
-        "//model:languages_java_proto_lite",
+        "//model/src/main/proto:languages_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/locale:oppia_locale",
     ],
 )
@@ -80,7 +80,7 @@ kt_android_library(
     deps = [
         ":dagger",
         "//config/src/java/org/oppia/android/config:languages_config",
-        "//model:languages_java_proto_lite",
+        "//model/src/main/proto:languages_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/caching:annotations",
         "//utility/src/main/java/org/oppia/android/util/caching:asset_repository",
     ],

domain/src/main/java/org/oppia/android/domain/onboarding/BUILD.bazel

@@ -15,7 +15,7 @@ kt_android_library(
         ":exploration_meta_data_retriever",
         "//data/src/main/java/org/oppia/android/data/persistence:cache_store",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger",
-        "//model:onboarding_java_proto_lite",
+        "//model/src/main/proto:onboarding_java_proto_lite",
         "//third_party:javax_inject_javax_inject",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
         "//utility/src/main/java/org/oppia/android/util/data:data_providers",

domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel

@@ -13,7 +13,7 @@ kt_android_library(
     visibility = ["//domain:__subpackages__"],
     deps = [
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:controller",
-        "//model:event_logger_java_proto_lite",
+        "//model/src/main/proto:event_logger_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/logging:console_logger",
     ],
 )

domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel

@@ -13,7 +13,7 @@ kt_android_library(
     deps = [
         "//data/src/main/java/org/oppia/android/data/persistence:cache_store",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:storage_module",
-        "//model:event_logger_java_proto_lite",
+        "//model/src/main/proto:event_logger_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
         "//utility/src/main/java/org/oppia/android/util/logging:console_logger",
         "//utility/src/main/java/org/oppia/android/util/logging:event_logger",