diff --git a/app/build.gradle b/app/build.gradle index 23d01f4b8db9e058a1d34fabc370b2b38c625661..5603a40b35a501874262768d5a32ad7ac1b2ed6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,11 +35,11 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'com.android.support:appcompat-v7:28.0.0' + //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.+' - 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' } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml index 39c01c40cab4b0937df3c9a97dac9bf281223313..e897cbfd4166c06f2a768b82c3937dbd8d9a559c 100644 --- a/app/src/main/res/layout/fragment_task_list.xml +++ b/app/src/main/res/layout/fragment_task_list.xml @@ -15,4 +15,14 @@ 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 diff --git a/gradle.properties b/gradle.properties index 7c985649a67ba015ccfbfff1a9ac6ad2c5aa60de..4214b38bd1a3751008710979c05a45c77dfde875 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.useAndroidX=true \ No newline at end of file