Fix oppia#1587 : Made intent/bundle/saved/tags instance keys consistent

The-Pascal · Aug 26, 2020 · 7206d49 · 7206d49
1 parent 9146ce8
commit 7206d49
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 24 deletions.
diff --git a/app/src/main/java/org/oppia/app/help/HelpActivity.kt b/app/src/main/java/org/oppia/app/help/HelpActivity.kt
@@ -28,7 +28,7 @@ class HelpActivity : InjectableAppCompatActivity(), RouteToFAQListListener {
  companion object {
  // TODO(#1655): Re-restrict access to fields in tests post-Gradle.
  const val BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY =
- "BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY"
+ "HelpActivity.bool_is_from_navigation_drawer"
 
  fun createHelpActivityIntent(
  context: Context,

diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionDialogFragment.kt b/app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
@@ -10,12 +10,18 @@ import org.oppia.app.fragment.InjectableDialogFragment
 import org.oppia.app.model.State
 import javax.inject.Inject
 
-private const val CURRENT_EXPANDED_LIST_INDEX_SAVED_KEY = "CURRENT_EXPANDED_LIST_INDEX"
-private const val STATE_SAVED_KEY = "STATE_SAVED_KEY"
-private const val HINT_INDEX_SAVED_KEY = "HINT_INDEX_SAVED_KEY"
-private const val IS_HINT_REVEALED_SAVED_KEY = "IS_HINT_REVEALED_SAVED_KEY"
-private const val SOLUTION_INDEX_SAVED_KEY = "SOLUTION_INDEX_SAVED_KEY"
-private const val IS_SOLUTION_REVEALED_SAVED_KEY = "IS_SOLUTION_REVEALED_SAVED_KEY"
+private const val CURRENT_EXPANDED_LIST_INDEX_SAVED_KEY =
+ "HintsAndSolutionDialogFragment.current_expanded_list_index"
+private const val STATE_SAVED_KEY =
+ "HintsAndSolutionDialogFragment.state"
+private const val HINT_INDEX_SAVED_KEY =
+ "HintsAndSolutionDialogFragment.hint_index"
+private const val IS_HINT_REVEALED_SAVED_KEY =
+ "HintsAndSolutionDialogFragment.is_hint_revealed"
+private const val SOLUTION_INDEX_SAVED_KEY =
+ "HintsAndSolutionDialogFragment.solution_index"
+private const val IS_SOLUTION_REVEALED_SAVED_KEY =
+ "HintsAndSolutionDialogFragment.is_solution_revealed"
 
 /* Fragment that displays a fullscreen dialog for Hints and Solutions. */
 class HintsAndSolutionDialogFragment :

diff --git a/app/src/main/java/org/oppia/app/options/OptionsActivity.kt b/app/src/main/java/org/oppia/app/options/OptionsActivity.kt
@@ -20,7 +20,7 @@ class OptionsActivity :
  companion object {
  // TODO(#1655): Re-restrict access to fields in tests post-Gradle.
  const val BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY =
- "BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY"
+ "OptionsActivity.bool_is_from_navigation_drawer"
 
  fun createOptionsActivity(
  context: Context,

diff --git a/app/src/main/java/org/oppia/app/player/audio/AudioFragmentPresenter.kt b/app/src/main/java/org/oppia/app/player/audio/AudioFragmentPresenter.kt
@@ -32,7 +32,8 @@ import javax.inject.Inject
 
 const val TAG_LANGUAGE_DIALOG = "LANGUAGE_DIALOG"
 private const val TAG_CELLULAR_DATA_DIALOG = "CELLULAR_DATA_DIALOG"
-const val AUDIO_FRAGMENT_PROFILE_ID_ARGUMENT_KEY = "AUDIO_FRAGMENT_PROFILE_ID_ARGUMENT_KEY"
+const val AUDIO_FRAGMENT_PROFILE_ID_ARGUMENT_KEY =
+ "AudioFragmentPresenter.audio_fragment_profile_id"
 
 /** The presenter for [AudioFragment]. */
 @FragmentScope

diff --git a/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
@@ -41,10 +41,10 @@ import org.oppia.util.parser.ExplorationHtmlParserEntityType
 import java.util.Date
 import javax.inject.Inject
 
-const val STATE_FRAGMENT_PROFILE_ID_ARGUMENT_KEY = "STATE_FRAGMENT_PROFILE_ID_ARGUMENT_KEY"
-const val STATE_FRAGMENT_TOPIC_ID_ARGUMENT_KEY = "STATE_FRAGMENT_TOPIC_ID_ARGUMENT_KEY"
-const val STATE_FRAGMENT_STORY_ID_ARGUMENT_KEY = "STATE_FRAGMENT_STORY_ID_ARGUMENT_KEY"
-const val STATE_FRAGMENT_EXPLORATION_ID_ARGUMENT_KEY = "STATE_FRAGMENT_EXPLORATION_ID_ARGUMENT_KEY"
+const val STATE_FRAGMENT_PROFILE_ID_ARGUMENT_KEY = "StateFragmentPresenter.profile_id"
+const val STATE_FRAGMENT_TOPIC_ID_ARGUMENT_KEY = "StateFragmentPresenter.topic_id"
+const val STATE_FRAGMENT_STORY_ID_ARGUMENT_KEY = "StateFragmentPresenter.story_id"
+const val STATE_FRAGMENT_EXPLORATION_ID_ARGUMENT_KEY = "StateFragmentPresenter.exploration_id"
 private const val TAG_AUDIO_FRAGMENT = "AUDIO_FRAGMENT"
 
 /** The presenter for [StateFragment]. */

diff --git a/app/src/main/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivity.kt b/app/src/main/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivity.kt
@@ -20,7 +20,8 @@ class TestFontScaleConfigurationUtilActivity : InjectableAppCompatActivity() {
  }
 
  companion object {
- private const val FONT_SCALE_EXTRA_KEY = "FONT_SCALE_EXTRA_KEY"
+ private const val FONT_SCALE_EXTRA_KEY = 
+ "TestFontScaleConfigurationUtilActivity.font_scale"
 
  /** Returns a new [TestFontScaleConfigurationUtilActivity] for context and reading text size. */
  fun createFontScaleTestActivity(context: Context, readingTextSize: String): Intent {

diff --git a/app/src/main/java/org/oppia/app/topic/TopicActivityPresenter.kt b/app/src/main/java/org/oppia/app/topic/TopicActivityPresenter.kt
@@ -8,9 +8,9 @@ import org.oppia.app.model.ProfileId
 import javax.inject.Inject
 
 const val TOPIC_FRAGMENT_TAG = "TopicFragment"
-const val PROFILE_ID_ARGUMENT_KEY = "profile_id"
-const val TOPIC_ID_ARGUMENT_KEY = "topic_id"
-const val STORY_ID_ARGUMENT_KEY = "story_id"
+const val PROFILE_ID_ARGUMENT_KEY = "TopicActivityPresenter.profile_id"
+const val TOPIC_ID_ARGUMENT_KEY = "TopicActivityPresenter.topic_id"
+const val STORY_ID_ARGUMENT_KEY = "TopicActivityPresenter.story_id"
 
 /** The presenter for [TopicActivity]. */
 @ActivityScope

diff --git a/app/src/main/java/org/oppia/app/topic/practice/TopicPracticeFragment.kt b/app/src/main/java/org/oppia/app/topic/practice/TopicPracticeFragment.kt
@@ -13,8 +13,8 @@ import javax.inject.Inject
 /** Fragment that displays skills for topic practice mode. */
 class TopicPracticeFragment : InjectableFragment() {
  companion object {
- internal const val SUBTOPIC_ID_LIST_ARGUMENT_KEY = "SUBTOPIC_ID_LIST_ARGUMENT_KEY"
- internal const val SKILL_ID_LIST_ARGUMENT_KEY = "SKILL_ID_LIST_ARGUMENT_KEY"
+ internal const val SUBTOPIC_ID_LIST_ARGUMENT_KEY = "TopicPracticeFragment.subtopic_id_list"
+ internal const val SKILL_ID_LIST_ARGUMENT_KEY = "TopicPracticeFragment.skill_id_list"
 
  /** Returns a new [TopicPracticeFragment]. */
  fun newInstance(internalProfileId: Int, topicId: String): TopicPracticeFragment {

diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardActivity.kt b/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardActivity.kt
@@ -38,9 +38,12 @@ class RevisionCardActivity : InjectableAppCompatActivity(), ReturnToTopicClickLi
  }
 
  companion object {
- internal const val INTERNAL_PROFILE_ID_EXTRA_KEY = "INTERNAL_PROFILE_ID_EXTRA_KEY"
- internal const val TOPIC_ID_EXTRA_KEY = "TOPIC_ID_EXTRA_KEY"
- internal const val SUBTOPIC_ID_EXTRA_KEY = "SUBTOPIC_ID_EXTRA_KEY"
+ internal const val INTERNAL_PROFILE_ID_EXTRA_KEY =
+ "RevisionCardActivity.internal_profile_id"
+ internal const val TOPIC_ID_EXTRA_KEY = 
+ "RevisionCardActivity.topic_id"
+ internal const val SUBTOPIC_ID_EXTRA_KEY = 
+ "RevisionCardActivity.subtopic_id"
 
  /** Returns a new [Intent] to route to [RevisionCardActivity]. */
  fun createRevisionCardActivityIntent(

diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragment.kt b/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragment.kt
@@ -11,8 +11,8 @@ import javax.inject.Inject
 /* Fragment that displays revision card */
 class RevisionCardFragment : InjectableDialogFragment() {
  companion object {
- internal const val TOPIC_ID_ARGUMENT_KEY = "TOPIC_ID_ARGUMENT_KEY"
- internal const val SUBTOPIC_ID_ARGUMENT_KEY = "SUBOPIC_ID_ARGUMENT_KEY"
+ internal const val TOPIC_ID_ARGUMENT_KEY = "RevisionCardFragment.topic_id"
+ internal const val SUBTOPIC_ID_ARGUMENT_KEY = "RevisionCardFragment.subtopic_id"
 
  /** Returns a new [RevisionCardFragment] to display the subtopic content.. */
  fun newInstance(topicId: String, subtopicId: Int): RevisionCardFragment {