Bookmark added dialog promo tidy-up, addressing feedback

Author: CDRussell

app/src/main/java/com/duckduckgo/app/bookmarks/dialog/BookmarkAddedConfirmationDialog.kt

@@ -31,7 +31,7 @@ import android.widget.LinearLayout
 import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import com.duckduckgo.app.bookmarks.BookmarkAddedPromotionPlugin
+import com.duckduckgo.app.bookmarks.BookmarkAddedDialogPlugin
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.databinding.BottomSheetAddBookmarkBinding
 import com.duckduckgo.common.ui.view.gone
@@ -54,7 +54,7 @@ import com.google.android.material.R as MaterialR
 class BookmarkAddedConfirmationDialog(
     context: Context,
     private val bookmarkFolder: BookmarkFolder?,
-    private val promoPlugins: PluginPoint<BookmarkAddedPromotionPlugin>,
+    private val promoPlugins: PluginPoint<BookmarkAddedDialogPlugin>,
 ) : BottomSheetDialog(context) {
 
     abstract class EventListener {

app/src/main/java/com/duckduckgo/app/bookmarks/dialog/BookmarkAddedConfirmationDialogFactory.kt

@@ -17,7 +17,7 @@
 package com.duckduckgo.app.bookmarks.dialog
 
 import android.content.Context
-import com.duckduckgo.app.bookmarks.BookmarkAddedPromotionPlugin
+import com.duckduckgo.app.bookmarks.BookmarkAddedDialogPlugin
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.savedsites.api.models.BookmarkFolder
@@ -31,7 +31,7 @@ interface BookmarkAddedConfirmationDialogFactory {
 
 @ContributesBinding(AppScope::class)
 class ReadyBookmarkAddedConfirmationDialogFactory @Inject constructor(
-    private val plugins: PluginPoint<BookmarkAddedPromotionPlugin>,
+    private val plugins: PluginPoint<BookmarkAddedDialogPlugin>,
 ) : BookmarkAddedConfirmationDialogFactory {
     override fun create(context: Context, bookmarkFolder: BookmarkFolder?): BookmarkAddedConfirmationDialog {
         return BookmarkAddedConfirmationDialog(context, bookmarkFolder, plugins)

app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt

@@ -25,7 +25,7 @@ import androidx.datastore.preferences.preferencesDataStore
 import androidx.work.WorkManager
 import com.duckduckgo.adclick.api.AdClickManager
 import com.duckduckgo.anvil.annotations.ContributesPluginPoint
-import com.duckduckgo.app.bookmarks.BookmarkAddedPromotionPlugin
+import com.duckduckgo.app.bookmarks.BookmarkAddedDialogPlugin
 import com.duckduckgo.app.browser.*
 import com.duckduckgo.app.browser.addtohome.AddToHomeCapabilityDetector
 import com.duckduckgo.app.browser.addtohome.AddToHomeSystemCapabilityDetector
@@ -389,5 +389,5 @@ class BrowserModule {
 @Qualifier
 annotation class IndonesiaNewTabSection
 
-@ContributesPluginPoint(scope = AppScope::class, boundType = BookmarkAddedPromotionPlugin::class)
-private interface BookmarkAddedPromotionPluginPoint
+@ContributesPluginPoint(scope = AppScope::class, boundType = BookmarkAddedDialogPlugin::class)
+private interface BookmarkAddedDialogPluginPoint

app/src/main/res/layout/bottom_sheet_add_bookmark.xml

@@ -21,8 +21,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/rounded_top_corners_bottom_sheet_drawable"
     android:orientation="vertical"
-    android:paddingTop="@dimen/actionBottomSheetVerticalPadding"
-    android:paddingBottom="@dimen/actionBottomSheetVerticalPadding">
+    android:paddingTop="@dimen/actionBottomSheetVerticalPadding">
 
     <com.duckduckgo.common.ui.view.text.DaxTextView
         android:id="@+id/bookmarksBottomSheetDialogTitle"
@@ -68,9 +67,12 @@
         android:id="@+id/promotionContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_4"
-        android:layout_marginTop="@dimen/keyline_5"
-        android:orientation="vertical" />
+        android:layout_marginTop="@dimen/keyline_2"
+        android:background="?attr/daxColorBackground"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/keyline_4"
+        android:paddingTop="@dimen/keyline_4"
+        android:paddingEnd="@dimen/keyline_4"
+        android:paddingBottom="@dimen/keyline_4" />
 
 </com.duckduckgo.app.bookmarks.dialog.TouchObservingLinearLayout>

browser-api/src/main/java/com/duckduckgo/app/bookmarks/BookmarkAddedPromotionPlugin.kt renamed to browser-api/src/main/java/com/duckduckgo/app/bookmarks/BookmarkAddedDialogPlugin.kt

@@ -18,7 +18,7 @@ package com.duckduckgo.app.bookmarks
 
 import android.view.View
 
-interface BookmarkAddedPromotionPlugin {
+interface BookmarkAddedDialogPlugin {
 
     /**
      * Returns a view to be displayed in the bookmark added confirmation dialog, or null if the promotion should not be shown.
@@ -27,6 +27,6 @@ interface BookmarkAddedPromotionPlugin {
     suspend fun getView(): View?
 
     companion object {
-        const val PRIORITY_KEY_BOOKMARK_ADDED_PROMOTION = 100
+        const val PRIORITY_KEY_SETUP_SYNC = 100
     }
 }

sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/promotion/bookmarks/addeddialog/SetupSyncBookmarkAddedPromo.kt

@@ -22,7 +22,7 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.duckduckgo.anvil.annotations.PriorityKey
-import com.duckduckgo.app.bookmarks.BookmarkAddedPromotionPlugin
+import com.duckduckgo.app.bookmarks.BookmarkAddedDialogPlugin
 import com.duckduckgo.common.ui.menu.PopupMenu
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.listitem.OneLineListItem
@@ -39,14 +39,14 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @ContributesMultibinding(scope = ActivityScope::class)
-@PriorityKey(BookmarkAddedPromotionPlugin.PRIORITY_KEY_BOOKMARK_ADDED_PROMOTION)
+@PriorityKey(BookmarkAddedDialogPlugin.PRIORITY_KEY_SETUP_SYNC)
 class SetupSyncBookmarkAddedPromo @Inject constructor(
     private val globalActivityStarter: GlobalActivityStarter,
     private val dispatchers: DispatcherProvider,
     private val activity: AppCompatActivity,
     private val syncPromotions: SyncPromotions,
     private val syncStateMonitor: SyncStateMonitor,
-) : BookmarkAddedPromotionPlugin {
+) : BookmarkAddedDialogPlugin {
 
     @SuppressLint("InflateParams")
     override suspend fun getView(): View? {