diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3eaf7fa45..7a711c938 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -153,7 +153,7 @@ dependencies {
implementation("com.google.code.gson:gson:2.8.5")
implementation("com.github.rey5137:material:1.2.5")
implementation("com.nononsenseapps:filepicker:4.2.1")
- implementation("com.google.android.material:material:1.0.0")
+ implementation("com.google.android.material:material:1.1.0-alpha07")
implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.cardview:cardview:1.0.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta1")
diff --git a/app/licenses.yml b/app/licenses.yml
index 2add1cf0a..59870fd0b 100644
--- a/app/licenses.yml
+++ b/app/licenses.yml
@@ -725,4 +725,34 @@
copyrightHolder: The Android Open Source Project
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+ url: http://developer.android.com/tools/extras/support-library.html
+- artifact: androidx.appcompat:appcompat-resources:+
+ name: Android Resources Library
+ copyrightHolder: Android Open Source Project
+ license: The Apache Software License, Version 2.0
+ licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+ url: http://developer.android.com/tools/extras/support-library.html
+- artifact: androidx.viewpager2:viewpager2:+
+ name: AndroidX Widget ViewPager2
+ copyrightHolder: Android Open Source Project
+ license: The Apache Software License, Version 2.0
+ licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+ url: http://developer.android.com/tools/extras/support-library.html
+- artifact: androidx.concurrent:concurrent-futures:+
+ name: AndroidX Futures
+ copyrightHolder: Android Open Source Project
+ license: The Apache Software License, Version 2.0
+ licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+ url: https://developer.android.com/topic/libraries/architecture/index.html
+- artifact: androidx.savedstate:savedstate:+
+ name: Activity
+ copyrightHolder: Android Open Source Project
+ license: The Apache Software License, Version 2.0
+ licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+ url: http://developer.android.com/tools/extras/support-library.html
+- artifact: androidx.activity:activity:+
+ name: Activity
+ copyrightHolder: Android Open Source Project
+ license: The Apache Software License, Version 2.0
+ licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: http://developer.android.com/tools/extras/support-library.html
\ No newline at end of file
diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json
index 775eab1fa..544716929 100644
--- a/app/src/main/assets/licenses.json
+++ b/app/src/main/assets/licenses.json
@@ -45,7 +45,7 @@
"artifactId": {
"name": "coordinatorlayout",
"group": "androidx.coordinatorlayout",
- "version": "1.0.0"
+ "version": "1.1.0-alpha01"
}
},
{
@@ -109,7 +109,7 @@
"artifactId": {
"name": "fragment",
"group": "androidx.fragment",
- "version": "1.0.0"
+ "version": "1.1.0-alpha08"
}
},
{
@@ -125,7 +125,7 @@
"artifactId": {
"name": "vectordrawable-animated",
"group": "androidx.vectordrawable",
- "version": "1.0.0"
+ "version": "1.1.0-beta01"
}
},
{
@@ -157,7 +157,7 @@
"artifactId": {
"name": "core",
"group": "androidx.core",
- "version": "1.0.1"
+ "version": "1.0.2"
}
},
{
@@ -173,7 +173,7 @@
"artifactId": {
"name": "core-common",
"group": "androidx.arch.core",
- "version": "2.0.1"
+ "version": "2.1.0-beta01"
}
},
{
@@ -509,7 +509,7 @@
"artifactId": {
"name": "lifecycle-viewmodel",
"group": "androidx.lifecycle",
- "version": "2.0.0"
+ "version": "2.2.0-alpha01"
}
},
{
@@ -909,7 +909,7 @@
"artifactId": {
"name": "ical4j",
"group": "org.mnode.ical4j",
- "version": "2.2.4"
+ "version": "2.2.5"
}
},
{
@@ -925,7 +925,7 @@
"artifactId": {
"name": "recyclerview",
"group": "androidx.recyclerview",
- "version": "1.0.0"
+ "version": "1.1.0-alpha05"
}
},
{
@@ -1053,7 +1053,7 @@
"artifactId": {
"name": "material",
"group": "com.google.android.material",
- "version": "1.0.0"
+ "version": "1.1.0-alpha07"
}
},
{
@@ -1101,7 +1101,7 @@
"artifactId": {
"name": "vectordrawable",
"group": "androidx.vectordrawable",
- "version": "1.0.1"
+ "version": "1.1.0-beta01"
}
},
{
@@ -1149,7 +1149,7 @@
"artifactId": {
"name": "appcompat",
"group": "androidx.appcompat",
- "version": "1.0.2"
+ "version": "1.1.0-alpha05"
}
},
{
@@ -1293,7 +1293,7 @@
"artifactId": {
"name": "transition",
"group": "androidx.transition",
- "version": "1.0.0"
+ "version": "1.0.1"
}
},
{
@@ -1501,7 +1501,7 @@
"artifactId": {
"name": "kotlin-stdlib",
"group": "org.jetbrains.kotlin",
- "version": "1.3.40"
+ "version": "1.3.41"
}
},
{
@@ -1725,7 +1725,7 @@
"artifactId": {
"name": "kotlin-stdlib-jdk7",
"group": "org.jetbrains.kotlin",
- "version": "1.3.40"
+ "version": "1.3.41"
}
},
{
@@ -1935,6 +1935,86 @@
"group": "androidx.core",
"version": "1.0.2"
}
+ },
+ {
+ "notice": null,
+ "copyrightHolder": "Android Open Source Project",
+ "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+ "license": "The Apache Software License, Version 2.0",
+ "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+ "normalizedLicense": "apache2",
+ "year": null,
+ "url": "http://developer.android.com/tools/extras/support-library.html",
+ "libraryName": "Android Resources Library",
+ "artifactId": {
+ "name": "appcompat-resources",
+ "group": "androidx.appcompat",
+ "version": "1.1.0-alpha05"
+ }
+ },
+ {
+ "notice": null,
+ "copyrightHolder": "Android Open Source Project",
+ "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+ "license": "The Apache Software License, Version 2.0",
+ "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+ "normalizedLicense": "apache2",
+ "year": null,
+ "url": "http://developer.android.com/tools/extras/support-library.html",
+ "libraryName": "AndroidX Widget ViewPager2",
+ "artifactId": {
+ "name": "viewpager2",
+ "group": "androidx.viewpager2",
+ "version": "1.0.0-alpha04"
+ }
+ },
+ {
+ "notice": null,
+ "copyrightHolder": "Android Open Source Project",
+ "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+ "license": "The Apache Software License, Version 2.0",
+ "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+ "normalizedLicense": "apache2",
+ "year": null,
+ "url": "https://developer.android.com/topic/libraries/architecture/index.html",
+ "libraryName": "AndroidX Futures",
+ "artifactId": {
+ "name": "concurrent-futures",
+ "group": "androidx.concurrent",
+ "version": "1.0.0-beta01"
+ }
+ },
+ {
+ "notice": null,
+ "copyrightHolder": "Android Open Source Project",
+ "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+ "license": "The Apache Software License, Version 2.0",
+ "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+ "normalizedLicense": "apache2",
+ "year": null,
+ "url": "http://developer.android.com/tools/extras/support-library.html",
+ "libraryName": "Activity",
+ "artifactId": {
+ "name": "savedstate",
+ "group": "androidx.savedstate",
+ "version": "1.0.0-beta01"
+ }
+ },
+ {
+ "notice": null,
+ "copyrightHolder": "Android Open Source Project",
+ "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.",
+ "license": "The Apache Software License, Version 2.0",
+ "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+ "normalizedLicense": "apache2",
+ "year": null,
+ "url": "http://developer.android.com/tools/extras/support-library.html",
+ "libraryName": "Activity",
+ "artifactId": {
+ "name": "activity",
+ "group": "androidx.activity",
+ "version": "1.0.0-alpha08"
+ }
}
]
}
\ No newline at end of file
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 345766f4e..3162cc14d 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -474,7 +474,8 @@ public final class TaskListFragment extends InjectingFragment
public Snackbar makeSnackbar(String text) {
Snackbar snackbar =
Snackbar.make(coordinatorLayout, text, 8000)
- .setActionTextColor(getColor(context, R.color.snackbar_text_color));
+ .setTextColor(getColor(context, R.color.snackbar_text_color))
+ .setActionTextColor(getColor(context, R.color.snackbar_action_color));
snackbar.getView().setBackgroundColor(getColor(context, R.color.snackbar_background));
return snackbar;
}
diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
index d59cc5ece..b9c3a7516 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
@@ -363,7 +363,8 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
private void showSnackbar(String message) {
Snackbar snackbar =
Snackbar.make(root, message, 8000)
- .setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_text_color));
+ .setTextColor(ContextCompat.getColor(context, R.color.snackbar_text_color))
+ .setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_action_color));
snackbar
.getView()
.setBackgroundColor(ContextCompat.getColor(this, R.color.snackbar_background));
diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
index aac1d4bb1..2c6b9316c 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
@@ -186,7 +186,8 @@ public class CaldavCalendarSettingsActivity extends BaseListSettingsActivity {
private void showSnackbar(String message) {
Snackbar snackbar =
Snackbar.make(root, message, 8000)
- .setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_text_color));
+ .setTextColor(ContextCompat.getColor(this, R.color.snackbar_text_color))
+ .setActionTextColor(ContextCompat.getColor(this, R.color.snackbar_action_color));
snackbar
.getView()
.setBackgroundColor(ContextCompat.getColor(this, R.color.snackbar_background));
diff --git a/app/src/main/res/layout/activity_location_picker.xml b/app/src/main/res/layout/activity_location_picker.xml
index 77c9cd09f..44d6d4cf6 100644
--- a/app/src/main/res/layout/activity_location_picker.xml
+++ b/app/src/main/res/layout/activity_location_picker.xml
@@ -77,7 +77,8 @@
android:layout_gravity="end|bottom"
android:padding="0dp"
android:src="@drawable/ic_outline_gps_fixed_24px"
- android:tint="?attr/fab_text"
+ app:tint="?attr/fab_text"
+ app:backgroundTint="?attr/colorAccent"
app:borderWidth="0dp"
app:layout_constraintBottom_toBottomOf="@id/map"
app:layout_constraintEnd_toEndOf="@id/map"/>
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index b3cc6a923..e20991621 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -52,7 +52,8 @@
android:layout_gravity="end|bottom"
android:padding="0dp"
android:src="@drawable/ic_outline_add_24px"
- android:tint="?attr/fab_text"
+ app:tint="?attr/fab_text"
+ app:backgroundTint="?attr/colorAccent"
app:borderWidth="0dp"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ac0e8f17f..58e9aa235 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -112,7 +112,8 @@
@color/blue_500
@color/grey_500
- #f4b400
+ @color/white_100
+ #f4b400
@color/grey_800
#e1e1e1
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d0ed6ec65..37d392640 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -106,7 +106,7 @@
@@ -154,6 +154,7 @@
- @style/TextAppearance.AppCompat.Small
- @dimen/chip_min_height
- false
+ - false
- @dimen/chip_text_padding
- @dimen/chip_text_padding