resoilved conflicts

app/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -21,6 +19,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    dataBinding {
+        enabled = true
+    }
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -42,26 +43,29 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    api 'com.google.guava:guava:28.0-android'
-
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation 'org.robolectric:robolectric:4.3'
-    testImplementation "com.google.truth:truth:0.43"
-    testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-    androidTestImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation "com.google.truth:truth:0.43"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-    implementation 'com.hypertrack:hyperlog:0.0.10'
-
+    implementation(
+            'android.arch.lifecycle:extensions:1.1.1',
+            'androidx.appcompat:appcompat:1.0.2',
+            'androidx.constraintlayout:constraintlayout:1.1.3',
+            'androidx.core:core-ktx:1.0.2',
+            'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha03',
+            "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
+    )
+    testImplementation(
+            'androidx.test:core:1.2.0',
+            'androidx.test.espresso:espresso-core:3.2.0',
+            'androidx.test.ext:junit:1.1.1',
+            'com.google.truth:truth:0.43',
+            'org.robolectric:robolectric:4.3',
+    )
+    androidTestImplementation(
+            'androidx.test:core:1.2.0',
+            'androidx.test.espresso:espresso-core:3.2.0',
+            'androidx.test.ext:junit:1.1.1',
+            'androidx.test:runner:1.2.0',
+            'com.google.truth:truth:0.43',
+    )
     implementation project(":model")
+    implementation project(":domain")
     implementation project(":utility")
 }

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

@@ -1,52 +1,14 @@
 package org.oppia.app
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.Log
-import android.widget.TextView
-import com.google.common.util.concurrent.FutureCallback
-import com.google.common.util.concurrent.Futures
-import com.google.common.util.concurrent.ListenableFuture
-import com.google.common.util.concurrent.MoreExecutors.directExecutor
-import org.oppia.app.model.UserAppHistory
-import org.oppia.util.data.AsyncDataSource
+import androidx.appcompat.app.AppCompatActivity
 
 /** The central activity for all users entering the app. */
 class HomeActivity : AppCompatActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.home_activity)
-  }
-
-  override fun onStart() {
-    super.onStart()
-    // TODO(BenHenning): Convert this to LiveData rather than risk an async operation completing outside of the
-    // activity's lifecycle. Also, a directExecutor() in this context could be a really bad idea if it isn't the main
-    // thread.
-    Futures.addCallback(getUserAppHistory().pendingOperation, object: FutureCallback<UserAppHistory> {
-      override fun onSuccess(result: UserAppHistory?) {
-        if (result != null && result.alreadyOpenedApp) {
-          getWelcomeTextView().setText(R.string.welcome_back_text)
-        }
-      }
-
-      override fun onFailure(t: Throwable) {
-        // TODO(BenHenning): Replace this log statement with a clearer logging API.
-        Log.e("HomeActivity", "Failed to retrieve user app history = "+ t)
-      }
-    }, directExecutor())
-  }
-
-  private fun getWelcomeTextView(): TextView {
-    return findViewById(R.id.welcome_text_view)
-  }
-
-  private fun getUserAppHistory(): AsyncDataSource<UserAppHistory> {
-    // TODO(BenHenning): Retrieve this from a domain provider.
-    return object: AsyncDataSource<UserAppHistory> {
-      override val pendingOperation: ListenableFuture<UserAppHistory>
-        get() = Futures.immediateFuture(UserAppHistory.newBuilder().setAlreadyOpenedApp(false).build())
-    }
+    supportFragmentManager.beginTransaction().add(R.id.home_fragment_placeholder, HomeFragment()).commitNow()
   }
 }