Skip to content

Commit

Permalink
ADS: Meetup Presentation (#5080)
Browse files Browse the repository at this point in the history
Task/Issue URL: https://app.asana.com/0/5439528766830/1208417779579894/f

### Description
Add missing elements and move text around for the ADS demo.
  • Loading branch information
malmstein authored Oct 1, 2024
1 parent 474879a commit 065a5c3
Show file tree
Hide file tree
Showing 9 changed files with 282 additions and 177 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ import com.duckduckgo.app.browser.BrowserActivity
import com.duckduckgo.app.browser.R
import com.duckduckgo.app.di.AppCoroutineScope
import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
import com.duckduckgo.app.settings.SettingsActivity
import com.duckduckgo.appbuildconfig.api.AppBuildConfig
import com.duckduckgo.appbuildconfig.api.isInternalBuild
import com.duckduckgo.common.ui.themepreview.ui.AppComponentsActivity
import com.duckduckgo.common.utils.DispatcherProvider
import com.duckduckgo.di.scopes.AppScope
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksActivity
Expand Down Expand Up @@ -68,6 +72,7 @@ class AppShortcutCreatorLifecycleObserver(
class AppShortcutCreator @Inject constructor(
private val context: Context,
@AppCoroutineScope private val appCoroutineScope: CoroutineScope,
private val appBuildConfig: AppBuildConfig,
private val dispatchers: DispatcherProvider,
) {

Expand All @@ -79,6 +84,10 @@ class AppShortcutCreator @Inject constructor(
shortcutList.add(buildClearDataShortcut(context))
shortcutList.add(buildBookmarksShortcut(context))

if (appBuildConfig.isInternalBuild()) {
shortcutList.add(buildAndroidDesignSystemShortcut(context))
}

val shortcutManager = context.getSystemService(ShortcutManager::class.java)
kotlin.runCatching { shortcutManager.dynamicShortcuts = shortcutList }
}
Expand Down Expand Up @@ -125,9 +134,27 @@ class AppShortcutCreator @Inject constructor(
.build().toShortcutInfo()
}

private fun buildAndroidDesignSystemShortcut(context: Context): ShortcutInfo {
val browserActivity = BrowserActivity.intent(context).also { it.action = Intent.ACTION_VIEW }
val settingsActivity = SettingsActivity.intent(context).also { it.action = Intent.ACTION_VIEW }
val adsActivity = AppComponentsActivity.intent(context).also { it.action = Intent.ACTION_VIEW }

val stackBuilder = TaskStackBuilder.create(context)
.addNextIntent(browserActivity)
.addNextIntent(settingsActivity)
.addNextIntent(adsActivity)

return ShortcutInfoCompat.Builder(context, SHORTCUT_ID_DESIGN_SYSTEM_DEMO)
.setShortLabel(context.getString(com.duckduckgo.mobile.android.R.string.ads_demo_activity_title))
.setIcon(IconCompat.createWithResource(context, com.duckduckgo.mobile.android.R.drawable.ic_dax_icon))
.setIntents(stackBuilder.intents)
.build().toShortcutInfo()
}

companion object {
private const val SHORTCUT_ID_CLEAR_DATA = "clearData"
private const val SHORTCUT_ID_NEW_TAB = "newTab"
private const val SHORTCUT_ID_SHOW_BOOKMARKS = "showBookmarks"
private const val SHORTCUT_ID_DESIGN_SYSTEM_DEMO = "designSystemDemo"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import javax.inject.Inject
@PriorityKey(InternalFeaturePlugin.ADS_SETTINGS_PRIO_KEY)
class ThemesPreviewInternalFeature @Inject constructor() : InternalFeaturePlugin {
override fun internalFeatureTitle(): String {
return "App Components Design Preview"
return "Android Design System Preview"
}

override fun internalFeatureSubtitle(): String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:gravity="start"
android:paddingTop="@dimen/keyline_4"
android:text="App Components"
android:text="@string/ads_demo_header_title"
app:drawableStartCompat="@drawable/ic_dax_icon"
android:drawablePadding="@dimen/keyline_2"/>

Expand Down
Loading

0 comments on commit 065a5c3

Please sign in to comment.