From 2a36733045b5101235fcb5bacc364ace9e685373 Mon Sep 17 00:00:00 2001
From: Monnot <48322244+Saigai@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:26:49 +0100
Subject: [PATCH] modified view
---
app/build.gradle | 5 -----
app/src/main/res/layout/activity_main.xml | 4 ++--
app/src/main/res/layout/fragment_task_list.xml | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index e12c570..45dfe4f 100644
--- a/app/build.gradle
+++ b/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
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fafdb3a..dca24e8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/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"
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index 8d7c017..369364e 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/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"
--
GitLab