diff --git a/app/build.gradle b/app/build.gradle index 3c1e181d35017008ec84f349d007fd252633fd14..8e320174632e4decbd0490b22678fb15c8ec7714 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,12 @@ dependencies { //implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:2.0.4' implementation "androidx.recyclerview:recyclerview:1.1.0" + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.+' +<<<<<<< HEAD // androidTestImplementation 'com.android.support.test:runner:1.0.2' +======= + //androidTestImplementation 'com.android.support.test:runner:1.0.2' +>>>>>>> 36446a79a955a5ec115e137ca38bcb6976aede75 androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_add_24.xml b/app/src/main/res/drawable/ic_baseline_add_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..eb232541d873c666e1063cb1ef41aa3e66b1cf27 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_add_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> +</vector> diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml index d1a0b8d5fb6744c7206e353455639bf5d78cc685..e897cbfd4166c06f2a768b82c3937dbd8d9a559c 100644 --- a/app/src/main/res/layout/fragment_task_list.xml +++ b/app/src/main/res/layout/fragment_task_list.xml @@ -1,11 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/linearLayout" android:layout_width="match_parent" android:layout_height="match_parent"> <androidx.recyclerview.widget.RecyclerView - android:layout_height="match_parent" - android:layout_width="match_parent" android:id="@+id/fragment_tasklist_recyclerView" - /> -</LinearLayout> \ No newline at end of file + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/button3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="30dp" + android:layout_marginBottom="30dp" + android:text="Button" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file