PIR: Rename PirDashboardActivity and PirWebViewActivity (#6549)

Task/Issue URL:
https://app.asana.com/1/137249556945/project/1203581873609357/task/1211005965407917?focus=true

### Description
Renames activities to make it clearer what they are used for and to
match other naming standards.

### Steps to test this PR
Nothing to test

### UI changes
No UI changes

Author: landomen

pir/pir-api/src/main/java/com/duckduckgo/pir/api/dashboard/PirDashboardScreen.kt renamed to pir/pir-api/src/main/java/com/duckduckgo/pir/api/dashboard/PirDashboardWebViewScreen.kt

@@ -19,6 +19,6 @@ package com.duckduckgo.pir.api.dashboard
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 
 /**
- * Use this model to launch the PIR Dashboard screen.
+ * Use this model to launch the PIR Dashboard WebView screen.
  */
-data object PirDashboardScreen : GlobalActivityStarter.ActivityParams
+data object PirDashboardWebViewScreen : GlobalActivityStarter.ActivityParams

pir/pir-impl/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
 
     <application>
         <activity
-            android:name=".dashboard.PirDashboardActivity"
+            android:name=".dashboard.PirDashboardWebViewActivity"
             android:parentActivityName="com.duckduckgo.app.settings.SettingsActivity"
             android:label="@string/activityPirDashboard" />
     </application>

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/PirDashboardActivity.kt renamed to pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/dashboard/PirDashboardWebViewActivity.kt

@@ -24,18 +24,18 @@ import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.store.AppTheme
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.ActivityScope
-import com.duckduckgo.pir.api.dashboard.PirDashboardScreen
-import com.duckduckgo.pir.impl.databinding.ActivityPirDashboardBinding
+import com.duckduckgo.pir.api.dashboard.PirDashboardWebViewScreen
+import com.duckduckgo.pir.impl.databinding.ActivityPirDashboardWebviewBinding
 import javax.inject.Inject
 
 @InjectWith(ActivityScope::class)
-@ContributeToActivityStarter(PirDashboardScreen::class)
-class PirDashboardActivity : DuckDuckGoActivity() {
+@ContributeToActivityStarter(PirDashboardWebViewScreen::class)
+class PirDashboardWebViewActivity : DuckDuckGoActivity() {
 
     @Inject
     lateinit var appTheme: AppTheme
 
-    private val binding: ActivityPirDashboardBinding by viewBinding()
+    private val binding: ActivityPirDashboardWebviewBinding by viewBinding()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

pir/pir-impl/src/main/res/layout/activity_pir_dashboard.xml renamed to pir/pir-impl/src/main/res/layout/activity_pir_dashboard_webview.xml

@@ -20,7 +20,7 @@
             android:label="@string/pirDevOptOutTitle" />
 
         <activity
-            android:name=".settings.PirWebViewActivity"
+            android:name=".settings.PirDevWebViewActivity"
             android:label="@string/pirDevDebugOptOutTitle" />
 
         <service
@@ -43,4 +43,4 @@
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:process=":pir" />
     </application>
-</manifest>
+</manifest>

pir/pir-internal/src/main/AndroidManifest.xml

@@ -88,7 +88,7 @@ class PirDevOptOutActivity : DuckDuckGoActivity() {
             if (selectedBroker != null) {
                 globalActivityStarter.start(
                     this,
-                    PirDebugWebViewResultsScreenParams(listOf(selectedBroker!!)),
+                    PirDevWebViewResultsScreenParams(listOf(selectedBroker!!)),
                 )
             }
         }

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/settings/PirDevOptOutActivity.kt

@@ -26,31 +26,31 @@ import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams
 import com.duckduckgo.navigation.api.getActivityParams
-import com.duckduckgo.pir.internal.databinding.ActivityPirWebviewBinding
+import com.duckduckgo.pir.internal.databinding.ActivityPirInternalWebviewBinding
 import com.duckduckgo.pir.internal.optout.PirOptOut
 import javax.inject.Inject
 import kotlinx.coroutines.launch
 
 @InjectWith(ActivityScope::class)
-@ContributeToActivityStarter(PirDebugWebViewResultsScreenParams::class)
-class PirWebViewActivity : DuckDuckGoActivity() {
+@ContributeToActivityStarter(PirDevWebViewResultsScreenParams::class)
+class PirDevWebViewActivity : DuckDuckGoActivity() {
     @Inject
     lateinit var pirOptOut: PirOptOut
 
     @Inject
     lateinit var dispatcherProvider: DispatcherProvider
 
-    private val binding: ActivityPirWebviewBinding by viewBinding()
-    private val params: PirDebugWebViewResultsScreenParams?
-        get() = intent.getActivityParams(PirDebugWebViewResultsScreenParams::class.java)
+    private val binding: ActivityPirInternalWebviewBinding by viewBinding()
+    private val params: PirDevWebViewResultsScreenParams?
+        get() = intent.getActivityParams(PirDevWebViewResultsScreenParams::class.java)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         val brokersToOptOut = params?.brokers
         lifecycleScope.launch {
             if (!brokersToOptOut.isNullOrEmpty()) {
-                pirOptOut.debugExecute(brokersToOptOut, binding.pirDebugWebView).also {
+                pirOptOut.debugExecute(brokersToOptOut, binding.pirDevWebView).also {
                     finish()
                 }
             } else {
@@ -65,4 +65,4 @@ class PirWebViewActivity : DuckDuckGoActivity() {
     }
 }
 
-data class PirDebugWebViewResultsScreenParams(val brokers: List<String>) : ActivityParams
+data class PirDevWebViewResultsScreenParams(val brokers: List<String>) : ActivityParams

pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/settings/PirWebViewActivity.kt renamed to pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/settings/PirDevWebViewActivity.kt

@@ -18,8 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <WebView
-        android:id="@+id/pirDebugWebView"
+        android:id="@+id/pirDevWebView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-</LinearLayout>
+</LinearLayout>

pir/pir-internal/src/main/res/layout/activity_pir_webview.xml renamed to pir/pir-internal/src/main/res/layout/activity_pir_internal_webview.xml

@@ -32,7 +32,7 @@ import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.ViewViewModelFactory
 import com.duckduckgo.di.scopes.ViewScope
 import com.duckduckgo.navigation.api.GlobalActivityStarter
-import com.duckduckgo.pir.api.dashboard.PirDashboardScreen
+import com.duckduckgo.pir.api.dashboard.PirDashboardWebViewScreen
 import com.duckduckgo.subscriptions.impl.R
 import com.duckduckgo.subscriptions.impl.databinding.ViewPirSettingsBinding
 import com.duckduckgo.subscriptions.impl.pir.PirActivity.Companion.PirScreenWithEmptyParams
@@ -126,7 +126,7 @@ class PirSettingView @JvmOverloads constructor(
             }
 
             OpenPirDashboard -> {
-                globalActivityStarter.start(context, PirDashboardScreen)
+                globalActivityStarter.start(context, PirDashboardWebViewScreen)
             }
         }
     }