Migrate to AndroidX

pull/757/head
Alex Baker 6 years ago
parent 2440d1b6e2
commit c74b8c7f63

@ -23,7 +23,7 @@ android {
versionName "6.1.3" versionName "6.1.3"
targetSdkVersion 28 targetSdkVersion 28
minSdkVersion 15 minSdkVersion 15
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
@ -107,11 +107,8 @@ configurations {
} }
final DAGGER_VERSION = '2.16' final DAGGER_VERSION = '2.16'
final BUTTERKNIFE_VERSION = '8.8.1' final BUTTERKNIFE_VERSION = '9.0.0-rc1'
final SUPPORT_VERSION = '28.0.0'
final ROOM_VERSION = '1.1.1'
final STETHO_VERSION = '1.5.0' final STETHO_VERSION = '1.5.0'
final TESTING_SUPPORT_VERSION = '1.0.0'
final WORK_VERSION = '1.0.0-alpha10' final WORK_VERSION = '1.0.0-alpha10'
final LEAKCANARY_VERSION = '1.6.1' final LEAKCANARY_VERSION = '1.6.1'
@ -122,11 +119,11 @@ dependencies {
annotationProcessor "com.google.dagger:dagger-compiler:${DAGGER_VERSION}" annotationProcessor "com.google.dagger:dagger-compiler:${DAGGER_VERSION}"
implementation "com.google.dagger:dagger:${DAGGER_VERSION}" implementation "com.google.dagger:dagger:${DAGGER_VERSION}"
implementation "android.arch.persistence.room:rxjava2:${ROOM_VERSION}" implementation 'androidx.room:room-rxjava2:2.1.0-alpha01'
annotationProcessor "android.arch.persistence.room:compiler:${ROOM_VERSION}" annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha01'
implementation "android.arch.lifecycle:extensions:1.1.1" implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
implementation "io.reactivex.rxjava2:rxandroid:2.0.2" implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
implementation "android.arch.paging:runtime:1.0.1" implementation "androidx.paging:paging-runtime:2.1.0-alpha01"
annotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}" annotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}"
implementation "com.jakewharton:butterknife:${BUTTERKNIFE_VERSION}" implementation "com.jakewharton:butterknife:${BUTTERKNIFE_VERSION}"
@ -138,17 +135,17 @@ dependencies {
//noinspection GradleDependency //noinspection GradleDependency
debugImplementation "com.squareup.leakcanary:leakcanary-android:${LEAKCANARY_VERSION}" debugImplementation "com.squareup.leakcanary:leakcanary-android:${LEAKCANARY_VERSION}"
debugImplementation "com.squareup.leakcanary:leakcanary-support-fragment:${LEAKCANARY_VERSION}" debugImplementation "com.squareup.leakcanary:leakcanary-support-fragment:${LEAKCANARY_VERSION}"
debugImplementation 'com.android.support:multidex:1.0.3' debugImplementation 'androidx.multidex:multidex:2.0.0'
implementation 'com.squareup.okhttp3:okhttp:3.11.0' implementation 'com.squareup.okhttp3:okhttp:3.11.0'
implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.github.rey5137:material:1.2.5' implementation 'com.github.rey5137:material:1.2.5'
implementation 'com.nononsenseapps:filepicker:4.2.1' implementation 'com.nononsenseapps:filepicker:4.2.1'
implementation "com.android.support:design:${SUPPORT_VERSION}" implementation 'com.google.android.material:material:1.0.0'
implementation "com.android.support:support-annotations:${SUPPORT_VERSION}" implementation 'androidx.annotation:annotation:1.0.0'
implementation "com.android.support:support-v13:${SUPPORT_VERSION}" implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation "com.android.support:cardview-v7:${SUPPORT_VERSION}" implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
implementation 'com.jakewharton.timber:timber:4.7.1' implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.jakewharton.threetenabp:threetenabp:1.1.0' implementation 'com.jakewharton.threetenabp:threetenabp:1.1.0'
//noinspection GradleDependency //noinspection GradleDependency
@ -190,9 +187,9 @@ dependencies {
androidTestAnnotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}" androidTestAnnotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}"
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
androidTestImplementation 'com.natpryce:make-it-easy:4.0.1' androidTestImplementation 'com.natpryce:make-it-easy:4.0.1'
androidTestImplementation "com.android.support.test:runner:${TESTING_SUPPORT_VERSION}" androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
androidTestImplementation "com.android.support.test:rules:${TESTING_SUPPORT_VERSION}" androidTestImplementation 'androidx.test:rules:1.1.0-beta02'
androidTestImplementation "com.android.support:support-annotations:${SUPPORT_VERSION}" androidTestImplementation 'androidx.annotation:annotation:1.0.0'
} }
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'

@ -5,14 +5,14 @@
*/ */
package com.todoroo.andlib.test; package com.todoroo.andlib.test;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

@ -5,7 +5,7 @@
*/ */
package com.todoroo.andlib.utility; package com.todoroo.andlib.utility;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static com.todoroo.andlib.utility.DateUtilities.addCalendarMonthsToUnixtime; import static com.todoroo.andlib.utility.DateUtilities.addCalendarMonthsToUnixtime;
import static com.todoroo.andlib.utility.DateUtilities.getDateString; import static com.todoroo.andlib.utility.DateUtilities.getDateString;
import static com.todoroo.andlib.utility.DateUtilities.getStartOfDay; import static com.todoroo.andlib.utility.DateUtilities.getStartOfDay;
@ -19,7 +19,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.date.DateTimeUtils.newDateTime;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import java.util.Locale; import java.util.Locale;
import org.junit.After; import org.junit.After;

@ -1,12 +1,12 @@
package com.todoroo.andlib.utility; package com.todoroo.andlib.utility;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static com.todoroo.andlib.utility.DateUtilities.getRelativeDay; import static com.todoroo.andlib.utility.DateUtilities.getRelativeDay;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static org.tasks.Freeze.freezeAt; import static org.tasks.Freeze.freezeAt;
import static org.tasks.Freeze.thaw; import static org.tasks.Freeze.thaw;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.util.Locale; import java.util.Locale;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

@ -7,7 +7,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.tasks.makers.TaskMaker.REMINDER_LAST; import static org.tasks.makers.TaskMaker.REMINDER_LAST;
import static org.tasks.makers.TaskMaker.newTask; import static org.tasks.makers.TaskMaker.newTask;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import javax.inject.Inject; import javax.inject.Inject;

@ -9,7 +9,7 @@ import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotSame; import static junit.framework.Assert.assertNotSame;
import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertNull;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -19,7 +19,7 @@ import static org.tasks.Freeze.thaw;
import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.date.DateTimeUtils.newDateTime;
import static org.tasks.time.DateTimeUtils.currentTimeMillis; import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task.Priority; import com.todoroo.astrid.data.Task.Priority;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.TreeSet; import java.util.TreeSet;

@ -4,7 +4,7 @@ import static junit.framework.Assert.assertEquals;
import static org.tasks.Freeze.freezeClock; import static org.tasks.Freeze.freezeClock;
import static org.tasks.time.DateTimeUtils.currentTimeMillis; import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import javax.inject.Inject; import javax.inject.Inject;

@ -24,7 +24,7 @@ import static org.tasks.makers.TaskMaker.REMINDER_LAST;
import static org.tasks.makers.TaskMaker.SNOOZE_TIME; import static org.tasks.makers.TaskMaker.SNOOZE_TIME;
import static org.tasks.makers.TaskMaker.newTask; import static org.tasks.makers.TaskMaker.newTask;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

@ -8,7 +8,7 @@ package com.todoroo.astrid.repeats;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.date.DateTimeUtils.newDateTime;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.ical.values.Frequency; import com.google.ical.values.Frequency;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.google.ical.values.Weekday; import com.google.ical.values.Weekday;

@ -4,7 +4,7 @@ import static com.todoroo.astrid.repeats.RepeatTaskHelper.computeNextDueDate;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.ical.values.Frequency; import com.google.ical.values.Frequency;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.google.ical.values.Weekday; import com.google.ical.values.Weekday;

@ -13,7 +13,7 @@ import static org.tasks.makers.TaskMaker.RRULE;
import static org.tasks.makers.TaskMaker.newTask; import static org.tasks.makers.TaskMaker.newTask;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.todoroo.astrid.alarms.AlarmService; import com.todoroo.astrid.alarms.AlarmService;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;

@ -7,7 +7,7 @@ package com.todoroo.astrid.service;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.Task.Priority; import com.todoroo.astrid.data.Task.Priority;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;

@ -11,7 +11,7 @@ import static junit.framework.Assert.assertNotSame;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.date.DateTimeUtils.newDateTime;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.ical.values.Frequency; import com.google.ical.values.Frequency;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -2,7 +2,7 @@ package com.todoroo.astrid.subtasks;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import javax.inject.Inject; import javax.inject.Inject;

@ -1,6 +1,6 @@
package com.todoroo.astrid.subtasks; package com.todoroo.astrid.subtasks;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import javax.inject.Inject; import javax.inject.Inject;

@ -1,6 +1,6 @@
package com.todoroo.astrid.subtasks; package com.todoroo.astrid.subtasks;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNotNull;

@ -2,7 +2,7 @@ package com.todoroo.astrid.sync;
import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertFalse;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

@ -1,7 +1,7 @@
package org.tasks; package org.tasks;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.io.CharStreams; import com.google.common.io.CharStreams;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -3,7 +3,7 @@ package org.tasks.caldav;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static org.tasks.TestUtilities.vtodo; import static org.tasks.TestUtilities.vtodo;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task.Priority; import com.todoroo.astrid.data.Task.Priority;
import java.util.TimeZone; import java.util.TimeZone;
import org.junit.After; import org.junit.After;

@ -1,6 +1,6 @@
package org.tasks.caldav; package org.tasks.caldav;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

@ -3,7 +3,7 @@ package org.tasks.caldav;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static org.tasks.TestUtilities.vtodo; import static org.tasks.TestUtilities.vtodo;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task.Priority; import com.todoroo.astrid.data.Task.Priority;
import java.util.TimeZone; import java.util.TimeZone;
import org.junit.After; import org.junit.After;

@ -3,7 +3,7 @@ package org.tasks.caldav;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static org.tasks.TestUtilities.vtodo; import static org.tasks.TestUtilities.vtodo;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task.Priority; import com.todoroo.astrid.data.Task.Priority;
import java.util.TimeZone; import java.util.TimeZone;
import org.junit.After; import org.junit.After;

@ -2,7 +2,7 @@ package org.tasks.data;
import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayList;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.common.collect.ContiguousSet; import com.google.common.collect.ContiguousSet;
import com.google.common.collect.DiscreteDomain; import com.google.common.collect.DiscreteDomain;
import com.google.common.collect.Range; import com.google.common.collect.Range;

@ -5,7 +5,7 @@ import static org.tasks.Freeze.freezeAt;
import static org.tasks.date.DateTimeUtils.newDateUtc; import static org.tasks.date.DateTimeUtils.newDateUtc;
import static org.tasks.time.DateTimeUtils.currentTimeMillis; import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.util.TimeZone; import java.util.TimeZone;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

@ -1,6 +1,6 @@
package org.tasks.injection; package org.tasks.injection;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static org.tasks.TestUtilities.initializeMockito; import static org.tasks.TestUtilities.initializeMockito;
import org.junit.Before; import org.junit.Before;

@ -1,6 +1,6 @@
package org.tasks.injection; package org.tasks.injection;
import android.arch.persistence.room.Room; import androidx.room.Room;
import android.content.Context; import android.content.Context;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;

@ -5,11 +5,11 @@
*/ */
package org.tasks.jobs; package org.tasks.jobs;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.io.File; import java.io.File;

@ -9,7 +9,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.stub; import static org.mockito.Mockito.stub;
import static org.tasks.date.DateTimeUtils.newDate; import static org.tasks.date.DateTimeUtils.newDate;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.io.File; import java.io.File;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

@ -15,7 +15,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.tasks.time.DateTimeUtils.currentTimeMillis; import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.junit.After; import org.junit.After;

@ -1,10 +1,10 @@
package org.tasks.preferences; package org.tasks.preferences;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

@ -1,9 +1,9 @@
package org.tasks.repeats; package org.tasks.repeats;
import static android.support.test.InstrumentationRegistry.getTargetContext; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import java.text.ParseException; import java.text.ParseException;
import org.junit.Test; import org.junit.Test;

@ -4,7 +4,7 @@ import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.junit.Test; import org.junit.Test;

@ -8,7 +8,7 @@ package com.todoroo.astrid.gtasks;
import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -13,7 +13,7 @@ import static org.tasks.makers.GtaskListMaker.newGtaskList;
import static org.tasks.makers.RemoteGtaskListMaker.newRemoteList; import static org.tasks.makers.RemoteGtaskListMaker.newRemoteList;
import static org.tasks.time.DateTimeUtils.currentTimeMillis; import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.api.client.util.DateTime; import com.google.api.client.util.DateTime;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;

@ -8,7 +8,7 @@ package com.todoroo.astrid.gtasks;
import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertNull;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import javax.inject.Inject; import javax.inject.Inject;

@ -8,7 +8,7 @@ package com.todoroo.astrid.gtasks;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNotNull;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -8,7 +8,7 @@ package com.todoroo.astrid.gtasks;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNotNull;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -7,7 +7,7 @@ import static com.todoroo.astrid.gtasks.api.GtasksApiUtilities.unixTimeToGtasksD
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertNull;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;

@ -10,7 +10,7 @@ import static org.tasks.makers.TaskMaker.DUE_TIME;
import static org.tasks.makers.TaskMaker.HIDE_TYPE; import static org.tasks.makers.TaskMaker.HIDE_TYPE;
import static org.tasks.makers.TaskMaker.newTask; import static org.tasks.makers.TaskMaker.newTask;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

@ -1,5 +1,5 @@
package org.tasks; package org.tasks;
import android.support.multidex.MultiDexApplication; import androidx.multidex.MultiDexApplication;
public abstract class BaseApplication extends MultiDexApplication {} public abstract class BaseApplication extends MultiDexApplication {}

@ -3,7 +3,7 @@ package org.tasks.location;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.app.JobIntentService; import androidx.core.app.JobIntentService;
import com.google.android.gms.location.GeofencingEvent; import com.google.android.gms.location.GeofencingEvent;
import com.todoroo.astrid.reminders.ReminderService; import com.todoroo.astrid.reminders.ReminderService;
import java.util.List; import java.util.List;

@ -223,7 +223,7 @@
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:name="android.support.v4.content.FileProvider"> android:name="androidx.core.content.FileProvider">
<meta-data <meta-data
android:name="android.support.FILE_PROVIDER_PATHS" android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_provider_paths"/> android:resource="@xml/file_provider_paths"/>

@ -9,10 +9,10 @@ import static java.util.Arrays.asList;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;

@ -11,14 +11,14 @@ import static org.tasks.tasklist.ActionUtils.applySupportActionModeColor;
import static org.tasks.ui.NavigationDrawerFragment.OnFilterItemClickedListener; import static org.tasks.ui.NavigationDrawerFragment.OnFilterItemClickedListener;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import android.support.v7.view.ActionMode; import androidx.appcompat.view.ActionMode;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;

@ -10,10 +10,10 @@ import static org.tasks.date.DateTimeUtils.newDateTime;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;

@ -6,25 +6,25 @@
package com.todoroo.astrid.activity; package com.todoroo.astrid.activity;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
import static android.support.v4.content.ContextCompat.getColor; import static androidx.core.content.ContextCompat.getColor;
import android.app.Activity; import android.app.Activity;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.speech.RecognizerIntent; import android.speech.RecognizerIntent;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar; import com.google.android.material.snackbar.Snackbar;
import android.support.v4.view.MenuItemCompat; import androidx.core.view.MenuItemCompat;
import android.support.v4.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.support.v7.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.support.v7.widget.SearchView; import androidx.appcompat.widget.SearchView;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;

@ -5,7 +5,7 @@
*/ */
package com.todoroo.astrid.adapter; package com.todoroo.astrid.adapter;
import static android.support.v4.content.ContextCompat.getColor; import static androidx.core.content.ContextCompat.getColor;
import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.base.Strings.isNullOrEmpty;
import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop; import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop;
import static org.tasks.caldav.CaldavCalendarSettingsActivity.EXTRA_CALDAV_ACCOUNT; import static org.tasks.caldav.CaldavCalendarSettingsActivity.EXTRA_CALDAV_ACCOUNT;
@ -17,11 +17,11 @@ import android.content.Intent;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v4.content.res.ResourcesCompat; import androidx.core.content.res.ResourcesCompat;
import android.support.v4.graphics.drawable.DrawableCompat; import androidx.core.graphics.drawable.DrawableCompat;
import android.support.v4.util.Pair; import androidx.core.util.Pair;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

@ -8,7 +8,7 @@ package com.todoroo.astrid.adapter;
import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.primitives.Longs.asList; import static com.google.common.primitives.Longs.asList;
import android.arch.paging.AsyncPagedListDiffer; import androidx.paging.AsyncPagedListDiffer;
import com.google.common.collect.ObjectArrays; import com.google.common.collect.ObjectArrays;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Property.LongProperty;

@ -12,8 +12,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.MenuItem; import android.view.MenuItem;

@ -6,7 +6,7 @@
package com.todoroo.astrid.core; package com.todoroo.astrid.core;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;

@ -11,7 +11,7 @@ import static org.tasks.activities.RemoteListNativePicker.newRemoteListNativePic
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.preference.Preference; import android.preference.Preference;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.api.GtasksFilter;

@ -5,8 +5,8 @@
*/ */
package com.todoroo.astrid.dao; package com.todoroo.astrid.dao;
import android.arch.persistence.db.SupportSQLiteDatabase; import androidx.sqlite.db.SupportSQLiteDatabase;
import android.arch.persistence.room.RoomDatabase; import androidx.room.RoomDatabase;
import android.database.Cursor; import android.database.Cursor;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.io.IOException; import java.io.IOException;
@ -41,7 +41,7 @@ import org.tasks.notifications.Notification;
import org.tasks.notifications.NotificationDao; import org.tasks.notifications.NotificationDao;
import timber.log.Timber; import timber.log.Timber;
@android.arch.persistence.room.Database( @androidx.room.Database(
entities = { entities = {
Notification.class, Notification.class,
TagData.class, TagData.class,

@ -7,9 +7,9 @@ package com.todoroo.astrid.dao;
import static com.todoroo.andlib.utility.DateUtilities.now; import static com.todoroo.andlib.utility.DateUtilities.now;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.Update; import androidx.room.Update;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
@ -47,48 +47,48 @@ public abstract class TaskDao {
return needsRefresh(now()); return needsRefresh(now());
} }
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT * FROM tasks WHERE completed = 0 AND deleted = 0 AND (hideUntil > :now OR dueDate > :now)") "SELECT * FROM tasks WHERE completed = 0 AND deleted = 0 AND (hideUntil > :now OR dueDate > :now)")
abstract List<Task> needsRefresh(long now); abstract List<Task> needsRefresh(long now);
@android.arch.persistence.room.Query("SELECT * FROM tasks WHERE _id = :id LIMIT 1") @androidx.room.Query("SELECT * FROM tasks WHERE _id = :id LIMIT 1")
public abstract Task fetch(long id); public abstract Task fetch(long id);
@android.arch.persistence.room.Query("SELECT * FROM tasks WHERE _id IN (:taskIds)") @androidx.room.Query("SELECT * FROM tasks WHERE _id IN (:taskIds)")
public abstract List<Task> fetch(List<Long> taskIds); public abstract List<Task> fetch(List<Long> taskIds);
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT COUNT(1) FROM tasks WHERE timerStart > 0 AND deleted = 0") "SELECT COUNT(1) FROM tasks WHERE timerStart > 0 AND deleted = 0")
public abstract int activeTimers(); public abstract int activeTimers();
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT tasks.* FROM tasks INNER JOIN notification ON tasks._id = notification.task") "SELECT tasks.* FROM tasks INNER JOIN notification ON tasks._id = notification.task")
public abstract List<Task> activeNotifications(); public abstract List<Task> activeNotifications();
@android.arch.persistence.room.Query("SELECT * FROM tasks WHERE remoteId = :remoteId") @androidx.room.Query("SELECT * FROM tasks WHERE remoteId = :remoteId")
public abstract Task fetch(String remoteId); public abstract Task fetch(String remoteId);
@android.arch.persistence.room.Query("SELECT * FROM tasks WHERE completed = 0 AND deleted = 0") @androidx.room.Query("SELECT * FROM tasks WHERE completed = 0 AND deleted = 0")
abstract List<Task> getActiveTasks(); abstract List<Task> getActiveTasks();
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT * FROM tasks WHERE hideUntil < (strftime('%s','now')*1000)") "SELECT * FROM tasks WHERE hideUntil < (strftime('%s','now')*1000)")
abstract List<Task> getVisibleTasks(); abstract List<Task> getVisibleTasks();
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT * FROM tasks WHERE remoteId IN (:remoteIds) " "SELECT * FROM tasks WHERE remoteId IN (:remoteIds) "
+ "AND recurrence NOT NULL AND LENGTH(recurrence) > 0") + "AND recurrence NOT NULL AND LENGTH(recurrence) > 0")
public abstract List<Task> getRecurringTasks(List<String> remoteIds); public abstract List<Task> getRecurringTasks(List<String> remoteIds);
@android.arch.persistence.room.Query( @androidx.room.Query(
"UPDATE tasks SET completed = :completionDate " + "WHERE remoteId = :remoteId") "UPDATE tasks SET completed = :completionDate " + "WHERE remoteId = :remoteId")
public abstract void setCompletionDate(String remoteId, long completionDate); public abstract void setCompletionDate(String remoteId, long completionDate);
@android.arch.persistence.room.Query( @androidx.room.Query(
"UPDATE tasks SET snoozeTime = :millis WHERE _id in (:taskIds)") "UPDATE tasks SET snoozeTime = :millis WHERE _id in (:taskIds)")
public abstract void snooze(List<Long> taskIds, long millis); public abstract void snooze(List<Long> taskIds, long millis);
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT tasks.* FROM tasks " "SELECT tasks.* FROM tasks "
+ "LEFT JOIN google_tasks ON tasks._id = google_tasks.task " + "LEFT JOIN google_tasks ON tasks._id = google_tasks.task "
+ "WHERE list_id IN (SELECT remote_id FROM google_task_lists WHERE account = :account)" + "WHERE list_id IN (SELECT remote_id FROM google_task_lists WHERE account = :account)"
@ -96,37 +96,37 @@ public abstract class TaskDao {
+ "OR google_tasks.remote_id = '')") + "OR google_tasks.remote_id = '')")
public abstract List<Task> getGoogleTasksToPush(String account); public abstract List<Task> getGoogleTasksToPush(String account);
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT tasks.* FROM tasks " "SELECT tasks.* FROM tasks "
+ "LEFT JOIN caldav_tasks ON tasks._id = caldav_tasks.task " + "LEFT JOIN caldav_tasks ON tasks._id = caldav_tasks.task "
+ "WHERE caldav_tasks.calendar = :calendar " + "WHERE caldav_tasks.calendar = :calendar "
+ "AND tasks.modified > caldav_tasks.last_sync") + "AND tasks.modified > caldav_tasks.last_sync")
public abstract List<Task> getCaldavTasksToPush(String calendar); public abstract List<Task> getCaldavTasksToPush(String calendar);
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT * FROM TASKS " "SELECT * FROM TASKS "
+ "WHERE completed = 0 AND deleted = 0 AND (notificationFlags > 0 OR notifications > 0)") + "WHERE completed = 0 AND deleted = 0 AND (notificationFlags > 0 OR notifications > 0)")
public abstract List<Task> getTasksWithReminders(); public abstract List<Task> getTasksWithReminders();
// --- SQL clause generators // --- SQL clause generators
@android.arch.persistence.room.Query("SELECT * FROM tasks") @androidx.room.Query("SELECT * FROM tasks")
public abstract List<Task> getAll(); public abstract List<Task> getAll();
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT calendarUri FROM tasks " + "WHERE calendarUri NOT NULL AND calendarUri != ''") "SELECT calendarUri FROM tasks " + "WHERE calendarUri NOT NULL AND calendarUri != ''")
public abstract List<String> getAllCalendarEvents(); public abstract List<String> getAllCalendarEvents();
@android.arch.persistence.room.Query( @androidx.room.Query(
"UPDATE tasks SET calendarUri = '' " + "WHERE calendarUri NOT NULL AND calendarUri != ''") "UPDATE tasks SET calendarUri = '' " + "WHERE calendarUri NOT NULL AND calendarUri != ''")
public abstract int clearAllCalendarEvents(); public abstract int clearAllCalendarEvents();
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT calendarUri FROM tasks " "SELECT calendarUri FROM tasks "
+ "WHERE completed > 0 AND calendarUri NOT NULL AND calendarUri != ''") + "WHERE completed > 0 AND calendarUri NOT NULL AND calendarUri != ''")
public abstract List<String> getCompletedCalendarEvents(); public abstract List<String> getCompletedCalendarEvents();
@android.arch.persistence.room.Query( @androidx.room.Query(
"UPDATE tasks SET calendarUri = '' " "UPDATE tasks SET calendarUri = '' "
+ "WHERE completed > 0 AND calendarUri NOT NULL AND calendarUri != ''") + "WHERE completed > 0 AND calendarUri NOT NULL AND calendarUri != ''")
public abstract int clearCompletedCalendarEvents(); public abstract int clearCompletedCalendarEvents();
@ -178,7 +178,7 @@ public abstract class TaskDao {
return false; return false;
} }
@android.arch.persistence.room.Query( @androidx.room.Query(
"SELECT * FROM tasks " "SELECT * FROM tasks "
+ "WHERE completed = 0 AND deleted = 0 AND hideUntil < (strftime('%s','now')*1000) " + "WHERE completed = 0 AND deleted = 0 AND hideUntil < (strftime('%s','now')*1000) "
+ "ORDER BY (CASE WHEN (dueDate=0) THEN (strftime('%s','now')*1000)*2 ELSE ((CASE WHEN (dueDate / 60000) > 0 THEN dueDate ELSE (dueDate + 43140000) END)) END) + 172800000 * importance ASC " + "ORDER BY (CASE WHEN (dueDate=0) THEN (strftime('%s','now')*1000)*2 ELSE ((CASE WHEN (dueDate / 60000) > 0 THEN dueDate ELSE (dueDate + 43140000) END)) END) + 172800000 * importance ASC "

@ -8,16 +8,16 @@ package com.todoroo.astrid.data;
import static java.lang.annotation.RetentionPolicy.SOURCE; import static java.lang.annotation.RetentionPolicy.SOURCE;
import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.date.DateTimeUtils.newDateTime;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.IntDef; import androidx.annotation.IntDef;
import android.text.TextUtils; import android.text.TextUtils;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;

@ -19,7 +19,7 @@ import android.content.Intent;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

@ -8,7 +8,7 @@ package com.todoroo.astrid.gtasks;
import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.transform; import static com.google.common.collect.Lists.transform;
import android.support.v4.util.Pair; import androidx.core.util.Pair;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.api.GtasksFilter;
import java.util.List; import java.util.List;

@ -5,7 +5,7 @@
*/ */
package com.todoroo.astrid.notes; package com.todoroo.astrid.notes;
import static android.support.v4.content.ContextCompat.getColor; import static androidx.core.content.ContextCompat.getColor;
import static org.tasks.files.FileHelper.getPathFromUri; import static org.tasks.files.FileHelper.getPathFromUri;
import static org.tasks.files.ImageHelper.sampleBitmap; import static org.tasks.files.ImageHelper.sampleBitmap;
@ -13,7 +13,7 @@ import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.net.Uri; import android.net.Uri;
import android.support.v4.content.FileProvider; import androidx.core.content.FileProvider;
import android.text.Html; import android.text.Html;
import android.text.util.Linkify; import android.text.util.Linkify;
import android.view.View; import android.view.View;

@ -11,7 +11,7 @@ import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.database.MatrixCursor; import android.database.MatrixCursor;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -5,7 +5,7 @@
*/ */
package com.todoroo.astrid.repeats; package com.todoroo.astrid.repeats;
import static android.support.v4.content.ContextCompat.getColor; import static androidx.core.content.ContextCompat.getColor;
import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayList;
import static com.google.ical.values.Frequency.MONTHLY; import static com.google.ical.values.Frequency.MONTHLY;
import static org.tasks.repeats.BasicRecurrenceDialog.newBasicRecurrenceDialog; import static org.tasks.repeats.BasicRecurrenceDialog.newBasicRecurrenceDialog;
@ -14,10 +14,10 @@ import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat; import androidx.core.graphics.drawable.DrawableCompat;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

@ -16,11 +16,11 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat; import androidx.core.graphics.drawable.DrawableCompat;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;

@ -9,8 +9,8 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.text.format.DateUtils; import android.text.format.DateUtils;

@ -11,7 +11,7 @@ import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.support.v4.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;

@ -6,7 +6,7 @@
package com.todoroo.astrid.ui; package com.todoroo.astrid.ui;
import android.content.Context; import android.content.Context;
import android.support.v7.widget.AppCompatImageView; import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.ViewDebug; import android.view.ViewDebug;
import android.widget.Checkable; import android.widget.Checkable;

@ -8,7 +8,7 @@ package com.todoroo.astrid.ui;
import android.content.Context; import android.content.Context;
import android.graphics.Paint; import android.graphics.Paint;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

@ -5,7 +5,7 @@
*/ */
package com.todoroo.astrid.ui; package com.todoroo.astrid.ui;
import static android.support.v4.content.ContextCompat.getColor; import static androidx.core.content.ContextCompat.getColor;
import static com.todoroo.astrid.data.Task.HIDE_UNTIL_DAY_BEFORE; import static com.todoroo.astrid.data.Task.HIDE_UNTIL_DAY_BEFORE;
import static com.todoroo.astrid.data.Task.HIDE_UNTIL_DUE; import static com.todoroo.astrid.data.Task.HIDE_UNTIL_DUE;
import static com.todoroo.astrid.data.Task.HIDE_UNTIL_NONE; import static com.todoroo.astrid.data.Task.HIDE_UNTIL_NONE;
@ -17,8 +17,8 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

@ -8,7 +8,7 @@ package com.todoroo.astrid.ui;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

@ -6,7 +6,7 @@
package com.todoroo.astrid.ui; package com.todoroo.astrid.ui;
import android.content.Context; import android.content.Context;
import android.support.v7.widget.AppCompatImageButton; import androidx.appcompat.widget.AppCompatImageButton;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;

@ -19,8 +19,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;

@ -1,6 +1,6 @@
package com.todoroo.astrid.voice; package com.todoroo.astrid.voice;
import android.arch.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;
import android.media.MediaRecorder; import android.media.MediaRecorder;
import android.os.SystemClock; import android.os.SystemClock;
import java.io.IOException; import java.io.IOException;

@ -16,13 +16,13 @@ public class LocalBroadcastManager {
private static final String REPEAT = BuildConfig.APPLICATION_ID + ".REPEAT"; private static final String REPEAT = BuildConfig.APPLICATION_ID + ".REPEAT";
private static final String REFRESH_PURCHASES = BuildConfig.APPLICATION_ID + ".REFRESH_PURCHASES"; private static final String REFRESH_PURCHASES = BuildConfig.APPLICATION_ID + ".REFRESH_PURCHASES";
private final android.support.v4.content.LocalBroadcastManager localBroadcastManager; private final androidx.localbroadcastmanager.content.LocalBroadcastManager localBroadcastManager;
private final AppWidgetManager appWidgetManager; private final AppWidgetManager appWidgetManager;
@Inject @Inject
public LocalBroadcastManager(@ForApplication Context context, AppWidgetManager appWidgetManager) { public LocalBroadcastManager(@ForApplication Context context, AppWidgetManager appWidgetManager) {
this.appWidgetManager = appWidgetManager; this.appWidgetManager = appWidgetManager;
localBroadcastManager = android.support.v4.content.LocalBroadcastManager.getInstance(context); localBroadcastManager = androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(context);
} }
public void registerRefreshReceiver(BroadcastReceiver broadcastReceiver) { public void registerRefreshReceiver(BroadcastReceiver broadcastReceiver) {

@ -8,7 +8,7 @@ import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;

@ -4,7 +4,7 @@ import static org.tasks.activities.CalendarSelectionDialog.newCalendarSelectionD
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import org.tasks.calendars.AndroidCalendar; import org.tasks.calendars.AndroidCalendar;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.ThemedInjectingAppCompatActivity; import org.tasks.injection.ThemedInjectingAppCompatActivity;

@ -7,8 +7,8 @@ import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Toast; import android.widget.Toast;
import com.google.common.base.Strings; import com.google.common.base.Strings;

@ -9,7 +9,7 @@ import android.content.pm.ResolveInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.support.v4.content.FileProvider; import androidx.core.content.FileProvider;
import android.widget.Toast; import android.widget.Toast;
import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Constants;
import java.io.File; import java.io.File;

@ -10,10 +10,10 @@ import static android.text.TextUtils.isEmpty;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import android.support.design.widget.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import butterknife.BindView; import butterknife.BindView;

@ -8,9 +8,9 @@ import static org.tasks.gtasks.RenameListDialog.newRenameListDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.text.InputType; import android.text.InputType;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;

@ -4,9 +4,9 @@ import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;

@ -10,10 +10,10 @@ import static android.text.TextUtils.isEmpty;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import android.support.design.widget.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.text.InputType; import android.text.InputType;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;

@ -6,7 +6,7 @@ import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.widget.Toast; import android.widget.Toast;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;

@ -14,7 +14,7 @@
package org.tasks.billing; package org.tasks.billing;
import android.graphics.Rect; import android.graphics.Rect;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.View; import android.view.View;
import org.tasks.billing.row.RowDataProvider; import org.tasks.billing.row.RowDataProvider;
import org.tasks.billing.row.SkuRowData; import org.tasks.billing.row.SkuRowData;

@ -16,10 +16,10 @@ import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.support.v7.widget.Toolbar.OnMenuItemClickListener; import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;

@ -20,8 +20,8 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import android.content.Context; import android.content.Context;
import android.support.annotation.IntDef; import androidx.annotation.IntDef;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

@ -1,6 +1,6 @@
package org.tasks.billing.row; package org.tasks.billing.row;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;

@ -7,11 +7,11 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.Snackbar; import com.google.android.material.snackbar.Snackbar;
import android.support.design.widget.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import android.support.design.widget.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout; import android.widget.LinearLayout;

@ -6,12 +6,12 @@ import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.Snackbar; import com.google.android.material.snackbar.Snackbar;
import android.support.design.widget.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import android.support.design.widget.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.support.v7.widget.Toolbar.OnMenuItemClickListener; import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import android.text.InputType; import android.text.InputType;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;

@ -2,7 +2,7 @@ package org.tasks.caldav;
import static com.google.common.collect.Lists.transform; import static com.google.common.collect.Lists.transform;
import android.support.v4.util.Pair; import androidx.core.util.Pair;
import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import java.util.ArrayList; import java.util.ArrayList;

@ -4,7 +4,7 @@ import static android.app.Activity.RESULT_OK;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;

@ -7,7 +7,7 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.util.ArrayList; import java.util.ArrayList;

@ -7,7 +7,7 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

@ -1,9 +1,9 @@
package org.tasks.data; package org.tasks.data;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
@Entity(tableName = "alarms") @Entity(tableName = "alarms")
public class Alarm { public class Alarm {

@ -1,9 +1,9 @@
package org.tasks.data; package org.tasks.data;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Delete; import androidx.room.Delete;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;
@Dao @Dao

@ -2,10 +2,10 @@ package org.tasks.data;
import static com.todoroo.astrid.data.Task.NO_UUID; import static com.todoroo.astrid.data.Task.NO_UUID;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;

@ -2,10 +2,10 @@ package org.tasks.data;
import static com.todoroo.astrid.data.Task.NO_UUID; import static com.todoroo.astrid.data.Task.NO_UUID;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;

@ -1,10 +1,10 @@
package org.tasks.data; package org.tasks.data;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Delete; import androidx.room.Delete;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.Query; import androidx.room.Query;
import android.arch.persistence.room.Update; import androidx.room.Update;
import java.util.List; import java.util.List;
@Dao @Dao

@ -1,9 +1,9 @@
package org.tasks.data; package org.tasks.data;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import com.todoroo.andlib.data.Table; import com.todoroo.andlib.data.Table;
@Entity(tableName = "caldav_tasks") @Entity(tableName = "caldav_tasks")

@ -3,10 +3,10 @@ package org.tasks.data;
import static com.google.common.collect.Iterables.partition; import static com.google.common.collect.Iterables.partition;
import static com.todoroo.andlib.utility.DateUtilities.now; import static com.todoroo.andlib.utility.DateUtilities.now;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Delete; import androidx.room.Delete;
import android.arch.persistence.room.Query; import androidx.room.Query;
import android.arch.persistence.room.Transaction; import androidx.room.Transaction;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

@ -1,8 +1,8 @@
package org.tasks.data; package org.tasks.data;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
@Entity(tableName = "filters") @Entity(tableName = "filters")
public class Filter { public class Filter {

@ -1,10 +1,10 @@
package org.tasks.data; package org.tasks.data;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import android.arch.persistence.room.Update; import androidx.room.Update;
import java.util.List; import java.util.List;
@Dao @Dao

@ -1,9 +1,9 @@
package org.tasks.data; package org.tasks.data;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Table; import com.todoroo.andlib.data.Table;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save