Merge branch 'develop' into introduce-exploration-progress-controller

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
     android:supportsRtl="true"
     android:theme="@style/OppiaTheme">
     <activity android:name=".player.exploration.ExplorationActivity"/>
+    <activity android:name=".topic.TopicActivity"/>
     <activity android:name="org.oppia.app.home.HomeActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>

app/src/main/java/org/oppia/app/activity/ActivityComponent.kt

@@ -6,6 +6,7 @@ import dagger.Subcomponent
 import org.oppia.app.fragment.FragmentComponent
 import org.oppia.app.home.HomeActivity
 import org.oppia.app.player.exploration.ExplorationActivity
+import org.oppia.app.topic.TopicActivity
 import javax.inject.Provider
 
 /** Root subcomponent for all activities. */
@@ -22,4 +23,5 @@ interface ActivityComponent {
 
   fun inject(explorationActivity: ExplorationActivity)
   fun inject(homeActivity: HomeActivity)
+  fun inject(topicActivity: TopicActivity)
 }

app/src/main/java/org/oppia/app/fragment/FragmentComponent.kt

@@ -7,7 +7,12 @@ import org.oppia.app.home.HomeFragment
 import org.oppia.app.player.exploration.ExplorationFragment
 import org.oppia.app.player.state.StateFragment
 import org.oppia.app.player.audio.AudioFragment
+import org.oppia.app.topic.TopicFragment
 import org.oppia.app.topic.conceptcard.ConceptCardFragment
+import org.oppia.app.topic.overview.TopicOverviewFragment
+import org.oppia.app.topic.play.TopicPlayFragment
+import org.oppia.app.topic.review.TopicReviewFragment
+import org.oppia.app.topic.train.TopicTrainFragment
 
 /** Root subcomponent for all fragments. */
 @Subcomponent
@@ -20,8 +25,13 @@ interface FragmentComponent {
   }
 
   fun inject(audioFragment: AudioFragment)
+  fun inject(conceptCardFragment: ConceptCardFragment)
   fun inject(explorationFragment: ExplorationFragment)
   fun inject(homeFragment: HomeFragment)
   fun inject(stateFragment: StateFragment)
-  fun inject(conceptCardFragment: ConceptCardFragment)
+  fun inject(topicFragment: TopicFragment)
+  fun inject(topicOverviewFragment: TopicOverviewFragment)
+  fun inject(topicPlayFragment: TopicPlayFragment)
+  fun inject(topicReviewFragment: TopicReviewFragment)
+  fun inject(topicTrainFragment: TopicTrainFragment)
 }

app/src/main/java/org/oppia/app/fragment/InjectableDialogFragment.kt

@@ -2,7 +2,6 @@ package org.oppia.app.fragment
 
 import android.content.Context
 import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
 import org.oppia.app.activity.InjectableAppCompatActivity
 
 /**

app/src/main/java/org/oppia/app/topic/TopicActivity.kt

@@ -0,0 +1,16 @@
+package org.oppia.app.topic
+
+import android.os.Bundle
+import org.oppia.app.activity.InjectableAppCompatActivity
+import javax.inject.Inject
+
+/** The activity for tabs in Topic. */
+class TopicActivity : InjectableAppCompatActivity() {
+  @Inject lateinit var topicActivityPresenter: TopicActivityPresenter
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    activityComponent.inject(this)
+    topicActivityPresenter.handleOnCreate()
+  }
+}

app/src/main/java/org/oppia/app/topic/TopicActivityPresenter.kt

@@ -0,0 +1,24 @@
+package org.oppia.app.topic
+
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.app.R
+import org.oppia.app.activity.ActivityScope
+import javax.inject.Inject
+
+/** The presenter for [TopicActivity]. */
+@ActivityScope
+class TopicActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
+  fun handleOnCreate() {
+    activity.setContentView(R.layout.topic_activity)
+    if (getTopicFragment() == null) {
+      activity.supportFragmentManager.beginTransaction().add(
+        R.id.topic_fragment_placeholder,
+        TopicFragment()
+      ).commitNow()
+    }
+  }
+
+  private fun getTopicFragment(): TopicFragment? {
+    return activity.supportFragmentManager.findFragmentById(R.id.topic_fragment_placeholder) as TopicFragment?
+  }
+}

app/src/main/java/org/oppia/app/topic/TopicFragment.kt

@@ -0,0 +1,23 @@
+package org.oppia.app.topic
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.oppia.app.fragment.InjectableFragment
+import javax.inject.Inject
+
+/** Fragment that contains tabs for Topic. */
+class TopicFragment : InjectableFragment() {
+  @Inject lateinit var topicFragmentPresenter: TopicFragmentPresenter
+
+  override fun onAttach(context: Context?) {
+    super.onAttach(context)
+    fragmentComponent.inject(this)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return topicFragmentPresenter.handleCreateView(inflater, container)
+  }
+}

app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt

@@ -0,0 +1,23 @@
+package org.oppia.app.topic
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import org.oppia.app.databinding.TopicFragmentBinding
+import org.oppia.app.fragment.FragmentScope
+import javax.inject.Inject
+
+/** The controller for [TopicFragment]. */
+@FragmentScope
+class TopicFragmentPresenter @Inject constructor(
+  private val fragment: Fragment
+) {
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
+    val binding = TopicFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
+    binding.let {
+      it.lifecycleOwner = fragment
+    }
+    return binding.root
+  }
+}

app/src/main/java/org/oppia/app/topic/overview/TopicOverviewFragment.kt

@@ -0,0 +1,24 @@
+package org.oppia.app.topic.overview
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.oppia.app.fragment.InjectableFragment
+import javax.inject.Inject
+
+/** Fragment that contains overview of Topic. */
+class TopicOverviewFragment : InjectableFragment() {
+  @Inject
+  lateinit var topicOverviewFragmentPresenter: TopicOverviewFragmentPresenter
+
+  override fun onAttach(context: Context?) {
+    super.onAttach(context)
+    fragmentComponent.inject(this)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return topicOverviewFragmentPresenter.handleCreateView(inflater, container)
+  }
+}

app/src/main/java/org/oppia/app/topic/overview/TopicOverviewFragmentPresenter.kt

@@ -0,0 +1,23 @@
+package org.oppia.app.topic.overview
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import org.oppia.app.databinding.TopicOverviewFragmentBinding
+import org.oppia.app.fragment.FragmentScope
+import javax.inject.Inject
+
+/** The presenter for [TopicOverviewFragment]. */
+@FragmentScope
+class TopicOverviewFragmentPresenter @Inject constructor(
+  private val fragment: Fragment
+) {
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
+    val binding = TopicOverviewFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
+    binding.let {
+      it.lifecycleOwner = fragment
+    }
+    return binding.root
+  }
+}

app/src/main/java/org/oppia/app/topic/play/TopicPlayFragment.kt

@@ -0,0 +1,24 @@
+package org.oppia.app.topic.play
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.oppia.app.fragment.InjectableFragment
+import javax.inject.Inject
+
+/** Fragment that contains subtopic list for play mode. */
+class TopicPlayFragment : InjectableFragment() {
+  @Inject
+  lateinit var topicPlayFragmentPresenter: TopicPlayFragmentPresenter
+
+  override fun onAttach(context: Context?) {
+    super.onAttach(context)
+    fragmentComponent.inject(this)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return topicPlayFragmentPresenter.handleCreateView(inflater, container)
+  }
+}

app/src/main/java/org/oppia/app/topic/play/TopicPlayFragmentPresenter.kt

@@ -0,0 +1,23 @@
+package org.oppia.app.topic.play
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import org.oppia.app.databinding.TopicPlayFragmentBinding
+import org.oppia.app.fragment.FragmentScope
+import javax.inject.Inject
+
+/** The presenter for [TopicPlayFragment]. */
+@FragmentScope
+class TopicPlayFragmentPresenter @Inject constructor(
+  private val fragment: Fragment
+) {
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
+    val binding = TopicPlayFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
+    binding.let {
+      it.lifecycleOwner = fragment
+    }
+    return binding.root
+  }
+}

app/src/main/java/org/oppia/app/topic/review/TopicReviewFragment.kt

@@ -0,0 +1,24 @@
+package org.oppia.app.topic.review
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.oppia.app.fragment.InjectableFragment
+import javax.inject.Inject
+
+/** Fragment that card for topic review. */
+class TopicReviewFragment : InjectableFragment() {
+  @Inject
+  lateinit var topicReviewFragmentPresenter: TopicReviewFragmentPresenter
+
+  override fun onAttach(context: Context?) {
+    super.onAttach(context)
+    fragmentComponent.inject(this)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return topicReviewFragmentPresenter.handleCreateView(inflater, container)
+  }
+}

app/src/main/java/org/oppia/app/topic/review/TopicReviewFragmentPresenter.kt

@@ -0,0 +1,23 @@
+package org.oppia.app.topic.review
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import org.oppia.app.databinding.TopicReviewFragmentBinding
+import org.oppia.app.fragment.FragmentScope
+import javax.inject.Inject
+
+/** The presenter for [TopicReviewFragment]. */
+@FragmentScope
+class TopicReviewFragmentPresenter @Inject constructor(
+  private val fragment: Fragment
+) {
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
+    val binding = TopicReviewFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
+    binding.let {
+      it.lifecycleOwner = fragment
+    }
+    return binding.root
+  }
+}

app/src/main/java/org/oppia/app/topic/train/TopicTrainFragment.kt

@@ -0,0 +1,24 @@
+package org.oppia.app.topic.train
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.oppia.app.fragment.InjectableFragment
+import javax.inject.Inject
+
+/** Fragment that contains skills for topic train mode. */
+class TopicTrainFragment : InjectableFragment() {
+  @Inject
+  lateinit var topicTrainFragmentPresenter: TopicTrainFragmentPresenter
+
+  override fun onAttach(context: Context?) {
+    super.onAttach(context)
+    fragmentComponent.inject(this)
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return topicTrainFragmentPresenter.handleCreateView(inflater, container)
+  }
+}

app/src/main/java/org/oppia/app/topic/train/TopicTrainFragmentPresenter.kt

@@ -0,0 +1,23 @@
+package org.oppia.app.topic.train
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import org.oppia.app.databinding.TopicTrainFragmentBinding
+import org.oppia.app.fragment.FragmentScope
+import javax.inject.Inject
+
+/** The presenter for [TopicTrainFragment]. */
+@FragmentScope
+class TopicTrainFragmentPresenter @Inject constructor(
+  private val fragment: Fragment
+) {
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
+    val binding = TopicTrainFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
+    binding.let {
+      it.lifecycleOwner = fragment
+    }
+    return binding.root
+  }
+}

app/src/main/res/layout/topic_activity.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/topic_fragment_placeholder"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  tools:context=".topic.TopicActivity" />

app/src/main/res/layout/topic_fragment.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+      android:id="@+id/dummy_text_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="This is dummy TextView for testing"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"/>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/topic_overview_fragment.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+      android:id="@+id/dummy_text_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="This is dummy TextView for testing"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"/>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>