modified view

app/build.gradle

@@ -41,13 +41,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
     testImplementation 'junit:junit:4.+'
-<<<<<<< HEAD
-  // androidTestImplementation 'com.android.support.test:runner:1.0.2'
-
    // androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-=======
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
->>>>>>> f7de788a79d6a422d77d0cab63ac99197c44abfb
 }
\ No newline at end of file

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

@@ -11,8 +11,8 @@
     <fragment
         android:id="@+id/fragment_tasklist"
         android:name="com.clemhaowen.dm_td2.tasklist.TaskListFragment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:text="Hello World!"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"

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

@@ -17,7 +17,7 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="30dp"
         android:layout_marginBottom="30dp"