Merge pull request #4337 from CruGlobal/toolDetailsTipsTutorial

Author: frett

app/src/main/AndroidManifest.xml

@@ -97,11 +97,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.tooldetails.ToolDetailsActivity"
-            android:parentActivityName=".ui.dashboard.DashboardActivity"
-            android:screenOrientation="@integer/default_screen_orientation" />
-
         <activity
             android:name=".base.ui.circuit.CircuitActivity"
             android:exported="true">

app/src/main/kotlin/org/cru/godtools/ui/dashboard/DashboardActivity.kt

@@ -29,7 +29,7 @@ import org.cru.godtools.base.ui.theme.GodToolsTheme
 import org.cru.godtools.model.Tool
 import org.cru.godtools.ui.dashboard.optinnotification.OptInNotificationController
 import org.cru.godtools.ui.onboarding.OnboardingScreen
-import org.cru.godtools.ui.tooldetails.startToolDetailsActivity
+import org.cru.godtools.ui.tooldetails.ToolDetailsScreen
 import org.cru.godtools.util.openToolActivity
 
 @AndroidEntryPoint
@@ -82,7 +82,7 @@ class DashboardActivity : BaseActivity() {
                                     is DashboardEvent.OpenTool ->
                                         openTool(e.tool, e.type, *listOfNotNull(e.lang1, e.lang2).toTypedArray())
                                     is DashboardEvent.OpenToolDetails ->
-                                        e.tool?.let { startToolDetailsActivity(it, e.lang) }
+                                        e.tool?.let { startCircuitActivity(ToolDetailsScreen(it, e.lang)) }
                                 }
                             },
                         )

app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/AllFavoritesPresenter.kt

@@ -58,8 +58,8 @@ class AllFavoritesPresenter @AssistedInject constructor(
                         when (it) {
                             ToolCard.Event.Click,
                             ToolCard.Event.OpenTool -> {
-                                val intent = tool.createToolIntent(
-                                    context = context,
+                                val intent = context.createToolIntent(
+                                    tool = tool,
                                     languages = listOfNotNull(
                                         tool.primaryLocale ?: state.translation?.languageCode,
                                         tool.parallelLocale

app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenter.kt

@@ -93,8 +93,8 @@ class HomePresenter @AssistedInject constructor(
                     lessonState = toolCardPresenter.present(lesson) {
                         when (it) {
                             ToolCard.Event.Click -> {
-                                val intent = lesson.createToolIntent(
-                                    context = context,
+                                val intent = context.createToolIntent(
+                                    tool = lesson,
                                     languages = listOfNotNull(lessonState.translation?.languageCode),
                                     resumeProgress = true,
                                 )
@@ -133,8 +133,8 @@ class HomePresenter @AssistedInject constructor(
                     when (it) {
                         ToolCard.Event.Click,
                         ToolCard.Event.OpenTool -> {
-                            val intent = tool.createToolIntent(
-                                context = context,
+                            val intent = context.createToolIntent(
+                                tool = tool,
                                 languages = listOfNotNull(
                                     tool.primaryLocale ?: state.translation?.languageCode,
                                     tool.parallelLocale

app/src/main/kotlin/org/cru/godtools/ui/dashboard/lessons/LessonsPresenter.kt

@@ -157,8 +157,8 @@ class LessonsPresenter @AssistedInject constructor(
                                 eventBus.post(OpenAnalyticsActionEvent(ACTION_OPEN_LESSON, tool.code, SOURCE_LESSONS))
                                 navigator.goTo(
                                     IntentScreen(
-                                        tool.createToolIntent(
-                                            context = context,
+                                        context.createToolIntent(
+                                            tool = tool,
                                             languages = listOfNotNull(toolState.translation?.languageCode),
                                             resumeProgress = true
                                         ) ?: return@present