Fix #3930 Greeting text on home screen should be a single TextView

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

@@ -13,14 +13,19 @@ class WelcomeViewModel(
   dateTimeUtil: DateTimeUtil
 ) : HomeItemViewModel() {
 
-  /** Text [String] to greet the learner and display on-screen when launching the home activity. */
+  /** Text [String] to greet the learner. */
   val greeting: String = dateTimeUtil.getGreetingMessage()
 
   /**
-   * Returns the user-readable portion of the welcome screen greeting that contains the user's name.
+   *  Returns the string which contains greeting message with user's name and display on-screen when launching the home activity.
    */
-  fun computeProfileNameText(): String {
-    return resourceHandler.getStringInLocaleWithWrapping(R.string.welcome_profile_name, profileName)
+  fun welcomeText(): String {
+    return "$greeting ${
+      resourceHandler.getStringInLocaleWithWrapping(
+        R.string.welcome_profile_name,
+        profileName
+      )
+    }"
   }
 
   // Overriding equals is needed so that DataProvider combine functions used in the HomeViewModel

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

@@ -33,16 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/home_welcome_text_view_margin_end"
         android:fontFamily="sans-serif"
-        android:text="@{viewModel.greeting}"
-        android:textColor="@color/component_color_shared_primary_text_color"
-        android:textSize="24sp" />
-
-      <TextView
-        android:id="@+id/profile_name_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:text="@{viewModel.computeProfileNameText()}"
+        android:text="@{viewModel.welcomeText}"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="24sp" />
     </com.google.android.flexbox.FlexboxLayout>