Successfully merged

.devbots/vacation.yml

@@ -0,0 +1,12 @@
+# Reference: https://devbots.xyz/documentation/vacation/.
+enabled: true
+pull-comment: >
+ Thanks for submitting this pull request! Some main reviewers
+ have taken time off for the next few weeks, so it may take a
+ little while before we can look at this PR. We appreciate your
+ patience while some of our team members recharge.
+issue-comment: >
+ Thanks for filing this issue! Please note that some team members
+ are currently taking time off to recharge, so it might be a
+ while before we respond to or triage this issue.
+period: 2021-11-19 - 2021-12-06

.github/CODEOWNERS

@@ -47,6 +47,9 @@ gradlew.bat @BenHenning
 /.github/workflows/ @BenHenning
 /.github/stale.yml @BenHenning
 
+# Devbots configurations.
+/.devbots/ @BenHenning
+
 # All tests.
 *Test.kt @anandwana001
 

.github/workflows/repository_messaging.yml

@@ -0,0 +1,24 @@
+# Contains jobs corresponding to repository-wide messaging.
+
+name: Repository Messaging
+
+on:
+ pull_request_target:
+ types: [ opened ]
+
+jobs:
+ holiday_message:
+ runs-on: ubuntu-latest
+ # NOTE TO DEVELOPERS: Update the body text and set this to 'true' to enable automatic messaging on all new PRs.
+ if: false
+ steps:
+ - name: Add holiday comment
+ uses: peter-evans/create-or-update-comment@v1
+ with:
+ issue-number: ${{ github.event.pull_request.number }}
+ body: |
+ Thanks for submitting this pull request! Some main reviewers
+ have taken time off for the next few weeks, so it may take a
+ little while before we can look at this PR. We appreciate your
+ patience while some of our team members recharge. We'll be fully
+ returning on 4 January 2021.

app/BUILD.bazel

@@ -198,6 +198,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
  "src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt",
  "src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt",
  "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt",
+ "src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt",
  "src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt",
  "src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt",
  "src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt",
@@ -292,7 +293,6 @@ VIEW_MODELS = [
  "src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt",
  "src/main/java/org/oppia/android/app/player/state/StateViewModel.kt",
  "src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt",
- "src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt",
  "src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt",
  "src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt",
  "src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt",
@@ -609,6 +609,10 @@ kt_android_library(
  "//utility/src/main/java/org/oppia/android/util/caching:caching_prod_module",
  "//utility/src/main/java/org/oppia/android/util/logging:prod_module",
  "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/html:html_parser",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_loader",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_parsing_annonations",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_transformation",
  ],
 )
 
@@ -646,6 +650,7 @@ kt_android_library(
  "//app/src/main/java/org/oppia/android/app/utility/datetime:date_time_util",
  "//domain",
  "//domain/src/main/java/org/oppia/android/domain/audio:audio_player_controller",
+ "//domain/src/main/java/org/oppia/android/domain/onboarding:state_controller",
  "//third_party:androidx_core_core",
  "//third_party:androidx_databinding_databinding-common",
  "//third_party:androidx_databinding_databinding-runtime",
@@ -729,6 +734,8 @@ kt_android_library(
  "//data/src/main/java/org/oppia/android/data/backends/gae:prod_module",
  "//domain/src/main/java/org/oppia/android/domain/locale:locale_application_injector",
  "//domain/src/main/java/org/oppia/android/domain/locale:locale_application_injector_provider",
+ "//domain/src/main/java/org/oppia/android/domain/onboarding:retriever_prod_module",
+ "//domain/src/main/java/org/oppia/android/domain/onboarding:state_controller",
  "//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",
@@ -752,6 +759,12 @@ kt_android_library(
  "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
  "//utility/src/main/java/org/oppia/android/util/extensions:bundle_extensions",
  "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/html:html_parser_entity_type_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_loader",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:glide_image_loader_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:repository_glide_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_parsing_annonations",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_parsing_module",
  # TODO(#2432): Replace debug_module with prod_module when building the app in prod mode.
  "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
  "//utility/src/main/java/org/oppia/android/util/statusbar:status_bar_color",
@@ -800,12 +813,15 @@ TEST_DEPS = [
  "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
  "//domain",
  "//domain/src/main/java/org/oppia/android/domain/audio:audio_player_controller",
+ "//domain/src/main/java/org/oppia/android/domain/onboarding/testing:fake_exploration_meta_data_retriever",
+ "//domain/src/main/java/org/oppia/android/domain/onboarding/testing:retriever_test_module",
  "//testing",
  "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
  "//testing/src/main/java/org/oppia/android/testing/espresso:edit_text_input_action",
  "//testing/src/main/java/org/oppia/android/testing/espresso:generic_view_matchers",
  "//testing/src/main/java/org/oppia/android/testing/espresso:image_view_matcher",
  "//testing/src/main/java/org/oppia/android/testing/espresso:konfetti_view_matcher",
+ "//testing/src/main/java/org/oppia/android/testing/espresso:text_input_action",
  "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
  "//testing/src/main/java/org/oppia/android/testing/mockito",
  "//testing/src/main/java/org/oppia/android/testing/network",
@@ -842,6 +858,14 @@ TEST_DEPS = [
  "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
  "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
  "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/html:custom_bullet_span",
+ "//utility/src/main/java/org/oppia/android/util/parser/html:html_parser",
+ "//utility/src/main/java/org/oppia/android/util/parser/html:html_parser_entity_type_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:glide_image_loader",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:glide_image_loader_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_parsing_module",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:image_transformation",
+ "//utility/src/main/java/org/oppia/android/util/parser/image:test_glide_image_loader",
 ]
 
 # App module tests. Note that all tests are assumed to be tests with resources (even though not all

app/build.gradle

@@ -56,7 +56,7 @@ android {
  unitTests {
  includeAndroidResources = true
  all {
- maxHeapSize = "1024m"
+ maxHeapSize = "4096m"
 
  // Enable forking to ensure each test is properly run in isolation. For context, see:
  // https://discuss.gradle.org/t/36066/2 & https://github.com/oppia/oppia-android/issues/1942

app/src/main/AndroidManifest.xml

@@ -67,6 +67,7 @@
  android:theme="@style/OppiaThemeWithoutActionBar" />
  <activity
  android:name=".app.home.HomeActivity"
+ android:label="@string/home_activity_title"
  android:theme="@style/OppiaThemeWithoutActionBar" />
  <activity
  android:name=".app.home.recentlyplayed.RecentlyPlayedActivity"
@@ -215,6 +216,7 @@
  android:theme="@style/OppiaThemeWithoutActionBar" />
  <activity
  android:name=".app.walkthrough.WalkthroughActivity"
+ android:label="@string/walkthrough_activity_title"
  android:theme="@style/OppiaThemeWithoutActionBar" />
  <activity android:name=".app.testing.LessonThumbnailImageViewTestActivity" />
  <activity

app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt

@@ -76,14 +76,14 @@ class SegmentedCircularProgressView : View {
  calculateSweepAngle()
 
  chapterFinishedArcPaint = Paint(Paint.ANTI_ALIAS_FLAG)
- setupArcPaint(chapterFinishedArcPaint, R.color.oppiaProgressChapterFinished)
+ setupArcPaint(chapterFinishedArcPaint, R.color.oppia_progress_chapter_finished)
 
  chapterInProgressArcPaint = Paint(Paint.ANTI_ALIAS_FLAG)
- setupArcPaint(chapterInProgressArcPaint, R.color.oppiaProgressChapterInProgress)
+ setupArcPaint(chapterInProgressArcPaint, R.color.oppia_progress_chapter_in_progress)
 
  chapterNotStartedArcPaint = Paint(Paint.ANTI_ALIAS_FLAG)
  if (chaptersFinished != 0) {
- setupArcPaint(chapterNotStartedArcPaint, R.color.oppiaProgressChapterNotFinished)
+ setupArcPaint(chapterNotStartedArcPaint, R.color.oppia_progress_chapter_not_finished)
  } else {
  setupArcPaint(chapterNotStartedArcPaint, R.color.grey_shade_20)
  }

app/src/main/java/org/oppia/android/app/customview/VerticalDashedLineView.kt

@@ -35,7 +35,7 @@ class VerticalDashedLineView @JvmOverloads constructor(
 
  paint = Paint().apply {
  isAntiAlias = true
- color = ContextCompat.getColor(context, R.color.colorPrimary)
+ color = ContextCompat.getColor(context, R.color.oppia_primary)
  style = Paint.Style.STROKE
  strokeCap = Paint.Cap.ROUND
  strokeWidth = dashThickness

app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt

@@ -411,7 +411,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  super.onDrawerOpened(drawerView)
  fragment.activity!!.invalidateOptionsMenu()
  StatusBarColor.statusBarColorUpdate(
- R.color.slideDrawerOpenStatusBar,
+ R.color.slide_drawer_open_status_bar,
  activity,
  false
  )
@@ -421,7 +421,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  super.onDrawerClosed(drawerView)
  fragment.activity!!.invalidateOptionsMenu()
  StatusBarColor.statusBarColorUpdate(
- R.color.colorPrimaryDark,
+ R.color.oppia_primary_dark,
  activity,
  false
  )
@@ -448,7 +448,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  super.onDrawerOpened(drawerView)
  fragment.activity!!.invalidateOptionsMenu()
  StatusBarColor.statusBarColorUpdate(
- R.color.slideDrawerOpenStatusBar,
+ R.color.slide_drawer_open_status_bar,
  activity,
  false
  )
@@ -458,7 +458,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
  super.onDrawerClosed(drawerView)
  fragment.activity!!.invalidateOptionsMenu()
  StatusBarColor.statusBarColorUpdate(
- R.color.colorPrimaryDark,
+ R.color.oppia_primary_dark,
  activity,
  false
  )

app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt

@@ -54,6 +54,8 @@ import org.oppia.android.app.resumelesson.ResumeLessonFragment
 import org.oppia.android.app.settings.profile.ProfileEditDeletionDialogFragment
 import org.oppia.android.app.settings.profile.ProfileEditFragment
 import org.oppia.android.app.settings.profile.ProfileListFragment
+import org.oppia.android.app.settings.profile.ProfileRenameFragment
+import org.oppia.android.app.settings.profile.ProfileResetPinFragment
 import org.oppia.android.app.shim.IntentFactoryShimModule
 import org.oppia.android.app.shim.ViewBindingShimModule
 import org.oppia.android.app.story.StoryFragment
@@ -132,8 +134,10 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
  fun inject(profileEditDeletionDialogFragment: ProfileEditDeletionDialogFragment)
  fun inject(profileEditFragment: ProfileEditFragment)
  fun inject(profileListFragment: ProfileListFragment)
+ fun inject(profileRenameFragment: ProfileRenameFragment)
  fun inject(profilePictureEditDialogFragment: ProfilePictureEditDialogFragment)
  fun inject(profileProgressFragment: ProfileProgressFragment)
+ fun inject(profileResetPinFragment: ProfileResetPinFragment)
  fun inject(progressDatabaseFullDialogFragment: ProgressDatabaseFullDialogFragment)
  fun inject(questionPlayerFragment: QuestionPlayerFragment)
  fun inject(readingTextSizeFragment: ReadingTextSizeFragment)

app/src/main/java/org/oppia/android/app/home/HomeActivity.kt

@@ -43,7 +43,7 @@ class HomeActivity :
  (activityComponent as ActivityComponentImpl).inject(this)
  internalProfileId = intent?.getIntExtra(NAVIGATION_PROFILE_ID_ARGUMENT_KEY, -1)!!
  homeActivityPresenter.handleOnCreate()
- title = resourceHandler.getStringInLocale(R.string.menu_home)
+ title = resourceHandler.getStringInLocale(R.string.home_activity_title)
  }
 
  override fun onRestart() {

app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt

@@ -133,27 +133,27 @@ class OnboardingFragmentPresenter @Inject constructor(
  private fun onboardingStatusBarColorUpdate(position: Int) {
  when (position) {
  0 -> StatusBarColor.statusBarColorUpdate(
- R.color.onboarding1StatusBar,
+ R.color.onboarding_1_status_bar,
  activity,
  false
  )
  1 -> StatusBarColor.statusBarColorUpdate(
- R.color.onboarding2StatusBar,
+ R.color.onboarding_2_status_bar,
  activity,
  false
  )
  2 -> StatusBarColor.statusBarColorUpdate(
- R.color.onboarding3StatusBar,
+ R.color.onboarding_3_status_bar,
  activity,
  false
  )
  3 -> StatusBarColor.statusBarColorUpdate(
- R.color.onboarding4StatusBar,
+ R.color.onboarding_4_status_bar,
  activity,
  false
  )
  else -> StatusBarColor.statusBarColorUpdate(
- R.color.colorPrimaryDark,
+ R.color.oppia_primary_dark,
  activity,
  false
  )

app/src/main/java/org/oppia/android/app/options/AudioLanguageActivityPresenter.kt

@@ -1,8 +1,11 @@
 package org.oppia.android.app.options
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.databinding.AudioLanguageActivityBinding
 import javax.inject.Inject
 
 /** The presenter for [AudioLanguageActivity]. */
@@ -12,7 +15,18 @@ class AudioLanguageActivityPresenter @Inject constructor(private val activity: A
  private lateinit var prefSummaryValue: String
 
  fun handleOnCreate(prefKey: String, prefValue: String) {
- activity.setContentView(R.layout.audio_language_activity)
+ val binding: AudioLanguageActivityBinding = DataBindingUtil.setContentView(
+ activity,
+ R.layout.audio_language_activity,
+ )
+ val toolbar = binding.audioLanguageToolbar
+ toolbar.setNavigationOnClickListener {
+ val intent = Intent().apply {
+ putExtra(MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY, prefSummaryValue)
+ }
+ (activity as AudioLanguageActivity).setResult(REQUEST_CODE_AUDIO_LANGUAGE, intent)
+ activity.finish()
+ }
  setLanguageSelected(prefValue)
  if (getAudioLanguageFragment() == null) {
  val audioLanguageFragment = AudioLanguageFragment.newInstance(prefKey, prefValue)

app/src/main/java/org/oppia/android/app/options/AudioLanguageFragmentPresenter.kt

@@ -1,6 +1,5 @@
 package org.oppia.android.app.options
 
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -34,14 +33,6 @@ class AudioLanguageFragmentPresenter @Inject constructor(
  adapter = createRecyclerViewAdapter()
  }
 
- binding.audioLanguageToolbar?.setNavigationOnClickListener {
- val message = languageSelectionViewModel.selectedLanguage.value
- val intent = Intent()
- intent.putExtra(MESSAGE_AUDIO_LANGUAGE_ARGUMENT_KEY, message)
- (fragment.activity as AudioLanguageActivity).setResult(REQUEST_CODE_AUDIO_LANGUAGE, intent)
- (fragment.activity as AudioLanguageActivity).finish()
- }
-
  return binding.root
  }
 

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

@@ -328,13 +328,15 @@ class StatePlayerRecyclerViewAssembler private constructor(
  translationController.extractString(
  ephemeralState.state.content, ephemeralState.writtenTranslationContext
  )
- pendingItemList += ContentViewModel(
- contentSubtitledHtml,
- gcsEntityId,
- hasConversationView,
- isSplitView.get()!!,
- playerFeatureSet.conceptCardSupport
- )
+ if (contentSubtitledHtml.isNotEmpty()) {
+ pendingItemList += ContentViewModel(
+ contentSubtitledHtml,
+ gcsEntityId,
+ hasConversationView,
+ isSplitView.get()!!,
+ playerFeatureSet.conceptCardSupport
+ )
+ }
  }
 
  private fun addPreviousAnswers(

app/src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt

@@ -1,13 +1,17 @@
 package org.oppia.android.app.profile
 
 import androidx.databinding.ObservableField
+import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.viewmodel.ObservableViewModel
 import javax.inject.Inject
 
 /** The ViewModel for [AddProfileActivity]. */
 @ActivityScope
-class AddProfileViewModel @Inject constructor() : ObservableViewModel() {
+class AddProfileViewModel @Inject constructor(
+ resourceHandler: AppLanguageResourceHandler
+) : ObservableViewModel() {
  val validPin = ObservableField(false)
  val pinErrorMsg = ObservableField("")
  val confirmPinErrorMsg = ObservableField("")
@@ -18,6 +22,8 @@ class AddProfileViewModel @Inject constructor() : ObservableViewModel() {
  val createPin = ObservableField(false)
  val isButtonActive = ObservableField(false)
  val showInfoAlertPopup = ObservableField<Boolean>(false)
+ val requiredTextWithStar: String = "*" +
+ resourceHandler.getStringInLocale(R.string.add_profile_required)
 
  fun clearAllErrorMessages() {
  pinErrorMsg.set("")

app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt

@@ -78,7 +78,7 @@ class ProfileChooserFragmentPresenter @Inject constructor(
 
  /** Binds ViewModel and sets up RecyclerView Adapter. */
  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
- StatusBarColor.statusBarColorUpdate(R.color.profileStatusBar, activity, false)
+ StatusBarColor.statusBarColorUpdate(R.color.profile_status_bar, activity, false)
  binding = ProfileChooserFragmentBinding.inflate(
  inflater,
  container,