Move Tasker plugin to main

build.gradle

@@ -127,6 +127,7 @@ dependencies {
     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.twofortyfouram:android-plugin-api-for-locale:1.0.2'
     compile ('com.rubiconproject.oss:jchronic:0.2.6') {
         transitive = false
     }
@@ -137,7 +138,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-v4'
     }
 
-    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}"
     googleplayCompile "com.google.android.gms:play-services-auth:${GPS_VERSION}"

src/amazon/java/org/tasks/injection/ActivityComponent.java

@@ -23,6 +23,7 @@ import org.tasks.activities.TimePickerActivity;
 import org.tasks.dashclock.DashClockSettings;
 import org.tasks.files.FileExplore;
 import org.tasks.files.MyFilePickerActivity;
+import org.tasks.locale.ui.activity.TaskerSettingsActivity;
 import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.BackupPreferences;
 import org.tasks.preferences.BasicPreferences;
@@ -50,6 +51,8 @@ public interface ActivityComponent {
 
     NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
 
+    void inject(TaskerSettingsActivity taskerSettingsActivity);
+
     void inject(DashClockSettings dashClockSettings);
 
     void inject(AACRecordingActivity aacRecordingActivity);

src/amazon/java/org/tasks/injection/BroadcastComponent.java

@@ -7,6 +7,7 @@ import com.todoroo.astrid.gcal.GCalTaskCompleteListener;
 import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
 import com.todoroo.astrid.timers.TimerTaskCompleteListener;
 
+import org.tasks.locale.receiver.FireReceiver;
 import org.tasks.receivers.BootCompletedReceiver;
 import org.tasks.receivers.CompleteTaskReceiver;
 import org.tasks.receivers.FirstLaunchReceiver;
@@ -21,6 +22,8 @@ import dagger.Subcomponent;
 
 @Subcomponent(modules = BroadcastModule.class)
 public interface BroadcastComponent {
+    void inject(FireReceiver fireReceiver);
+
     void inject(TimerTaskCompleteListener timerTaskCompleteListener);
 
     void inject(PhoneStateChangedReceiver phoneStateChangedReceiver);

src/generic/java/org/tasks/injection/ActivityComponent.java

@@ -23,6 +23,7 @@ import org.tasks.activities.TimePickerActivity;
 import org.tasks.dashclock.DashClockSettings;
 import org.tasks.files.FileExplore;
 import org.tasks.files.MyFilePickerActivity;
+import org.tasks.locale.ui.activity.TaskerSettingsActivity;
 import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.BackupPreferences;
 import org.tasks.preferences.BasicPreferences;
@@ -50,6 +51,8 @@ public interface ActivityComponent {
 
     NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
 
+    void inject(TaskerSettingsActivity taskerSettingsActivity);
+
     void inject(DashClockSettings dashClockSettings);
 
     void inject(AACRecordingActivity aacRecordingActivity);

src/generic/java/org/tasks/injection/BroadcastComponent.java

@@ -7,6 +7,7 @@ import com.todoroo.astrid.gcal.GCalTaskCompleteListener;
 import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
 import com.todoroo.astrid.timers.TimerTaskCompleteListener;
 
+import org.tasks.locale.receiver.FireReceiver;
 import org.tasks.receivers.BootCompletedReceiver;
 import org.tasks.receivers.CompleteTaskReceiver;
 import org.tasks.receivers.FirstLaunchReceiver;
@@ -21,6 +22,8 @@ import dagger.Subcomponent;
 
 @Subcomponent(modules = BroadcastModule.class)
 public interface BroadcastComponent {
+    void inject(FireReceiver fireReceiver);
+
     void inject(TimerTaskCompleteListener timerTaskCompleteListener);
 
     void inject(PhoneStateChangedReceiver phoneStateChangedReceiver);

src/googleplay/AndroidManifest.xml

@@ -87,40 +87,6 @@
 
         <service android:name="com.google.android.gms.analytics.CampaignTrackingService" />
 
-        <!-- Tasker/Locale -->
-
-        <activity
-            android:name=".locale.ui.activity.TaskerSettingsActivity"
-            android:exported="false"
-            android:label="@string/app_name"
-            android:theme="@style/Tasks"
-            android:uiOptions="splitActionBarWhenNarrow"
-            android:windowSoftInputMode="adjustResize"/>
-
-        <activity-alias
-            android:name="com.twofortyfouram.locale.example.setting.toast.ui.activity.PluginActivity"
-            android:exported="true"
-            android:enabled="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:targetActivity=".locale.ui.activity.TaskerSettingsActivity"
-            tools:ignore="ExportedActivity">
-            <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
-            </intent-filter>
-        </activity-alias>
-
-        <receiver
-            android:name=".locale.receiver.FireReceiver"
-            android:exported="true"
-            android:enabled="true"
-            android:process=":background"
-            tools:ignore="ExportedReceiver">
-            <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
-            </intent-filter>
-        </receiver>
-
         <!-- SyncService for Google Tasks -->
 
         <service

src/googleplay/java/org/tasks/injection/ActivityComponent.java

@@ -48,8 +48,6 @@ public interface ActivityComponent {
 
     void inject(GtasksPreferences gtasksPreferences);
 
-    void inject(TaskerSettingsActivity taskerSettingsActivity);
-
     void inject(GtasksLoginActivity gtasksLoginActivity);
 
     Theme getTheme();
@@ -60,6 +58,8 @@ public interface ActivityComponent {
 
     NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
 
+    void inject(TaskerSettingsActivity taskerSettingsActivity);
+
     void inject(DashClockSettings dashClockSettings);
 
     void inject(AACRecordingActivity aacRecordingActivity);

src/main/AndroidManifest.xml

@@ -478,6 +478,41 @@
         <activity android:name=".dashclock.DashClockSettings"
             android:label="@string/app_name"
             android:exported="true" />
+
+        <!-- Tasker/Locale -->
+
+        <activity
+            android:name=".locale.ui.activity.TaskerSettingsActivity"
+            android:exported="false"
+            android:label="@string/app_name"
+            android:theme="@style/Tasks"
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:windowSoftInputMode="adjustResize"/>
+
+        <activity-alias
+            android:name="com.twofortyfouram.locale.example.setting.toast.ui.activity.PluginActivity"
+            android:exported="true"
+            android:enabled="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:targetActivity=".locale.ui.activity.TaskerSettingsActivity"
+            tools:ignore="ExportedActivity">
+            <intent-filter>
+                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
+            </intent-filter>
+        </activity-alias>
+
+        <receiver
+            android:name=".locale.receiver.FireReceiver"
+            android:exported="true"
+            android:enabled="true"
+            android:process=":background"
+            tools:ignore="ExportedReceiver">
+            <intent-filter>
+                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
+            </intent-filter>
+        </receiver>
+
     </application>
 
 </manifest>

src/main/java/org/tasks/preferences/BasicPreferences.java

@@ -193,7 +193,6 @@ public class BasicPreferences extends InjectingPreferenceActivity implements
 
         if (!BuildConfig.FLAVOR_store.equals("googleplay")) {
             requires(R.string.settings_general, false, R.string.synchronization);
-            requires(R.string.get_plugins, false, R.string.p_purchased_tasker, R.string.p_purchased_dashclock);
             requires(R.string.privacy, false, R.string.p_collect_statistics);
         }
     }