From 2b32d868df585048584a0929f21ec8a155ec5aa5 Mon Sep 17 00:00:00 2001 From: janewaitara Date: Sun, 31 Jan 2021 00:23:40 +0300 Subject: [PATCH 1/7] Made intent keys consistent in the topic package --- .../oppia/android/app/topic/TopicActivity.kt | 18 +++++++++--------- .../questionplayer/QuestionPlayerActivity.kt | 8 ++++---- .../QuestionPlayerActivityPresenter.kt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt index a158d2fa7e3..eaa6873ad83 100755 --- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt @@ -12,8 +12,8 @@ import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity import org.oppia.android.app.topic.revisioncard.RevisionCardActivity import javax.inject.Inject -private const val TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY = "TopicActivity.topic_id" -private const val TOPIC_ACTIVITY_STORY_ID_ARGUMENT_KEY = "TopicActivity.story_id" +private const val TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY = "TopicActivity.topic_activity_topic_id" +private const val TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY = "TopicActivity.topic_activity_story_id" /** The activity for displaying [TopicFragment]. */ class TopicActivity : @@ -34,10 +34,10 @@ class TopicActivity : super.onCreate(savedInstanceState) activityComponent.inject(this) internalProfileId = intent?.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1)!! - topicId = checkNotNull(intent?.getStringExtra(TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY)) { + topicId = checkNotNull(intent?.getStringExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY)) { "Expected topic ID to be included in intent for TopicActivity." } - storyId = intent?.getStringExtra(TOPIC_ACTIVITY_STORY_ID_ARGUMENT_KEY) + storyId = intent?.getStringExtra(TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY) topicActivityPresenter.handleOnCreate(internalProfileId, topicId, storyId) } @@ -102,11 +102,11 @@ class TopicActivity : } fun getTopicIdKey(): String { - return TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY + return TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY } fun getStoryIdKey(): String { - return TOPIC_ACTIVITY_STORY_ID_ARGUMENT_KEY + return TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY } /** Returns a new [Intent] to route to [TopicActivity] for a specified topic ID. */ @@ -117,7 +117,7 @@ class TopicActivity : ): Intent { val intent = Intent(context, TopicActivity::class.java) intent.putExtra(KEY_NAVIGATION_PROFILE_ID, internalProfileId) - intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY, topicId) + intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY, topicId) return intent } @@ -130,8 +130,8 @@ class TopicActivity : ): Intent { val intent = Intent(context, TopicActivity::class.java) intent.putExtra(KEY_NAVIGATION_PROFILE_ID, internalProfileId) - intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY, topicId) - intent.putExtra(TOPIC_ACTIVITY_STORY_ID_ARGUMENT_KEY, storyId) + intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY, topicId) + intent.putExtra(TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY, storyId) return intent } } diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt index 62aed237402..0a17bff0216 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt @@ -18,8 +18,8 @@ import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener import org.oppia.android.app.topic.conceptcard.ConceptCardListener import javax.inject.Inject -const val QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY = - "QuestionPlayerActivity.skill_id_list" +const val QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY = + "QuestionPlayerActivity.question_player_activity_skill_id_list" private const val TAG_STOP_TRAINING_SESSION_DIALOG = "STOP_TRAINING_SESSION_DIALOG" /** Activity for QuestionPlayer in train mode. */ @@ -74,12 +74,12 @@ class QuestionPlayerActivity : skillIdList: ArrayList ): Intent { val intent = Intent(context, QuestionPlayerActivity::class.java) - intent.putExtra(QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY, skillIdList) + intent.putExtra(QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY, skillIdList) return intent } fun getIntentKey(): String { - return QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY + return QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY } } diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt index a4f927c79f4..2bf4213299b 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt @@ -86,7 +86,7 @@ class QuestionPlayerActivityPresenter @Inject constructor( private fun startTrainingSessionWithCallback(callback: () -> Unit) { val skillIds = - activity.intent.getStringArrayListExtra(QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY) + activity.intent.getStringArrayListExtra(QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY) questionTrainingController.startQuestionTrainingSession(skillIds).observe( activity, Observer { From 43314827e75d3e2dd1973ae49e5fc67612916981 Mon Sep 17 00:00:00 2001 From: janewaitara Date: Sun, 31 Jan 2021 00:30:26 +0300 Subject: [PATCH 2/7] Made intent keys consistent in the testing package --- .../oppia/android/app/testing/AudioFragmentTestActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt index b0ea2fc8d53..d34cfad0a50 100644 --- a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt @@ -6,7 +6,7 @@ import android.os.Bundle import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject -const val KEY_AUDIO_FRAGMENT_TEST_PROFILE_ID = "KEY_AUDIO_FRAGMENT_TEST_PROFILE_ID" +const val AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY = "AudioFragmentTestActivity.audio_fragment_test_profile_id" /** Test Activity used for testing AudioFragment */ class AudioFragmentTestActivity : InjectableAppCompatActivity() { @@ -18,14 +18,14 @@ class AudioFragmentTestActivity : InjectableAppCompatActivity() { super.onCreate(savedInstanceState) activityComponent.inject(this) val internalProfileId = - intent.getIntExtra(KEY_AUDIO_FRAGMENT_TEST_PROFILE_ID, /* defaultValue= */ -1) + intent.getIntExtra(AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY, /* defaultValue= */ -1) audioFragmentTestActivityController.handleOnCreate(internalProfileId) } companion object { fun createAudioFragmentTestActivity(context: Context, internalProfileId: Int?): Intent { val intent = Intent(context, AudioFragmentTestActivity::class.java) - intent.putExtra(KEY_AUDIO_FRAGMENT_TEST_PROFILE_ID, internalProfileId) + intent.putExtra(AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY, internalProfileId) return intent } } From 2038d466d502ce2f9dd240212ee59d71cfae35af Mon Sep 17 00:00:00 2001 From: janewaitara Date: Sun, 31 Jan 2021 00:36:25 +0300 Subject: [PATCH 3/7] Made intent keys consistent in the drawer package --- .../AdministratorControlsActivity.kt | 6 +++--- .../AdministratorControlsFragmentPresenter.kt | 4 ++-- .../app/drawer/NavigationDrawerFragmentPresenter.kt | 5 +++-- .../java/org/oppia/android/app/help/HelpActivity.kt | 4 ++-- .../java/org/oppia/android/app/home/HomeActivity.kt | 6 +++--- .../oppia/android/app/home/HomeFragmentPresenter.kt | 4 ++-- .../android/app/mydownloads/MyDownloadsActivity.kt | 8 ++++---- .../org/oppia/android/app/options/OptionsActivity.kt | 4 ++-- .../android/app/options/OptionsFragmentPresenter.kt | 4 ++-- .../oppia/android/app/shim/IntentFactoryShimImpl.kt | 6 +++--- .../android/app/testing/AudioFragmentTestActivity.kt | 3 ++- .../app/testing/NavigationDrawerTestActivity.kt | 6 +++--- .../java/org/oppia/android/app/topic/TopicActivity.kt | 10 +++++----- 13 files changed, 36 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt index 35fa87c4b31..fcdd329614d 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt @@ -7,7 +7,7 @@ import android.view.Menu import org.oppia.android.R import org.oppia.android.app.activity.InjectableAppCompatActivity import org.oppia.android.app.administratorcontrols.appversion.AppVersionActivity -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.settings.profile.ProfileListActivity import javax.inject.Inject @@ -58,12 +58,12 @@ class AdministratorControlsActivity : companion object { fun createAdministratorControlsActivityIntent(context: Context, profileId: Int?): Intent { val intent = Intent(context, AdministratorControlsActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, profileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, profileId) return intent } fun getIntentKey(): String { - return KEY_NAVIGATION_PROFILE_ID + return NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY } } diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt index 9de4a6fa2fc..d08d21319fd 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt @@ -12,7 +12,7 @@ import org.oppia.android.app.administratorcontrols.administratorcontrolsitemview import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsItemViewModel import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.fragment.FragmentScope import org.oppia.android.app.model.ProfileId import org.oppia.android.app.recyclerview.BindableAdapter @@ -52,7 +52,7 @@ class AdministratorControlsFragmentPresenter @Inject constructor( /* attachToRoot= */ false ) - internalProfileId = activity.intent.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1) + internalProfileId = activity.intent.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1) profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build() administratorControlsViewModel.setProfileId(profileId) diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt index 7032676f0e8..102f193716b 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt @@ -38,7 +38,8 @@ import org.oppia.android.util.logging.ConsoleLogger import org.oppia.android.util.statusbar.StatusBarColor import javax.inject.Inject -const val KEY_NAVIGATION_PROFILE_ID = "KEY_NAVIGATION_PROFILE_ID" +const val NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY = + "NavigationDrawerFragment.navigation_profile_id" const val TAG_SWITCH_PROFILE_DIALOG = "SWITCH_PROFILE_DIALOG" /** The presenter for [NavigationDrawerFragment]. */ @@ -65,7 +66,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor( fragment.setHasOptionsMenu(true) - internalProfileId = activity.intent.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1) + internalProfileId = activity.intent.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1) profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build() val headerBinding = diff --git a/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt index c2b27dd47ae..d5ddee6c909 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Bundle import org.oppia.android.R import org.oppia.android.app.activity.InjectableAppCompatActivity -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.help.faq.FAQListActivity import javax.inject.Inject @@ -36,7 +36,7 @@ class HelpActivity : InjectableAppCompatActivity(), RouteToFAQListListener { isFromNavigationDrawer: Boolean ): Intent { val intent = Intent(context, HelpActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, profileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, profileId) intent.putExtra(BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY, isFromNavigationDrawer) return intent } diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt index 164af1622e7..c7f7e755562 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt @@ -6,7 +6,7 @@ import android.os.Bundle import org.oppia.android.R import org.oppia.android.app.activity.InjectableAppCompatActivity import org.oppia.android.app.drawer.ExitProfileDialogFragment -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.drawer.TAG_SWITCH_PROFILE_DIALOG import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.topic.TopicActivity @@ -25,7 +25,7 @@ class HomeActivity : companion object { fun createHomeActivity(context: Context, profileId: Int?): Intent { val intent = Intent(context, HomeActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, profileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, profileId) return intent } } @@ -33,7 +33,7 @@ class HomeActivity : override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) activityComponent.inject(this) - internalProfileId = intent?.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1)!! + internalProfileId = intent?.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1)!! homeActivityPresenter.handleOnCreate() title = getString(R.string.menu_home) } diff --git a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt index d1c0898080d..b205908c899 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt @@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager import org.oppia.android.R -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.fragment.FragmentScope import org.oppia.android.app.home.promotedlist.PromotedStoryListViewModel import org.oppia.android.app.home.topiclist.AllTopicsViewModel @@ -51,7 +51,7 @@ class HomeFragmentPresenter @Inject constructor( // NB: Both the view model and lifecycle owner must be set in order to correctly bind LiveData elements to // data-bound view models. - internalProfileId = activity.intent.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1) + internalProfileId = activity.intent.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1) logHomeActivityEvent() val homeViewModel = HomeViewModel( diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt index 4e3c8e7f812..5d1549e9b6f 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import org.oppia.android.app.activity.InjectableAppCompatActivity -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.home.HomeActivity import javax.inject.Inject @@ -18,18 +18,18 @@ class MyDownloadsActivity : InjectableAppCompatActivity() { super.onCreate(savedInstanceState) activityComponent.inject(this) myDownloadsActivityPresenter.handleOnCreate() - internalProfileId = intent.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1) + internalProfileId = intent.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1) } companion object { fun createMyDownloadsActivityIntent(context: Context, profileId: Int?): Intent { val intent = Intent(context, MyDownloadsActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, profileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, profileId) return intent } fun getIntentKey(): String { - return KEY_NAVIGATION_PROFILE_ID + return NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY } } 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 88688163c65..524c8dccfcd 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 @@ -6,7 +6,7 @@ import android.os.Bundle import android.widget.TextView import org.oppia.android.R import org.oppia.android.app.activity.InjectableAppCompatActivity -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import javax.inject.Inject private const val SELECTED_OPTIONS_TITLE_SAVED_KEY = "OptionsActivity.selected_options_title" @@ -42,7 +42,7 @@ class OptionsActivity : isFromNavigationDrawer: Boolean ): Intent { val intent = Intent(context, OptionsActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, profileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, profileId) intent.putExtra(BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY, isFromNavigationDrawer) return intent } diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt index f578549effc..7fa26b3c419 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt @@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.recyclerview.widget.RecyclerView -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.fragment.FragmentScope import org.oppia.android.app.model.AppLanguage import org.oppia.android.app.model.AudioLanguage @@ -72,7 +72,7 @@ class OptionsFragmentPresenter @Inject constructor( /* attachToRoot= */ false ) - internalProfileId = activity.intent.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1) + internalProfileId = activity.intent.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1) profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build() viewModel.setProfileId(profileId) diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt index 2f9d758efdb..db2ef777398 100644 --- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt +++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt @@ -3,7 +3,7 @@ package org.oppia.android.app.shim import android.content.Context import android.content.Intent import androidx.fragment.app.FragmentActivity -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.profile.ProfileChooserActivity import org.oppia.android.app.topic.TopicActivity @@ -39,7 +39,7 @@ class IntentFactoryShimImpl @Inject constructor() : IntentFactoryShim { storyId: String ): Intent { val intent = Intent(context, TopicActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, internalProfileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, internalProfileId) intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY, topicId) intent.putExtra(TOPIC_ACTIVITY_STORY_ID_ARGUMENT_KEY, storyId) return intent @@ -54,7 +54,7 @@ class IntentFactoryShimImpl @Inject constructor() : IntentFactoryShim { topicId: String ): Intent { val intent = Intent(context, TopicActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, internalProfileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, internalProfileId) intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY, topicId) return intent } diff --git a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt index d34cfad0a50..968025ae291 100644 --- a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt @@ -6,7 +6,8 @@ import android.os.Bundle import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject -const val AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY = "AudioFragmentTestActivity.audio_fragment_test_profile_id" +const val AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY = + "AudioFragmentTestActivity.audio_fragment_test_profile_id" /** Test Activity used for testing AudioFragment */ class AudioFragmentTestActivity : InjectableAppCompatActivity() { diff --git a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt index 2149dba653e..9f8bbd47791 100644 --- a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Bundle import org.oppia.android.R import org.oppia.android.app.activity.InjectableAppCompatActivity -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.home.HomeActivityPresenter import org.oppia.android.app.home.RouteToTopicListener import org.oppia.android.app.topic.TopicActivity @@ -19,7 +19,7 @@ class NavigationDrawerTestActivity : InjectableAppCompatActivity(), RouteToTopic companion object { fun createNavigationDrawerTestActivity(context: Context, profileId: Int?): Intent { val intent = Intent(context, NavigationDrawerTestActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, profileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, profileId) return intent } } @@ -27,7 +27,7 @@ class NavigationDrawerTestActivity : InjectableAppCompatActivity(), RouteToTopic override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) activityComponent.inject(this) - internalProfileId = intent?.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1)!! + internalProfileId = intent?.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1)!! homeActivityPresenter.handleOnCreate() title = getString(R.string.menu_home) } diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt index eaa6873ad83..25e2e638834 100755 --- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import org.oppia.android.app.activity.InjectableAppCompatActivity -import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.drawer.NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY import org.oppia.android.app.home.RouteToExplorationListener import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.story.StoryActivity @@ -33,7 +33,7 @@ class TopicActivity : override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) activityComponent.inject(this) - internalProfileId = intent?.getIntExtra(KEY_NAVIGATION_PROFILE_ID, -1)!! + internalProfileId = intent?.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1)!! topicId = checkNotNull(intent?.getStringExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY)) { "Expected topic ID to be included in intent for TopicActivity." } @@ -98,7 +98,7 @@ class TopicActivity : companion object { fun getProfileIdKey(): String { - return KEY_NAVIGATION_PROFILE_ID + return NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY } fun getTopicIdKey(): String { @@ -116,7 +116,7 @@ class TopicActivity : topicId: String ): Intent { val intent = Intent(context, TopicActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, internalProfileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, internalProfileId) intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY, topicId) return intent } @@ -129,7 +129,7 @@ class TopicActivity : storyId: String ): Intent { val intent = Intent(context, TopicActivity::class.java) - intent.putExtra(KEY_NAVIGATION_PROFILE_ID, internalProfileId) + intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, internalProfileId) intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY, topicId) intent.putExtra(TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY, storyId) return intent From 76b9fec53d9423cb377e80ee82226029aeb2b813 Mon Sep 17 00:00:00 2001 From: janewaitara Date: Fri, 5 Feb 2021 19:24:46 +0300 Subject: [PATCH 4/7] Corrected the naming in the topic package --- .../oppia/android/app/topic/TopicActivity.kt | 18 +++++++++--------- .../questionplayer/QuestionPlayerActivity.kt | 6 +++--- .../QuestionPlayerActivityPresenter.kt | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt index 25e2e638834..d87ca8217b0 100755 --- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt @@ -12,8 +12,8 @@ import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity import org.oppia.android.app.topic.revisioncard.RevisionCardActivity import javax.inject.Inject -private const val TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY = "TopicActivity.topic_activity_topic_id" -private const val TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY = "TopicActivity.topic_activity_story_id" +private const val INTERNAL_TOPIC_ID_EXTRA_KEY = "TopicActivity.topic_activity_topic_id" +private const val INTERNAL_STORY_ID_EXTRA_KEY = "TopicActivity.topic_activity_story_id" /** The activity for displaying [TopicFragment]. */ class TopicActivity : @@ -34,10 +34,10 @@ class TopicActivity : super.onCreate(savedInstanceState) activityComponent.inject(this) internalProfileId = intent?.getIntExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, -1)!! - topicId = checkNotNull(intent?.getStringExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY)) { + topicId = checkNotNull(intent?.getStringExtra(INTERNAL_TOPIC_ID_EXTRA_KEY)) { "Expected topic ID to be included in intent for TopicActivity." } - storyId = intent?.getStringExtra(TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY) + storyId = intent?.getStringExtra(INTERNAL_STORY_ID_EXTRA_KEY) topicActivityPresenter.handleOnCreate(internalProfileId, topicId, storyId) } @@ -102,11 +102,11 @@ class TopicActivity : } fun getTopicIdKey(): String { - return TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY + return INTERNAL_TOPIC_ID_EXTRA_KEY } fun getStoryIdKey(): String { - return TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY + return INTERNAL_STORY_ID_EXTRA_KEY } /** Returns a new [Intent] to route to [TopicActivity] for a specified topic ID. */ @@ -117,7 +117,7 @@ class TopicActivity : ): Intent { val intent = Intent(context, TopicActivity::class.java) intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, internalProfileId) - intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY, topicId) + intent.putExtra(INTERNAL_TOPIC_ID_EXTRA_KEY, topicId) return intent } @@ -130,8 +130,8 @@ class TopicActivity : ): Intent { val intent = Intent(context, TopicActivity::class.java) intent.putExtra(NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY, internalProfileId) - intent.putExtra(TOPIC_ACTIVITY_TOPIC_ID_EXTRA_KEY, topicId) - intent.putExtra(TOPIC_ACTIVITY_STORY_ID_EXTRA_KEY, storyId) + intent.putExtra(INTERNAL_TOPIC_ID_EXTRA_KEY, topicId) + intent.putExtra(INTERNAL_STORY_ID_EXTRA_KEY, storyId) return intent } } diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt index 0a17bff0216..4f16ceee82c 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt @@ -18,7 +18,7 @@ import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener import org.oppia.android.app.topic.conceptcard.ConceptCardListener import javax.inject.Inject -const val QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY = +const val INTERNAL_SKILL_ID_LIST_EXTRA_KEY = "QuestionPlayerActivity.question_player_activity_skill_id_list" private const val TAG_STOP_TRAINING_SESSION_DIALOG = "STOP_TRAINING_SESSION_DIALOG" @@ -74,12 +74,12 @@ class QuestionPlayerActivity : skillIdList: ArrayList ): Intent { val intent = Intent(context, QuestionPlayerActivity::class.java) - intent.putExtra(QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY, skillIdList) + intent.putExtra(INTERNAL_SKILL_ID_LIST_EXTRA_KEY, skillIdList) return intent } fun getIntentKey(): String { - return QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY + return INTERNAL_SKILL_ID_LIST_EXTRA_KEY } } diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt index 2bf4213299b..439f2f6cc26 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt @@ -86,7 +86,7 @@ class QuestionPlayerActivityPresenter @Inject constructor( private fun startTrainingSessionWithCallback(callback: () -> Unit) { val skillIds = - activity.intent.getStringArrayListExtra(QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_EXTRA_KEY) + activity.intent.getStringArrayListExtra(INTERNAL_SKILL_ID_LIST_EXTRA_KEY) questionTrainingController.startQuestionTrainingSession(skillIds).observe( activity, Observer { From aa396b3a4ad27c27ec7133020a37bfd8fd1010ba Mon Sep 17 00:00:00 2001 From: janewaitara Date: Fri, 5 Feb 2021 19:26:48 +0300 Subject: [PATCH 5/7] Corrected the naming in the testing package --- .../oppia/android/app/testing/AudioFragmentTestActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt index 968025ae291..a0a7213f3bb 100644 --- a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt @@ -6,7 +6,7 @@ import android.os.Bundle import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject -const val AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY = +const val INTERNAL_PROFILE_ID_EXTRA_KEY = "AudioFragmentTestActivity.audio_fragment_test_profile_id" /** Test Activity used for testing AudioFragment */ @@ -19,14 +19,14 @@ class AudioFragmentTestActivity : InjectableAppCompatActivity() { super.onCreate(savedInstanceState) activityComponent.inject(this) val internalProfileId = - intent.getIntExtra(AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY, /* defaultValue= */ -1) + intent.getIntExtra(INTERNAL_PROFILE_ID_EXTRA_KEY, /* defaultValue= */ -1) audioFragmentTestActivityController.handleOnCreate(internalProfileId) } companion object { fun createAudioFragmentTestActivity(context: Context, internalProfileId: Int?): Intent { val intent = Intent(context, AudioFragmentTestActivity::class.java) - intent.putExtra(AUDIO_FRAGMENT_TEST_PROFILE_ID_EXTRA_KEY, internalProfileId) + intent.putExtra(INTERNAL_PROFILE_ID_EXTRA_KEY, internalProfileId) return intent } } From 0c3fa0371632c89c6894932552a27b125859e4b0 Mon Sep 17 00:00:00 2001 From: janewaitara Date: Fri, 5 Feb 2021 19:56:47 +0300 Subject: [PATCH 6/7] Corrected the naming of const value in topic and test packages --- .../oppia/android/app/testing/AudioFragmentTestActivity.kt | 2 +- .../main/java/org/oppia/android/app/topic/TopicActivity.kt | 4 ++-- .../app/topic/questionplayer/QuestionPlayerActivity.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt index a0a7213f3bb..210011d3102 100644 --- a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt @@ -7,7 +7,7 @@ import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val INTERNAL_PROFILE_ID_EXTRA_KEY = - "AudioFragmentTestActivity.audio_fragment_test_profile_id" + "AudioFragmentTestActivity.internal_profile_id" /** Test Activity used for testing AudioFragment */ class AudioFragmentTestActivity : InjectableAppCompatActivity() { diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt index d87ca8217b0..ac94b9f8ee1 100755 --- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt @@ -12,8 +12,8 @@ import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity import org.oppia.android.app.topic.revisioncard.RevisionCardActivity import javax.inject.Inject -private const val INTERNAL_TOPIC_ID_EXTRA_KEY = "TopicActivity.topic_activity_topic_id" -private const val INTERNAL_STORY_ID_EXTRA_KEY = "TopicActivity.topic_activity_story_id" +private const val INTERNAL_TOPIC_ID_EXTRA_KEY = "TopicActivity.internal_topic_id" +private const val INTERNAL_STORY_ID_EXTRA_KEY = "TopicActivity.internal_story_id" /** The activity for displaying [TopicFragment]. */ class TopicActivity : diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt index 4f16ceee82c..cf73fec97ad 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt @@ -19,7 +19,7 @@ import org.oppia.android.app.topic.conceptcard.ConceptCardListener import javax.inject.Inject const val INTERNAL_SKILL_ID_LIST_EXTRA_KEY = - "QuestionPlayerActivity.question_player_activity_skill_id_list" + "QuestionPlayerActivity.internal_skill_id_list" private const val TAG_STOP_TRAINING_SESSION_DIALOG = "STOP_TRAINING_SESSION_DIALOG" /** Activity for QuestionPlayer in train mode. */ From 3696226933f0c6ff18db3fed5166728916543005 Mon Sep 17 00:00:00 2001 From: janewaitara Date: Fri, 5 Feb 2021 20:00:26 +0300 Subject: [PATCH 7/7] Corrected the naming of const value in drawer package --- .../android/app/drawer/NavigationDrawerFragmentPresenter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt index 102f193716b..f14f6c0bb7d 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt @@ -39,7 +39,7 @@ import org.oppia.android.util.statusbar.StatusBarColor import javax.inject.Inject const val NAVIGATION_DRAWER_PROFILE_ID_ARGUMENT_KEY = - "NavigationDrawerFragment.navigation_profile_id" + "NavigationDrawerFragment.navigation_drawer_profile_id" const val TAG_SWITCH_PROFILE_DIALOG = "SWITCH_PROFILE_DIALOG" /** The presenter for [NavigationDrawerFragment]. */