Move internal feature plugin to common module (#3344)

Task/Issue URL: https://app.asana.com/0/488551667048375/1205045123960031/f ### Description This PR moves the InternalFeaturePlugin to the common module ### Steps to test this PR - [x] Build the internal flavour - [x] Check that all the internal settings still exist
duckduckgo · Jul 18, 2023 · cd40ae2 · cd40ae2
1 parent baf7139
commit cd40ae2
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -281,6 +281,8 @@ dependencies {
 
     implementation project(':installation-impl')
 
+    implementation project(':internal-features-api')
+
     // Deprecated. TODO: Stop using this artifact.
     implementation "androidx.legacy:legacy-support-v4:_"
     debugImplementation Square.leakCanary.android

diff --git a/app/src/internal/java/com/duckduckgo/app/audit/AuditSettingsFeature.kt b/app/src/internal/java/com/duckduckgo/app/audit/AuditSettingsFeature.kt
@@ -18,8 +18,8 @@ package com.duckduckgo.app.audit
 
 import android.content.Context
 import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.settings.extension.InternalFeaturePlugin
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 

diff --git a/app/src/internal/java/com/duckduckgo/app/dev/settings/DevSettingsFeature.kt b/app/src/internal/java/com/duckduckgo/app/dev/settings/DevSettingsFeature.kt
@@ -18,8 +18,8 @@ package com.duckduckgo.app.dev.settings
 
 import android.content.Context
 import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.settings.extension.InternalFeaturePlugin
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 

diff --git a/app/src/internal/java/com/duckduckgo/app/feature/NetPInternalSettingsFeature.kt b/app/src/internal/java/com/duckduckgo/app/feature/NetPInternalSettingsFeature.kt
@@ -17,8 +17,8 @@
 package com.duckduckgo.app.feature
 
 import android.content.Context
-import com.duckduckgo.app.settings.extension.InternalFeaturePlugin
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.duckduckgo.networkprotection.internal.feature.NetPInternalSettingsActivity
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject

diff --git a/app/src/internal/java/com/duckduckgo/app/feature/ThemesPreviewInternalFeature.kt b/app/src/internal/java/com/duckduckgo/app/feature/ThemesPreviewInternalFeature.kt
@@ -17,8 +17,8 @@
 package com.duckduckgo.app.feature
 
 import android.content.Context
-import com.duckduckgo.app.settings.extension.InternalFeaturePlugin
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.duckduckgo.mobile.android.themepreview.ui.AppComponentsActivity
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject

diff --git a/app/src/internal/java/com/duckduckgo/app/feature/VpnInternalSettingsFeature.kt b/app/src/internal/java/com/duckduckgo/app/feature/VpnInternalSettingsFeature.kt
@@ -17,8 +17,8 @@
 package com.duckduckgo.app.feature
 
 import android.content.Context
-import com.duckduckgo.app.settings.extension.InternalFeaturePlugin
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.vpn.internal.feature.LaunchVpnInternalScreenWithEmptyParams
 import com.squareup.anvil.annotations.ContributesMultibinding

diff --git a/app/src/internal/java/com/duckduckgo/app/sync/InternalSyncFeature.kt b/app/src/internal/java/com/duckduckgo/app/sync/InternalSyncFeature.kt
@@ -3,8 +3,8 @@ package com.duckduckgo.app.sync
 import android.content.Context
 import android.content.Intent
 import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.settings.extension.InternalFeaturePlugin
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.duckduckgo.sync.impl.ui.SyncInitialSetupActivity
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject

diff --git a/app/src/main/java/com/duckduckgo/app/internal/InternalFeaturePluginPoint.kt b/app/src/main/java/com/duckduckgo/app/internal/InternalFeaturePluginPoint.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.internal
+
+import com.duckduckgo.anvil.annotations.ContributesPluginPoint
+import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
+
+@ContributesPluginPoint(
+    scope = AppScope::class,
+    boundType = InternalFeaturePlugin::class,
+)
+@Suppress("unused")
+interface InternalFeaturePluginPoint
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
@@ -42,14 +42,14 @@ import com.duckduckgo.app.permissions.PermissionsScreenNoParams
 import com.duckduckgo.app.pixels.AppPixelName
 import com.duckduckgo.app.privatesearch.PrivateSearchScreenNoParams
 import com.duckduckgo.app.settings.SettingsViewModel.Command
-import com.duckduckgo.app.settings.extension.InternalFeaturePlugin
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.webtrackingprotection.WebTrackingProtectionScreenNoParams
 import com.duckduckgo.app.widget.AddWidgetLauncher
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.autoconsent.impl.ui.AutoconsentSettingsActivity
 import com.duckduckgo.autofill.api.AutofillSettingsActivityLauncher
 import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.duckduckgo.macos.api.MacOsScreenWithEmptyParams
 import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerActivityWithEmptyParams
 import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerOnboardingActivityWithEmptyParamsParams

diff --git a/internal-features/internal-features-api/.gitignore b/internal-features/internal-features-api/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/internal-features/internal-features-api/build.gradle b/internal-features/internal-features-api/build.gradle
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+apply from: "$rootProject.projectDir/gradle/android-library.gradle"
+
+android {
+    namespace 'com.duckduckgo.internal.features.api'
+}
+
+dependencies {
+    implementation Kotlin.stdlib.jdk7
+}
diff --git a/...ttings/extension/InternalFeaturePlugin.kt → ...nal/features/api/InternalFeaturePlugin.kt b/...ttings/extension/InternalFeaturePlugin.kt → ...nal/features/api/InternalFeaturePlugin.kt
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.settings.extension
+package com.duckduckgo.internal.features.api
 
 import android.content.Context
-import com.duckduckgo.anvil.annotations.ContributesPluginPoint
-import com.duckduckgo.di.scopes.AppScope
 
-@ContributesPluginPoint(AppScope::class)
 interface InternalFeaturePlugin {
     /** @return the title of the internal feature */
     fun internalFeatureTitle(): String