Fixes part of #59: Build app module views + view models with Bazel

WORKSPACE

@@ -104,6 +104,17 @@ git_repository(
 load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies")
 google_services_workspace_dependencies()
 
+git_repository(
+    name = "circularimageview",
+    commit = "6098dec76713b34eb8b10883cbe54189ddc08566",
+    remote = "https://github.com/oppia/CircularImageview",
+)
+
+bind(
+  name = "databinding_annotation_processor",
+  actual = "//tools/android:compiler_annotation_processor",
+)
+
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 maven_install(
@@ -112,27 +123,47 @@ maven_install(
         "androidx.annotation:annotation:1.1.0",
         "androidx.appcompat:appcompat:1.0.2",
         "androidx.arch.core:core-testing:2.1.0",
+        "androidx.constraintlayout:constraintlayout:1.1.3",
         "androidx.core:core-ktx:1.0.1",
-        "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03",
+        "androidx.core:core:1.0.1",
+        "androidx.databinding:databinding-adapters:3.4.2",
+        "androidx.databinding:databinding-common:3.4.2",
+        "androidx.databinding:databinding-runtime:3.4.2",
+        "androidx.lifecycle:lifecycle-extensions:2.2.0",
+        "androidx.lifecycle:lifecycle-livedata-core:2.2.0",
+        "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0",
+        "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0",
+        "androidx.multidex:multidex-instrumentation:2.0.0",
+        "androidx.multidex:multidex:2.0.1",
+        "androidx.recyclerview:recyclerview:1.0.0",
         "androidx.test.espresso:espresso-contrib:3.1.0",
         "androidx.test.espresso:espresso-core:3.2.0",
         "androidx.test.espresso:espresso-intents:3.1.0",
         "androidx.test.ext:junit:1.1.1",
         "androidx.test:runner:1.2.0",
+        "androidx.viewpager:viewpager:1.0.0",
         "com.android.support:support-annotations:28.0.0",
         "com.caverock:androidsvg-aar:1.4",
+        "com.chaos.view:pinview:1.4.3",
         "com.crashlytics.sdk.android:crashlytics:2.9.8",
         "com.github.bumptech.glide:glide:4.11.0",
+        "com.google.android.material:material:1.2.0-alpha02",
         "com.google.firebase:firebase-analytics:17.4.4",
         "com.google.firebase:firebase-crashlytics:17.1.1",
+        "com.google.gms:google-services:4.3.3",
         "com.google.truth:truth:0.43",
+        "com.squareup.retrofit2:converter-gson:2.5.0",
+        "com.squareup.retrofit2:retrofit:2.9.0",
+        "de.hdodenhof:circleimageview:3.0.1",
         "io.fabric.sdk.android:fabric:1.4.7",
+        "javax.annotation:javax.annotation-api:jar:1.3.2",
         "junit:junit:4.12",
         "org.jetbrains.kotlin:kotlin-reflect:1.3.41",
         "org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.3.72",
         "org.jetbrains.kotlin:kotlin-test-junit:1.3.72",
         "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2",
         "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2",
+        "org.jetbrains:annotations:jar:13.0",
         "org.mockito:mockito-core:2.19.0",
         "org.robolectric:annotations:4.3",
         "org.robolectric:robolectric:4.3",

app/src/main/AndroidManifest.xml

@@ -4,6 +4,8 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <!-- TODO(#56): Reenable landscape support. -->
+  <uses-sdk android:minSdkVersion="19"
+    android:maxSdkVersion="28" />
   <application
     android:name=".application.OppiaApplication"
     android:allowBackup="true"

app/src/main/ViewModelManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- TODO(#1632): Remove manifest post-Gradle -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="org.oppia.app.vm">
+  <uses-sdk android:minSdkVersion="19"
+    android:targetSdkVersion="28" />
+</manifest>

app/src/main/ViewsManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- TODO(#1632): Remove manifest post-Gradle -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="org.oppia.app.views">
+  <uses-sdk android:minSdkVersion="19"
+    android:targetSdkVersion="28" />
+</manifest>

app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsViewModel.kt

@@ -14,6 +14,7 @@ import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.Ad
 import org.oppia.app.fragment.FragmentScope
 import org.oppia.app.model.DeviceSettings
 import org.oppia.app.model.ProfileId
+import org.oppia.app.shim.IntentFactoryShim
 import org.oppia.app.viewmodel.ObservableViewModel
 import org.oppia.domain.profile.ProfileManagementController
 import org.oppia.util.data.AsyncResult
@@ -26,7 +27,8 @@ class AdministratorControlsViewModel @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val logger: ConsoleLogger,
-  private val profileManagementController: ProfileManagementController
+  private val profileManagementController: ProfileManagementController,
+  private val IntentFactoryShim: IntentFactoryShim
 ) : ObservableViewModel() {
   private val routeToProfileListListener = activity as RouteToProfileListListener
   private lateinit var userProfileId: ProfileId
@@ -72,7 +74,12 @@ class AdministratorControlsViewModel @Inject constructor(
       )
     )
     itemViewModelList.add(AdministratorControlsAppInformationViewModel(activity))
-    itemViewModelList.add(AdministratorControlsAccountActionsViewModel(fragment))
+    itemViewModelList.add(
+      AdministratorControlsAccountActionsViewModel(
+        fragment,
+        IntentFactoryShim
+      )
+    )
 
     return itemViewModelList
   }

app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt

@@ -4,11 +4,12 @@ import android.content.Intent
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import org.oppia.app.R
-import org.oppia.app.profile.ProfileActivity
+import org.oppia.app.shim.IntentFactoryShim
 
 /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */
 class AdministratorControlsAccountActionsViewModel(
-  private val fragment: Fragment
+  private val fragment: Fragment,
+  private val intentFactoryShim: IntentFactoryShim
 ) : AdministratorControlsItemViewModel() {
 
   fun onLogOutClicked() {
@@ -19,7 +20,7 @@ class AdministratorControlsAccountActionsViewModel(
       }
       .setPositiveButton(R.string.log_out_dialog_okay_button) { _, _ ->
         // TODO(#762): Replace [ProfileChooserActivity] to [LoginActivity] once it is added.
-        val intent = Intent(fragment.activity, ProfileActivity::class.java)
+        val intent = intentFactoryShim.createProfileActivityIntent(fragment.activity!!)
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         fragment.activity!!.startActivity(intent)
         fragment.activity!!.finish()

app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionViewModel.kt

@@ -1,8 +1,9 @@
 package org.oppia.app.administratorcontrols.appversion
 
+import android.content.Context
 import androidx.databinding.ObservableField
 import androidx.fragment.app.Fragment
-import org.oppia.app.BuildConfig
+import androidx.lifecycle.ViewModel
 import org.oppia.app.fragment.FragmentScope
 import org.oppia.app.viewmodel.ObservableViewModel
 import org.oppia.util.system.OppiaDateTimeFormatter
@@ -13,10 +14,12 @@ import javax.inject.Inject
 @FragmentScope
 class AppVersionViewModel @Inject constructor(
   fragment: Fragment,
-  private val oppiaDateTimeFormatter: OppiaDateTimeFormatter
+  private val oppiaDateTimeFormatter: OppiaDateTimeFormatter,
+  context: Context
 ) : ObservableViewModel() {
 
-  val versionName = ObservableField<String>(BuildConfig.VERSION_NAME)
+  val versionName: String = context.packageManager
+    .getPackageInfo(context.packageName, 0).versionName
 
   private val lastUpdateDateTime =
     fragment.activity!!.packageManager.getPackageInfo(

app/src/main/java/org/oppia/app/application/ApplicationComponent.kt

@@ -4,6 +4,8 @@ import android.app.Application
 import dagger.BindsInstance
 import dagger.Component
 import org.oppia.app.activity.ActivityComponent
+import org.oppia.app.shim.IntentFactoryShimModule
+import org.oppia.app.shim.ViewBindingShimModule
 import org.oppia.data.backends.gae.NetworkModule
 import org.oppia.domain.classify.InteractionsModule
 import org.oppia.domain.classify.rules.continueinteraction.ContinueModule
@@ -45,7 +47,8 @@ import javax.inject.Singleton
     InteractionsModule::class, GcsResourceModule::class, GlideImageLoaderModule::class,
     ImageParsingModule::class, HtmlParserEntityTypeModule::class, CachingModule::class,
     QuestionModule::class, LogReportingModule::class, AccessibilityModule::class,
-    ImageClickInputModule::class, LogStorageModule::class, PrimeTopicAssetsControllerModule::class,
+    ImageClickInputModule::class, LogStorageModule::class, IntentFactoryShimModule::class,
+    ViewBindingShimModule::class, PrimeTopicAssetsControllerModule::class,
     ExpirationMetaDataRetrieverModule::class
   ]
 )

app/src/main/java/org/oppia/app/customview/LessonThumbnailImageView.kt

@@ -3,11 +3,12 @@ package org.oppia.app.customview
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import org.oppia.app.R
-import org.oppia.app.fragment.InjectableFragment
 import org.oppia.app.model.LessonThumbnail
 import org.oppia.app.model.LessonThumbnailGraphic
+import org.oppia.app.shim.ViewComponentFactory
 import org.oppia.util.gcsresource.DefaultResourceBucketName
 import org.oppia.util.parser.DefaultGcsPrefix
 import org.oppia.util.parser.ImageLoader
@@ -98,9 +99,8 @@ class LessonThumbnailImageView @JvmOverloads constructor(
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-    FragmentManager.findFragment<InjectableFragment>(this)
-      .createViewComponent(this)
-      .inject(this)
+    (FragmentManager.findFragment<Fragment>(this) as ViewComponentFactory)
+      .createViewComponent(this).inject(this)
   }
 
   private fun getLessonDrawableResource(lessonThumbnail: LessonThumbnail): Int {

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

@@ -32,6 +32,8 @@ import org.oppia.app.profile.AdminSettingsDialogFragment
 import org.oppia.app.profile.ProfileChooserFragment
 import org.oppia.app.profile.ResetPinDialogFragment
 import org.oppia.app.profileprogress.ProfileProgressFragment
+import org.oppia.app.shim.IntentFactoryShimModule
+import org.oppia.app.shim.ViewBindingShimModule
 import org.oppia.app.story.StoryFragment
 import org.oppia.app.testing.BindableAdapterTestFragment
 import org.oppia.app.testing.ImageRegionSelectionTestFragment
@@ -51,7 +53,12 @@ import org.oppia.app.walkthrough.welcome.WalkthroughWelcomeFragment
 import javax.inject.Provider
 
 /** Root subcomponent for all fragments. */
-@Subcomponent(modules = [FragmentModule::class, InteractionViewModelModule::class])
+@Subcomponent(
+  modules = [
+    FragmentModule::class, InteractionViewModelModule::class, IntentFactoryShimModule::class,
+    ViewBindingShimModule::class
+  ]
+)
 @FragmentScope
 interface FragmentComponent {
   @Subcomponent.Builder

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

@@ -4,13 +4,14 @@ import android.content.Context
 import android.view.View
 import androidx.fragment.app.Fragment
 import org.oppia.app.activity.InjectableAppCompatActivity
+import org.oppia.app.shim.ViewComponentFactory
 import org.oppia.app.view.ViewComponent
 
 /**
  * A fragment that facilitates field injection to children. This fragment can only be used with
  * [InjectableAppCompatActivity] contexts.
  */
-abstract class InjectableFragment : Fragment() {
+abstract class InjectableFragment : Fragment(), ViewComponentFactory {
   /**
    * The [FragmentComponent] corresponding to this fragment. This cannot be used before [onAttach] is called, and can be
    * used to inject lateinit fields in child fragments during fragment attachment (which is recommended to be done in an
@@ -24,7 +25,7 @@ abstract class InjectableFragment : Fragment() {
       (requireActivity() as InjectableAppCompatActivity).createFragmentComponent(this)
   }
 
-  fun createViewComponent(view: View): ViewComponent {
+  override fun createViewComponent(view: View): ViewComponent {
     return fragmentComponent.getViewComponentBuilderProvider().get().setView(view).build()
   }
 }

app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt

@@ -25,6 +25,7 @@ import org.oppia.app.model.Profile
 import org.oppia.app.model.ProfileId
 import org.oppia.app.model.TopicList
 import org.oppia.app.model.TopicSummary
+import org.oppia.app.shim.IntentFactoryShim
 import org.oppia.domain.oppialogger.OppiaLogger
 import org.oppia.domain.profile.ProfileManagementController
 import org.oppia.domain.topic.TopicListController
@@ -46,6 +47,7 @@ class HomeFragmentPresenter @Inject constructor(
   private val oppiaClock: OppiaClock,
   private val logger: ConsoleLogger,
   private val oppiaLogger: OppiaLogger,
+  private val intentFactoryShim: IntentFactoryShim,
   @TopicHtmlParserEntityType private val topicEntityType: String,
   @StoryHtmlParserEntityType private val storyEntityType: String
 ) {
@@ -71,7 +73,11 @@ class HomeFragmentPresenter @Inject constructor(
     logHomeActivityEvent()
 
     welcomeViewModel = WelcomeViewModel()
-    promotedStoryListViewModel = PromotedStoryListViewModel(activity, internalProfileId)
+    promotedStoryListViewModel = PromotedStoryListViewModel(
+      activity,
+      internalProfileId,
+      intentFactoryShim
+    )
     allTopicsViewModel = AllTopicsViewModel()
     itemList.add(welcomeViewModel)
     itemList.add(promotedStoryListViewModel)
@@ -191,14 +197,24 @@ class HomeFragmentPresenter @Inject constructor(
         promotedStoryList.clear()
         if (it.recentStoryCount != 0) {
           it.recentStoryList.take(limit).forEach { promotedStory ->
-            val recentStory = PromotedStoryViewModel(activity, internalProfileId, storyEntityType)
+            val recentStory = PromotedStoryViewModel(
+              activity,
+              internalProfileId,
+              storyEntityType,
+              intentFactoryShim
+            )
             recentStory.setPromotedStory(promotedStory)
             promotedStoryList.add(recentStory)
           }
         } else {
           // TODO(#936): Optimise this as part of recommended stories.
           it.olderStoryList.take(limit).forEach { promotedStory ->
-            val oldStory = PromotedStoryViewModel(activity, internalProfileId, storyEntityType)
+            val oldStory = PromotedStoryViewModel(
+              activity,
+              internalProfileId,
+              storyEntityType,
+              intentFactoryShim
+            )
             oldStory.setPromotedStory(promotedStory)
             promotedStoryList.add(oldStory)
           }

app/src/main/java/org/oppia/app/home/topiclist/PromotedStoryListViewModel.kt

@@ -4,12 +4,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModel
 import org.oppia.app.home.HomeItemViewModel
 import org.oppia.app.home.RouteToRecentlyPlayedListener
-import org.oppia.app.home.recentlyplayed.RecentlyPlayedActivity
+import org.oppia.app.shim.IntentFactoryShim
 
 /** [ViewModel] promoted story list in [HomeFragment]. */
 class PromotedStoryListViewModel(
   private val activity: AppCompatActivity,
-  private val internalProfileId: Int
+  private val internalProfileId: Int,
+  private val IntentFactoryShim: IntentFactoryShim
 ) :
   HomeItemViewModel(),
   RouteToRecentlyPlayedListener {
@@ -19,11 +20,10 @@ class PromotedStoryListViewModel(
   }
 
   override fun routeToRecentlyPlayed() {
-    activity.startActivity(
-      RecentlyPlayedActivity.createRecentlyPlayedActivityIntent(
-        activity.applicationContext,
-        internalProfileId
-      )
+    val intent = IntentFactoryShim.createRecentlyPlayedActivityIntent(
+      activity.applicationContext,
+      internalProfileId
     )
+    activity.startActivity(intent)
   }
 }