Fix Part of #4938: Introduce Create profile screen

app/BUILD.bazel

@@ -211,6 +211,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt",
     "src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt",
     "src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt",
+    "src/main/java/org/oppia/android/app/onboarding/CreateProfileViewModel.kt",
     "src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt",
     "src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt",
     "src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt",

app/src/main/AndroidManifest.xml

@@ -332,7 +332,14 @@
     <activity
       android:name=".app.testing.ColorBindingAdaptersTestActivity"
       android:theme="@style/OppiaThemeWithoutActionBar" />
-
+    <activity
+      android:name=".app.onboarding.OnboardingProfileTypeActivity"
+      android:label="@string/onboarding_profile_type_activity_title"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.onboarding.CreateProfileActivity"
+      android:label="@string/create_profile_activity_title"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
     <provider
       android:name="androidx.work.impl.WorkManagerInitializer"
       android:authorities="${applicationId}.workmanager-init"

app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt

@@ -31,7 +31,9 @@ import org.oppia.android.app.help.thirdparty.ThirdPartyDependencyListActivity
 import org.oppia.android.app.home.HomeActivity
 import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
 import org.oppia.android.app.mydownloads.MyDownloadsActivity
+import org.oppia.android.app.onboarding.CreateProfileActivity
 import org.oppia.android.app.onboarding.OnboardingActivity
+import org.oppia.android.app.onboarding.OnboardingProfileTypeActivity
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity
 import org.oppia.android.app.options.AppLanguageActivity
 import org.oppia.android.app.options.AudioLanguageActivity
@@ -218,4 +220,6 @@ interface ActivityComponentImpl :
   fun inject(walkthroughActivity: WalkthroughActivity)
   fun inject(surveyActivity: SurveyActivity)
   fun inject(colorBindingAdaptersTestActivity: ColorBindingAdaptersTestActivity)
+  fun inject(onboardingProfileTypeActivity: OnboardingProfileTypeActivity)
+  fun inject(createProfileActivity: CreateProfileActivity)
 }

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

@@ -35,7 +35,9 @@ import org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.GeneralAvailabilityUpgradeNoticeDialogFragment
 import org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.OsDeprecationNoticeDialogFragment
+import org.oppia.android.app.onboarding.CreateProfileFragment
 import org.oppia.android.app.onboarding.OnboardingFragment
+import org.oppia.android.app.onboarding.OnboardingProfileTypeFragment
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListFragment
 import org.oppia.android.app.options.AppLanguageFragment
 import org.oppia.android.app.options.AudioLanguageFragment
@@ -194,4 +196,6 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(exitSurveyConfirmationDialogFragment: ExitSurveyConfirmationDialogFragment)
   fun inject(surveyWelcomeDialogFragment: SurveyWelcomeDialogFragment)
   fun inject(surveyOutroDialogFragment: SurveyOutroDialogFragment)
+  fun inject(onboardingProfileTypeFragment: OnboardingProfileTypeFragment)
+  fun inject(createProfileFragment: CreateProfileFragment)
 }

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

@@ -0,0 +1,32 @@
+package org.oppia.android.app.onboarding
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import org.oppia.android.app.activity.ActivityComponentImpl
+import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
+import org.oppia.android.app.model.ScreenName.CREATE_PROFILE_ACTIVITY
+import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
+import javax.inject.Inject
+
+/** Activity for displaying a new learner profile creation flow. */
+class CreateProfileActivity : InjectableAutoLocalizedAppCompatActivity() {
+  @Inject
+  lateinit var learnerProfileActivityPresenter: CreateProfileActivityPresenter
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    (activityComponent as ActivityComponentImpl).inject(this)
+
+    learnerProfileActivityPresenter.handleOnCreate()
+  }
+
+  companion object {
+    /** Returns a new [Intent] open a [CreateProfileActivity] with the specified params. */
+    fun createProfileActivityIntent(context: Context): Intent {
+      return Intent(context, CreateProfileActivity::class.java).apply {
+        decorateWithScreenName(CREATE_PROFILE_ACTIVITY)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,39 @@
+package org.oppia.android.app.onboarding
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import org.oppia.android.R
+import org.oppia.android.databinding.CreateProfileActivityBinding
+import javax.inject.Inject
+
+private const val TAG_CREATE_PROFILE_ACTIVITY_FRAGMENT = "TAG_CREATE_PROFILE_ACTIVITY_FRAGMENT"
+
+/** Presenter for [CreateProfileActivity]. */
+class CreateProfileActivityPresenter @Inject constructor(
+  private val activity: AppCompatActivity
+) {
+  private lateinit var binding: CreateProfileActivityBinding
+
+  /** Handle creation and binding of the CreateProfileActivity layout. */
+  fun handleOnCreate() {
+    binding = DataBindingUtil.setContentView(activity, R.layout.create_profile_activity)
+    binding.apply {
+      lifecycleOwner = activity
+    }
+
+    if (getNewLearnerProfileFragment() == null) {
+      val createLearnerProfileFragment = CreateProfileFragment()
+      activity.supportFragmentManager.beginTransaction().add(
+        R.id.profile_fragment_placeholder,
+        createLearnerProfileFragment,
+        TAG_CREATE_PROFILE_ACTIVITY_FRAGMENT
+      ).commitNow()
+    }
+  }
+
+  private fun getNewLearnerProfileFragment(): CreateProfileFragment? {
+    return activity.supportFragmentManager.findFragmentByTag(
+      TAG_CREATE_PROFILE_ACTIVITY_FRAGMENT
+    ) as? CreateProfileFragment
+  }
+}

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

@@ -0,0 +1,35 @@
+package org.oppia.android.app.onboarding
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableFragment
+import javax.inject.Inject
+
+/** Fragment for displaying a new learner profile creation flow. */
+class CreateProfileFragment : InjectableFragment() {
+  @Inject
+  lateinit var createProfileFragmentPresenter: CreateProfileFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+    return createProfileFragmentPresenter.handleCreateView(inflater, container)
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+    createProfileFragmentPresenter.handleOnActivityResult(requestCode, resultCode, data)
+  }
+}

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

@@ -0,0 +1,108 @@
+package org.oppia.android.app.onboarding
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.PorterDuff
+import android.provider.MediaStore
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.res.ResourcesCompat
+import androidx.fragment.app.Fragment
+import org.oppia.android.R
+import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.databinding.CreateProfileFragmentBinding
+import org.oppia.android.util.parser.image.ImageLoader
+import org.oppia.android.util.parser.image.ImageViewTarget
+import javax.inject.Inject
+
+private const val GALLERY_INTENT_RESULT_CODE = 1
+
+/** Presenter for [CreateProfileFragment]. */
+@FragmentScope
+class CreateProfileFragmentPresenter @Inject constructor(
+  private val fragment: Fragment,
+  private val activity: AppCompatActivity,
+  private val createProfileViewModel: CreateProfileViewModel,
+  private val imageLoader: ImageLoader
+) {
+  private lateinit var binding: CreateProfileFragmentBinding
+  private lateinit var uploadImageView: ImageView
+  private lateinit var selectedImage: String
+
+  /** Initialize layout bindings. */
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View {
+    binding = CreateProfileFragmentBinding.inflate(
+      inflater,
+      container,
+      /* attachToRoot= */ false
+    )
+    binding.let {
+      it.lifecycleOwner = fragment
+      it.viewModel = createProfileViewModel
+    }
+
+    uploadImageView = binding.createProfileUserImageView
+
+    uploadImageView.apply {
+      setColorFilter(
+        ResourcesCompat.getColor(
+          activity.resources,
+          R.color.component_color_avatar_background_25_color,
+          null
+        ),
+        PorterDuff.Mode.DST_OVER
+      )
+
+      imageLoader.loadDrawable(
+        R.drawable.ic_profile_icon,
+        ImageViewTarget(this)
+      )
+    }
+
+    binding.onboardingNavigationContinue.setOnClickListener {
+      val nickname = binding.createProfileNicknameEdittext.text.toString().trim()
+
+      createProfileViewModel.hasErrorMessage.set(nickname.isBlank())
+    }
+
+    binding.createProfileNicknameEdittext.addTextChangedListener(object : TextWatcher {
+      override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+      override fun afterTextChanged(s: Editable?) {}
+      override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+        createProfileViewModel.hasErrorMessage.set(false)
+      }
+    })
+
+    binding.onboardingNavigationBack.setOnClickListener { activity.finish() }
+    binding.createProfileEditPictureIcon.setOnClickListener { openGalleryIntent() }
+    binding.createProfilePicturePrompt.setOnClickListener { openGalleryIntent() }
+    binding.createProfileUserImageView.setOnClickListener { openGalleryIntent() }
+
+    return binding.root
+  }
+
+  /** Receive the result of image upload and load it into the image view. */
+  fun handleOnActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+    if (requestCode == GALLERY_INTENT_RESULT_CODE && resultCode == Activity.RESULT_OK) {
+      binding.createProfilePicturePrompt.visibility = View.GONE
+      intent?.let {
+        selectedImage =
+          checkNotNull(intent.data.toString()) { "Could not find the selected image." }
+        imageLoader.loadBitmap(
+          selectedImage,
+          ImageViewTarget(uploadImageView)
+        )
+      }
+    }
+  }
+
+  private fun openGalleryIntent() {
+    val galleryIntent = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
+    fragment.startActivityForResult(galleryIntent, GALLERY_INTENT_RESULT_CODE)
+  }
+}

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

@@ -0,0 +1,14 @@
+package org.oppia.android.app.onboarding
+
+import androidx.databinding.ObservableField
+import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.app.viewmodel.ObservableViewModel
+import javax.inject.Inject
+
+/** The ViewModel for [CreateProfileFragment]. */
+@FragmentScope
+class CreateProfileViewModel @Inject constructor() : ObservableViewModel() {
+
+  /** ObservableField that tracks whether creating a nickname has triggered an error condition. */
+  val hasErrorMessage = ObservableField(false)
+}

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

@@ -3,6 +3,7 @@ package org.oppia.android.app.onboarding
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentScope
@@ -13,6 +14,7 @@ import javax.inject.Inject
 /** The presenter for [OnboardingFragment]. */
 @FragmentScope
 class OnboardingFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val appLanguageResourceHandler: AppLanguageResourceHandler
 ) {
@@ -33,6 +35,12 @@ class OnboardingFragmentPresenter @Inject constructor(
         R.string.onboarding_language_activity_title,
         appLanguageResourceHandler.getStringInLocale(R.string.app_name)
       )
+
+      onboardingLanguageLetsGoButton.setOnClickListener {
+        val intent =
+          OnboardingProfileTypeActivity.createOnboardingProfileTypeActivityIntent(activity)
+        fragment.startActivity(intent)
+      }
     }
 
     return binding.root

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

@@ -0,0 +1,32 @@
+package org.oppia.android.app.onboarding
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import org.oppia.android.app.activity.ActivityComponentImpl
+import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
+import org.oppia.android.app.model.ScreenName.ONBOARDING_PROFILE_TYPE_ACTIVITY
+import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
+import javax.inject.Inject
+
+/** The activity for showing the profile type selection screen. */
+class OnboardingProfileTypeActivity : InjectableAutoLocalizedAppCompatActivity() {
+  @Inject
+  lateinit var onboardingProfileTypeActivityPresenter: OnboardingProfileTypeActivityPresenter
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    (activityComponent as ActivityComponentImpl).inject(this)
+
+    onboardingProfileTypeActivityPresenter.handleOnCreate()
+  }
+
+  companion object {
+    /** Returns a new [Intent] open a [OnboardingProfileTypeActivity] with the specified params. */
+    fun createOnboardingProfileTypeActivityIntent(context: Context): Intent {
+      return Intent(context, OnboardingProfileTypeActivity::class.java).apply {
+        decorateWithScreenName(ONBOARDING_PROFILE_TYPE_ACTIVITY)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,41 @@
+package org.oppia.android.app.onboarding
+
+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.OnboardingProfileTypeActivityBinding
+import javax.inject.Inject
+
+private const val TAG_PROFILE_TYPE_FRAGMENT = "TAG_PROFILE_TYPE_FRAGMENT"
+
+/** The Presenter for [OnboardingProfileTypeActivity]. */
+@ActivityScope
+class OnboardingProfileTypeActivityPresenter @Inject constructor(
+  private val activity: AppCompatActivity
+) {
+  private lateinit var binding: OnboardingProfileTypeActivityBinding
+
+  /** Handle creation and binding of the  OnboardingProfileTypeActivity layout. */
+  fun handleOnCreate() {
+    binding = DataBindingUtil.setContentView(activity, R.layout.onboarding_profile_type_activity)
+    binding.apply {
+      lifecycleOwner = activity
+    }
+
+    if (getOnboardingProfileTypeFragment() == null) {
+      val onboardingProfileTypeFragment = OnboardingProfileTypeFragment()
+      activity.supportFragmentManager.beginTransaction().add(
+        R.id.profile_type_fragment_placeholder,
+        onboardingProfileTypeFragment,
+        TAG_PROFILE_TYPE_FRAGMENT
+      ).commitNow()
+    }
+  }
+
+  private fun getOnboardingProfileTypeFragment(): OnboardingProfileTypeFragment? {
+    return activity.supportFragmentManager.findFragmentByTag(
+      TAG_PROFILE_TYPE_FRAGMENT
+    ) as? OnboardingProfileTypeFragment
+  }
+}