diff --git a/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt index f0e04951f5c..3a6c05dfcc7 100644 --- a/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt @@ -16,9 +16,9 @@ class AppLanguageActivity : InjectableAppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) activityComponent.inject(this) - prefKey = intent.getStringExtra(KEY_APP_LANGUAGE_PREFERENCE_TITLE) + prefKey = intent.getStringExtra(APP_LANGUAGE_PREFERENCE_TITLE_EXTRA_KEY) prefSummaryValue = if (savedInstanceState == null) { - intent.getStringExtra(KEY_APP_LANGUAGE_PREFERENCE_SUMMARY_VALUE) + intent.getStringExtra(APP_LANGUAGE_PREFERENCE_SUMMARY_VALUE_EXTRA_KEY) } else { savedInstanceState.get(KEY_SELECTED_LANGUAGE) as String } @@ -26,10 +26,12 @@ class AppLanguageActivity : InjectableAppCompatActivity() { } companion object { - internal const val KEY_APP_LANGUAGE_PREFERENCE_TITLE = "APP_LANGUAGE_PREFERENCE" - internal const val KEY_APP_LANGUAGE_PREFERENCE_SUMMARY_VALUE = - "APP_LANGUAGE_PREFERENCE_SUMMARY_VALUE" + internal const val APP_LANGUAGE_PREFERENCE_TITLE_EXTRA_KEY = + "AppLanguageActivity.app_language_preference_title" + internal const val APP_LANGUAGE_PREFERENCE_SUMMARY_VALUE_EXTRA_KEY = + "AppLanguageActivity.app_language_preference_summary_value" internal const val KEY_SELECTED_LANGUAGE = "SELECTED_LANGUAGE" + /** Returns a new [Intent] to route to [AppLanguageActivity]. */ fun createAppLanguageActivityIntent( context: Context, @@ -37,8 +39,8 @@ class AppLanguageActivity : InjectableAppCompatActivity() { summaryValue: String? ): Intent { val intent = Intent(context, AppLanguageActivity::class.java) - intent.putExtra(KEY_APP_LANGUAGE_PREFERENCE_TITLE, prefKey) - intent.putExtra(KEY_APP_LANGUAGE_PREFERENCE_SUMMARY_VALUE, summaryValue) + intent.putExtra(APP_LANGUAGE_PREFERENCE_TITLE_EXTRA_KEY, prefKey) + intent.putExtra(APP_LANGUAGE_PREFERENCE_SUMMARY_VALUE_EXTRA_KEY, summaryValue) return intent } } @@ -46,7 +48,7 @@ class AppLanguageActivity : InjectableAppCompatActivity() { override fun onBackPressed() { val message = appLanguageActivityPresenter.getLanguageSelected() val intent = Intent() - intent.putExtra(KEY_MESSAGE_APP_LANGUAGE, message) + intent.putExtra(MESSAGE_APP_LANGUAGE_ARGUMENT_KEY, message) setResult(REQUEST_CODE_APP_LANGUAGE, intent) finish() } diff --git a/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt index 900357b5cfb..bf8ff6e0a4d 100644 --- a/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt @@ -35,7 +35,7 @@ class AppLanguageFragmentPresenter @Inject constructor(private val fragment: Fra binding.appLanguageToolbar?.setNavigationOnClickListener { val message = languageSelectionAdapter.getSelectedLanguage() val intent = Intent() - intent.putExtra(KEY_MESSAGE_APP_LANGUAGE, message) + intent.putExtra(MESSAGE_APP_LANGUAGE_ARGUMENT_KEY, message) (fragment.activity as AppLanguageActivity).setResult(REQUEST_CODE_APP_LANGUAGE, intent) (fragment.activity as AppLanguageActivity).finish() } diff --git a/app/src/main/java/org/oppia/android/app/options/AudioLanguageActivity.kt b/app/src/main/java/org/oppia/android/app/options/AudioLanguageActivity.kt index b1f65ad6cb9..d0aa5b49457 100644 --- a/app/src/main/java/org/oppia/android/app/options/AudioLanguageActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/AudioLanguageActivity.kt @@ -54,7 +54,7 @@ class AudioLanguageActivity : InjectableAppCompatActivity() { override fun onBackPressed() { val message = audioLanguageActivityPresenter.getLanguageSelected() val intent = Intent() - intent.putExtra(KEY_MESSAGE_AUDIO_LANGUAGE, message) + intent.putExtra(MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY, message) setResult(REQUEST_CODE_AUDIO_LANGUAGE, intent) finish() } diff --git a/app/src/main/java/org/oppia/android/app/options/AudioLanguageFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AudioLanguageFragmentPresenter.kt index 68a2786724f..b23f9ca4bc4 100644 --- a/app/src/main/java/org/oppia/android/app/options/AudioLanguageFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/AudioLanguageFragmentPresenter.kt @@ -36,7 +36,7 @@ class AudioLanguageFragmentPresenter @Inject constructor(private val fragment: F binding.audioLanguageToolbar?.setNavigationOnClickListener { val message = languageSelectionAdapter.getSelectedLanguage() val intent = Intent() - intent.putExtra(KEY_MESSAGE_AUDIO_LANGUAGE, message) + intent.putExtra(MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY, message) (fragment.activity as AudioLanguageActivity).setResult(REQUEST_CODE_AUDIO_LANGUAGE, intent) (fragment.activity as AudioLanguageActivity).finish() } diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt b/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt index 09c9ca6c2f7..88688163c65 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt @@ -34,7 +34,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_extra_key" fun createOptionsActivity( context: Context, @@ -77,15 +77,15 @@ class OptionsActivity : super.onActivityResult(requestCode, resultCode, data) when (requestCode) { REQUEST_CODE_TEXT_SIZE -> { - val textSize = data!!.getStringExtra(KEY_MESSAGE_READING_TEXT_SIZE) as String + val textSize = data!!.getStringExtra(MESSAGE_READING_TEXT_SIZE_ARGUMENT_KEY) as String optionActivityPresenter.updateReadingTextSize(textSize) } REQUEST_CODE_APP_LANGUAGE -> { - val appLanguage = data!!.getStringExtra(KEY_MESSAGE_APP_LANGUAGE) as String + val appLanguage = data!!.getStringExtra(MESSAGE_APP_LANGUAGE_ARGUMENT_KEY) as String optionActivityPresenter.updateAppLanguage(appLanguage) } else -> { - val audioLanguage = data!!.getStringExtra(KEY_MESSAGE_AUDIO_LANGUAGE) as String + val audioLanguage = data!!.getStringExtra(MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY) as String optionActivityPresenter.updateAudioLanguage(audioLanguage) } } diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt b/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt index b84726c4507..4c52acd54c7 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt @@ -8,9 +8,9 @@ import android.view.ViewGroup import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject -const val KEY_MESSAGE_READING_TEXT_SIZE = "TEXT_SIZE" -const val KEY_MESSAGE_APP_LANGUAGE = "APP_LANGUAGE" -const val KEY_MESSAGE_AUDIO_LANGUAGE = "AUDIO_LANGUAGE" +const val MESSAGE_READING_TEXT_SIZE_ARGUMENT_KEY = "OptionsFragment.message_reading_text_size" +const val MESSAGE_APP_LANGUAGE_ARGUMENT_KEY = "OptionsFragment.message_app_language" +const val MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY = "OptionsFragment.message_audio_language" const val REQUEST_CODE_TEXT_SIZE = 1 const val REQUEST_CODE_APP_LANGUAGE = 2 const val REQUEST_CODE_AUDIO_LANGUAGE = 3 diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt index 06971c85e2e..bac045ec82e 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt @@ -56,7 +56,7 @@ class ReadingTextSizeActivity : InjectableAppCompatActivity() { override fun onBackPressed() { val message = readingTextSizeActivityPresenter.getSelectedReadingTextSize() val intent = Intent() - intent.putExtra(KEY_MESSAGE_READING_TEXT_SIZE, message) + intent.putExtra(MESSAGE_READING_TEXT_SIZE_ARGUMENT_KEY, message) setResult(REQUEST_CODE_TEXT_SIZE, intent) finish() } diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt index aea366f4616..912921855b9 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt @@ -37,7 +37,7 @@ class ReadingTextSizeFragmentPresenter @Inject constructor(private val fragment: binding.readingTextSizeToolbar?.setNavigationOnClickListener { val intent = Intent() - intent.putExtra(KEY_MESSAGE_READING_TEXT_SIZE, fontSize) + intent.putExtra(MESSAGE_READING_TEXT_SIZE_ARGUMENT_KEY, fontSize) (fragment.activity as ReadingTextSizeActivity).setResult(REQUEST_CODE_TEXT_SIZE, intent) (fragment.activity as ReadingTextSizeActivity).finish() } diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt index 76bfd5890aa..aa40363033a 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt @@ -17,10 +17,14 @@ import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener import javax.inject.Inject -internal const val TEST_ACTIVITY_PROFILE_ID_EXTRA = "StateFragmentTestActivity.profile_id" -internal const val TEST_ACTIVITY_TOPIC_ID_EXTRA = "StateFragmentTestActivity.topic_id" -internal const val TEST_ACTIVITY_STORY_ID_EXTRA = "StateFragmentTestActivity.story_id" -internal const val TEST_ACTIVITY_EXPLORATION_ID_EXTRA = "StateFragmentTestActivity.exploration_id" +internal const val TEST_ACTIVITY_PROFILE_ID_EXTRA_KEY = + "StateFragmentTestActivity.test_activity_profile_id" +internal const val TEST_ACTIVITY_TOPIC_ID_EXTRA_KEY = + "StateFragmentTestActivity.test_activity_topic_id" +internal const val TEST_ACTIVITY_STORY_ID_EXTRA_KEY = + "StateFragmentTestActivity.test_activity_story_id" +internal const val TEST_ACTIVITY_EXPLORATION_ID_EXTRA_KEY = + "StateFragmentTestActivity.test_activity_exploration_id" /** Test Activity used for testing StateFragment */ class StateFragmentTestActivity : @@ -33,7 +37,8 @@ class StateFragmentTestActivity : RevealHintListener, RevealSolutionInterface, HintsAndSolutionExplorationManagerListener { - @Inject lateinit var stateFragmentTestActivityPresenter: StateFragmentTestActivityPresenter + @Inject + lateinit var stateFragmentTestActivityPresenter: StateFragmentTestActivityPresenter private lateinit var state: State override fun onCreate(savedInstanceState: Bundle?) { @@ -55,10 +60,10 @@ class StateFragmentTestActivity : explorationId: String ): Intent { val intent = Intent(context, StateFragmentTestActivity::class.java) - intent.putExtra(TEST_ACTIVITY_PROFILE_ID_EXTRA, profileId) - intent.putExtra(TEST_ACTIVITY_TOPIC_ID_EXTRA, topicId) - intent.putExtra(TEST_ACTIVITY_STORY_ID_EXTRA, storyId) - intent.putExtra(TEST_ACTIVITY_EXPLORATION_ID_EXTRA, explorationId) + intent.putExtra(TEST_ACTIVITY_PROFILE_ID_EXTRA_KEY, profileId) + intent.putExtra(TEST_ACTIVITY_TOPIC_ID_EXTRA_KEY, topicId) + intent.putExtra(TEST_ACTIVITY_STORY_ID_EXTRA_KEY, storyId) + intent.putExtra(TEST_ACTIVITY_EXPLORATION_ID_EXTRA_KEY, explorationId) return intent } } diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt index d25d68d172c..6a366fda7f4 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt @@ -39,11 +39,14 @@ class StateFragmentTestActivityPresenter @Inject constructor( viewModel = getStateFragmentTestViewModel() } - val profileId = activity.intent.getIntExtra(TEST_ACTIVITY_PROFILE_ID_EXTRA, 1) - val topicId = activity.intent.getStringExtra(TEST_ACTIVITY_TOPIC_ID_EXTRA) ?: TEST_TOPIC_ID_0 - val storyId = activity.intent.getStringExtra(TEST_ACTIVITY_STORY_ID_EXTRA) ?: TEST_STORY_ID_0 + val profileId = activity.intent.getIntExtra(TEST_ACTIVITY_PROFILE_ID_EXTRA_KEY, 1) + val topicId = + activity.intent.getStringExtra(TEST_ACTIVITY_TOPIC_ID_EXTRA_KEY) ?: TEST_TOPIC_ID_0 + val storyId = + activity.intent.getStringExtra(TEST_ACTIVITY_STORY_ID_EXTRA_KEY) ?: TEST_STORY_ID_0 val explorationId = - activity.intent.getStringExtra(TEST_ACTIVITY_EXPLORATION_ID_EXTRA) ?: TEST_EXPLORATION_ID_2 + activity.intent.getStringExtra(TEST_ACTIVITY_EXPLORATION_ID_EXTRA_KEY) + ?: TEST_EXPLORATION_ID_2 activity.findViewById