diff --git a/.travis.yml b/.travis.yml index ba1794182..cbef7e4d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,5 +23,5 @@ before_install: - adb shell input keyevent 82 & script: - - ./gradlew :lintGoogleplayDebug - - ./gradlew :connectedGoogleplayDebugAndroidTest + - ./gradlew :app:lintGoogleplayProdDebug + - ./gradlew :app:connectedGoogleplayProdDebugAndroidTest diff --git a/build.gradle b/app/build.gradle similarity index 93% rename from build.gradle rename to app/build.gradle index 7ea9a9ef1..3256370d4 100644 --- a/build.gradle +++ b/app/build.gradle @@ -7,13 +7,10 @@ task wrapper(type: Wrapper) { buildscript { repositories { jcenter() - maven { - url 'https://maven.google.com' - } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha3' + classpath 'com.android.tools.build:gradle:2.3.3' } } @@ -33,11 +30,13 @@ android { defaultConfig { applicationId "org.tasks" - versionCode 457 - versionName "4.9.14" + versionCode 458 + versionName "4.9.15" targetSdkVersion 25 - minSdkVersion 15 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + jackOptions { + enabled true + } } signingConfigs { @@ -60,7 +59,7 @@ android { } } - flavorDimensions 'store' + flavorDimensions 'store', 'env' productFlavors { generic { @@ -72,6 +71,14 @@ android { amazon { dimension 'store' } + dev { + minSdkVersion 21 + dimension 'env' + } + prod { + minSdkVersion 15 + dimension 'env' + } } if (project.hasProperty('keyAlias') && diff --git a/lint.xml b/app/lint.xml similarity index 100% rename from lint.xml rename to app/lint.xml diff --git a/proguard.pro b/app/proguard.pro similarity index 100% rename from proguard.pro rename to app/proguard.pro diff --git a/scripts/clean_translations.rb b/app/scripts/clean_translations.rb similarity index 100% rename from scripts/clean_translations.rb rename to app/scripts/clean_translations.rb diff --git a/scripts/getloc.rb b/app/scripts/getloc.rb similarity index 100% rename from scripts/getloc.rb rename to app/scripts/getloc.rb diff --git a/scripts/resize-launcher.sh b/app/scripts/resize-launcher.sh similarity index 100% rename from scripts/resize-launcher.sh rename to app/scripts/resize-launcher.sh diff --git a/scripts/resize-notification.sh b/app/scripts/resize-notification.sh similarity index 100% rename from scripts/resize-notification.sh rename to app/scripts/resize-notification.sh diff --git a/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml similarity index 100% rename from src/amazon/AndroidManifest.xml rename to app/src/amazon/AndroidManifest.xml diff --git a/src/amazon/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/app/src/amazon/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java similarity index 100% rename from src/amazon/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java rename to app/src/amazon/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java diff --git a/src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java b/app/src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java similarity index 100% rename from src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java rename to app/src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java diff --git a/src/amazon/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java b/app/src/amazon/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java similarity index 100% rename from src/amazon/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java rename to app/src/amazon/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java diff --git a/src/amazon/java/org/tasks/AccountManager.java b/app/src/amazon/java/org/tasks/AccountManager.java similarity index 100% rename from src/amazon/java/org/tasks/AccountManager.java rename to app/src/amazon/java/org/tasks/AccountManager.java diff --git a/src/amazon/java/org/tasks/FlavorSetup.java b/app/src/amazon/java/org/tasks/FlavorSetup.java similarity index 100% rename from src/amazon/java/org/tasks/FlavorSetup.java rename to app/src/amazon/java/org/tasks/FlavorSetup.java diff --git a/src/amazon/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/amazon/java/org/tasks/activities/GoogleTaskListSettingsActivity.java similarity index 100% rename from src/amazon/java/org/tasks/activities/GoogleTaskListSettingsActivity.java rename to app/src/amazon/java/org/tasks/activities/GoogleTaskListSettingsActivity.java diff --git a/src/amazon/java/org/tasks/analytics/Tracker.java b/app/src/amazon/java/org/tasks/analytics/Tracker.java similarity index 100% rename from src/amazon/java/org/tasks/analytics/Tracker.java rename to app/src/amazon/java/org/tasks/analytics/Tracker.java diff --git a/src/amazon/java/org/tasks/billing/PurchaseHelper.java b/app/src/amazon/java/org/tasks/billing/PurchaseHelper.java similarity index 100% rename from src/amazon/java/org/tasks/billing/PurchaseHelper.java rename to app/src/amazon/java/org/tasks/billing/PurchaseHelper.java diff --git a/src/amazon/java/org/tasks/dialogs/AccountSelectionDialog.java b/app/src/amazon/java/org/tasks/dialogs/AccountSelectionDialog.java similarity index 100% rename from src/amazon/java/org/tasks/dialogs/AccountSelectionDialog.java rename to app/src/amazon/java/org/tasks/dialogs/AccountSelectionDialog.java diff --git a/src/amazon/java/org/tasks/gtasks/SyncAdapterHelper.java b/app/src/amazon/java/org/tasks/gtasks/SyncAdapterHelper.java similarity index 100% rename from src/amazon/java/org/tasks/gtasks/SyncAdapterHelper.java rename to app/src/amazon/java/org/tasks/gtasks/SyncAdapterHelper.java diff --git a/src/amazon/java/org/tasks/injection/ActivityComponent.java b/app/src/amazon/java/org/tasks/injection/ActivityComponent.java similarity index 100% rename from src/amazon/java/org/tasks/injection/ActivityComponent.java rename to app/src/amazon/java/org/tasks/injection/ActivityComponent.java diff --git a/src/amazon/java/org/tasks/injection/ApplicationComponent.java b/app/src/amazon/java/org/tasks/injection/ApplicationComponent.java similarity index 100% rename from src/amazon/java/org/tasks/injection/ApplicationComponent.java rename to app/src/amazon/java/org/tasks/injection/ApplicationComponent.java diff --git a/src/amazon/java/org/tasks/injection/BroadcastComponent.java b/app/src/amazon/java/org/tasks/injection/BroadcastComponent.java similarity index 100% rename from src/amazon/java/org/tasks/injection/BroadcastComponent.java rename to app/src/amazon/java/org/tasks/injection/BroadcastComponent.java diff --git a/src/amazon/java/org/tasks/injection/DialogFragmentComponent.java b/app/src/amazon/java/org/tasks/injection/DialogFragmentComponent.java similarity index 100% rename from src/amazon/java/org/tasks/injection/DialogFragmentComponent.java rename to app/src/amazon/java/org/tasks/injection/DialogFragmentComponent.java diff --git a/src/amazon/java/org/tasks/injection/NativeDialogFragmentComponent.java b/app/src/amazon/java/org/tasks/injection/NativeDialogFragmentComponent.java similarity index 100% rename from src/amazon/java/org/tasks/injection/NativeDialogFragmentComponent.java rename to app/src/amazon/java/org/tasks/injection/NativeDialogFragmentComponent.java diff --git a/src/amazon/java/org/tasks/location/GeofenceApi.java b/app/src/amazon/java/org/tasks/location/GeofenceApi.java similarity index 100% rename from src/amazon/java/org/tasks/location/GeofenceApi.java rename to app/src/amazon/java/org/tasks/location/GeofenceApi.java diff --git a/src/amazon/java/org/tasks/location/GeofenceTransitionsIntentService.java b/app/src/amazon/java/org/tasks/location/GeofenceTransitionsIntentService.java similarity index 100% rename from src/amazon/java/org/tasks/location/GeofenceTransitionsIntentService.java rename to app/src/amazon/java/org/tasks/location/GeofenceTransitionsIntentService.java diff --git a/src/amazon/java/org/tasks/location/PlacePicker.java b/app/src/amazon/java/org/tasks/location/PlacePicker.java similarity index 100% rename from src/amazon/java/org/tasks/location/PlacePicker.java rename to app/src/amazon/java/org/tasks/location/PlacePicker.java diff --git a/src/amazon/java/org/tasks/tasklist/GtasksListFragment.java b/app/src/amazon/java/org/tasks/tasklist/GtasksListFragment.java similarity index 100% rename from src/amazon/java/org/tasks/tasklist/GtasksListFragment.java rename to app/src/amazon/java/org/tasks/tasklist/GtasksListFragment.java diff --git a/src/amazon/java/org/tasks/ui/GoogleTaskListFragment.java b/app/src/amazon/java/org/tasks/ui/GoogleTaskListFragment.java similarity index 100% rename from src/amazon/java/org/tasks/ui/GoogleTaskListFragment.java rename to app/src/amazon/java/org/tasks/ui/GoogleTaskListFragment.java diff --git a/src/amazon/res/values/keys.xml b/app/src/amazon/res/values/keys.xml similarity index 100% rename from src/amazon/res/values/keys.xml rename to app/src/amazon/res/values/keys.xml diff --git a/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java b/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java similarity index 100% rename from src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java rename to app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java diff --git a/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java b/app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java rename to app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java diff --git a/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java b/app/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java rename to app/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java b/app/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java rename to app/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java diff --git a/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java rename to app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java diff --git a/src/androidTest/java/com/todoroo/astrid/data/TaskTest.java b/app/src/androidTest/java/com/todoroo/astrid/data/TaskTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/data/TaskTest.java rename to app/src/androidTest/java/com/todoroo/astrid/data/TaskTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/model/TaskTest.java b/app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/model/TaskTest.java rename to app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java b/app/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java rename to app/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java diff --git a/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java b/app/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java rename to app/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java diff --git a/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java b/app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java rename to app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java b/app/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java rename to app/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java b/app/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java rename to app/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java diff --git a/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java b/app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java rename to app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java b/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java rename to app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java b/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java rename to app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java rename to app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java rename to app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java rename to app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java diff --git a/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java b/app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java rename to app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java diff --git a/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java b/app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java rename to app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java diff --git a/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java b/app/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java similarity index 100% rename from src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java rename to app/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java diff --git a/src/androidTest/java/org/tasks/Freeze.java b/app/src/androidTest/java/org/tasks/Freeze.java similarity index 100% rename from src/androidTest/java/org/tasks/Freeze.java rename to app/src/androidTest/java/org/tasks/Freeze.java diff --git a/src/androidTest/java/org/tasks/RemoteModelHelpers.java b/app/src/androidTest/java/org/tasks/RemoteModelHelpers.java similarity index 100% rename from src/androidTest/java/org/tasks/RemoteModelHelpers.java rename to app/src/androidTest/java/org/tasks/RemoteModelHelpers.java diff --git a/src/androidTest/java/org/tasks/Snippet.java b/app/src/androidTest/java/org/tasks/Snippet.java similarity index 100% rename from src/androidTest/java/org/tasks/Snippet.java rename to app/src/androidTest/java/org/tasks/Snippet.java diff --git a/src/androidTest/java/org/tasks/TestUtilities.java b/app/src/androidTest/java/org/tasks/TestUtilities.java similarity index 100% rename from src/androidTest/java/org/tasks/TestUtilities.java rename to app/src/androidTest/java/org/tasks/TestUtilities.java diff --git a/src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java b/app/src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java similarity index 100% rename from src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java rename to app/src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java diff --git a/src/androidTest/java/org/tasks/injection/InjectingTestCase.java b/app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java similarity index 100% rename from src/androidTest/java/org/tasks/injection/InjectingTestCase.java rename to app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java diff --git a/src/androidTest/java/org/tasks/injection/TestModule.java b/app/src/androidTest/java/org/tasks/injection/TestModule.java similarity index 100% rename from src/androidTest/java/org/tasks/injection/TestModule.java rename to app/src/androidTest/java/org/tasks/injection/TestModule.java diff --git a/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java b/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java similarity index 100% rename from src/androidTest/java/org/tasks/jobs/BackupServiceTests.java rename to app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java diff --git a/src/androidTest/java/org/tasks/jobs/JobQueueTest.java b/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java similarity index 99% rename from src/androidTest/java/org/tasks/jobs/JobQueueTest.java rename to app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java index 28652db9b..9ee549b01 100644 --- a/src/androidTest/java/org/tasks/jobs/JobQueueTest.java +++ b/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java @@ -14,6 +14,7 @@ import org.tasks.preferences.Preferences; import java.util.concurrent.TimeUnit; import static com.todoroo.astrid.reminders.ReminderService.TYPE_DUE; +import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static junit.framework.Assert.assertEquals; import static org.mockito.AdditionalAnswers.returnsFirstArg; diff --git a/src/androidTest/java/org/tasks/makers/GtaskListMaker.java b/app/src/androidTest/java/org/tasks/makers/GtaskListMaker.java similarity index 100% rename from src/androidTest/java/org/tasks/makers/GtaskListMaker.java rename to app/src/androidTest/java/org/tasks/makers/GtaskListMaker.java diff --git a/src/androidTest/java/org/tasks/makers/Maker.java b/app/src/androidTest/java/org/tasks/makers/Maker.java similarity index 100% rename from src/androidTest/java/org/tasks/makers/Maker.java rename to app/src/androidTest/java/org/tasks/makers/Maker.java diff --git a/src/androidTest/java/org/tasks/makers/TaskMaker.java b/app/src/androidTest/java/org/tasks/makers/TaskMaker.java similarity index 100% rename from src/androidTest/java/org/tasks/makers/TaskMaker.java rename to app/src/androidTest/java/org/tasks/makers/TaskMaker.java diff --git a/src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java b/app/src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java similarity index 100% rename from src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java rename to app/src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.java diff --git a/src/androidTest/java/org/tasks/preferences/PreferenceTests.java b/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java similarity index 100% rename from src/androidTest/java/org/tasks/preferences/PreferenceTests.java rename to app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java diff --git a/src/androidTest/java/org/tasks/time/DateTimeTest.java b/app/src/androidTest/java/org/tasks/time/DateTimeTest.java similarity index 100% rename from src/androidTest/java/org/tasks/time/DateTimeTest.java rename to app/src/androidTest/java/org/tasks/time/DateTimeTest.java diff --git a/src/androidTest/res/.do.not.delete b/app/src/androidTest/res/.do.not.delete similarity index 100% rename from src/androidTest/res/.do.not.delete rename to app/src/androidTest/res/.do.not.delete diff --git a/src/androidTestAmazon/java/org/tasks/injection/TestComponent.java b/app/src/androidTestAmazon/java/org/tasks/injection/TestComponent.java similarity index 100% rename from src/androidTestAmazon/java/org/tasks/injection/TestComponent.java rename to app/src/androidTestAmazon/java/org/tasks/injection/TestComponent.java diff --git a/src/androidTestGeneric/java/org/tasks/injection/TestComponent.java b/app/src/androidTestGeneric/java/org/tasks/injection/TestComponent.java similarity index 100% rename from src/androidTestGeneric/java/org/tasks/injection/TestComponent.java rename to app/src/androidTestGeneric/java/org/tasks/injection/TestComponent.java diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java similarity index 100% rename from src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java rename to app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java similarity index 100% rename from src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java rename to app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java similarity index 100% rename from src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java rename to app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java similarity index 100% rename from src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java rename to app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java similarity index 100% rename from src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java rename to app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java similarity index 100% rename from src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java rename to app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java similarity index 100% rename from src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java rename to app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java diff --git a/src/androidTestGoogleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapterTest.java b/app/src/androidTestGoogleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapterTest.java similarity index 100% rename from src/androidTestGoogleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapterTest.java rename to app/src/androidTestGoogleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapterTest.java diff --git a/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java b/app/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java similarity index 100% rename from src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java rename to app/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java diff --git a/src/androidTestGoogleplay/java/org/tasks/makers/RemoteGtaskListMaker.java b/app/src/androidTestGoogleplay/java/org/tasks/makers/RemoteGtaskListMaker.java similarity index 100% rename from src/androidTestGoogleplay/java/org/tasks/makers/RemoteGtaskListMaker.java rename to app/src/androidTestGoogleplay/java/org/tasks/makers/RemoteGtaskListMaker.java diff --git a/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml similarity index 100% rename from src/debug/AndroidManifest.xml rename to app/src/debug/AndroidManifest.xml diff --git a/src/debug/java/org/tasks/BaseApplication.java b/app/src/debug/java/org/tasks/BaseApplication.java similarity index 100% rename from src/debug/java/org/tasks/BaseApplication.java rename to app/src/debug/java/org/tasks/BaseApplication.java diff --git a/src/debug/java/org/tasks/BuildSetup.java b/app/src/debug/java/org/tasks/BuildSetup.java similarity index 100% rename from src/debug/java/org/tasks/BuildSetup.java rename to app/src/debug/java/org/tasks/BuildSetup.java diff --git a/src/debug/res/xml/google_analytics.xml b/app/src/debug/res/xml/google_analytics.xml similarity index 100% rename from src/debug/res/xml/google_analytics.xml rename to app/src/debug/res/xml/google_analytics.xml diff --git a/src/generic/AndroidManifest.xml b/app/src/generic/AndroidManifest.xml similarity index 100% rename from src/generic/AndroidManifest.xml rename to app/src/generic/AndroidManifest.xml diff --git a/src/generic/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/app/src/generic/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java similarity index 100% rename from src/generic/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java rename to app/src/generic/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java diff --git a/src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java b/app/src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java similarity index 100% rename from src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java rename to app/src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java diff --git a/src/generic/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java b/app/src/generic/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java similarity index 100% rename from src/generic/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java rename to app/src/generic/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java diff --git a/src/generic/java/org/tasks/AccountManager.java b/app/src/generic/java/org/tasks/AccountManager.java similarity index 100% rename from src/generic/java/org/tasks/AccountManager.java rename to app/src/generic/java/org/tasks/AccountManager.java diff --git a/src/generic/java/org/tasks/FlavorSetup.java b/app/src/generic/java/org/tasks/FlavorSetup.java similarity index 100% rename from src/generic/java/org/tasks/FlavorSetup.java rename to app/src/generic/java/org/tasks/FlavorSetup.java diff --git a/src/generic/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/generic/java/org/tasks/activities/GoogleTaskListSettingsActivity.java similarity index 100% rename from src/generic/java/org/tasks/activities/GoogleTaskListSettingsActivity.java rename to app/src/generic/java/org/tasks/activities/GoogleTaskListSettingsActivity.java diff --git a/src/generic/java/org/tasks/analytics/Tracker.java b/app/src/generic/java/org/tasks/analytics/Tracker.java similarity index 100% rename from src/generic/java/org/tasks/analytics/Tracker.java rename to app/src/generic/java/org/tasks/analytics/Tracker.java diff --git a/src/generic/java/org/tasks/billing/PurchaseHelper.java b/app/src/generic/java/org/tasks/billing/PurchaseHelper.java similarity index 100% rename from src/generic/java/org/tasks/billing/PurchaseHelper.java rename to app/src/generic/java/org/tasks/billing/PurchaseHelper.java diff --git a/src/generic/java/org/tasks/dialogs/AccountSelectionDialog.java b/app/src/generic/java/org/tasks/dialogs/AccountSelectionDialog.java similarity index 100% rename from src/generic/java/org/tasks/dialogs/AccountSelectionDialog.java rename to app/src/generic/java/org/tasks/dialogs/AccountSelectionDialog.java diff --git a/src/generic/java/org/tasks/gtasks/SyncAdapterHelper.java b/app/src/generic/java/org/tasks/gtasks/SyncAdapterHelper.java similarity index 100% rename from src/generic/java/org/tasks/gtasks/SyncAdapterHelper.java rename to app/src/generic/java/org/tasks/gtasks/SyncAdapterHelper.java diff --git a/src/generic/java/org/tasks/injection/ActivityComponent.java b/app/src/generic/java/org/tasks/injection/ActivityComponent.java similarity index 100% rename from src/generic/java/org/tasks/injection/ActivityComponent.java rename to app/src/generic/java/org/tasks/injection/ActivityComponent.java diff --git a/src/generic/java/org/tasks/injection/ApplicationComponent.java b/app/src/generic/java/org/tasks/injection/ApplicationComponent.java similarity index 100% rename from src/generic/java/org/tasks/injection/ApplicationComponent.java rename to app/src/generic/java/org/tasks/injection/ApplicationComponent.java diff --git a/src/generic/java/org/tasks/injection/BroadcastComponent.java b/app/src/generic/java/org/tasks/injection/BroadcastComponent.java similarity index 100% rename from src/generic/java/org/tasks/injection/BroadcastComponent.java rename to app/src/generic/java/org/tasks/injection/BroadcastComponent.java diff --git a/src/generic/java/org/tasks/injection/DialogFragmentComponent.java b/app/src/generic/java/org/tasks/injection/DialogFragmentComponent.java similarity index 100% rename from src/generic/java/org/tasks/injection/DialogFragmentComponent.java rename to app/src/generic/java/org/tasks/injection/DialogFragmentComponent.java diff --git a/src/generic/java/org/tasks/injection/NativeDialogFragmentComponent.java b/app/src/generic/java/org/tasks/injection/NativeDialogFragmentComponent.java similarity index 100% rename from src/generic/java/org/tasks/injection/NativeDialogFragmentComponent.java rename to app/src/generic/java/org/tasks/injection/NativeDialogFragmentComponent.java diff --git a/src/generic/java/org/tasks/location/GeofenceApi.java b/app/src/generic/java/org/tasks/location/GeofenceApi.java similarity index 100% rename from src/generic/java/org/tasks/location/GeofenceApi.java rename to app/src/generic/java/org/tasks/location/GeofenceApi.java diff --git a/src/generic/java/org/tasks/location/GeofenceTransitionsIntentService.java b/app/src/generic/java/org/tasks/location/GeofenceTransitionsIntentService.java similarity index 100% rename from src/generic/java/org/tasks/location/GeofenceTransitionsIntentService.java rename to app/src/generic/java/org/tasks/location/GeofenceTransitionsIntentService.java diff --git a/src/generic/java/org/tasks/location/PlacePicker.java b/app/src/generic/java/org/tasks/location/PlacePicker.java similarity index 100% rename from src/generic/java/org/tasks/location/PlacePicker.java rename to app/src/generic/java/org/tasks/location/PlacePicker.java diff --git a/src/generic/java/org/tasks/tasklist/GtasksListFragment.java b/app/src/generic/java/org/tasks/tasklist/GtasksListFragment.java similarity index 100% rename from src/generic/java/org/tasks/tasklist/GtasksListFragment.java rename to app/src/generic/java/org/tasks/tasklist/GtasksListFragment.java diff --git a/src/generic/java/org/tasks/ui/GoogleTaskListFragment.java b/app/src/generic/java/org/tasks/ui/GoogleTaskListFragment.java similarity index 100% rename from src/generic/java/org/tasks/ui/GoogleTaskListFragment.java rename to app/src/generic/java/org/tasks/ui/GoogleTaskListFragment.java diff --git a/src/generic/res/values/keys.xml b/app/src/generic/res/values/keys.xml similarity index 100% rename from src/generic/res/values/keys.xml rename to app/src/generic/res/values/keys.xml diff --git a/src/googleplay/AndroidManifest.xml b/app/src/googleplay/AndroidManifest.xml similarity index 100% rename from src/googleplay/AndroidManifest.xml rename to app/src/googleplay/AndroidManifest.xml diff --git a/src/googleplay/aidl/com/android/vending/billing/IInAppBillingService.aidl b/app/src/googleplay/aidl/com/android/vending/billing/IInAppBillingService.aidl similarity index 100% rename from src/googleplay/aidl/com/android/vending/billing/IInAppBillingService.aidl rename to app/src/googleplay/aidl/com/android/vending/billing/IInAppBillingService.aidl diff --git a/src/googleplay/java/com/android/vending/billing/IabBroadcastReceiver.java b/app/src/googleplay/java/com/android/vending/billing/IabBroadcastReceiver.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/IabBroadcastReceiver.java rename to app/src/googleplay/java/com/android/vending/billing/IabBroadcastReceiver.java diff --git a/src/googleplay/java/com/android/vending/billing/IabException.java b/app/src/googleplay/java/com/android/vending/billing/IabException.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/IabException.java rename to app/src/googleplay/java/com/android/vending/billing/IabException.java diff --git a/src/googleplay/java/com/android/vending/billing/IabHelper.java b/app/src/googleplay/java/com/android/vending/billing/IabHelper.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/IabHelper.java rename to app/src/googleplay/java/com/android/vending/billing/IabHelper.java diff --git a/src/googleplay/java/com/android/vending/billing/IabResult.java b/app/src/googleplay/java/com/android/vending/billing/IabResult.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/IabResult.java rename to app/src/googleplay/java/com/android/vending/billing/IabResult.java diff --git a/src/googleplay/java/com/android/vending/billing/Inventory.java b/app/src/googleplay/java/com/android/vending/billing/Inventory.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/Inventory.java rename to app/src/googleplay/java/com/android/vending/billing/Inventory.java diff --git a/src/googleplay/java/com/android/vending/billing/Purchase.java b/app/src/googleplay/java/com/android/vending/billing/Purchase.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/Purchase.java rename to app/src/googleplay/java/com/android/vending/billing/Purchase.java diff --git a/src/googleplay/java/com/android/vending/billing/Security.java b/app/src/googleplay/java/com/android/vending/billing/Security.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/Security.java rename to app/src/googleplay/java/com/android/vending/billing/Security.java diff --git a/src/googleplay/java/com/android/vending/billing/SkuDetails.java b/app/src/googleplay/java/com/android/vending/billing/SkuDetails.java similarity index 100% rename from src/googleplay/java/com/android/vending/billing/SkuDetails.java rename to app/src/googleplay/java/com/android/vending/billing/SkuDetails.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java rename to app/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java diff --git a/src/googleplay/java/com/todoroo/astrid/service/SyncV2Service.java b/app/src/googleplay/java/com/todoroo/astrid/service/SyncV2Service.java similarity index 100% rename from src/googleplay/java/com/todoroo/astrid/service/SyncV2Service.java rename to app/src/googleplay/java/com/todoroo/astrid/service/SyncV2Service.java diff --git a/src/googleplay/java/org/tasks/AccountManager.java b/app/src/googleplay/java/org/tasks/AccountManager.java similarity index 100% rename from src/googleplay/java/org/tasks/AccountManager.java rename to app/src/googleplay/java/org/tasks/AccountManager.java diff --git a/src/googleplay/java/org/tasks/FlavorSetup.java b/app/src/googleplay/java/org/tasks/FlavorSetup.java similarity index 100% rename from src/googleplay/java/org/tasks/FlavorSetup.java rename to app/src/googleplay/java/org/tasks/FlavorSetup.java diff --git a/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java similarity index 100% rename from src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java rename to app/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java diff --git a/src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java b/app/src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java similarity index 100% rename from src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java rename to app/src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java diff --git a/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java b/app/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java similarity index 100% rename from src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java rename to app/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java diff --git a/src/googleplay/java/org/tasks/analytics/Tracker.java b/app/src/googleplay/java/org/tasks/analytics/Tracker.java similarity index 100% rename from src/googleplay/java/org/tasks/analytics/Tracker.java rename to app/src/googleplay/java/org/tasks/analytics/Tracker.java diff --git a/src/googleplay/java/org/tasks/billing/InventoryHelper.java b/app/src/googleplay/java/org/tasks/billing/InventoryHelper.java similarity index 100% rename from src/googleplay/java/org/tasks/billing/InventoryHelper.java rename to app/src/googleplay/java/org/tasks/billing/InventoryHelper.java diff --git a/src/googleplay/java/org/tasks/billing/PurchaseHelper.java b/app/src/googleplay/java/org/tasks/billing/PurchaseHelper.java similarity index 100% rename from src/googleplay/java/org/tasks/billing/PurchaseHelper.java rename to app/src/googleplay/java/org/tasks/billing/PurchaseHelper.java diff --git a/src/googleplay/java/org/tasks/dialogs/AccountSelectionDialog.java b/app/src/googleplay/java/org/tasks/dialogs/AccountSelectionDialog.java similarity index 100% rename from src/googleplay/java/org/tasks/dialogs/AccountSelectionDialog.java rename to app/src/googleplay/java/org/tasks/dialogs/AccountSelectionDialog.java diff --git a/src/googleplay/java/org/tasks/gtasks/CreateListDialog.java b/app/src/googleplay/java/org/tasks/gtasks/CreateListDialog.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/CreateListDialog.java rename to app/src/googleplay/java/org/tasks/gtasks/CreateListDialog.java diff --git a/src/googleplay/java/org/tasks/gtasks/DeleteListDialog.java b/app/src/googleplay/java/org/tasks/gtasks/DeleteListDialog.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/DeleteListDialog.java rename to app/src/googleplay/java/org/tasks/gtasks/DeleteListDialog.java diff --git a/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java b/app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java rename to app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java diff --git a/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncService.java b/app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncService.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncService.java rename to app/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncService.java diff --git a/src/googleplay/java/org/tasks/gtasks/GoogleTasksUnsuccessfulResponseHandler.java b/app/src/googleplay/java/org/tasks/gtasks/GoogleTasksUnsuccessfulResponseHandler.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/GoogleTasksUnsuccessfulResponseHandler.java rename to app/src/googleplay/java/org/tasks/gtasks/GoogleTasksUnsuccessfulResponseHandler.java diff --git a/src/googleplay/java/org/tasks/gtasks/PlayServicesAvailability.java b/app/src/googleplay/java/org/tasks/gtasks/PlayServicesAvailability.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/PlayServicesAvailability.java rename to app/src/googleplay/java/org/tasks/gtasks/PlayServicesAvailability.java diff --git a/src/googleplay/java/org/tasks/gtasks/RenameListDialog.java b/app/src/googleplay/java/org/tasks/gtasks/RenameListDialog.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/RenameListDialog.java rename to app/src/googleplay/java/org/tasks/gtasks/RenameListDialog.java diff --git a/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java b/app/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java similarity index 100% rename from src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java rename to app/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java diff --git a/src/googleplay/java/org/tasks/injection/ActivityComponent.java b/app/src/googleplay/java/org/tasks/injection/ActivityComponent.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/ActivityComponent.java rename to app/src/googleplay/java/org/tasks/injection/ActivityComponent.java diff --git a/src/googleplay/java/org/tasks/injection/ApplicationComponent.java b/app/src/googleplay/java/org/tasks/injection/ApplicationComponent.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/ApplicationComponent.java rename to app/src/googleplay/java/org/tasks/injection/ApplicationComponent.java diff --git a/src/googleplay/java/org/tasks/injection/BroadcastComponent.java b/app/src/googleplay/java/org/tasks/injection/BroadcastComponent.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/BroadcastComponent.java rename to app/src/googleplay/java/org/tasks/injection/BroadcastComponent.java diff --git a/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java b/app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java rename to app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java diff --git a/src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java b/app/src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java rename to app/src/googleplay/java/org/tasks/injection/InjectingAbstractThreadedSyncAdapter.java diff --git a/src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java b/app/src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java rename to app/src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java diff --git a/src/googleplay/java/org/tasks/injection/SyncAdapterComponent.java b/app/src/googleplay/java/org/tasks/injection/SyncAdapterComponent.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/SyncAdapterComponent.java rename to app/src/googleplay/java/org/tasks/injection/SyncAdapterComponent.java diff --git a/src/googleplay/java/org/tasks/injection/SyncAdapterModule.java b/app/src/googleplay/java/org/tasks/injection/SyncAdapterModule.java similarity index 100% rename from src/googleplay/java/org/tasks/injection/SyncAdapterModule.java rename to app/src/googleplay/java/org/tasks/injection/SyncAdapterModule.java diff --git a/src/googleplay/java/org/tasks/location/GeofenceApi.java b/app/src/googleplay/java/org/tasks/location/GeofenceApi.java similarity index 100% rename from src/googleplay/java/org/tasks/location/GeofenceApi.java rename to app/src/googleplay/java/org/tasks/location/GeofenceApi.java diff --git a/src/googleplay/java/org/tasks/location/GeofenceTransitionsIntentService.java b/app/src/googleplay/java/org/tasks/location/GeofenceTransitionsIntentService.java similarity index 100% rename from src/googleplay/java/org/tasks/location/GeofenceTransitionsIntentService.java rename to app/src/googleplay/java/org/tasks/location/GeofenceTransitionsIntentService.java diff --git a/src/googleplay/java/org/tasks/location/GoogleApi.java b/app/src/googleplay/java/org/tasks/location/GoogleApi.java similarity index 100% rename from src/googleplay/java/org/tasks/location/GoogleApi.java rename to app/src/googleplay/java/org/tasks/location/GoogleApi.java diff --git a/src/googleplay/java/org/tasks/location/PlacePicker.java b/app/src/googleplay/java/org/tasks/location/PlacePicker.java similarity index 100% rename from src/googleplay/java/org/tasks/location/PlacePicker.java rename to app/src/googleplay/java/org/tasks/location/PlacePicker.java diff --git a/src/googleplay/java/org/tasks/receivers/GoogleTaskPushReceiver.java b/app/src/googleplay/java/org/tasks/receivers/GoogleTaskPushReceiver.java similarity index 100% rename from src/googleplay/java/org/tasks/receivers/GoogleTaskPushReceiver.java rename to app/src/googleplay/java/org/tasks/receivers/GoogleTaskPushReceiver.java diff --git a/src/googleplay/java/org/tasks/tasklist/GtasksListFragment.java b/app/src/googleplay/java/org/tasks/tasklist/GtasksListFragment.java similarity index 100% rename from src/googleplay/java/org/tasks/tasklist/GtasksListFragment.java rename to app/src/googleplay/java/org/tasks/tasklist/GtasksListFragment.java diff --git a/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java b/app/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java similarity index 100% rename from src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java rename to app/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java diff --git a/src/googleplay/res/values/bools.xml b/app/src/googleplay/res/values/bools.xml similarity index 100% rename from src/googleplay/res/values/bools.xml rename to app/src/googleplay/res/values/bools.xml diff --git a/src/googleplay/res/values/keys.xml b/app/src/googleplay/res/values/keys.xml similarity index 100% rename from src/googleplay/res/values/keys.xml rename to app/src/googleplay/res/values/keys.xml diff --git a/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 99% rename from src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index b28031143..d02811637 100644 --- a/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -150,7 +150,7 @@ - + diff --git a/src/main/java/com/mdimension/jchronic/AstridChronic.java b/app/src/main/java/com/mdimension/jchronic/AstridChronic.java similarity index 100% rename from src/main/java/com/mdimension/jchronic/AstridChronic.java rename to app/src/main/java/com/mdimension/jchronic/AstridChronic.java diff --git a/src/main/java/com/todoroo/andlib/data/AbstractModel.java b/app/src/main/java/com/todoroo/andlib/data/AbstractModel.java similarity index 100% rename from src/main/java/com/todoroo/andlib/data/AbstractModel.java rename to app/src/main/java/com/todoroo/andlib/data/AbstractModel.java diff --git a/src/main/java/com/todoroo/andlib/data/Callback.java b/app/src/main/java/com/todoroo/andlib/data/Callback.java similarity index 100% rename from src/main/java/com/todoroo/andlib/data/Callback.java rename to app/src/main/java/com/todoroo/andlib/data/Callback.java diff --git a/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/app/src/main/java/com/todoroo/andlib/data/DatabaseDao.java similarity index 100% rename from src/main/java/com/todoroo/andlib/data/DatabaseDao.java rename to app/src/main/java/com/todoroo/andlib/data/DatabaseDao.java diff --git a/src/main/java/com/todoroo/andlib/data/Property.java b/app/src/main/java/com/todoroo/andlib/data/Property.java similarity index 100% rename from src/main/java/com/todoroo/andlib/data/Property.java rename to app/src/main/java/com/todoroo/andlib/data/Property.java diff --git a/src/main/java/com/todoroo/andlib/data/SqlConstructorVisitor.java b/app/src/main/java/com/todoroo/andlib/data/SqlConstructorVisitor.java similarity index 100% rename from src/main/java/com/todoroo/andlib/data/SqlConstructorVisitor.java rename to app/src/main/java/com/todoroo/andlib/data/SqlConstructorVisitor.java diff --git a/src/main/java/com/todoroo/andlib/data/Table.java b/app/src/main/java/com/todoroo/andlib/data/Table.java similarity index 100% rename from src/main/java/com/todoroo/andlib/data/Table.java rename to app/src/main/java/com/todoroo/andlib/data/Table.java diff --git a/src/main/java/com/todoroo/andlib/data/TodorooCursor.java b/app/src/main/java/com/todoroo/andlib/data/TodorooCursor.java similarity index 100% rename from src/main/java/com/todoroo/andlib/data/TodorooCursor.java rename to app/src/main/java/com/todoroo/andlib/data/TodorooCursor.java diff --git a/src/main/java/com/todoroo/andlib/sql/Criterion.java b/app/src/main/java/com/todoroo/andlib/sql/Criterion.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/Criterion.java rename to app/src/main/java/com/todoroo/andlib/sql/Criterion.java diff --git a/src/main/java/com/todoroo/andlib/sql/DBObject.java b/app/src/main/java/com/todoroo/andlib/sql/DBObject.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/DBObject.java rename to app/src/main/java/com/todoroo/andlib/sql/DBObject.java diff --git a/src/main/java/com/todoroo/andlib/sql/Field.java b/app/src/main/java/com/todoroo/andlib/sql/Field.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/Field.java rename to app/src/main/java/com/todoroo/andlib/sql/Field.java diff --git a/src/main/java/com/todoroo/andlib/sql/Functions.java b/app/src/main/java/com/todoroo/andlib/sql/Functions.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/Functions.java rename to app/src/main/java/com/todoroo/andlib/sql/Functions.java diff --git a/src/main/java/com/todoroo/andlib/sql/Join.java b/app/src/main/java/com/todoroo/andlib/sql/Join.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/Join.java rename to app/src/main/java/com/todoroo/andlib/sql/Join.java diff --git a/src/main/java/com/todoroo/andlib/sql/JoinType.java b/app/src/main/java/com/todoroo/andlib/sql/JoinType.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/JoinType.java rename to app/src/main/java/com/todoroo/andlib/sql/JoinType.java diff --git a/src/main/java/com/todoroo/andlib/sql/Operator.java b/app/src/main/java/com/todoroo/andlib/sql/Operator.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/Operator.java rename to app/src/main/java/com/todoroo/andlib/sql/Operator.java diff --git a/src/main/java/com/todoroo/andlib/sql/Order.java b/app/src/main/java/com/todoroo/andlib/sql/Order.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/Order.java rename to app/src/main/java/com/todoroo/andlib/sql/Order.java diff --git a/src/main/java/com/todoroo/andlib/sql/OrderType.java b/app/src/main/java/com/todoroo/andlib/sql/OrderType.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/OrderType.java rename to app/src/main/java/com/todoroo/andlib/sql/OrderType.java diff --git a/src/main/java/com/todoroo/andlib/sql/Query.java b/app/src/main/java/com/todoroo/andlib/sql/Query.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/Query.java rename to app/src/main/java/com/todoroo/andlib/sql/Query.java diff --git a/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java b/app/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/QueryTemplate.java rename to app/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java diff --git a/src/main/java/com/todoroo/andlib/sql/SqlConstants.java b/app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/SqlConstants.java rename to app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java diff --git a/src/main/java/com/todoroo/andlib/sql/SqlTable.java b/app/src/main/java/com/todoroo/andlib/sql/SqlTable.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/SqlTable.java rename to app/src/main/java/com/todoroo/andlib/sql/SqlTable.java diff --git a/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java b/app/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java similarity index 100% rename from src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java rename to app/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java diff --git a/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java similarity index 100% rename from src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java rename to app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java diff --git a/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java similarity index 100% rename from src/main/java/com/todoroo/andlib/utility/DateUtilities.java rename to app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java diff --git a/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java similarity index 100% rename from src/main/java/com/todoroo/andlib/utility/DialogUtilities.java rename to app/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java diff --git a/src/main/java/com/todoroo/andlib/utility/Pair.java b/app/src/main/java/com/todoroo/andlib/utility/Pair.java similarity index 100% rename from src/main/java/com/todoroo/andlib/utility/Pair.java rename to app/src/main/java/com/todoroo/andlib/utility/Pair.java diff --git a/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java similarity index 100% rename from src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java rename to app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java diff --git a/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java similarity index 100% rename from src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java rename to app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java similarity index 100% rename from src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java rename to app/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java similarity index 100% rename from src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java rename to app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java similarity index 100% rename from src/main/java/com/todoroo/astrid/activity/TaskListActivity.java rename to app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java similarity index 100% rename from src/main/java/com/todoroo/astrid/activity/TaskListFragment.java rename to app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java rename to app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java diff --git a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java rename to app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java diff --git a/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java b/app/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java similarity index 100% rename from src/main/java/com/todoroo/astrid/alarms/AlarmFields.java rename to app/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java diff --git a/src/main/java/com/todoroo/astrid/alarms/AlarmService.java b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java similarity index 100% rename from src/main/java/com/todoroo/astrid/alarms/AlarmService.java rename to app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java diff --git a/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java b/app/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java similarity index 100% rename from src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java rename to app/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java diff --git a/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java b/app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/AstridApiConstants.java rename to app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java diff --git a/src/main/java/com/todoroo/astrid/api/CustomFilter.java b/app/src/main/java/com/todoroo/astrid/api/CustomFilter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/CustomFilter.java rename to app/src/main/java/com/todoroo/astrid/api/CustomFilter.java diff --git a/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java b/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java rename to app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java diff --git a/src/main/java/com/todoroo/astrid/api/Filter.java b/app/src/main/java/com/todoroo/astrid/api/Filter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/Filter.java rename to app/src/main/java/com/todoroo/astrid/api/Filter.java diff --git a/src/main/java/com/todoroo/astrid/api/FilterListItem.java b/app/src/main/java/com/todoroo/astrid/api/FilterListItem.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/FilterListItem.java rename to app/src/main/java/com/todoroo/astrid/api/FilterListItem.java diff --git a/src/main/java/com/todoroo/astrid/api/GtasksFilter.java b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/GtasksFilter.java rename to app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java diff --git a/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java b/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java rename to app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java diff --git a/src/main/java/com/todoroo/astrid/api/PermaSql.java b/app/src/main/java/com/todoroo/astrid/api/PermaSql.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/PermaSql.java rename to app/src/main/java/com/todoroo/astrid/api/PermaSql.java diff --git a/src/main/java/com/todoroo/astrid/api/TagFilter.java b/app/src/main/java/com/todoroo/astrid/api/TagFilter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/TagFilter.java rename to app/src/main/java/com/todoroo/astrid/api/TagFilter.java diff --git a/src/main/java/com/todoroo/astrid/api/TaskAction.java b/app/src/main/java/com/todoroo/astrid/api/TaskAction.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/TaskAction.java rename to app/src/main/java/com/todoroo/astrid/api/TaskAction.java diff --git a/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java b/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java similarity index 100% rename from src/main/java/com/todoroo/astrid/api/TextInputCriterion.java rename to app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java diff --git a/src/main/java/com/todoroo/astrid/backup/BackupConstants.java b/app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java similarity index 100% rename from src/main/java/com/todoroo/astrid/backup/BackupConstants.java rename to app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java diff --git a/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java rename to app/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java diff --git a/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java rename to app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java diff --git a/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/app/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java similarity index 100% rename from src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java rename to app/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java diff --git a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java rename to app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java rename to app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java rename to app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java rename to app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java diff --git a/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java b/app/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java rename to app/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java diff --git a/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java b/app/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/LinkActionExposer.java rename to app/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java diff --git a/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java b/app/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java rename to app/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java diff --git a/src/main/java/com/todoroo/astrid/core/SavedFilter.java b/app/src/main/java/com/todoroo/astrid/core/SavedFilter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/SavedFilter.java rename to app/src/main/java/com/todoroo/astrid/core/SavedFilter.java diff --git a/src/main/java/com/todoroo/astrid/core/SortHelper.java b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java similarity index 100% rename from src/main/java/com/todoroo/astrid/core/SortHelper.java rename to app/src/main/java/com/todoroo/astrid/core/SortHelper.java diff --git a/src/main/java/com/todoroo/astrid/dao/Database.java b/app/src/main/java/com/todoroo/astrid/dao/Database.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/Database.java rename to app/src/main/java/com/todoroo/astrid/dao/Database.java diff --git a/src/main/java/com/todoroo/astrid/dao/MetadataDao.java b/app/src/main/java/com/todoroo/astrid/dao/MetadataDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/MetadataDao.java rename to app/src/main/java/com/todoroo/astrid/dao/MetadataDao.java diff --git a/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java b/app/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java rename to app/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java diff --git a/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java b/app/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java rename to app/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java diff --git a/src/main/java/com/todoroo/astrid/dao/TagDataDao.java b/app/src/main/java/com/todoroo/astrid/dao/TagDataDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/TagDataDao.java rename to app/src/main/java/com/todoroo/astrid/dao/TagDataDao.java diff --git a/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java rename to app/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java diff --git a/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/TaskDao.java rename to app/src/main/java/com/todoroo/astrid/dao/TaskDao.java diff --git a/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java rename to app/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java diff --git a/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java b/app/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/dao/UserActivityDao.java rename to app/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java diff --git a/src/main/java/com/todoroo/astrid/data/Metadata.java b/app/src/main/java/com/todoroo/astrid/data/Metadata.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/Metadata.java rename to app/src/main/java/com/todoroo/astrid/data/Metadata.java diff --git a/src/main/java/com/todoroo/astrid/data/RemoteModel.java b/app/src/main/java/com/todoroo/astrid/data/RemoteModel.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/RemoteModel.java rename to app/src/main/java/com/todoroo/astrid/data/RemoteModel.java diff --git a/src/main/java/com/todoroo/astrid/data/StoreObject.java b/app/src/main/java/com/todoroo/astrid/data/StoreObject.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/StoreObject.java rename to app/src/main/java/com/todoroo/astrid/data/StoreObject.java diff --git a/src/main/java/com/todoroo/astrid/data/SyncFlags.java b/app/src/main/java/com/todoroo/astrid/data/SyncFlags.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/SyncFlags.java rename to app/src/main/java/com/todoroo/astrid/data/SyncFlags.java diff --git a/src/main/java/com/todoroo/astrid/data/TagData.java b/app/src/main/java/com/todoroo/astrid/data/TagData.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/TagData.java rename to app/src/main/java/com/todoroo/astrid/data/TagData.java diff --git a/src/main/java/com/todoroo/astrid/data/Task.java b/app/src/main/java/com/todoroo/astrid/data/Task.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/Task.java rename to app/src/main/java/com/todoroo/astrid/data/Task.java diff --git a/src/main/java/com/todoroo/astrid/data/TaskApiDao.java b/app/src/main/java/com/todoroo/astrid/data/TaskApiDao.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/TaskApiDao.java rename to app/src/main/java/com/todoroo/astrid/data/TaskApiDao.java diff --git a/src/main/java/com/todoroo/astrid/data/TaskAttachment.java b/app/src/main/java/com/todoroo/astrid/data/TaskAttachment.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/TaskAttachment.java rename to app/src/main/java/com/todoroo/astrid/data/TaskAttachment.java diff --git a/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java b/app/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/TaskListMetadata.java rename to app/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java diff --git a/src/main/java/com/todoroo/astrid/data/UserActivity.java b/app/src/main/java/com/todoroo/astrid/data/UserActivity.java similarity index 100% rename from src/main/java/com/todoroo/astrid/data/UserActivity.java rename to app/src/main/java/com/todoroo/astrid/data/UserActivity.java diff --git a/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java b/app/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java similarity index 100% rename from src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java rename to app/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java diff --git a/src/main/java/com/todoroo/astrid/files/FilesAction.java b/app/src/main/java/com/todoroo/astrid/files/FilesAction.java similarity index 100% rename from src/main/java/com/todoroo/astrid/files/FilesAction.java rename to app/src/main/java/com/todoroo/astrid/files/FilesAction.java diff --git a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/files/FilesControlSet.java rename to app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java diff --git a/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/app/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java similarity index 100% rename from src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java rename to app/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java diff --git a/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/app/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java similarity index 100% rename from src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java rename to app/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java b/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java similarity index 100% rename from src/main/java/com/todoroo/astrid/gcal/GCalHelper.java rename to app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/app/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java similarity index 100% rename from src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java rename to app/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java similarity index 100% rename from src/main/java/com/todoroo/astrid/gtasks/GtasksList.java rename to app/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java similarity index 100% rename from src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java rename to app/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java similarity index 100% rename from src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java rename to app/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java diff --git a/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java b/app/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java similarity index 100% rename from src/main/java/com/todoroo/astrid/helper/UUIDHelper.java rename to app/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java diff --git a/src/main/java/com/todoroo/astrid/notes/CommentsController.java b/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java similarity index 100% rename from src/main/java/com/todoroo/astrid/notes/CommentsController.java rename to app/src/main/java/com/todoroo/astrid/notes/CommentsController.java diff --git a/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java b/app/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java similarity index 100% rename from src/main/java/com/todoroo/astrid/notes/NoteMetadata.java rename to app/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java diff --git a/src/main/java/com/todoroo/astrid/notes/NotesAction.java b/app/src/main/java/com/todoroo/astrid/notes/NotesAction.java similarity index 100% rename from src/main/java/com/todoroo/astrid/notes/NotesAction.java rename to app/src/main/java/com/todoroo/astrid/notes/NotesAction.java diff --git a/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java similarity index 100% rename from src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java rename to app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java diff --git a/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/app/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java similarity index 100% rename from src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java rename to app/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java diff --git a/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java b/app/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java similarity index 100% rename from src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java rename to app/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java similarity index 100% rename from src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java rename to app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java similarity index 100% rename from src/main/java/com/todoroo/astrid/reminders/ReminderService.java rename to app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java rename to app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java similarity index 100% rename from src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java rename to app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java diff --git a/src/main/java/com/todoroo/astrid/service/StartupService.java b/app/src/main/java/com/todoroo/astrid/service/StartupService.java similarity index 100% rename from src/main/java/com/todoroo/astrid/service/StartupService.java rename to app/src/main/java/com/todoroo/astrid/service/StartupService.java diff --git a/src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java b/app/src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java similarity index 100% rename from src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java rename to app/src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java diff --git a/src/main/java/com/todoroo/astrid/service/TaskCreator.java b/app/src/main/java/com/todoroo/astrid/service/TaskCreator.java similarity index 100% rename from src/main/java/com/todoroo/astrid/service/TaskCreator.java rename to app/src/main/java/com/todoroo/astrid/service/TaskCreator.java diff --git a/src/main/java/com/todoroo/astrid/service/TaskDeleter.java b/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.java similarity index 100% rename from src/main/java/com/todoroo/astrid/service/TaskDeleter.java rename to app/src/main/java/com/todoroo/astrid/service/TaskDeleter.java diff --git a/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java b/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java similarity index 100% rename from src/main/java/com/todoroo/astrid/service/TaskDuplicator.java rename to app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java diff --git a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java similarity index 100% rename from src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java rename to app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java similarity index 100% rename from src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java rename to app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java similarity index 100% rename from src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java rename to app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java similarity index 100% rename from src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java rename to app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java similarity index 100% rename from src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java rename to app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java diff --git a/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java b/app/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java similarity index 100% rename from src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java rename to app/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java diff --git a/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java similarity index 100% rename from src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java rename to app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java diff --git a/src/main/java/com/todoroo/astrid/tags/TagService.java b/app/src/main/java/com/todoroo/astrid/tags/TagService.java similarity index 100% rename from src/main/java/com/todoroo/astrid/tags/TagService.java rename to app/src/main/java/com/todoroo/astrid/tags/TagService.java diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/tags/TagsControlSet.java rename to app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java diff --git a/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java b/app/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java similarity index 100% rename from src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java rename to app/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java diff --git a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/timers/TimerControlSet.java rename to app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java diff --git a/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java similarity index 100% rename from src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java rename to app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java diff --git a/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java similarity index 100% rename from src/main/java/com/todoroo/astrid/timers/TimerPlugin.java rename to app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java diff --git a/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java b/app/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java similarity index 100% rename from src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java rename to app/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java diff --git a/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java b/app/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/CheckableImageView.java rename to app/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java diff --git a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java rename to app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java rename to app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java diff --git a/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java b/app/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java rename to app/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java diff --git a/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java b/app/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/MultilineHelper.java rename to app/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java diff --git a/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java b/app/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java rename to app/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java diff --git a/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java b/app/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/MultilinePreference.java rename to app/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java diff --git a/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java b/app/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java rename to app/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java diff --git a/src/main/java/com/todoroo/astrid/ui/NumberPicker.java b/app/src/main/java/com/todoroo/astrid/ui/NumberPicker.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/NumberPicker.java rename to app/src/main/java/com/todoroo/astrid/ui/NumberPicker.java diff --git a/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java b/app/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java rename to app/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java diff --git a/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java b/app/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java rename to app/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java diff --git a/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java rename to app/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java rename to app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java diff --git a/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java similarity index 100% rename from src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java rename to app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java diff --git a/src/main/java/com/todoroo/astrid/utility/Constants.java b/app/src/main/java/com/todoroo/astrid/utility/Constants.java similarity index 100% rename from src/main/java/com/todoroo/astrid/utility/Constants.java rename to app/src/main/java/com/todoroo/astrid/utility/Constants.java diff --git a/src/main/java/com/todoroo/astrid/utility/Flags.java b/app/src/main/java/com/todoroo/astrid/utility/Flags.java similarity index 100% rename from src/main/java/com/todoroo/astrid/utility/Flags.java rename to app/src/main/java/com/todoroo/astrid/utility/Flags.java diff --git a/src/main/java/com/todoroo/astrid/utility/TitleParser.java b/app/src/main/java/com/todoroo/astrid/utility/TitleParser.java similarity index 100% rename from src/main/java/com/todoroo/astrid/utility/TitleParser.java rename to app/src/main/java/com/todoroo/astrid/utility/TitleParser.java diff --git a/src/main/java/com/todoroo/astrid/voice/AACRecorder.java b/app/src/main/java/com/todoroo/astrid/voice/AACRecorder.java similarity index 100% rename from src/main/java/com/todoroo/astrid/voice/AACRecorder.java rename to app/src/main/java/com/todoroo/astrid/voice/AACRecorder.java diff --git a/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java b/app/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java similarity index 100% rename from src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java rename to app/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java diff --git a/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java b/app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java similarity index 100% rename from src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java rename to app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java diff --git a/src/main/java/org/tasks/Broadcaster.java b/app/src/main/java/org/tasks/Broadcaster.java similarity index 100% rename from src/main/java/org/tasks/Broadcaster.java rename to app/src/main/java/org/tasks/Broadcaster.java diff --git a/src/main/java/org/tasks/ErrorReportingSingleThreadExecutor.java b/app/src/main/java/org/tasks/ErrorReportingSingleThreadExecutor.java similarity index 100% rename from src/main/java/org/tasks/ErrorReportingSingleThreadExecutor.java rename to app/src/main/java/org/tasks/ErrorReportingSingleThreadExecutor.java diff --git a/src/main/java/org/tasks/Notifier.java b/app/src/main/java/org/tasks/Notifier.java similarity index 100% rename from src/main/java/org/tasks/Notifier.java rename to app/src/main/java/org/tasks/Notifier.java diff --git a/src/main/java/org/tasks/PermissionUtil.java b/app/src/main/java/org/tasks/PermissionUtil.java similarity index 100% rename from src/main/java/org/tasks/PermissionUtil.java rename to app/src/main/java/org/tasks/PermissionUtil.java diff --git a/src/main/java/org/tasks/Tasks.java b/app/src/main/java/org/tasks/Tasks.java similarity index 100% rename from src/main/java/org/tasks/Tasks.java rename to app/src/main/java/org/tasks/Tasks.java diff --git a/src/main/java/org/tasks/activities/AddAttachmentActivity.java b/app/src/main/java/org/tasks/activities/AddAttachmentActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/AddAttachmentActivity.java rename to app/src/main/java/org/tasks/activities/AddAttachmentActivity.java diff --git a/src/main/java/org/tasks/activities/CalendarSelectionActivity.java b/app/src/main/java/org/tasks/activities/CalendarSelectionActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/CalendarSelectionActivity.java rename to app/src/main/java/org/tasks/activities/CalendarSelectionActivity.java diff --git a/src/main/java/org/tasks/activities/CalendarSelectionDialog.java b/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java similarity index 100% rename from src/main/java/org/tasks/activities/CalendarSelectionDialog.java rename to app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java diff --git a/src/main/java/org/tasks/activities/CameraActivity.java b/app/src/main/java/org/tasks/activities/CameraActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/CameraActivity.java rename to app/src/main/java/org/tasks/activities/CameraActivity.java diff --git a/src/main/java/org/tasks/activities/ColorPickerActivity.java b/app/src/main/java/org/tasks/activities/ColorPickerActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/ColorPickerActivity.java rename to app/src/main/java/org/tasks/activities/ColorPickerActivity.java diff --git a/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java b/app/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/DateAndTimePickerActivity.java rename to app/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java diff --git a/src/main/java/org/tasks/activities/DatePickerActivity.java b/app/src/main/java/org/tasks/activities/DatePickerActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/DatePickerActivity.java rename to app/src/main/java/org/tasks/activities/DatePickerActivity.java diff --git a/src/main/java/org/tasks/activities/FilterSelectionActivity.java b/app/src/main/java/org/tasks/activities/FilterSelectionActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/FilterSelectionActivity.java rename to app/src/main/java/org/tasks/activities/FilterSelectionActivity.java diff --git a/src/main/java/org/tasks/activities/FilterSettingsActivity.java b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/FilterSettingsActivity.java rename to app/src/main/java/org/tasks/activities/FilterSettingsActivity.java diff --git a/src/main/java/org/tasks/activities/TagSettingsActivity.java b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/TagSettingsActivity.java rename to app/src/main/java/org/tasks/activities/TagSettingsActivity.java diff --git a/src/main/java/org/tasks/activities/TimePickerActivity.java b/app/src/main/java/org/tasks/activities/TimePickerActivity.java similarity index 100% rename from src/main/java/org/tasks/activities/TimePickerActivity.java rename to app/src/main/java/org/tasks/activities/TimePickerActivity.java diff --git a/src/main/java/org/tasks/analytics/Tracking.java b/app/src/main/java/org/tasks/analytics/Tracking.java similarity index 100% rename from src/main/java/org/tasks/analytics/Tracking.java rename to app/src/main/java/org/tasks/analytics/Tracking.java diff --git a/src/main/java/org/tasks/billing/PurchaseHelperCallback.java b/app/src/main/java/org/tasks/billing/PurchaseHelperCallback.java similarity index 100% rename from src/main/java/org/tasks/billing/PurchaseHelperCallback.java rename to app/src/main/java/org/tasks/billing/PurchaseHelperCallback.java diff --git a/src/main/java/org/tasks/calendars/AndroidCalendar.java b/app/src/main/java/org/tasks/calendars/AndroidCalendar.java similarity index 100% rename from src/main/java/org/tasks/calendars/AndroidCalendar.java rename to app/src/main/java/org/tasks/calendars/AndroidCalendar.java diff --git a/src/main/java/org/tasks/calendars/AndroidCalendarEvent.java b/app/src/main/java/org/tasks/calendars/AndroidCalendarEvent.java similarity index 100% rename from src/main/java/org/tasks/calendars/AndroidCalendarEvent.java rename to app/src/main/java/org/tasks/calendars/AndroidCalendarEvent.java diff --git a/src/main/java/org/tasks/calendars/AndroidCalendarEventAttendee.java b/app/src/main/java/org/tasks/calendars/AndroidCalendarEventAttendee.java similarity index 100% rename from src/main/java/org/tasks/calendars/AndroidCalendarEventAttendee.java rename to app/src/main/java/org/tasks/calendars/AndroidCalendarEventAttendee.java diff --git a/src/main/java/org/tasks/calendars/CalendarEventAttendeeProvider.java b/app/src/main/java/org/tasks/calendars/CalendarEventAttendeeProvider.java similarity index 100% rename from src/main/java/org/tasks/calendars/CalendarEventAttendeeProvider.java rename to app/src/main/java/org/tasks/calendars/CalendarEventAttendeeProvider.java diff --git a/src/main/java/org/tasks/calendars/CalendarEventProvider.java b/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java similarity index 100% rename from src/main/java/org/tasks/calendars/CalendarEventProvider.java rename to app/src/main/java/org/tasks/calendars/CalendarEventProvider.java diff --git a/src/main/java/org/tasks/calendars/CalendarProvider.java b/app/src/main/java/org/tasks/calendars/CalendarProvider.java similarity index 100% rename from src/main/java/org/tasks/calendars/CalendarProvider.java rename to app/src/main/java/org/tasks/calendars/CalendarProvider.java diff --git a/src/main/java/org/tasks/dashclock/DashClockExtension.java b/app/src/main/java/org/tasks/dashclock/DashClockExtension.java similarity index 100% rename from src/main/java/org/tasks/dashclock/DashClockExtension.java rename to app/src/main/java/org/tasks/dashclock/DashClockExtension.java diff --git a/src/main/java/org/tasks/dashclock/DashClockSettings.java b/app/src/main/java/org/tasks/dashclock/DashClockSettings.java similarity index 100% rename from src/main/java/org/tasks/dashclock/DashClockSettings.java rename to app/src/main/java/org/tasks/dashclock/DashClockSettings.java diff --git a/src/main/java/org/tasks/data/TaskListDataProvider.java b/app/src/main/java/org/tasks/data/TaskListDataProvider.java similarity index 100% rename from src/main/java/org/tasks/data/TaskListDataProvider.java rename to app/src/main/java/org/tasks/data/TaskListDataProvider.java diff --git a/src/main/java/org/tasks/date/DateTimeUtils.java b/app/src/main/java/org/tasks/date/DateTimeUtils.java similarity index 100% rename from src/main/java/org/tasks/date/DateTimeUtils.java rename to app/src/main/java/org/tasks/date/DateTimeUtils.java diff --git a/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java b/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/AddAttachmentDialog.java rename to app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java diff --git a/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java similarity index 100% rename from src/main/java/org/tasks/dialogs/AlertDialogBuilder.java rename to app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java diff --git a/src/main/java/org/tasks/dialogs/ColorPickerDialog.java b/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/ColorPickerDialog.java rename to app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java diff --git a/src/main/java/org/tasks/dialogs/DialogBuilder.java b/app/src/main/java/org/tasks/dialogs/DialogBuilder.java similarity index 89% rename from src/main/java/org/tasks/dialogs/DialogBuilder.java rename to app/src/main/java/org/tasks/dialogs/DialogBuilder.java index 1cd851a9b..c73fa8255 100644 --- a/src/main/java/org/tasks/dialogs/DialogBuilder.java +++ b/app/src/main/java/org/tasks/dialogs/DialogBuilder.java @@ -39,7 +39,8 @@ public class DialogBuilder { ProgressDialog progressDialog = new ProgressDialog(activity, theme.getThemeBase().getAlertDialogStyle()); theme.applyToContext(progressDialog.getContext()); if (AndroidUtilities.preLollipop()) { - progressDialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.R.color.transparent)); + ColorDrawable background = new ColorDrawable(activity.getResources().getColor(android.R.color.transparent)); + progressDialog.getWindow().setBackgroundDrawable(background); } return progressDialog; } diff --git a/src/main/java/org/tasks/dialogs/DonationDialog.java b/app/src/main/java/org/tasks/dialogs/DonationDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/DonationDialog.java rename to app/src/main/java/org/tasks/dialogs/DonationDialog.java diff --git a/src/main/java/org/tasks/dialogs/ExportTasksDialog.java b/app/src/main/java/org/tasks/dialogs/ExportTasksDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/ExportTasksDialog.java rename to app/src/main/java/org/tasks/dialogs/ExportTasksDialog.java diff --git a/src/main/java/org/tasks/dialogs/ImportTasksDialog.java b/app/src/main/java/org/tasks/dialogs/ImportTasksDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/ImportTasksDialog.java rename to app/src/main/java/org/tasks/dialogs/ImportTasksDialog.java diff --git a/src/main/java/org/tasks/dialogs/MyDatePickerDialog.java b/app/src/main/java/org/tasks/dialogs/MyDatePickerDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/MyDatePickerDialog.java rename to app/src/main/java/org/tasks/dialogs/MyDatePickerDialog.java diff --git a/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java b/app/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/MyTimePickerDialog.java rename to app/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java diff --git a/src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java b/app/src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java rename to app/src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java diff --git a/src/main/java/org/tasks/dialogs/NativeTimePickerDialog.java b/app/src/main/java/org/tasks/dialogs/NativeTimePickerDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/NativeTimePickerDialog.java rename to app/src/main/java/org/tasks/dialogs/NativeTimePickerDialog.java diff --git a/src/main/java/org/tasks/dialogs/RecordAudioDialog.java b/app/src/main/java/org/tasks/dialogs/RecordAudioDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/RecordAudioDialog.java rename to app/src/main/java/org/tasks/dialogs/RecordAudioDialog.java diff --git a/src/main/java/org/tasks/dialogs/SeekBarDialog.java b/app/src/main/java/org/tasks/dialogs/SeekBarDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/SeekBarDialog.java rename to app/src/main/java/org/tasks/dialogs/SeekBarDialog.java diff --git a/src/main/java/org/tasks/dialogs/SortDialog.java b/app/src/main/java/org/tasks/dialogs/SortDialog.java similarity index 100% rename from src/main/java/org/tasks/dialogs/SortDialog.java rename to app/src/main/java/org/tasks/dialogs/SortDialog.java diff --git a/src/main/java/org/tasks/files/FileExplore.java b/app/src/main/java/org/tasks/files/FileExplore.java similarity index 100% rename from src/main/java/org/tasks/files/FileExplore.java rename to app/src/main/java/org/tasks/files/FileExplore.java diff --git a/src/main/java/org/tasks/files/FileHelper.java b/app/src/main/java/org/tasks/files/FileHelper.java similarity index 100% rename from src/main/java/org/tasks/files/FileHelper.java rename to app/src/main/java/org/tasks/files/FileHelper.java diff --git a/src/main/java/org/tasks/files/ImageHelper.java b/app/src/main/java/org/tasks/files/ImageHelper.java similarity index 100% rename from src/main/java/org/tasks/files/ImageHelper.java rename to app/src/main/java/org/tasks/files/ImageHelper.java diff --git a/src/main/java/org/tasks/files/MyFilePickerActivity.java b/app/src/main/java/org/tasks/files/MyFilePickerActivity.java similarity index 100% rename from src/main/java/org/tasks/files/MyFilePickerActivity.java rename to app/src/main/java/org/tasks/files/MyFilePickerActivity.java diff --git a/src/main/java/org/tasks/filters/FilterCounter.java b/app/src/main/java/org/tasks/filters/FilterCounter.java similarity index 100% rename from src/main/java/org/tasks/filters/FilterCounter.java rename to app/src/main/java/org/tasks/filters/FilterCounter.java diff --git a/src/main/java/org/tasks/filters/FilterCriteriaProvider.java b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java similarity index 100% rename from src/main/java/org/tasks/filters/FilterCriteriaProvider.java rename to app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java diff --git a/src/main/java/org/tasks/filters/FilterProvider.java b/app/src/main/java/org/tasks/filters/FilterProvider.java similarity index 100% rename from src/main/java/org/tasks/filters/FilterProvider.java rename to app/src/main/java/org/tasks/filters/FilterProvider.java diff --git a/src/main/java/org/tasks/filters/NavigationDrawerAction.java b/app/src/main/java/org/tasks/filters/NavigationDrawerAction.java similarity index 100% rename from src/main/java/org/tasks/filters/NavigationDrawerAction.java rename to app/src/main/java/org/tasks/filters/NavigationDrawerAction.java diff --git a/src/main/java/org/tasks/filters/NavigationDrawerSeparator.java b/app/src/main/java/org/tasks/filters/NavigationDrawerSeparator.java similarity index 100% rename from src/main/java/org/tasks/filters/NavigationDrawerSeparator.java rename to app/src/main/java/org/tasks/filters/NavigationDrawerSeparator.java diff --git a/src/main/java/org/tasks/filters/NavigationDrawerSubheader.java b/app/src/main/java/org/tasks/filters/NavigationDrawerSubheader.java similarity index 100% rename from src/main/java/org/tasks/filters/NavigationDrawerSubheader.java rename to app/src/main/java/org/tasks/filters/NavigationDrawerSubheader.java diff --git a/src/main/java/org/tasks/fragments/CommentBarFragment.java b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java similarity index 100% rename from src/main/java/org/tasks/fragments/CommentBarFragment.java rename to app/src/main/java/org/tasks/fragments/CommentBarFragment.java diff --git a/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java similarity index 100% rename from src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java rename to app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java diff --git a/src/main/java/org/tasks/gtasks/GoogleTaskListSelectionHandler.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskListSelectionHandler.java similarity index 100% rename from src/main/java/org/tasks/gtasks/GoogleTaskListSelectionHandler.java rename to app/src/main/java/org/tasks/gtasks/GoogleTaskListSelectionHandler.java diff --git a/src/main/java/org/tasks/injection/ActivityModule.java b/app/src/main/java/org/tasks/injection/ActivityModule.java similarity index 100% rename from src/main/java/org/tasks/injection/ActivityModule.java rename to app/src/main/java/org/tasks/injection/ActivityModule.java diff --git a/src/main/java/org/tasks/injection/ActivityScope.java b/app/src/main/java/org/tasks/injection/ActivityScope.java similarity index 100% rename from src/main/java/org/tasks/injection/ActivityScope.java rename to app/src/main/java/org/tasks/injection/ActivityScope.java diff --git a/src/main/java/org/tasks/injection/ApplicationModule.java b/app/src/main/java/org/tasks/injection/ApplicationModule.java similarity index 100% rename from src/main/java/org/tasks/injection/ApplicationModule.java rename to app/src/main/java/org/tasks/injection/ApplicationModule.java diff --git a/src/main/java/org/tasks/injection/ApplicationScope.java b/app/src/main/java/org/tasks/injection/ApplicationScope.java similarity index 100% rename from src/main/java/org/tasks/injection/ApplicationScope.java rename to app/src/main/java/org/tasks/injection/ApplicationScope.java diff --git a/src/main/java/org/tasks/injection/BroadcastModule.java b/app/src/main/java/org/tasks/injection/BroadcastModule.java similarity index 100% rename from src/main/java/org/tasks/injection/BroadcastModule.java rename to app/src/main/java/org/tasks/injection/BroadcastModule.java diff --git a/src/main/java/org/tasks/injection/ContentProviderComponent.java b/app/src/main/java/org/tasks/injection/ContentProviderComponent.java similarity index 100% rename from src/main/java/org/tasks/injection/ContentProviderComponent.java rename to app/src/main/java/org/tasks/injection/ContentProviderComponent.java diff --git a/src/main/java/org/tasks/injection/ContentProviderModule.java b/app/src/main/java/org/tasks/injection/ContentProviderModule.java similarity index 100% rename from src/main/java/org/tasks/injection/ContentProviderModule.java rename to app/src/main/java/org/tasks/injection/ContentProviderModule.java diff --git a/src/main/java/org/tasks/injection/Dagger.java b/app/src/main/java/org/tasks/injection/Dagger.java similarity index 100% rename from src/main/java/org/tasks/injection/Dagger.java rename to app/src/main/java/org/tasks/injection/Dagger.java diff --git a/src/main/java/org/tasks/injection/DialogFragmentModule.java b/app/src/main/java/org/tasks/injection/DialogFragmentModule.java similarity index 100% rename from src/main/java/org/tasks/injection/DialogFragmentModule.java rename to app/src/main/java/org/tasks/injection/DialogFragmentModule.java diff --git a/src/main/java/org/tasks/injection/ForActivity.java b/app/src/main/java/org/tasks/injection/ForActivity.java similarity index 100% rename from src/main/java/org/tasks/injection/ForActivity.java rename to app/src/main/java/org/tasks/injection/ForActivity.java diff --git a/src/main/java/org/tasks/injection/ForApplication.java b/app/src/main/java/org/tasks/injection/ForApplication.java similarity index 100% rename from src/main/java/org/tasks/injection/ForApplication.java rename to app/src/main/java/org/tasks/injection/ForApplication.java diff --git a/src/main/java/org/tasks/injection/FragmentComponent.java b/app/src/main/java/org/tasks/injection/FragmentComponent.java similarity index 100% rename from src/main/java/org/tasks/injection/FragmentComponent.java rename to app/src/main/java/org/tasks/injection/FragmentComponent.java diff --git a/src/main/java/org/tasks/injection/FragmentModule.java b/app/src/main/java/org/tasks/injection/FragmentModule.java similarity index 100% rename from src/main/java/org/tasks/injection/FragmentModule.java rename to app/src/main/java/org/tasks/injection/FragmentModule.java diff --git a/src/main/java/org/tasks/injection/InjectingActivity.java b/app/src/main/java/org/tasks/injection/InjectingActivity.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingActivity.java rename to app/src/main/java/org/tasks/injection/InjectingActivity.java diff --git a/src/main/java/org/tasks/injection/InjectingAppCompatActivity.java b/app/src/main/java/org/tasks/injection/InjectingAppCompatActivity.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingAppCompatActivity.java rename to app/src/main/java/org/tasks/injection/InjectingAppCompatActivity.java diff --git a/src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java b/app/src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java rename to app/src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java diff --git a/src/main/java/org/tasks/injection/InjectingApplication.java b/app/src/main/java/org/tasks/injection/InjectingApplication.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingApplication.java rename to app/src/main/java/org/tasks/injection/InjectingApplication.java diff --git a/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java b/app/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java rename to app/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java diff --git a/src/main/java/org/tasks/injection/InjectingContentProvider.java b/app/src/main/java/org/tasks/injection/InjectingContentProvider.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingContentProvider.java rename to app/src/main/java/org/tasks/injection/InjectingContentProvider.java diff --git a/src/main/java/org/tasks/injection/InjectingDialogFragment.java b/app/src/main/java/org/tasks/injection/InjectingDialogFragment.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingDialogFragment.java rename to app/src/main/java/org/tasks/injection/InjectingDialogFragment.java diff --git a/src/main/java/org/tasks/injection/InjectingFragment.java b/app/src/main/java/org/tasks/injection/InjectingFragment.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingFragment.java rename to app/src/main/java/org/tasks/injection/InjectingFragment.java diff --git a/src/main/java/org/tasks/injection/InjectingIntentService.java b/app/src/main/java/org/tasks/injection/InjectingIntentService.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingIntentService.java rename to app/src/main/java/org/tasks/injection/InjectingIntentService.java diff --git a/src/main/java/org/tasks/injection/InjectingListFragment.java b/app/src/main/java/org/tasks/injection/InjectingListFragment.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingListFragment.java rename to app/src/main/java/org/tasks/injection/InjectingListFragment.java diff --git a/src/main/java/org/tasks/injection/InjectingNativeDialogFragment.java b/app/src/main/java/org/tasks/injection/InjectingNativeDialogFragment.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingNativeDialogFragment.java rename to app/src/main/java/org/tasks/injection/InjectingNativeDialogFragment.java diff --git a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java similarity index 100% rename from src/main/java/org/tasks/injection/InjectingPreferenceActivity.java rename to app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java diff --git a/src/main/java/org/tasks/injection/IntentServiceComponent.java b/app/src/main/java/org/tasks/injection/IntentServiceComponent.java similarity index 100% rename from src/main/java/org/tasks/injection/IntentServiceComponent.java rename to app/src/main/java/org/tasks/injection/IntentServiceComponent.java diff --git a/src/main/java/org/tasks/injection/IntentServiceModule.java b/app/src/main/java/org/tasks/injection/IntentServiceModule.java similarity index 100% rename from src/main/java/org/tasks/injection/IntentServiceModule.java rename to app/src/main/java/org/tasks/injection/IntentServiceModule.java diff --git a/src/main/java/org/tasks/injection/NativeDialogFragmentModule.java b/app/src/main/java/org/tasks/injection/NativeDialogFragmentModule.java similarity index 100% rename from src/main/java/org/tasks/injection/NativeDialogFragmentModule.java rename to app/src/main/java/org/tasks/injection/NativeDialogFragmentModule.java diff --git a/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java b/app/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java similarity index 100% rename from src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java rename to app/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.java diff --git a/src/main/java/org/tasks/intents/TaskIntents.java b/app/src/main/java/org/tasks/intents/TaskIntents.java similarity index 100% rename from src/main/java/org/tasks/intents/TaskIntents.java rename to app/src/main/java/org/tasks/intents/TaskIntents.java diff --git a/src/main/java/org/tasks/jobs/Alarm.java b/app/src/main/java/org/tasks/jobs/Alarm.java similarity index 100% rename from src/main/java/org/tasks/jobs/Alarm.java rename to app/src/main/java/org/tasks/jobs/Alarm.java diff --git a/src/main/java/org/tasks/jobs/AlarmJob.java b/app/src/main/java/org/tasks/jobs/AlarmJob.java similarity index 100% rename from src/main/java/org/tasks/jobs/AlarmJob.java rename to app/src/main/java/org/tasks/jobs/AlarmJob.java diff --git a/src/main/java/org/tasks/jobs/AlarmJobBroadcast.java b/app/src/main/java/org/tasks/jobs/AlarmJobBroadcast.java similarity index 100% rename from src/main/java/org/tasks/jobs/AlarmJobBroadcast.java rename to app/src/main/java/org/tasks/jobs/AlarmJobBroadcast.java diff --git a/src/main/java/org/tasks/jobs/BackupJob.java b/app/src/main/java/org/tasks/jobs/BackupJob.java similarity index 100% rename from src/main/java/org/tasks/jobs/BackupJob.java rename to app/src/main/java/org/tasks/jobs/BackupJob.java diff --git a/src/main/java/org/tasks/jobs/Job.java b/app/src/main/java/org/tasks/jobs/Job.java similarity index 100% rename from src/main/java/org/tasks/jobs/Job.java rename to app/src/main/java/org/tasks/jobs/Job.java diff --git a/src/main/java/org/tasks/jobs/JobManager.java b/app/src/main/java/org/tasks/jobs/JobManager.java similarity index 100% rename from src/main/java/org/tasks/jobs/JobManager.java rename to app/src/main/java/org/tasks/jobs/JobManager.java diff --git a/src/main/java/org/tasks/jobs/JobQueue.java b/app/src/main/java/org/tasks/jobs/JobQueue.java similarity index 100% rename from src/main/java/org/tasks/jobs/JobQueue.java rename to app/src/main/java/org/tasks/jobs/JobQueue.java diff --git a/src/main/java/org/tasks/jobs/JobQueueEntry.java b/app/src/main/java/org/tasks/jobs/JobQueueEntry.java similarity index 100% rename from src/main/java/org/tasks/jobs/JobQueueEntry.java rename to app/src/main/java/org/tasks/jobs/JobQueueEntry.java diff --git a/src/main/java/org/tasks/jobs/MidnightJob.java b/app/src/main/java/org/tasks/jobs/MidnightJob.java similarity index 100% rename from src/main/java/org/tasks/jobs/MidnightJob.java rename to app/src/main/java/org/tasks/jobs/MidnightJob.java diff --git a/src/main/java/org/tasks/jobs/MidnightRefreshJob.java b/app/src/main/java/org/tasks/jobs/MidnightRefreshJob.java similarity index 100% rename from src/main/java/org/tasks/jobs/MidnightRefreshJob.java rename to app/src/main/java/org/tasks/jobs/MidnightRefreshJob.java diff --git a/src/main/java/org/tasks/jobs/RefreshJob.java b/app/src/main/java/org/tasks/jobs/RefreshJob.java similarity index 100% rename from src/main/java/org/tasks/jobs/RefreshJob.java rename to app/src/main/java/org/tasks/jobs/RefreshJob.java diff --git a/src/main/java/org/tasks/jobs/Reminder.java b/app/src/main/java/org/tasks/jobs/Reminder.java similarity index 100% rename from src/main/java/org/tasks/jobs/Reminder.java rename to app/src/main/java/org/tasks/jobs/Reminder.java diff --git a/src/main/java/org/tasks/jobs/ReminderJob.java b/app/src/main/java/org/tasks/jobs/ReminderJob.java similarity index 100% rename from src/main/java/org/tasks/jobs/ReminderJob.java rename to app/src/main/java/org/tasks/jobs/ReminderJob.java diff --git a/src/main/java/org/tasks/jobs/ReminderJobBroadcast.java b/app/src/main/java/org/tasks/jobs/ReminderJobBroadcast.java similarity index 100% rename from src/main/java/org/tasks/jobs/ReminderJobBroadcast.java rename to app/src/main/java/org/tasks/jobs/ReminderJobBroadcast.java diff --git a/src/main/java/org/tasks/jobs/WakefulJob.java b/app/src/main/java/org/tasks/jobs/WakefulJob.java similarity index 100% rename from src/main/java/org/tasks/jobs/WakefulJob.java rename to app/src/main/java/org/tasks/jobs/WakefulJob.java diff --git a/src/main/java/org/tasks/locale/Locale.java b/app/src/main/java/org/tasks/locale/Locale.java similarity index 100% rename from src/main/java/org/tasks/locale/Locale.java rename to app/src/main/java/org/tasks/locale/Locale.java diff --git a/src/main/java/org/tasks/locale/LocalePickerDialog.java b/app/src/main/java/org/tasks/locale/LocalePickerDialog.java similarity index 100% rename from src/main/java/org/tasks/locale/LocalePickerDialog.java rename to app/src/main/java/org/tasks/locale/LocalePickerDialog.java diff --git a/src/main/java/org/tasks/locale/bundle/PluginBundleValues.java b/app/src/main/java/org/tasks/locale/bundle/PluginBundleValues.java similarity index 100% rename from src/main/java/org/tasks/locale/bundle/PluginBundleValues.java rename to app/src/main/java/org/tasks/locale/bundle/PluginBundleValues.java diff --git a/src/main/java/org/tasks/locale/receiver/FireReceiver.java b/app/src/main/java/org/tasks/locale/receiver/FireReceiver.java similarity index 100% rename from src/main/java/org/tasks/locale/receiver/FireReceiver.java rename to app/src/main/java/org/tasks/locale/receiver/FireReceiver.java diff --git a/src/main/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java b/app/src/main/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java similarity index 100% rename from src/main/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java rename to app/src/main/java/org/tasks/locale/ui/activity/AbstractFragmentPluginAppCompatActivity.java diff --git a/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java b/app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java similarity index 100% rename from src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java rename to app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java diff --git a/src/main/java/org/tasks/location/Geofence.java b/app/src/main/java/org/tasks/location/Geofence.java similarity index 100% rename from src/main/java/org/tasks/location/Geofence.java rename to app/src/main/java/org/tasks/location/Geofence.java diff --git a/src/main/java/org/tasks/location/GeofenceFields.java b/app/src/main/java/org/tasks/location/GeofenceFields.java similarity index 100% rename from src/main/java/org/tasks/location/GeofenceFields.java rename to app/src/main/java/org/tasks/location/GeofenceFields.java diff --git a/src/main/java/org/tasks/location/GeofenceService.java b/app/src/main/java/org/tasks/location/GeofenceService.java similarity index 100% rename from src/main/java/org/tasks/location/GeofenceService.java rename to app/src/main/java/org/tasks/location/GeofenceService.java diff --git a/src/main/java/org/tasks/notifications/AudioManager.java b/app/src/main/java/org/tasks/notifications/AudioManager.java similarity index 100% rename from src/main/java/org/tasks/notifications/AudioManager.java rename to app/src/main/java/org/tasks/notifications/AudioManager.java diff --git a/src/main/java/org/tasks/notifications/NotificationManager.java b/app/src/main/java/org/tasks/notifications/NotificationManager.java similarity index 100% rename from src/main/java/org/tasks/notifications/NotificationManager.java rename to app/src/main/java/org/tasks/notifications/NotificationManager.java diff --git a/src/main/java/org/tasks/notifications/TelephonyManager.java b/app/src/main/java/org/tasks/notifications/TelephonyManager.java similarity index 100% rename from src/main/java/org/tasks/notifications/TelephonyManager.java rename to app/src/main/java/org/tasks/notifications/TelephonyManager.java diff --git a/src/main/java/org/tasks/preferences/ActivityPermissionRequestor.java b/app/src/main/java/org/tasks/preferences/ActivityPermissionRequestor.java similarity index 100% rename from src/main/java/org/tasks/preferences/ActivityPermissionRequestor.java rename to app/src/main/java/org/tasks/preferences/ActivityPermissionRequestor.java diff --git a/src/main/java/org/tasks/preferences/AppCompatPreferenceActivity.java b/app/src/main/java/org/tasks/preferences/AppCompatPreferenceActivity.java similarity index 100% rename from src/main/java/org/tasks/preferences/AppCompatPreferenceActivity.java rename to app/src/main/java/org/tasks/preferences/AppCompatPreferenceActivity.java diff --git a/src/main/java/org/tasks/preferences/AppearancePreferences.java b/app/src/main/java/org/tasks/preferences/AppearancePreferences.java similarity index 100% rename from src/main/java/org/tasks/preferences/AppearancePreferences.java rename to app/src/main/java/org/tasks/preferences/AppearancePreferences.java diff --git a/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java similarity index 99% rename from src/main/java/org/tasks/preferences/BasicPreferences.java rename to app/src/main/java/org/tasks/preferences/BasicPreferences.java index 42ad7ff09..39fd4b821 100644 --- a/src/main/java/org/tasks/preferences/BasicPreferences.java +++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java @@ -137,7 +137,7 @@ public class BasicPreferences extends InjectingPreferenceActivity implements }); findPreference(R.string.TLA_menu_donate).setOnPreferenceClickListener(preference -> { - if (BuildConfig.FLAVOR.equals("googleplay")) { + if (BuildConfig.FLAVOR_store.equals("googleplay")) { newDonationDialog().show(getFragmentManager(), FRAG_TAG_DONATION); } else { startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("http://tasks.org/donate"))); @@ -214,7 +214,7 @@ public class BasicPreferences extends InjectingPreferenceActivity implements requires(R.string.get_plugins, atLeastJellybeanMR1(), R.string.p_purchased_dashclock); requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language, R.string.p_layout_direction); - if (!BuildConfig.FLAVOR.equals("googleplay")) { + if (!BuildConfig.FLAVOR_store.equals("googleplay")) { requires(R.string.settings_general, false, R.string.synchronization); requires(R.string.privacy, false, R.string.p_collect_statistics); } diff --git a/src/main/java/org/tasks/preferences/DateTimePreferences.java b/app/src/main/java/org/tasks/preferences/DateTimePreferences.java similarity index 100% rename from src/main/java/org/tasks/preferences/DateTimePreferences.java rename to app/src/main/java/org/tasks/preferences/DateTimePreferences.java diff --git a/src/main/java/org/tasks/preferences/DefaultFilterProvider.java b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.java similarity index 100% rename from src/main/java/org/tasks/preferences/DefaultFilterProvider.java rename to app/src/main/java/org/tasks/preferences/DefaultFilterProvider.java diff --git a/src/main/java/org/tasks/preferences/Device.java b/app/src/main/java/org/tasks/preferences/Device.java similarity index 100% rename from src/main/java/org/tasks/preferences/Device.java rename to app/src/main/java/org/tasks/preferences/Device.java diff --git a/src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java b/app/src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java similarity index 100% rename from src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java rename to app/src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java diff --git a/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java b/app/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java similarity index 100% rename from src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java rename to app/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java diff --git a/src/main/java/org/tasks/preferences/MiscellaneousPreferences.java b/app/src/main/java/org/tasks/preferences/MiscellaneousPreferences.java similarity index 100% rename from src/main/java/org/tasks/preferences/MiscellaneousPreferences.java rename to app/src/main/java/org/tasks/preferences/MiscellaneousPreferences.java diff --git a/src/main/java/org/tasks/preferences/PermissionChecker.java b/app/src/main/java/org/tasks/preferences/PermissionChecker.java similarity index 100% rename from src/main/java/org/tasks/preferences/PermissionChecker.java rename to app/src/main/java/org/tasks/preferences/PermissionChecker.java diff --git a/src/main/java/org/tasks/preferences/PermissionRequestor.java b/app/src/main/java/org/tasks/preferences/PermissionRequestor.java similarity index 100% rename from src/main/java/org/tasks/preferences/PermissionRequestor.java rename to app/src/main/java/org/tasks/preferences/PermissionRequestor.java diff --git a/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java similarity index 100% rename from src/main/java/org/tasks/preferences/Preferences.java rename to app/src/main/java/org/tasks/preferences/Preferences.java diff --git a/src/main/java/org/tasks/preferences/ResourceResolver.java b/app/src/main/java/org/tasks/preferences/ResourceResolver.java similarity index 100% rename from src/main/java/org/tasks/preferences/ResourceResolver.java rename to app/src/main/java/org/tasks/preferences/ResourceResolver.java diff --git a/src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java b/app/src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java similarity index 100% rename from src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java rename to app/src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java diff --git a/src/main/java/org/tasks/preferences/beast/BeastModeViewHolder.java b/app/src/main/java/org/tasks/preferences/beast/BeastModeViewHolder.java similarity index 100% rename from src/main/java/org/tasks/preferences/beast/BeastModeViewHolder.java rename to app/src/main/java/org/tasks/preferences/beast/BeastModeViewHolder.java diff --git a/src/main/java/org/tasks/receivers/BootCompletedReceiver.java b/app/src/main/java/org/tasks/receivers/BootCompletedReceiver.java similarity index 100% rename from src/main/java/org/tasks/receivers/BootCompletedReceiver.java rename to app/src/main/java/org/tasks/receivers/BootCompletedReceiver.java diff --git a/src/main/java/org/tasks/receivers/CompleteTaskReceiver.java b/app/src/main/java/org/tasks/receivers/CompleteTaskReceiver.java similarity index 100% rename from src/main/java/org/tasks/receivers/CompleteTaskReceiver.java rename to app/src/main/java/org/tasks/receivers/CompleteTaskReceiver.java diff --git a/src/main/java/org/tasks/receivers/ListNotificationReceiver.java b/app/src/main/java/org/tasks/receivers/ListNotificationReceiver.java similarity index 100% rename from src/main/java/org/tasks/receivers/ListNotificationReceiver.java rename to app/src/main/java/org/tasks/receivers/ListNotificationReceiver.java diff --git a/src/main/java/org/tasks/receivers/MyPackageReplacedReceiver.java b/app/src/main/java/org/tasks/receivers/MyPackageReplacedReceiver.java similarity index 100% rename from src/main/java/org/tasks/receivers/MyPackageReplacedReceiver.java rename to app/src/main/java/org/tasks/receivers/MyPackageReplacedReceiver.java diff --git a/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java b/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java similarity index 100% rename from src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java rename to app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java diff --git a/src/main/java/org/tasks/receivers/TeslaUnreadReceiver.java b/app/src/main/java/org/tasks/receivers/TeslaUnreadReceiver.java similarity index 100% rename from src/main/java/org/tasks/receivers/TeslaUnreadReceiver.java rename to app/src/main/java/org/tasks/receivers/TeslaUnreadReceiver.java diff --git a/src/main/java/org/tasks/reminders/MissedCallActivity.java b/app/src/main/java/org/tasks/reminders/MissedCallActivity.java similarity index 100% rename from src/main/java/org/tasks/reminders/MissedCallActivity.java rename to app/src/main/java/org/tasks/reminders/MissedCallActivity.java diff --git a/src/main/java/org/tasks/reminders/MissedCallDialog.java b/app/src/main/java/org/tasks/reminders/MissedCallDialog.java similarity index 100% rename from src/main/java/org/tasks/reminders/MissedCallDialog.java rename to app/src/main/java/org/tasks/reminders/MissedCallDialog.java diff --git a/src/main/java/org/tasks/reminders/NotificationActivity.java b/app/src/main/java/org/tasks/reminders/NotificationActivity.java similarity index 100% rename from src/main/java/org/tasks/reminders/NotificationActivity.java rename to app/src/main/java/org/tasks/reminders/NotificationActivity.java diff --git a/src/main/java/org/tasks/reminders/NotificationDialog.java b/app/src/main/java/org/tasks/reminders/NotificationDialog.java similarity index 100% rename from src/main/java/org/tasks/reminders/NotificationDialog.java rename to app/src/main/java/org/tasks/reminders/NotificationDialog.java diff --git a/src/main/java/org/tasks/reminders/Random.java b/app/src/main/java/org/tasks/reminders/Random.java similarity index 100% rename from src/main/java/org/tasks/reminders/Random.java rename to app/src/main/java/org/tasks/reminders/Random.java diff --git a/src/main/java/org/tasks/reminders/SnoozeActivity.java b/app/src/main/java/org/tasks/reminders/SnoozeActivity.java similarity index 100% rename from src/main/java/org/tasks/reminders/SnoozeActivity.java rename to app/src/main/java/org/tasks/reminders/SnoozeActivity.java diff --git a/src/main/java/org/tasks/reminders/SnoozeCallback.java b/app/src/main/java/org/tasks/reminders/SnoozeCallback.java similarity index 100% rename from src/main/java/org/tasks/reminders/SnoozeCallback.java rename to app/src/main/java/org/tasks/reminders/SnoozeCallback.java diff --git a/src/main/java/org/tasks/reminders/SnoozeDialog.java b/app/src/main/java/org/tasks/reminders/SnoozeDialog.java similarity index 100% rename from src/main/java/org/tasks/reminders/SnoozeDialog.java rename to app/src/main/java/org/tasks/reminders/SnoozeDialog.java diff --git a/src/main/java/org/tasks/reminders/SnoozeOption.java b/app/src/main/java/org/tasks/reminders/SnoozeOption.java similarity index 100% rename from src/main/java/org/tasks/reminders/SnoozeOption.java rename to app/src/main/java/org/tasks/reminders/SnoozeOption.java diff --git a/src/main/java/org/tasks/scheduling/AlarmManager.java b/app/src/main/java/org/tasks/scheduling/AlarmManager.java similarity index 100% rename from src/main/java/org/tasks/scheduling/AlarmManager.java rename to app/src/main/java/org/tasks/scheduling/AlarmManager.java diff --git a/src/main/java/org/tasks/scheduling/BackgroundScheduler.java b/app/src/main/java/org/tasks/scheduling/BackgroundScheduler.java similarity index 100% rename from src/main/java/org/tasks/scheduling/BackgroundScheduler.java rename to app/src/main/java/org/tasks/scheduling/BackgroundScheduler.java diff --git a/src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java b/app/src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java similarity index 100% rename from src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java rename to app/src/main/java/org/tasks/scheduling/CalendarNotificationIntentService.java diff --git a/src/main/java/org/tasks/scheduling/GeofenceSchedulingIntentService.java b/app/src/main/java/org/tasks/scheduling/GeofenceSchedulingIntentService.java similarity index 100% rename from src/main/java/org/tasks/scheduling/GeofenceSchedulingIntentService.java rename to app/src/main/java/org/tasks/scheduling/GeofenceSchedulingIntentService.java diff --git a/src/main/java/org/tasks/scheduling/NotificationSchedulerIntentService.java b/app/src/main/java/org/tasks/scheduling/NotificationSchedulerIntentService.java similarity index 100% rename from src/main/java/org/tasks/scheduling/NotificationSchedulerIntentService.java rename to app/src/main/java/org/tasks/scheduling/NotificationSchedulerIntentService.java diff --git a/src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java b/app/src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java similarity index 100% rename from src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java rename to app/src/main/java/org/tasks/scheduling/RecurringIntervalIntentService.java diff --git a/src/main/java/org/tasks/scheduling/RefreshScheduler.java b/app/src/main/java/org/tasks/scheduling/RefreshScheduler.java similarity index 100% rename from src/main/java/org/tasks/scheduling/RefreshScheduler.java rename to app/src/main/java/org/tasks/scheduling/RefreshScheduler.java diff --git a/src/main/java/org/tasks/scheduling/SchedulerIntentService.java b/app/src/main/java/org/tasks/scheduling/SchedulerIntentService.java similarity index 100% rename from src/main/java/org/tasks/scheduling/SchedulerIntentService.java rename to app/src/main/java/org/tasks/scheduling/SchedulerIntentService.java diff --git a/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java b/app/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java similarity index 100% rename from src/main/java/org/tasks/sync/RecordSyncStatusCallback.java rename to app/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java diff --git a/src/main/java/org/tasks/sync/SyncExecutor.java b/app/src/main/java/org/tasks/sync/SyncExecutor.java similarity index 100% rename from src/main/java/org/tasks/sync/SyncExecutor.java rename to app/src/main/java/org/tasks/sync/SyncExecutor.java diff --git a/src/main/java/org/tasks/tasklist/ActionUtils.java b/app/src/main/java/org/tasks/tasklist/ActionUtils.java similarity index 100% rename from src/main/java/org/tasks/tasklist/ActionUtils.java rename to app/src/main/java/org/tasks/tasklist/ActionUtils.java diff --git a/src/main/java/org/tasks/tasklist/TagFormatter.java b/app/src/main/java/org/tasks/tasklist/TagFormatter.java similarity index 100% rename from src/main/java/org/tasks/tasklist/TagFormatter.java rename to app/src/main/java/org/tasks/tasklist/TagFormatter.java diff --git a/src/main/java/org/tasks/tasklist/TagListFragment.java b/app/src/main/java/org/tasks/tasklist/TagListFragment.java similarity index 100% rename from src/main/java/org/tasks/tasklist/TagListFragment.java rename to app/src/main/java/org/tasks/tasklist/TagListFragment.java diff --git a/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java similarity index 100% rename from src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java rename to app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java diff --git a/src/main/java/org/tasks/tasklist/ViewHolder.java b/app/src/main/java/org/tasks/tasklist/ViewHolder.java similarity index 100% rename from src/main/java/org/tasks/tasklist/ViewHolder.java rename to app/src/main/java/org/tasks/tasklist/ViewHolder.java diff --git a/src/main/java/org/tasks/tasklist/ViewHolderFactory.java b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java similarity index 100% rename from src/main/java/org/tasks/tasklist/ViewHolderFactory.java rename to app/src/main/java/org/tasks/tasklist/ViewHolderFactory.java diff --git a/src/main/java/org/tasks/themes/LEDColor.java b/app/src/main/java/org/tasks/themes/LEDColor.java similarity index 100% rename from src/main/java/org/tasks/themes/LEDColor.java rename to app/src/main/java/org/tasks/themes/LEDColor.java diff --git a/src/main/java/org/tasks/themes/Theme.java b/app/src/main/java/org/tasks/themes/Theme.java similarity index 100% rename from src/main/java/org/tasks/themes/Theme.java rename to app/src/main/java/org/tasks/themes/Theme.java diff --git a/src/main/java/org/tasks/themes/ThemeAccent.java b/app/src/main/java/org/tasks/themes/ThemeAccent.java similarity index 100% rename from src/main/java/org/tasks/themes/ThemeAccent.java rename to app/src/main/java/org/tasks/themes/ThemeAccent.java diff --git a/src/main/java/org/tasks/themes/ThemeBase.java b/app/src/main/java/org/tasks/themes/ThemeBase.java similarity index 100% rename from src/main/java/org/tasks/themes/ThemeBase.java rename to app/src/main/java/org/tasks/themes/ThemeBase.java diff --git a/src/main/java/org/tasks/themes/ThemeCache.java b/app/src/main/java/org/tasks/themes/ThemeCache.java similarity index 100% rename from src/main/java/org/tasks/themes/ThemeCache.java rename to app/src/main/java/org/tasks/themes/ThemeCache.java diff --git a/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java similarity index 100% rename from src/main/java/org/tasks/themes/ThemeColor.java rename to app/src/main/java/org/tasks/themes/ThemeColor.java diff --git a/src/main/java/org/tasks/themes/WidgetTheme.java b/app/src/main/java/org/tasks/themes/WidgetTheme.java similarity index 100% rename from src/main/java/org/tasks/themes/WidgetTheme.java rename to app/src/main/java/org/tasks/themes/WidgetTheme.java diff --git a/src/main/java/org/tasks/time/DateTime.java b/app/src/main/java/org/tasks/time/DateTime.java similarity index 100% rename from src/main/java/org/tasks/time/DateTime.java rename to app/src/main/java/org/tasks/time/DateTime.java diff --git a/src/main/java/org/tasks/time/DateTimeUtils.java b/app/src/main/java/org/tasks/time/DateTimeUtils.java similarity index 100% rename from src/main/java/org/tasks/time/DateTimeUtils.java rename to app/src/main/java/org/tasks/time/DateTimeUtils.java diff --git a/src/main/java/org/tasks/time/FixedMillisProvider.java b/app/src/main/java/org/tasks/time/FixedMillisProvider.java similarity index 100% rename from src/main/java/org/tasks/time/FixedMillisProvider.java rename to app/src/main/java/org/tasks/time/FixedMillisProvider.java diff --git a/src/main/java/org/tasks/time/MillisProvider.java b/app/src/main/java/org/tasks/time/MillisProvider.java similarity index 100% rename from src/main/java/org/tasks/time/MillisProvider.java rename to app/src/main/java/org/tasks/time/MillisProvider.java diff --git a/src/main/java/org/tasks/time/SystemMillisProvider.java b/app/src/main/java/org/tasks/time/SystemMillisProvider.java similarity index 100% rename from src/main/java/org/tasks/time/SystemMillisProvider.java rename to app/src/main/java/org/tasks/time/SystemMillisProvider.java diff --git a/src/main/java/org/tasks/ui/CalendarControlSet.java b/app/src/main/java/org/tasks/ui/CalendarControlSet.java similarity index 100% rename from src/main/java/org/tasks/ui/CalendarControlSet.java rename to app/src/main/java/org/tasks/ui/CalendarControlSet.java diff --git a/src/main/java/org/tasks/ui/CheckBoxes.java b/app/src/main/java/org/tasks/ui/CheckBoxes.java similarity index 100% rename from src/main/java/org/tasks/ui/CheckBoxes.java rename to app/src/main/java/org/tasks/ui/CheckBoxes.java diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java similarity index 100% rename from src/main/java/org/tasks/ui/DeadlineControlSet.java rename to app/src/main/java/org/tasks/ui/DeadlineControlSet.java diff --git a/src/main/java/org/tasks/ui/DescriptionControlSet.java b/app/src/main/java/org/tasks/ui/DescriptionControlSet.java similarity index 100% rename from src/main/java/org/tasks/ui/DescriptionControlSet.java rename to app/src/main/java/org/tasks/ui/DescriptionControlSet.java diff --git a/src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java b/app/src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java similarity index 100% rename from src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java rename to app/src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java diff --git a/src/main/java/org/tasks/ui/EmptyTaskEditFragment.java b/app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.java similarity index 100% rename from src/main/java/org/tasks/ui/EmptyTaskEditFragment.java rename to app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.java diff --git a/src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java b/app/src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java similarity index 100% rename from src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java rename to app/src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java diff --git a/src/main/java/org/tasks/ui/MenuColorizer.java b/app/src/main/java/org/tasks/ui/MenuColorizer.java similarity index 100% rename from src/main/java/org/tasks/ui/MenuColorizer.java rename to app/src/main/java/org/tasks/ui/MenuColorizer.java diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java similarity index 100% rename from src/main/java/org/tasks/ui/NavigationDrawerFragment.java rename to app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java diff --git a/src/main/java/org/tasks/ui/PriorityControlSet.java b/app/src/main/java/org/tasks/ui/PriorityControlSet.java similarity index 100% rename from src/main/java/org/tasks/ui/PriorityControlSet.java rename to app/src/main/java/org/tasks/ui/PriorityControlSet.java diff --git a/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java b/app/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java similarity index 100% rename from src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java rename to app/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java diff --git a/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java b/app/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java similarity index 100% rename from src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java rename to app/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java diff --git a/src/main/java/org/tasks/ui/TaskEditControlFragment.java b/app/src/main/java/org/tasks/ui/TaskEditControlFragment.java similarity index 100% rename from src/main/java/org/tasks/ui/TaskEditControlFragment.java rename to app/src/main/java/org/tasks/ui/TaskEditControlFragment.java diff --git a/src/main/java/org/tasks/ui/TimePreference.java b/app/src/main/java/org/tasks/ui/TimePreference.java similarity index 100% rename from src/main/java/org/tasks/ui/TimePreference.java rename to app/src/main/java/org/tasks/ui/TimePreference.java diff --git a/src/main/java/org/tasks/ui/WidgetCheckBoxes.java b/app/src/main/java/org/tasks/ui/WidgetCheckBoxes.java similarity index 100% rename from src/main/java/org/tasks/ui/WidgetCheckBoxes.java rename to app/src/main/java/org/tasks/ui/WidgetCheckBoxes.java diff --git a/src/main/java/org/tasks/voice/VoiceCommandActivity.java b/app/src/main/java/org/tasks/voice/VoiceCommandActivity.java similarity index 100% rename from src/main/java/org/tasks/voice/VoiceCommandActivity.java rename to app/src/main/java/org/tasks/voice/VoiceCommandActivity.java diff --git a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java similarity index 100% rename from src/main/java/org/tasks/widget/ScrollableViewsFactory.java rename to app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java diff --git a/src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java b/app/src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java similarity index 100% rename from src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java rename to app/src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java diff --git a/src/main/java/org/tasks/widget/ShortcutConfigActivity.java b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java similarity index 100% rename from src/main/java/org/tasks/widget/ShortcutConfigActivity.java rename to app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java diff --git a/src/main/java/org/tasks/widget/TasksWidget.java b/app/src/main/java/org/tasks/widget/TasksWidget.java similarity index 100% rename from src/main/java/org/tasks/widget/TasksWidget.java rename to app/src/main/java/org/tasks/widget/TasksWidget.java diff --git a/src/main/java/org/tasks/widget/WidgetConfigActivity.java b/app/src/main/java/org/tasks/widget/WidgetConfigActivity.java similarity index 100% rename from src/main/java/org/tasks/widget/WidgetConfigActivity.java rename to app/src/main/java/org/tasks/widget/WidgetConfigActivity.java diff --git a/src/main/java/org/tasks/widget/WidgetPreferences.java b/app/src/main/java/org/tasks/widget/WidgetPreferences.java similarity index 100% rename from src/main/java/org/tasks/widget/WidgetPreferences.java rename to app/src/main/java/org/tasks/widget/WidgetPreferences.java diff --git a/src/main/res/color-night/text_primary.xml b/app/src/main/res/color-night/text_primary.xml similarity index 100% rename from src/main/res/color-night/text_primary.xml rename to app/src/main/res/color-night/text_primary.xml diff --git a/src/main/res/color/text_primary.xml b/app/src/main/res/color/text_primary.xml similarity index 100% rename from src/main/res/color/text_primary.xml rename to app/src/main/res/color/text_primary.xml diff --git a/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png similarity index 100% rename from src/main/res/drawable-hdpi/drawer_shadow.9.png rename to app/src/main/res/drawable-hdpi/drawer_shadow.9.png diff --git a/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_add_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_add_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_check_white_24dp.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_check_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_check_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_phone_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_phone_white_24dp.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_phone_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_phone_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_snooze_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_snooze_white_24dp.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_snooze_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_snooze_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_timer_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_timer_white_24dp.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_timer_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_timer_white_24dp.png diff --git a/src/main/res/drawable-hdpi/textfield_underline_black.9.png b/app/src/main/res/drawable-hdpi/textfield_underline_black.9.png similarity index 100% rename from src/main/res/drawable-hdpi/textfield_underline_black.9.png rename to app/src/main/res/drawable-hdpi/textfield_underline_black.9.png diff --git a/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/drawer_shadow.9.png rename to app/src/main/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_add_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_check_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_phone_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_phone_white_24dp.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_phone_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_phone_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_snooze_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_snooze_white_24dp.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_snooze_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_snooze_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_timer_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/textfield_underline_black.9.png b/app/src/main/res/drawable-xhdpi/textfield_underline_black.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/textfield_underline_black.9.png rename to app/src/main/res/drawable-xhdpi/textfield_underline_black.9.png diff --git a/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/drawer_shadow.9.png rename to app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_add_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_check_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_phone_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_phone_white_24dp.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_phone_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_phone_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_snooze_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_snooze_white_24dp.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_snooze_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_snooze_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/textfield_underline_black.9.png b/app/src/main/res/drawable-xxhdpi/textfield_underline_black.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/textfield_underline_black.9.png rename to app/src/main/res/drawable-xxhdpi/textfield_underline_black.9.png diff --git a/src/main/res/drawable/arrow_branch.png b/app/src/main/res/drawable/arrow_branch.png similarity index 100% rename from src/main/res/drawable/arrow_branch.png rename to app/src/main/res/drawable/arrow_branch.png diff --git a/src/main/res/drawable/arrow_down.png b/app/src/main/res/drawable/arrow_down.png similarity index 100% rename from src/main/res/drawable/arrow_down.png rename to app/src/main/res/drawable/arrow_down.png diff --git a/src/main/res/drawable/arrow_join.png b/app/src/main/res/drawable/arrow_join.png similarity index 100% rename from src/main/res/drawable/arrow_join.png rename to app/src/main/res/drawable/arrow_join.png diff --git a/src/main/res/drawable/drawer_shadow.9.png b/app/src/main/res/drawable/drawer_shadow.9.png similarity index 100% rename from src/main/res/drawable/drawer_shadow.9.png rename to app/src/main/res/drawable/drawer_shadow.9.png diff --git a/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_add_24dp.xml rename to app/src/main/res/drawable/ic_add_24dp.xml diff --git a/src/main/res/drawable/ic_add_white_24dp.png b/app/src/main/res/drawable/ic_add_white_24dp.png similarity index 100% rename from src/main/res/drawable/ic_add_white_24dp.png rename to app/src/main/res/drawable/ic_add_white_24dp.png diff --git a/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_arrow_back_24dp.xml rename to app/src/main/res/drawable/ic_arrow_back_24dp.xml diff --git a/src/main/res/drawable/ic_attachment_24dp.xml b/app/src/main/res/drawable/ic_attachment_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_attachment_24dp.xml rename to app/src/main/res/drawable/ic_attachment_24dp.xml diff --git a/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_camera_alt_black_24dp.xml rename to app/src/main/res/drawable/ic_camera_alt_black_24dp.xml diff --git a/src/main/res/drawable/ic_cancel_24dp.xml b/app/src/main/res/drawable/ic_cancel_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_cancel_24dp.xml rename to app/src/main/res/drawable/ic_cancel_24dp.xml diff --git a/src/main/res/drawable/ic_check_box_24dp.xml b/app/src/main/res/drawable/ic_check_box_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_check_box_24dp.xml rename to app/src/main/res/drawable/ic_check_box_24dp.xml diff --git a/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_check_box_outline_blank_24dp.xml rename to app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml diff --git a/src/main/res/drawable/ic_check_white_24dp.png b/app/src/main/res/drawable/ic_check_white_24dp.png similarity index 100% rename from src/main/res/drawable/ic_check_white_24dp.png rename to app/src/main/res/drawable/ic_check_white_24dp.png diff --git a/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_close_24dp.xml rename to app/src/main/res/drawable/ic_close_24dp.xml diff --git a/src/main/res/drawable/ic_cloud_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_cloud_black_24dp.xml rename to app/src/main/res/drawable/ic_cloud_black_24dp.xml diff --git a/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_content_copy_black_24dp.xml rename to app/src/main/res/drawable/ic_content_copy_black_24dp.xml diff --git a/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_delete_24dp.xml rename to app/src/main/res/drawable/ic_delete_24dp.xml diff --git a/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_drag_handle_black_24dp.xml rename to app/src/main/res/drawable/ic_drag_handle_black_24dp.xml diff --git a/src/main/res/drawable/ic_email_black_24dp.xml b/app/src/main/res/drawable/ic_email_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_email_black_24dp.xml rename to app/src/main/res/drawable/ic_email_black_24dp.xml diff --git a/src/main/res/drawable/ic_event_24dp.xml b/app/src/main/res/drawable/ic_event_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_event_24dp.xml rename to app/src/main/res/drawable/ic_event_24dp.xml diff --git a/src/main/res/drawable/ic_event_note_24dp.xml b/app/src/main/res/drawable/ic_event_note_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_event_note_24dp.xml rename to app/src/main/res/drawable/ic_event_note_24dp.xml diff --git a/src/main/res/drawable/ic_filter_list_24dp.xml b/app/src/main/res/drawable/ic_filter_list_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_filter_list_24dp.xml rename to app/src/main/res/drawable/ic_filter_list_24dp.xml diff --git a/src/main/res/drawable/ic_flag_24dp.xml b/app/src/main/res/drawable/ic_flag_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_flag_24dp.xml rename to app/src/main/res/drawable/ic_flag_24dp.xml diff --git a/src/main/res/drawable/ic_help_24dp.xml b/app/src/main/res/drawable/ic_help_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_help_24dp.xml rename to app/src/main/res/drawable/ic_help_24dp.xml diff --git a/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_history_24dp.xml rename to app/src/main/res/drawable/ic_history_24dp.xml diff --git a/src/main/res/drawable/ic_inbox_168px.xml b/app/src/main/res/drawable/ic_inbox_168px.xml similarity index 100% rename from src/main/res/drawable/ic_inbox_168px.xml rename to app/src/main/res/drawable/ic_inbox_168px.xml diff --git a/src/main/res/drawable/ic_inbox_24dp.xml b/app/src/main/res/drawable/ic_inbox_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_inbox_24dp.xml rename to app/src/main/res/drawable/ic_inbox_24dp.xml diff --git a/src/main/res/drawable/ic_label_24dp.xml b/app/src/main/res/drawable/ic_label_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_label_24dp.xml rename to app/src/main/res/drawable/ic_label_24dp.xml diff --git a/src/main/res/drawable/ic_label_outline_24dp.xml b/app/src/main/res/drawable/ic_label_outline_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_label_outline_24dp.xml rename to app/src/main/res/drawable/ic_label_outline_24dp.xml diff --git a/src/main/res/drawable/ic_lens_black_24dp.xml b/app/src/main/res/drawable/ic_lens_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_lens_black_24dp.xml rename to app/src/main/res/drawable/ic_lens_black_24dp.xml diff --git a/src/main/res/drawable/ic_menu_24dp.xml b/app/src/main/res/drawable/ic_menu_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_menu_24dp.xml rename to app/src/main/res/drawable/ic_menu_24dp.xml diff --git a/src/main/res/drawable/ic_mic_24dp.xml b/app/src/main/res/drawable/ic_mic_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_mic_24dp.xml rename to app/src/main/res/drawable/ic_mic_24dp.xml diff --git a/src/main/res/drawable/ic_notifications_24dp.xml b/app/src/main/res/drawable/ic_notifications_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_notifications_24dp.xml rename to app/src/main/res/drawable/ic_notifications_24dp.xml diff --git a/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_pause_24dp.xml rename to app/src/main/res/drawable/ic_pause_24dp.xml diff --git a/src/main/res/drawable/ic_phone_white_24dp.png b/app/src/main/res/drawable/ic_phone_white_24dp.png similarity index 100% rename from src/main/res/drawable/ic_phone_white_24dp.png rename to app/src/main/res/drawable/ic_phone_white_24dp.png diff --git a/src/main/res/drawable/ic_play_arrow_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_play_arrow_24dp.xml rename to app/src/main/res/drawable/ic_play_arrow_24dp.xml diff --git a/src/main/res/drawable/ic_public_black_24dp.xml b/app/src/main/res/drawable/ic_public_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_public_black_24dp.xml rename to app/src/main/res/drawable/ic_public_black_24dp.xml diff --git a/src/main/res/drawable/ic_repeat_24dp.xml b/app/src/main/res/drawable/ic_repeat_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_repeat_24dp.xml rename to app/src/main/res/drawable/ic_repeat_24dp.xml diff --git a/src/main/res/drawable/ic_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_save_24dp.xml rename to app/src/main/res/drawable/ic_save_24dp.xml diff --git a/src/main/res/drawable/ic_schedule_24dp.xml b/app/src/main/res/drawable/ic_schedule_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_schedule_24dp.xml rename to app/src/main/res/drawable/ic_schedule_24dp.xml diff --git a/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_search_24dp.xml rename to app/src/main/res/drawable/ic_search_24dp.xml diff --git a/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_settings_24dp.xml rename to app/src/main/res/drawable/ic_settings_24dp.xml diff --git a/src/main/res/drawable/ic_snooze_white_24dp.png b/app/src/main/res/drawable/ic_snooze_white_24dp.png similarity index 100% rename from src/main/res/drawable/ic_snooze_white_24dp.png rename to app/src/main/res/drawable/ic_snooze_white_24dp.png diff --git a/src/main/res/drawable/ic_sort_24dp.xml b/app/src/main/res/drawable/ic_sort_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_sort_24dp.xml rename to app/src/main/res/drawable/ic_sort_24dp.xml diff --git a/src/main/res/drawable/ic_timer_24dp.xml b/app/src/main/res/drawable/ic_timer_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_timer_24dp.xml rename to app/src/main/res/drawable/ic_timer_24dp.xml diff --git a/src/main/res/drawable/ic_timer_white_24dp.png b/app/src/main/res/drawable/ic_timer_white_24dp.png similarity index 100% rename from src/main/res/drawable/ic_timer_white_24dp.png rename to app/src/main/res/drawable/ic_timer_white_24dp.png diff --git a/src/main/res/drawable/ic_today_24dp.xml b/app/src/main/res/drawable/ic_today_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_today_24dp.xml rename to app/src/main/res/drawable/ic_today_24dp.xml diff --git a/src/main/res/drawable/ic_visibility_off_24dp.xml b/app/src/main/res/drawable/ic_visibility_off_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_visibility_off_24dp.xml rename to app/src/main/res/drawable/ic_visibility_off_24dp.xml diff --git a/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml similarity index 100% rename from src/main/res/drawable/ic_vpn_key_black_24dp.xml rename to app/src/main/res/drawable/ic_vpn_key_black_24dp.xml diff --git a/src/main/res/drawable/reminder_dialog_background.xml b/app/src/main/res/drawable/reminder_dialog_background.xml similarity index 100% rename from src/main/res/drawable/reminder_dialog_background.xml rename to app/src/main/res/drawable/reminder_dialog_background.xml diff --git a/src/main/res/drawable/speech_bubble_reminder.9.png b/app/src/main/res/drawable/speech_bubble_reminder.9.png similarity index 100% rename from src/main/res/drawable/speech_bubble_reminder.9.png rename to app/src/main/res/drawable/speech_bubble_reminder.9.png diff --git a/src/main/res/drawable/textfield_underline_black.9.png b/app/src/main/res/drawable/textfield_underline_black.9.png similarity index 100% rename from src/main/res/drawable/textfield_underline_black.9.png rename to app/src/main/res/drawable/textfield_underline_black.9.png diff --git a/src/main/res/drawable/timepicker_down_btn.xml b/app/src/main/res/drawable/timepicker_down_btn.xml similarity index 100% rename from src/main/res/drawable/timepicker_down_btn.xml rename to app/src/main/res/drawable/timepicker_down_btn.xml diff --git a/src/main/res/drawable/timepicker_down_disabled.9.png b/app/src/main/res/drawable/timepicker_down_disabled.9.png similarity index 100% rename from src/main/res/drawable/timepicker_down_disabled.9.png rename to app/src/main/res/drawable/timepicker_down_disabled.9.png diff --git a/src/main/res/drawable/timepicker_down_normal.9.png b/app/src/main/res/drawable/timepicker_down_normal.9.png similarity index 100% rename from src/main/res/drawable/timepicker_down_normal.9.png rename to app/src/main/res/drawable/timepicker_down_normal.9.png diff --git a/src/main/res/drawable/timepicker_down_pressed.9.png b/app/src/main/res/drawable/timepicker_down_pressed.9.png similarity index 100% rename from src/main/res/drawable/timepicker_down_pressed.9.png rename to app/src/main/res/drawable/timepicker_down_pressed.9.png diff --git a/src/main/res/drawable/timepicker_down_selected.9.png b/app/src/main/res/drawable/timepicker_down_selected.9.png similarity index 100% rename from src/main/res/drawable/timepicker_down_selected.9.png rename to app/src/main/res/drawable/timepicker_down_selected.9.png diff --git a/src/main/res/drawable/timepicker_input.xml b/app/src/main/res/drawable/timepicker_input.xml similarity index 100% rename from src/main/res/drawable/timepicker_input.xml rename to app/src/main/res/drawable/timepicker_input.xml diff --git a/src/main/res/drawable/timepicker_input_disabled.9.png b/app/src/main/res/drawable/timepicker_input_disabled.9.png similarity index 100% rename from src/main/res/drawable/timepicker_input_disabled.9.png rename to app/src/main/res/drawable/timepicker_input_disabled.9.png diff --git a/src/main/res/drawable/timepicker_input_normal.9.png b/app/src/main/res/drawable/timepicker_input_normal.9.png similarity index 100% rename from src/main/res/drawable/timepicker_input_normal.9.png rename to app/src/main/res/drawable/timepicker_input_normal.9.png diff --git a/src/main/res/drawable/timepicker_input_pressed.9.png b/app/src/main/res/drawable/timepicker_input_pressed.9.png similarity index 100% rename from src/main/res/drawable/timepicker_input_pressed.9.png rename to app/src/main/res/drawable/timepicker_input_pressed.9.png diff --git a/src/main/res/drawable/timepicker_input_selected.9.png b/app/src/main/res/drawable/timepicker_input_selected.9.png similarity index 100% rename from src/main/res/drawable/timepicker_input_selected.9.png rename to app/src/main/res/drawable/timepicker_input_selected.9.png diff --git a/src/main/res/drawable/timepicker_up_btn.xml b/app/src/main/res/drawable/timepicker_up_btn.xml similarity index 100% rename from src/main/res/drawable/timepicker_up_btn.xml rename to app/src/main/res/drawable/timepicker_up_btn.xml diff --git a/src/main/res/drawable/timepicker_up_disabled.9.png b/app/src/main/res/drawable/timepicker_up_disabled.9.png similarity index 100% rename from src/main/res/drawable/timepicker_up_disabled.9.png rename to app/src/main/res/drawable/timepicker_up_disabled.9.png diff --git a/src/main/res/drawable/timepicker_up_normal.9.png b/app/src/main/res/drawable/timepicker_up_normal.9.png similarity index 100% rename from src/main/res/drawable/timepicker_up_normal.9.png rename to app/src/main/res/drawable/timepicker_up_normal.9.png diff --git a/src/main/res/drawable/timepicker_up_pressed.9.png b/app/src/main/res/drawable/timepicker_up_pressed.9.png similarity index 100% rename from src/main/res/drawable/timepicker_up_pressed.9.png rename to app/src/main/res/drawable/timepicker_up_pressed.9.png diff --git a/src/main/res/drawable/timepicker_up_selected.9.png b/app/src/main/res/drawable/timepicker_up_selected.9.png similarity index 100% rename from src/main/res/drawable/timepicker_up_selected.9.png rename to app/src/main/res/drawable/timepicker_up_selected.9.png diff --git a/src/main/res/layout-v21/task_adapter_row_simple.xml b/app/src/main/res/layout-v21/task_adapter_row_simple.xml similarity index 100% rename from src/main/res/layout-v21/task_adapter_row_simple.xml rename to app/src/main/res/layout-v21/task_adapter_row_simple.xml diff --git a/src/main/res/layout-w820dp/task_list_activity.xml b/app/src/main/res/layout-w820dp/task_list_activity.xml similarity index 100% rename from src/main/res/layout-w820dp/task_list_activity.xml rename to app/src/main/res/layout-w820dp/task_list_activity.xml diff --git a/src/main/res/layout/aac_record_activity.xml b/app/src/main/res/layout/aac_record_activity.xml similarity index 100% rename from src/main/res/layout/aac_record_activity.xml rename to app/src/main/res/layout/aac_record_activity.xml diff --git a/src/main/res/layout/activity_google_task_list_settings.xml b/app/src/main/res/layout/activity_google_task_list_settings.xml similarity index 100% rename from src/main/res/layout/activity_google_task_list_settings.xml rename to app/src/main/res/layout/activity_google_task_list_settings.xml diff --git a/src/main/res/layout/activity_prefs.xml b/app/src/main/res/layout/activity_prefs.xml similarity index 100% rename from src/main/res/layout/activity_prefs.xml rename to app/src/main/res/layout/activity_prefs.xml diff --git a/src/main/res/layout/alarm_edit_row.xml b/app/src/main/res/layout/alarm_edit_row.xml similarity index 100% rename from src/main/res/layout/alarm_edit_row.xml rename to app/src/main/res/layout/alarm_edit_row.xml diff --git a/src/main/res/layout/astrid_calendar_reminder_view.xml b/app/src/main/res/layout/astrid_calendar_reminder_view.xml similarity index 100% rename from src/main/res/layout/astrid_calendar_reminder_view.xml rename to app/src/main/res/layout/astrid_calendar_reminder_view.xml diff --git a/src/main/res/layout/beast_mode_pref_activity.xml b/app/src/main/res/layout/beast_mode_pref_activity.xml similarity index 100% rename from src/main/res/layout/beast_mode_pref_activity.xml rename to app/src/main/res/layout/beast_mode_pref_activity.xml diff --git a/src/main/res/layout/calendar_reminder_activity.xml b/app/src/main/res/layout/calendar_reminder_activity.xml similarity index 100% rename from src/main/res/layout/calendar_reminder_activity.xml rename to app/src/main/res/layout/calendar_reminder_activity.xml diff --git a/src/main/res/layout/color_selection_row.xml b/app/src/main/res/layout/color_selection_row.xml similarity index 100% rename from src/main/res/layout/color_selection_row.xml rename to app/src/main/res/layout/color_selection_row.xml diff --git a/src/main/res/layout/comment_adapter_row.xml b/app/src/main/res/layout/comment_adapter_row.xml similarity index 100% rename from src/main/res/layout/comment_adapter_row.xml rename to app/src/main/res/layout/comment_adapter_row.xml diff --git a/src/main/res/layout/control_set_clear_button.xml b/app/src/main/res/layout/control_set_clear_button.xml similarity index 100% rename from src/main/res/layout/control_set_clear_button.xml rename to app/src/main/res/layout/control_set_clear_button.xml diff --git a/src/main/res/layout/control_set_deadline.xml b/app/src/main/res/layout/control_set_deadline.xml similarity index 100% rename from src/main/res/layout/control_set_deadline.xml rename to app/src/main/res/layout/control_set_deadline.xml diff --git a/src/main/res/layout/control_set_description.xml b/app/src/main/res/layout/control_set_description.xml similarity index 100% rename from src/main/res/layout/control_set_description.xml rename to app/src/main/res/layout/control_set_description.xml diff --git a/src/main/res/layout/control_set_files.xml b/app/src/main/res/layout/control_set_files.xml similarity index 100% rename from src/main/res/layout/control_set_files.xml rename to app/src/main/res/layout/control_set_files.xml diff --git a/src/main/res/layout/control_set_gcal_display.xml b/app/src/main/res/layout/control_set_gcal_display.xml similarity index 100% rename from src/main/res/layout/control_set_gcal_display.xml rename to app/src/main/res/layout/control_set_gcal_display.xml diff --git a/src/main/res/layout/control_set_google_task_list.xml b/app/src/main/res/layout/control_set_google_task_list.xml similarity index 100% rename from src/main/res/layout/control_set_google_task_list.xml rename to app/src/main/res/layout/control_set_google_task_list.xml diff --git a/src/main/res/layout/control_set_hide.xml b/app/src/main/res/layout/control_set_hide.xml similarity index 100% rename from src/main/res/layout/control_set_hide.xml rename to app/src/main/res/layout/control_set_hide.xml diff --git a/src/main/res/layout/control_set_priority.xml b/app/src/main/res/layout/control_set_priority.xml similarity index 100% rename from src/main/res/layout/control_set_priority.xml rename to app/src/main/res/layout/control_set_priority.xml diff --git a/src/main/res/layout/control_set_reminders.xml b/app/src/main/res/layout/control_set_reminders.xml similarity index 100% rename from src/main/res/layout/control_set_reminders.xml rename to app/src/main/res/layout/control_set_reminders.xml diff --git a/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml similarity index 100% rename from src/main/res/layout/control_set_repeat.xml rename to app/src/main/res/layout/control_set_repeat.xml diff --git a/src/main/res/layout/control_set_repeat_display.xml b/app/src/main/res/layout/control_set_repeat_display.xml similarity index 100% rename from src/main/res/layout/control_set_repeat_display.xml rename to app/src/main/res/layout/control_set_repeat_display.xml diff --git a/src/main/res/layout/control_set_tag_list.xml b/app/src/main/res/layout/control_set_tag_list.xml similarity index 100% rename from src/main/res/layout/control_set_tag_list.xml rename to app/src/main/res/layout/control_set_tag_list.xml diff --git a/src/main/res/layout/control_set_tags.xml b/app/src/main/res/layout/control_set_tags.xml similarity index 100% rename from src/main/res/layout/control_set_tags.xml rename to app/src/main/res/layout/control_set_tags.xml diff --git a/src/main/res/layout/control_set_template.xml b/app/src/main/res/layout/control_set_template.xml similarity index 100% rename from src/main/res/layout/control_set_template.xml rename to app/src/main/res/layout/control_set_template.xml diff --git a/src/main/res/layout/control_set_timers.xml b/app/src/main/res/layout/control_set_timers.xml similarity index 100% rename from src/main/res/layout/control_set_timers.xml rename to app/src/main/res/layout/control_set_timers.xml diff --git a/src/main/res/layout/control_set_timers_dialog.xml b/app/src/main/res/layout/control_set_timers_dialog.xml similarity index 100% rename from src/main/res/layout/control_set_timers_dialog.xml rename to app/src/main/res/layout/control_set_timers_dialog.xml diff --git a/src/main/res/layout/control_set_title.xml b/app/src/main/res/layout/control_set_title.xml similarity index 100% rename from src/main/res/layout/control_set_title.xml rename to app/src/main/res/layout/control_set_title.xml diff --git a/src/main/res/layout/custom_filter_activity.xml b/app/src/main/res/layout/custom_filter_activity.xml similarity index 100% rename from src/main/res/layout/custom_filter_activity.xml rename to app/src/main/res/layout/custom_filter_activity.xml diff --git a/src/main/res/layout/custom_filter_row.xml b/app/src/main/res/layout/custom_filter_row.xml similarity index 100% rename from src/main/res/layout/custom_filter_row.xml rename to app/src/main/res/layout/custom_filter_row.xml diff --git a/src/main/res/layout/dialog_font_size_seekbar.xml b/app/src/main/res/layout/dialog_font_size_seekbar.xml similarity index 100% rename from src/main/res/layout/dialog_font_size_seekbar.xml rename to app/src/main/res/layout/dialog_font_size_seekbar.xml diff --git a/src/main/res/layout/dialog_opacity_seekbar.xml b/app/src/main/res/layout/dialog_opacity_seekbar.xml similarity index 100% rename from src/main/res/layout/dialog_opacity_seekbar.xml rename to app/src/main/res/layout/dialog_opacity_seekbar.xml diff --git a/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml similarity index 100% rename from src/main/res/layout/file_row.xml rename to app/src/main/res/layout/file_row.xml diff --git a/src/main/res/layout/filter_adapter_row.xml b/app/src/main/res/layout/filter_adapter_row.xml similarity index 100% rename from src/main/res/layout/filter_adapter_row.xml rename to app/src/main/res/layout/filter_adapter_row.xml diff --git a/src/main/res/layout/filter_adapter_separator.xml b/app/src/main/res/layout/filter_adapter_separator.xml similarity index 100% rename from src/main/res/layout/filter_adapter_separator.xml rename to app/src/main/res/layout/filter_adapter_separator.xml diff --git a/src/main/res/layout/filter_adapter_subheader.xml b/app/src/main/res/layout/filter_adapter_subheader.xml similarity index 100% rename from src/main/res/layout/filter_adapter_subheader.xml rename to app/src/main/res/layout/filter_adapter_subheader.xml diff --git a/src/main/res/layout/filter_settings_activity.xml b/app/src/main/res/layout/filter_settings_activity.xml similarity index 100% rename from src/main/res/layout/filter_settings_activity.xml rename to app/src/main/res/layout/filter_settings_activity.xml diff --git a/src/main/res/layout/fragment_comment_bar.xml b/app/src/main/res/layout/fragment_comment_bar.xml similarity index 100% rename from src/main/res/layout/fragment_comment_bar.xml rename to app/src/main/res/layout/fragment_comment_bar.xml diff --git a/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml similarity index 100% rename from src/main/res/layout/fragment_navigation_drawer.xml rename to app/src/main/res/layout/fragment_navigation_drawer.xml diff --git a/src/main/res/layout/fragment_task_edit.xml b/app/src/main/res/layout/fragment_task_edit.xml similarity index 100% rename from src/main/res/layout/fragment_task_edit.xml rename to app/src/main/res/layout/fragment_task_edit.xml diff --git a/src/main/res/layout/fragment_task_edit_empty.xml b/app/src/main/res/layout/fragment_task_edit_empty.xml similarity index 100% rename from src/main/res/layout/fragment_task_edit_empty.xml rename to app/src/main/res/layout/fragment_task_edit_empty.xml diff --git a/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml similarity index 100% rename from src/main/res/layout/fragment_task_list.xml rename to app/src/main/res/layout/fragment_task_list.xml diff --git a/src/main/res/layout/n_number_picker_dialog.xml b/app/src/main/res/layout/n_number_picker_dialog.xml similarity index 100% rename from src/main/res/layout/n_number_picker_dialog.xml rename to app/src/main/res/layout/n_number_picker_dialog.xml diff --git a/src/main/res/layout/navigation_drawer.xml b/app/src/main/res/layout/navigation_drawer.xml similarity index 100% rename from src/main/res/layout/navigation_drawer.xml rename to app/src/main/res/layout/navigation_drawer.xml diff --git a/src/main/res/layout/number_picker.xml b/app/src/main/res/layout/number_picker.xml similarity index 100% rename from src/main/res/layout/number_picker.xml rename to app/src/main/res/layout/number_picker.xml diff --git a/src/main/res/layout/number_picker_dialog.xml b/app/src/main/res/layout/number_picker_dialog.xml similarity index 100% rename from src/main/res/layout/number_picker_dialog.xml rename to app/src/main/res/layout/number_picker_dialog.xml diff --git a/src/main/res/layout/preference_draggable_row.xml b/app/src/main/res/layout/preference_draggable_row.xml similarity index 100% rename from src/main/res/layout/preference_draggable_row.xml rename to app/src/main/res/layout/preference_draggable_row.xml diff --git a/src/main/res/layout/scrollable_widget.xml b/app/src/main/res/layout/scrollable_widget.xml similarity index 100% rename from src/main/res/layout/scrollable_widget.xml rename to app/src/main/res/layout/scrollable_widget.xml diff --git a/src/main/res/layout/simple_list_item_multiple_choice_themed.xml b/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml similarity index 100% rename from src/main/res/layout/simple_list_item_multiple_choice_themed.xml rename to app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml diff --git a/src/main/res/layout/simple_list_item_single_choice_themed.xml b/app/src/main/res/layout/simple_list_item_single_choice_themed.xml similarity index 100% rename from src/main/res/layout/simple_list_item_single_choice_themed.xml rename to app/src/main/res/layout/simple_list_item_single_choice_themed.xml diff --git a/src/main/res/layout/simple_spinner_dropdown_item.xml b/app/src/main/res/layout/simple_spinner_dropdown_item.xml similarity index 100% rename from src/main/res/layout/simple_spinner_dropdown_item.xml rename to app/src/main/res/layout/simple_spinner_dropdown_item.xml diff --git a/src/main/res/layout/tag_edit_row.xml b/app/src/main/res/layout/tag_edit_row.xml similarity index 100% rename from src/main/res/layout/tag_edit_row.xml rename to app/src/main/res/layout/tag_edit_row.xml diff --git a/src/main/res/layout/tag_settings_activity.xml b/app/src/main/res/layout/tag_settings_activity.xml similarity index 100% rename from src/main/res/layout/tag_settings_activity.xml rename to app/src/main/res/layout/tag_settings_activity.xml diff --git a/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml similarity index 98% rename from src/main/res/layout/task_adapter_row_body.xml rename to app/src/main/res/layout/task_adapter_row_body.xml index dfe4a8c7b..b7e8b3053 100644 --- a/src/main/res/layout/task_adapter_row_body.xml +++ b/app/src/main/res/layout/task_adapter_row_body.xml @@ -82,7 +82,6 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:ellipsize="none" - android:maxLines="1" android:paddingEnd="@dimen/keyline_first" android:paddingLeft="0dp" android:paddingRight="@dimen/keyline_first" diff --git a/src/main/res/layout/task_adapter_row_simple.xml b/app/src/main/res/layout/task_adapter_row_simple.xml similarity index 100% rename from src/main/res/layout/task_adapter_row_simple.xml rename to app/src/main/res/layout/task_adapter_row_simple.xml diff --git a/src/main/res/layout/task_edit_row_divider.xml b/app/src/main/res/layout/task_edit_row_divider.xml similarity index 100% rename from src/main/res/layout/task_edit_row_divider.xml rename to app/src/main/res/layout/task_edit_row_divider.xml diff --git a/src/main/res/layout/task_list_activity.xml b/app/src/main/res/layout/task_list_activity.xml similarity index 100% rename from src/main/res/layout/task_list_activity.xml rename to app/src/main/res/layout/task_list_activity.xml diff --git a/src/main/res/layout/task_list_body_empty.xml b/app/src/main/res/layout/task_list_body_empty.xml similarity index 100% rename from src/main/res/layout/task_list_body_empty.xml rename to app/src/main/res/layout/task_list_body_empty.xml diff --git a/src/main/res/layout/task_list_body_standard.xml b/app/src/main/res/layout/task_list_body_standard.xml similarity index 100% rename from src/main/res/layout/task_list_body_standard.xml rename to app/src/main/res/layout/task_list_body_standard.xml diff --git a/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml similarity index 100% rename from src/main/res/layout/toolbar.xml rename to app/src/main/res/layout/toolbar.xml diff --git a/src/main/res/layout/widget_row.xml b/app/src/main/res/layout/widget_row.xml similarity index 100% rename from src/main/res/layout/widget_row.xml rename to app/src/main/res/layout/widget_row.xml diff --git a/src/main/res/menu/beast_mode.xml b/app/src/main/res/menu/beast_mode.xml similarity index 100% rename from src/main/res/menu/beast_mode.xml rename to app/src/main/res/menu/beast_mode.xml diff --git a/src/main/res/menu/menu_custom_filter.xml b/app/src/main/res/menu/menu_custom_filter.xml similarity index 100% rename from src/main/res/menu/menu_custom_filter.xml rename to app/src/main/res/menu/menu_custom_filter.xml diff --git a/src/main/res/menu/menu_custom_filter_activity.xml b/app/src/main/res/menu/menu_custom_filter_activity.xml similarity index 100% rename from src/main/res/menu/menu_custom_filter_activity.xml rename to app/src/main/res/menu/menu_custom_filter_activity.xml diff --git a/src/main/res/menu/menu_gtasks_list_fragment.xml b/app/src/main/res/menu/menu_gtasks_list_fragment.xml similarity index 100% rename from src/main/res/menu/menu_gtasks_list_fragment.xml rename to app/src/main/res/menu/menu_gtasks_list_fragment.xml diff --git a/src/main/res/menu/menu_multi_select.xml b/app/src/main/res/menu/menu_multi_select.xml similarity index 100% rename from src/main/res/menu/menu_multi_select.xml rename to app/src/main/res/menu/menu_multi_select.xml diff --git a/src/main/res/menu/menu_tag_settings.xml b/app/src/main/res/menu/menu_tag_settings.xml similarity index 100% rename from src/main/res/menu/menu_tag_settings.xml rename to app/src/main/res/menu/menu_tag_settings.xml diff --git a/src/main/res/menu/menu_tag_view_fragment.xml b/app/src/main/res/menu/menu_tag_view_fragment.xml similarity index 100% rename from src/main/res/menu/menu_tag_view_fragment.xml rename to app/src/main/res/menu/menu_tag_view_fragment.xml diff --git a/src/main/res/menu/menu_task_edit_fragment.xml b/app/src/main/res/menu/menu_task_edit_fragment.xml similarity index 100% rename from src/main/res/menu/menu_task_edit_fragment.xml rename to app/src/main/res/menu/menu_task_edit_fragment.xml diff --git a/src/main/res/menu/menu_task_list_fragment.xml b/app/src/main/res/menu/menu_task_list_fragment.xml similarity index 100% rename from src/main/res/menu/menu_task_list_fragment.xml rename to app/src/main/res/menu/menu_task_list_fragment.xml diff --git a/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml similarity index 100% rename from src/main/res/values-ar/strings.xml rename to app/src/main/res/values-ar/strings.xml diff --git a/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml similarity index 99% rename from src/main/res/values-bg-rBG/strings.xml rename to app/src/main/res/values-bg-rBG/strings.xml index 09ad03a40..704fb69a0 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -336,7 +336,7 @@ (Без заглавие) Бутон \"Назад\" запазва задачата Списък по подразбиране - Tasks е проект с отворен код, поддържан от единствен разработчик. Ниша функции се предлагат както покупки в приложение, за да се подпомогне тяхното развитие. + Tasks е проект с отворен код, поддържан от един разработчик. Някои функции се предлагат както покупки в приложението за да се подпомогне процеса на разработка. Показване на значка за броя на активните задачи в списъка Ви по подразбиране. Изисква TeslaUnread за Nova Launcher Отключете всички теми и да добавите малко цвят към Tasks Context-Aware списък уведомления. Изисква Tasker или Locale diff --git a/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml similarity index 100% rename from src/main/res/values-ca/strings.xml rename to app/src/main/res/values-ca/strings.xml diff --git a/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from src/main/res/values-cs/strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from src/main/res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from src/main/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml similarity index 100% rename from src/main/res/values-el/strings.xml rename to app/src/main/res/values-el/strings.xml diff --git a/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 99% rename from src/main/res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml index beb94afb6..ef974a760 100644 --- a/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -39,7 +39,7 @@ Orden manual con subtareas Ordenación inteligente Por título - Por fecha límite + Por vencimiento Por prioridad Por última modificación Coincidencias con \'%s\' diff --git a/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml similarity index 100% rename from src/main/res/values-fa/strings.xml rename to app/src/main/res/values-fa/strings.xml diff --git a/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml similarity index 100% rename from src/main/res/values-fi/strings.xml rename to app/src/main/res/values-fi/strings.xml diff --git a/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from src/main/res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml similarity index 100% rename from src/main/res/values-gl/strings.xml rename to app/src/main/res/values-gl/strings.xml diff --git a/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml similarity index 100% rename from src/main/res/values-hu/strings.xml rename to app/src/main/res/values-hu/strings.xml diff --git a/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 99% rename from src/main/res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml index 0bfbaf2d0..823cce2db 100644 --- a/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -139,7 +139,7 @@ anche %s ha dei criteri Cancella Riga - Pressione lunga per accedere alle opzioni aggiuntive + Tenere premuto sulla voce per le opzioni aggiuntive Aggiungi Criteri Entro: ? Entro... diff --git a/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml similarity index 98% rename from src/main/res/values-iw/strings.xml rename to app/src/main/res/values-iw/strings.xml index a08a54179..6c55339a7 100644 --- a/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -264,6 +264,7 @@ סינכרון אפשר גודל גופן + מרווח שורה התאם אישית את מסך עריכת משימה קוד מקור תרום לתרגום @@ -403,4 +404,7 @@ %s נמחקו למחוק משימות? להעתיק משימות? + תאריך וושעה + תחילת השבוע + השתמש בממשק תאריך ושעה של המערכת \ No newline at end of file diff --git a/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml similarity index 100% rename from src/main/res/values-ja/strings.xml rename to app/src/main/res/values-ja/strings.xml diff --git a/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml similarity index 99% rename from src/main/res/values-ko/strings.xml rename to app/src/main/res/values-ko/strings.xml index 1fc96697e..2375ed287 100644 --- a/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -196,7 +196,7 @@ 항구적 알림은 지울 수 없습니다 다중-링 알림의 최대 볼륨 Tasks는 다중 소리 알림을 최대 볼륨으로 출력합니다 - 랜덤 알림 + 무작위 알림 사용안함 매시간 매일 @@ -222,7 +222,7 @@ %1$s 이 %2$s 로 변경되었습니다 새 태그 만들기 새 목록 만들기 - 미분류 일정 + 미분류 할일 %s 삭제할까요? %s 동안 타이머 작동함! 기한이 정해진 할일 @@ -312,7 +312,7 @@ 삭제 복사 필터 설정 - 숨겨진 일정 표시 + 숨겨진 할일 표시 완료된 할일 표시 반전 %d 할일 diff --git a/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml similarity index 100% rename from src/main/res/values-land/dimens.xml rename to app/src/main/res/values-land/dimens.xml diff --git a/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml similarity index 100% rename from src/main/res/values-nb/strings.xml rename to app/src/main/res/values-nb/strings.xml diff --git a/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml similarity index 100% rename from src/main/res/values-night/colors.xml rename to app/src/main/res/values-night/colors.xml diff --git a/src/main/res/values-night/dimens.xml b/app/src/main/res/values-night/dimens.xml similarity index 100% rename from src/main/res/values-night/dimens.xml rename to app/src/main/res/values-night/dimens.xml diff --git a/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml similarity index 100% rename from src/main/res/values-night/styles.xml rename to app/src/main/res/values-night/styles.xml diff --git a/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 98% rename from src/main/res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml index e576641dc..63c4bfe44 100644 --- a/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -261,6 +261,7 @@ Synchronisatie Actief Font grootte + Regelruimte Edit scherm aanpassen Bron code Help vertalen @@ -393,4 +394,8 @@ %s verwijderd Verwijder geselecteerde taken? Kopieer geselecteerde taken? + Datum en tijd + Begin van de week + Gebruik lokale instellingen + Gebruik standaard datum- en tijd selectie \ No newline at end of file diff --git a/src/main/res/values-notnight/colors.xml b/app/src/main/res/values-notnight/colors.xml similarity index 100% rename from src/main/res/values-notnight/colors.xml rename to app/src/main/res/values-notnight/colors.xml diff --git a/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml similarity index 99% rename from src/main/res/values-pl/strings.xml rename to app/src/main/res/values-pl/strings.xml index 02c93fa95..c4ffa7378 100644 --- a/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -333,7 +333,7 @@ (Bez tytułu) Przycisk Cofnij zapisuje zadanie Domyślna lista - Tasks jest projektem typu Open Source utrzymywanym przez niezależnego autora. Niektóre funkcjonalności są dostępne jako zakupy w aplikacji w celu wpierania jej rozwoju. + Tasks jest projektem na licencji open source utrzymywanym przez jednego developera. Płatne funkcje wspierają rozwój aplikacji. Pokaż licznik aktywnych zadań w domyślnej liście. Wymaga TeslaUnread dla Nova Launcher Odblokuj wszystkie motywy i dodaj trochę kolorów do Tasks Dotacje są bardzo mile widziane diff --git a/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from src/main/res/values-pt-rBR/strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml similarity index 100% rename from src/main/res/values-pt/strings.xml rename to app/src/main/res/values-pt/strings.xml diff --git a/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml similarity index 100% rename from src/main/res/values-ro/strings.xml rename to app/src/main/res/values-ro/strings.xml diff --git a/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from src/main/res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml similarity index 100% rename from src/main/res/values-sk/strings.xml rename to app/src/main/res/values-sk/strings.xml diff --git a/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from src/main/res/values-sl-rSI/strings.xml rename to app/src/main/res/values-sl-rSI/strings.xml diff --git a/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml similarity index 100% rename from src/main/res/values-sr/strings.xml rename to app/src/main/res/values-sr/strings.xml diff --git a/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml similarity index 100% rename from src/main/res/values-sv/strings.xml rename to app/src/main/res/values-sv/strings.xml diff --git a/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml similarity index 100% rename from src/main/res/values-sw360dp/dimens.xml rename to app/src/main/res/values-sw360dp/dimens.xml diff --git a/src/main/res/values-sw384dp/dimens.xml b/app/src/main/res/values-sw384dp/dimens.xml similarity index 100% rename from src/main/res/values-sw384dp/dimens.xml rename to app/src/main/res/values-sw384dp/dimens.xml diff --git a/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from src/main/res/values-sw600dp/dimens.xml rename to app/src/main/res/values-sw600dp/dimens.xml diff --git a/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml similarity index 100% rename from src/main/res/values-th/strings.xml rename to app/src/main/res/values-th/strings.xml diff --git a/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml similarity index 84% rename from src/main/res/values-tr/strings.xml rename to app/src/main/res/values-tr/strings.xml index e04e25e44..ab1d36145 100644 --- a/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -24,6 +24,7 @@ Zaman (saat : dakika) Geri al Ayar İçin Dokun + Burada görev yok. Ara Ayarlar %s [gizli] @@ -38,19 +39,24 @@ \'%s\' ile eşleşenler Görev adı Öncelik + Tarih yok Kadar gizle %s kadar gizle Açıklama Ne kadar sürecek? Görev üzerinde çalışılan zaman + Kal. %s + Geçen %s Zaman yok Ne Zaman + Öncelik Açıklama Dosyalar Hatırlatmalar Geri Sayım Denetimleri ----Her Zaman Gizle---- Daha yükle... + %s kişisinden cevapsız arama Şimdi ara Sonra ara Yoksay @@ -73,6 +79,10 @@ Silinen Görevleri Temizle Tüm silinen görevleri temizlemek istediğine emin misin?\n\nBu görevler tamamen silinecek! %d görev temizlendi! + Tercihleri sıfırla + Tercihler varsayılan değerlere sıfırlanacaktır + Görev verilerini sil + Tüm görevler kalıcı olarak silinecek Tamamlanan görevler için Takvim olaylarını sil Tamamlanmış görevlerden bütün olayları silmek istediğinize emin misiniz? %d takvim olayı silindi! @@ -125,6 +135,9 @@ Kaydı Durdur Üzgünüm! Bu dosya türünü destekleyen bir uygulama bulunamadı. Dosyanın ek olarak kopyalanmasında hata + Bir kez çal + 5 kez çal + Durmadan çal bir saat bir gün bir hafta @@ -162,8 +175,10 @@ Her %1$s\n%2$s \'e kadar Sürekli yinele %s\'e kadar yinele + Kategorilendirilmemiş %s için kronometre etkin! Zaman Ölçümü Olan Görevler + Kronometre başlanan görev: bu görevden vazgeç: Harcanan zaman: @@ -178,6 +193,7 @@ Bugün Yarın + Gelecek %s Dün Yarın Dün @@ -188,6 +204,9 @@ Bütün eşleme verilerini temizle Çıkış Yap / Senkron verisini sil? Bitiş tarihlerini göster + Onay kutularını göster + Başlığı göster + Ayarları göster Titreşimler Satır aralığı Kaynak kodu @@ -197,20 +216,42 @@ Tasks\'i Oyla Sessiz saatlerde hatırlatıcı yok Bildirimde erteleme ve tamamlanma hareketlerini göster + Şunda rastgele bir kez + Bir tarih seç + Geciktiğinde + Zamanı geldiğinde + Yarıçap (metre) + Yanıt süresi (daha yüksek değer pil tasarrufu sağlar) + Coğrafi Konum Hatırlatmaları Etiketler Filtreler + Kopyala Filtre Ayarları Gizlenenleri göster Tamamlananları göster + Ters + Ek dosyasını açmak için hiçbir uygulama bulunamadı + Ek ekle Yüksek Varsayılan Düşük Titreşim sayısı Her titreşimin uzunluğu (milisaniye) Titreşimler arasında duraklama (milisaniye) + Gizlilik + Gizlilik politikası + Task\'ı İyileştir + Tasks\'ı iyileştirmeye yardımcı olmak için anonim kullanım istatistiklerini ve kilitlenme raporlarını gönderin. Hiçbir kişisel veri toplanmayacak. + Etiket zaten var Tasks, bir geliştirici tarafından tutulan açık kaynaklı bir projedir. Bazı özellikleri, geliştirmeyi desteklemek için uygulama içi satın alma olarak sunulmaktadır. Şeffaflık + Beyaz Otomatik eşitleme şu anda Android tarafından devre dışı bırakıldı + Genel + Dil + Değişikliklerin etkili olması için Tasks yeniden başlatılmalıdır + Şimdi yeniden başlat + Sonra Yerelleştirme Yerleşim yönü Soldan sağa diff --git a/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml similarity index 99% rename from src/main/res/values-uk/strings.xml rename to app/src/main/res/values-uk/strings.xml index 91f194f44..a9bacfc8e 100644 --- a/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -214,7 +214,7 @@ з кінцевої дати з дати виконання Кожні %s - Кожні %1$s\до %2$s + Кожні %1$s\nдо %2$s Повторювати завжди Повторювати до %s %1$s перенесено на %2$s diff --git a/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml similarity index 100% rename from src/main/res/values-v21/dimens.xml rename to app/src/main/res/values-v21/dimens.xml diff --git a/src/main/res/values-v21/fonts.xml b/app/src/main/res/values-v21/fonts.xml similarity index 100% rename from src/main/res/values-v21/fonts.xml rename to app/src/main/res/values-v21/fonts.xml diff --git a/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml similarity index 100% rename from src/main/res/values-v21/styles.xml rename to app/src/main/res/values-v21/styles.xml diff --git a/src/main/res/values-v21/theme.xml b/app/src/main/res/values-v21/theme.xml similarity index 100% rename from src/main/res/values-v21/theme.xml rename to app/src/main/res/values-v21/theme.xml diff --git a/src/main/res/values-w380dp/dimens.xml b/app/src/main/res/values-w380dp/dimens.xml similarity index 100% rename from src/main/res/values-w380dp/dimens.xml rename to app/src/main/res/values-w380dp/dimens.xml diff --git a/src/main/res/values-w400dp/dimens.xml b/app/src/main/res/values-w400dp/dimens.xml similarity index 100% rename from src/main/res/values-w400dp/dimens.xml rename to app/src/main/res/values-w400dp/dimens.xml diff --git a/src/main/res/values-w820dp/bools.xml b/app/src/main/res/values-w820dp/bools.xml similarity index 100% rename from src/main/res/values-w820dp/bools.xml rename to app/src/main/res/values-w820dp/bools.xml diff --git a/src/main/res/values-w820dp/styles.xml b/app/src/main/res/values-w820dp/styles.xml similarity index 100% rename from src/main/res/values-w820dp/styles.xml rename to app/src/main/res/values-w820dp/styles.xml diff --git a/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from src/main/res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from src/main/res/values-zh-rTW/strings.xml rename to app/src/main/res/values-zh-rTW/strings.xml diff --git a/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from src/main/res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from src/main/res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml similarity index 100% rename from src/main/res/values/bools.xml rename to app/src/main/res/values/bools.xml diff --git a/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/src/main/res/values/cwac_touchlist_attrs.xml b/app/src/main/res/values/cwac_touchlist_attrs.xml similarity index 100% rename from src/main/res/values/cwac_touchlist_attrs.xml rename to app/src/main/res/values/cwac_touchlist_attrs.xml diff --git a/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from src/main/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml similarity index 100% rename from src/main/res/values/fonts.xml rename to app/src/main/res/values/fonts.xml diff --git a/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml similarity index 100% rename from src/main/res/values/integers.xml rename to app/src/main/res/values/integers.xml diff --git a/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml similarity index 100% rename from src/main/res/values/keys.xml rename to app/src/main/res/values/keys.xml diff --git a/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml similarity index 100% rename from src/main/res/values/theme.xml rename to app/src/main/res/values/theme.xml diff --git a/src/main/res/values/theme_amber.xml b/app/src/main/res/values/theme_amber.xml similarity index 100% rename from src/main/res/values/theme_amber.xml rename to app/src/main/res/values/theme_amber.xml diff --git a/src/main/res/values/theme_blue.xml b/app/src/main/res/values/theme_blue.xml similarity index 100% rename from src/main/res/values/theme_blue.xml rename to app/src/main/res/values/theme_blue.xml diff --git a/src/main/res/values/theme_blue_grey.xml b/app/src/main/res/values/theme_blue_grey.xml similarity index 100% rename from src/main/res/values/theme_blue_grey.xml rename to app/src/main/res/values/theme_blue_grey.xml diff --git a/src/main/res/values/theme_brown.xml b/app/src/main/res/values/theme_brown.xml similarity index 100% rename from src/main/res/values/theme_brown.xml rename to app/src/main/res/values/theme_brown.xml diff --git a/src/main/res/values/theme_cyan.xml b/app/src/main/res/values/theme_cyan.xml similarity index 100% rename from src/main/res/values/theme_cyan.xml rename to app/src/main/res/values/theme_cyan.xml diff --git a/src/main/res/values/theme_dark_grey.xml b/app/src/main/res/values/theme_dark_grey.xml similarity index 100% rename from src/main/res/values/theme_dark_grey.xml rename to app/src/main/res/values/theme_dark_grey.xml diff --git a/src/main/res/values/theme_deep_orange.xml b/app/src/main/res/values/theme_deep_orange.xml similarity index 100% rename from src/main/res/values/theme_deep_orange.xml rename to app/src/main/res/values/theme_deep_orange.xml diff --git a/src/main/res/values/theme_deep_purple.xml b/app/src/main/res/values/theme_deep_purple.xml similarity index 100% rename from src/main/res/values/theme_deep_purple.xml rename to app/src/main/res/values/theme_deep_purple.xml diff --git a/src/main/res/values/theme_green.xml b/app/src/main/res/values/theme_green.xml similarity index 100% rename from src/main/res/values/theme_green.xml rename to app/src/main/res/values/theme_green.xml diff --git a/src/main/res/values/theme_grey.xml b/app/src/main/res/values/theme_grey.xml similarity index 100% rename from src/main/res/values/theme_grey.xml rename to app/src/main/res/values/theme_grey.xml diff --git a/src/main/res/values/theme_indigo.xml b/app/src/main/res/values/theme_indigo.xml similarity index 100% rename from src/main/res/values/theme_indigo.xml rename to app/src/main/res/values/theme_indigo.xml diff --git a/src/main/res/values/theme_light_blue.xml b/app/src/main/res/values/theme_light_blue.xml similarity index 100% rename from src/main/res/values/theme_light_blue.xml rename to app/src/main/res/values/theme_light_blue.xml diff --git a/src/main/res/values/theme_light_green.xml b/app/src/main/res/values/theme_light_green.xml similarity index 100% rename from src/main/res/values/theme_light_green.xml rename to app/src/main/res/values/theme_light_green.xml diff --git a/src/main/res/values/theme_lime.xml b/app/src/main/res/values/theme_lime.xml similarity index 100% rename from src/main/res/values/theme_lime.xml rename to app/src/main/res/values/theme_lime.xml diff --git a/src/main/res/values/theme_orange.xml b/app/src/main/res/values/theme_orange.xml similarity index 100% rename from src/main/res/values/theme_orange.xml rename to app/src/main/res/values/theme_orange.xml diff --git a/src/main/res/values/theme_pink.xml b/app/src/main/res/values/theme_pink.xml similarity index 100% rename from src/main/res/values/theme_pink.xml rename to app/src/main/res/values/theme_pink.xml diff --git a/src/main/res/values/theme_purple.xml b/app/src/main/res/values/theme_purple.xml similarity index 100% rename from src/main/res/values/theme_purple.xml rename to app/src/main/res/values/theme_purple.xml diff --git a/src/main/res/values/theme_red.xml b/app/src/main/res/values/theme_red.xml similarity index 100% rename from src/main/res/values/theme_red.xml rename to app/src/main/res/values/theme_red.xml diff --git a/src/main/res/values/theme_teal.xml b/app/src/main/res/values/theme_teal.xml similarity index 100% rename from src/main/res/values/theme_teal.xml rename to app/src/main/res/values/theme_teal.xml diff --git a/src/main/res/values/theme_yellow.xml b/app/src/main/res/values/theme_yellow.xml similarity index 100% rename from src/main/res/values/theme_yellow.xml rename to app/src/main/res/values/theme_yellow.xml diff --git a/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml similarity index 100% rename from src/main/res/xml/file_provider_paths.xml rename to app/src/main/res/xml/file_provider_paths.xml diff --git a/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from src/main/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/src/main/res/xml/preferences_addons.xml b/app/src/main/res/xml/preferences_addons.xml similarity index 100% rename from src/main/res/xml/preferences_addons.xml rename to app/src/main/res/xml/preferences_addons.xml diff --git a/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml similarity index 100% rename from src/main/res/xml/preferences_appearance.xml rename to app/src/main/res/xml/preferences_appearance.xml diff --git a/src/main/res/xml/preferences_dashclock.xml b/app/src/main/res/xml/preferences_dashclock.xml similarity index 100% rename from src/main/res/xml/preferences_dashclock.xml rename to app/src/main/res/xml/preferences_dashclock.xml diff --git a/src/main/res/xml/preferences_date_time.xml b/app/src/main/res/xml/preferences_date_time.xml similarity index 100% rename from src/main/res/xml/preferences_date_time.xml rename to app/src/main/res/xml/preferences_date_time.xml diff --git a/src/main/res/xml/preferences_debug.xml b/app/src/main/res/xml/preferences_debug.xml similarity index 100% rename from src/main/res/xml/preferences_debug.xml rename to app/src/main/res/xml/preferences_debug.xml diff --git a/src/main/res/xml/preferences_defaults.xml b/app/src/main/res/xml/preferences_defaults.xml similarity index 100% rename from src/main/res/xml/preferences_defaults.xml rename to app/src/main/res/xml/preferences_defaults.xml diff --git a/src/main/res/xml/preferences_gtasks.xml b/app/src/main/res/xml/preferences_gtasks.xml similarity index 100% rename from src/main/res/xml/preferences_gtasks.xml rename to app/src/main/res/xml/preferences_gtasks.xml diff --git a/src/main/res/xml/preferences_help.xml b/app/src/main/res/xml/preferences_help.xml similarity index 100% rename from src/main/res/xml/preferences_help.xml rename to app/src/main/res/xml/preferences_help.xml diff --git a/src/main/res/xml/preferences_misc.xml b/app/src/main/res/xml/preferences_misc.xml similarity index 100% rename from src/main/res/xml/preferences_misc.xml rename to app/src/main/res/xml/preferences_misc.xml diff --git a/src/main/res/xml/preferences_oldtasks.xml b/app/src/main/res/xml/preferences_oldtasks.xml similarity index 100% rename from src/main/res/xml/preferences_oldtasks.xml rename to app/src/main/res/xml/preferences_oldtasks.xml diff --git a/src/main/res/xml/preferences_privacy.xml b/app/src/main/res/xml/preferences_privacy.xml similarity index 100% rename from src/main/res/xml/preferences_privacy.xml rename to app/src/main/res/xml/preferences_privacy.xml diff --git a/src/main/res/xml/preferences_reminders.xml b/app/src/main/res/xml/preferences_reminders.xml similarity index 100% rename from src/main/res/xml/preferences_reminders.xml rename to app/src/main/res/xml/preferences_reminders.xml diff --git a/src/main/res/xml/preferences_tasker.xml b/app/src/main/res/xml/preferences_tasker.xml similarity index 100% rename from src/main/res/xml/preferences_tasker.xml rename to app/src/main/res/xml/preferences_tasker.xml diff --git a/src/main/res/xml/preferences_widget.xml b/app/src/main/res/xml/preferences_widget.xml similarity index 100% rename from src/main/res/xml/preferences_widget.xml rename to app/src/main/res/xml/preferences_widget.xml diff --git a/src/main/res/xml/scrollable_widget_provider_info.xml b/app/src/main/res/xml/scrollable_widget_provider_info.xml similarity index 100% rename from src/main/res/xml/scrollable_widget_provider_info.xml rename to app/src/main/res/xml/scrollable_widget_provider_info.xml diff --git a/src/main/res/xml/syncadapter.xml b/app/src/main/res/xml/syncadapter.xml similarity index 100% rename from src/main/res/xml/syncadapter.xml rename to app/src/main/res/xml/syncadapter.xml diff --git a/src/release/java/org/tasks/BaseApplication.java b/app/src/release/java/org/tasks/BaseApplication.java similarity index 100% rename from src/release/java/org/tasks/BaseApplication.java rename to app/src/release/java/org/tasks/BaseApplication.java diff --git a/src/release/java/org/tasks/BuildSetup.java b/app/src/release/java/org/tasks/BuildSetup.java similarity index 100% rename from src/release/java/org/tasks/BuildSetup.java rename to app/src/release/java/org/tasks/BuildSetup.java diff --git a/src/release/res/xml/google_analytics.xml b/app/src/release/res/xml/google_analytics.xml similarity index 100% rename from src/release/res/xml/google_analytics.xml rename to app/src/release/res/xml/google_analytics.xml diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..4c90568ab --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include 'app'