From 8b137b0e7daa8df383ccffa88039b21c78714fbb Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 23 Aug 2016 16:35:43 -0500 Subject: [PATCH] Move dashclock extension to main --- build.gradle | 2 +- .../tasks/injection/ActivityComponent.java | 3 +++ .../tasks/injection/ApplicationComponent.java | 3 +++ .../tasks/injection/ActivityComponent.java | 3 +++ .../tasks/injection/ApplicationComponent.java | 3 +++ src/googleplay/AndroidManifest.xml | 22 ------------------- .../tasks/injection/ActivityComponent.java | 4 ++-- src/googleplay/res/values/keys.xml | 1 - src/main/AndroidManifest.xml | 21 ++++++++++++++++++ .../tasks/dashclock/DashClockExtension.java | 0 .../tasks/dashclock/DashClockSettings.java | 0 src/main/res/values/keys.xml | 1 + .../res/xml/preferences_dashclock.xml | 0 13 files changed, 37 insertions(+), 26 deletions(-) rename src/{googleplay => main}/java/org/tasks/dashclock/DashClockExtension.java (100%) rename src/{googleplay => main}/java/org/tasks/dashclock/DashClockSettings.java (100%) rename src/{googleplay => main}/res/xml/preferences_dashclock.xml (100%) diff --git a/build.gradle b/build.gradle index 64b57c46d..54d98f6fb 100644 --- a/build.gradle +++ b/build.gradle @@ -126,6 +126,7 @@ dependencies { compile 'com.jakewharton.timber:timber:4.1.2' compile 'com.google.guava:guava:19.0' compile 'com.jakewharton:process-phoenix:1.0.2' + compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0' compile ('com.rubiconproject.oss:jchronic:0.2.6') { transitive = false } @@ -136,7 +137,6 @@ dependencies { exclude group: 'com.android.support', module: 'support-v4' } - googleplayCompile 'com.google.android.apps.dashclock:dashclock-api:2.0.0' googleplayCompile 'com.twofortyfouram:android-plugin-api-for-locale:1.0.2' googleplayCompile "com.google.android.gms:play-services-location:${GPS_VERSION}" googleplayCompile "com.google.android.gms:play-services-analytics:${GPS_VERSION}" diff --git a/src/amazon/java/org/tasks/injection/ActivityComponent.java b/src/amazon/java/org/tasks/injection/ActivityComponent.java index 5ee882648..7f7255540 100644 --- a/src/amazon/java/org/tasks/injection/ActivityComponent.java +++ b/src/amazon/java/org/tasks/injection/ActivityComponent.java @@ -20,6 +20,7 @@ import org.tasks.activities.DateAndTimePickerActivity; import org.tasks.activities.DatePickerActivity; import org.tasks.activities.FilterSelectionActivity; import org.tasks.activities.TimePickerActivity; +import org.tasks.dashclock.DashClockSettings; import org.tasks.files.FileExplore; import org.tasks.files.MyFilePickerActivity; import org.tasks.preferences.AppearancePreferences; @@ -49,6 +50,8 @@ public interface ActivityComponent { NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule); + void inject(DashClockSettings dashClockSettings); + void inject(AACRecordingActivity aacRecordingActivity); void inject(CustomFilterActivity customFilterActivity); diff --git a/src/amazon/java/org/tasks/injection/ApplicationComponent.java b/src/amazon/java/org/tasks/injection/ApplicationComponent.java index ef2f66ea4..543da3e4f 100644 --- a/src/amazon/java/org/tasks/injection/ApplicationComponent.java +++ b/src/amazon/java/org/tasks/injection/ApplicationComponent.java @@ -1,6 +1,7 @@ package org.tasks.injection; import org.tasks.Tasks; +import org.tasks.dashclock.DashClockExtension; import org.tasks.widget.ScrollableWidgetUpdateService; import dagger.Component; @@ -8,6 +9,8 @@ import dagger.Component; @ApplicationScope @Component(modules = ApplicationModule.class) public interface ApplicationComponent { + void inject(DashClockExtension dashClockExtension); + void inject(Tasks tasks); void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService); diff --git a/src/generic/java/org/tasks/injection/ActivityComponent.java b/src/generic/java/org/tasks/injection/ActivityComponent.java index 5ee882648..7f7255540 100644 --- a/src/generic/java/org/tasks/injection/ActivityComponent.java +++ b/src/generic/java/org/tasks/injection/ActivityComponent.java @@ -20,6 +20,7 @@ import org.tasks.activities.DateAndTimePickerActivity; import org.tasks.activities.DatePickerActivity; import org.tasks.activities.FilterSelectionActivity; import org.tasks.activities.TimePickerActivity; +import org.tasks.dashclock.DashClockSettings; import org.tasks.files.FileExplore; import org.tasks.files.MyFilePickerActivity; import org.tasks.preferences.AppearancePreferences; @@ -49,6 +50,8 @@ public interface ActivityComponent { NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule); + void inject(DashClockSettings dashClockSettings); + void inject(AACRecordingActivity aacRecordingActivity); void inject(CustomFilterActivity customFilterActivity); diff --git a/src/generic/java/org/tasks/injection/ApplicationComponent.java b/src/generic/java/org/tasks/injection/ApplicationComponent.java index ef2f66ea4..543da3e4f 100644 --- a/src/generic/java/org/tasks/injection/ApplicationComponent.java +++ b/src/generic/java/org/tasks/injection/ApplicationComponent.java @@ -1,6 +1,7 @@ package org.tasks.injection; import org.tasks.Tasks; +import org.tasks.dashclock.DashClockExtension; import org.tasks.widget.ScrollableWidgetUpdateService; import dagger.Component; @@ -8,6 +9,8 @@ import dagger.Component; @ApplicationScope @Component(modules = ApplicationModule.class) public interface ApplicationComponent { + void inject(DashClockExtension dashClockExtension); + void inject(Tasks tasks); void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService); diff --git a/src/googleplay/AndroidManifest.xml b/src/googleplay/AndroidManifest.xml index e8545fca1..c37770d52 100644 --- a/src/googleplay/AndroidManifest.xml +++ b/src/googleplay/AndroidManifest.xml @@ -121,28 +121,6 @@ - - - - - - - - - - - - - - - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk8mXRE3dDXwtinUILCEzKjov2rxs3kZbLRzNrcjFWXpG9OEsUzRGLzqEN+WwibVuMRpZLj/+IxbU2sJWq/M0q+90rOhmXn46ZPeNyr77IqX2pWKIAWpzBoWq/mshRwtm9m1FIiGdBNlXrhSE7u3TGB5FuEuuSqKWvWzxeqQ7fHmlM04Lqrh1mN3FaMne8rWv+DWVHDbLrtnXBuC36glOAj17HxrzaE2v6Pv7Df3QefJ3rM1+0fAp/5jNInaP0qHAlG8WTbUmDShQ5kG3urbv3HLByyx6TSqhmNudXUK/6TusvIj50OptAG7x+UFYf956dD3diXhY3yoICvyFWx1sNwIDAQAB themes - dashclock_filter If you purchased the stand-alone Tasker plugin please send your Google Play Store transaction ID to support@tasks.org and you will receive a promo code for this in-app purchase. You can find the transaction ID in your Google Play Store order confirmation e-mail or by visiting wallet.google.com play_services_available warned_play_services diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index edad1c4cf..7c5173828 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -457,6 +457,27 @@ android:name="com.google.android.maps" android:required="false" /> + + + + + + + + + + + + + + diff --git a/src/googleplay/java/org/tasks/dashclock/DashClockExtension.java b/src/main/java/org/tasks/dashclock/DashClockExtension.java similarity index 100% rename from src/googleplay/java/org/tasks/dashclock/DashClockExtension.java rename to src/main/java/org/tasks/dashclock/DashClockExtension.java diff --git a/src/googleplay/java/org/tasks/dashclock/DashClockSettings.java b/src/main/java/org/tasks/dashclock/DashClockSettings.java similarity index 100% rename from src/googleplay/java/org/tasks/dashclock/DashClockSettings.java rename to src/main/java/org/tasks/dashclock/DashClockSettings.java diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml index 623000581..c374cdb7d 100644 --- a/src/main/res/values/keys.xml +++ b/src/main/res/values/keys.xml @@ -320,6 +320,7 @@ widget-show-checkboxes- widget-show-header- widget-show-settings- + dashclock_filter tasker tesla_unread diff --git a/src/googleplay/res/xml/preferences_dashclock.xml b/src/main/res/xml/preferences_dashclock.xml similarity index 100% rename from src/googleplay/res/xml/preferences_dashclock.xml rename to src/main/res/xml/preferences_dashclock.xml