From 45fae9b9023fcca07a6fcbca8b82e005f86698d8 Mon Sep 17 00:00:00 2001 From: Josh Leibstein Date: Tue, 7 Nov 2023 02:35:30 +0000 Subject: [PATCH] Standardize common-ui namespace --- ...ontributeToActivityStarterCodeGenerator.kt | 2 +- .../vpn/apps/ui/ExclusionListAdapter.kt | 12 +- .../ui/ManageRecentAppsProtectionActivity.kt | 10 +- .../ui/ManuallyDisableAppProtectionDialog.kt | 2 +- .../ui/ManuallyEnableAppProtectionDialog.kt | 2 +- .../apps/ui/RestoreDefaultProtectionDialog.kt | 2 +- .../apps/ui/TrackingProtectionAppsAdapter.kt | 8 +- ...TrackingProtectionExclusionListActivity.kt | 12 +- .../breakage/ReportBreakageAppListActivity.kt | 8 +- .../breakage/ReportBreakageAppListAdapter.kt | 2 +- ...ortBreakageCategorySingleChoiceActivity.kt | 6 +- .../alwayson/AlwaysOnAlertDialogFragment.kt | 4 +- .../DeviceShieldAlertNotificationBuilder.kt | 2 +- .../VpnEnabledNotificationBuilder.kt | 4 +- .../VpnReminderNotificationBuilder.kt | 2 +- .../AppTPVpnOnboardingResourceHelper.kt | 2 +- .../DeviceShieldOnboardingAdapter.kt | 6 +- .../ui/onboarding/VpnOnboardingActivity.kt | 10 +- .../ui/report/DeviceShieldAppTrackersInfo.kt | 4 +- .../vpn/ui/report/DeviceShieldFragment.kt | 6 +- .../AppTPCompanyDetailsAdapter.kt | 10 +- .../AppTPCompanyTrackersActivity.kt | 18 +-- .../DeviceShieldActivityFeedFragment.kt | 4 +- .../DeviceShieldMostRecentActivity.kt | 4 +- .../DeviceShieldTrackerActivity.kt | 34 +++--- .../PastWeekTrackerActivityContentView.kt | 2 +- .../tracker_activity/TrackerBadgeAdapter.kt | 8 +- .../ui/tracker_activity/TrackerFeedAdapter.kt | 11 +- .../view/AppsProtectionStateView.kt | 6 +- .../ui/tracker_activity/view/MultiAppsIcon.kt | 6 +- .../activity_vpn_onboarding_page.xml | 4 +- .../res/layout/activity_app_trackers_info.xml | 4 +- ...tivity_apptp_company_trackers_activity.xml | 6 +- .../activity_device_shield_activity.xml | 28 ++--- ...activity_manage_recent_apps_protection.xml | 8 +- .../activity_report_breakage_app_list.xml | 6 +- ...report_breakage_category_single_choice.xml | 14 +-- .../res/layout/activity_vpn_onboarding.xml | 2 +- .../layout/activity_vpn_onboarding_page.xml | 4 +- .../layout/content_vpn_always_on_alert.xml | 8 +- .../res/layout/content_vpn_controller.xml | 38 +++--- ...acking_protection_manually_disable_app.xml | 8 +- ...racking_protection_manually_enable_app.xml | 8 +- ...g_tracking_protection_restore_defaults.xml | 10 +- .../res/layout/fragment_device_shield_cta.xml | 4 +- .../include_company_trackers_toolbar.xml | 4 +- .../res/layout/item_apptp_company_details.xml | 8 +- .../menu_item_device_tracker_switch.xml | 2 +- ...window_exclusion_list_filter_item_menu.xml | 6 +- .../res/layout/row_exclusion_list_app.xml | 6 +- .../res/layout/row_exclusion_list_filter.xml | 2 +- .../layout/row_exclusion_list_info_panel.xml | 4 +- .../view_device_shield_activity_apps.xml | 2 +- ...device_shield_activity_apps_protection.xml | 4 +- ...iew_device_shield_activity_description.xml | 4 +- .../view_device_shield_activity_entry.xml | 6 +- ...ew_device_shield_activity_entry_header.xml | 2 +- ...e_shield_activity_skeleton_placeholder.xml | 14 +-- ...w_device_shield_activity_tracker_badge.xml | 4 +- ...ice_shield_excluded_app_entry_skeleton.xml | 6 +- ...vice_shield_past_week_activity_content.xml | 6 +- ...evice_shield_report_app_breakage_entry.xml | 2 +- ...ield_report_breakage_app_list_skeleton.xml | 6 +- .../feature/VpnInternalSettingsActivity.kt | 4 +- .../rules/ExceptionRulesDebugActivity.kt | 4 +- .../vpn/internal/feature/rules/RuleAppView.kt | 2 +- .../internal/feature/rules/RuleTrackerView.kt | 2 +- .../layout/activity_exception_rules_debug.xml | 2 +- .../layout/activity_vpn_internal_settings.xml | 38 +++--- .../res/layout/exception_rule_app_view.xml | 2 +- .../res/layout/exception_rule_domain_view.xml | 2 +- app/lint-baseline.xml | 2 +- .../app/browser/BrowserTabViewModelTest.kt | 2 +- .../LottiePrivacyShieldAnimationHelperTest.kt | 2 +- .../duckduckgo/app/cta/ui/CtaViewModelTest.kt | 2 +- .../app/audit/AuditSettingsActivity.kt | 4 +- .../app/dev/settings/DevSettingsActivity.kt | 6 +- .../res/layout/activity_audit_settings.xml | 32 ++--- .../res/layout/activity_dev_settings.xml | 24 ++-- .../popup_window_user_agent_override.xml | 12 +- .../app/WidgetThemeConfiguration.kt | 2 +- .../app/about/AboutDuckDuckGoActivity.kt | 8 +- .../accessibility/AccessibilityActivity.kt | 6 +- .../app/appearance/AppearanceActivity.kt | 10 +- .../app/appearance/AppearanceViewModel.kt | 4 +- .../app/bookmarks/ui/BookmarksActivity.kt | 14 +-- .../app/bookmarks/ui/BookmarksAdapter.kt | 6 +- .../ui/EditSavedSiteDialogFragment.kt | 4 +- .../app/bookmarks/ui/FavoritesAdapter.kt | 8 +- .../bookmarks/ui/SavedSiteDialogFragment.kt | 8 +- .../BookmarkFolderStructureAdapter.kt | 2 +- .../BookmarkFoldersActivity.kt | 2 +- .../bookmarkfolders/BookmarkFoldersAdapter.kt | 6 +- .../app/brokensite/BrokenSiteActivity.kt | 8 +- .../duckduckgo/app/browser/BrowserActivity.kt | 10 +- .../app/browser/BrowserTabFragment.kt | 35 +++--- .../app/browser/HomeBackgroundLogo.kt | 4 +- .../duckduckgo/app/browser/PulseAnimation.kt | 2 +- .../app/browser/TabSwitcherButton.kt | 2 +- .../favorites/FavoritesQuickAccessAdapter.kt | 2 +- .../history/NavigationHistoryAdapter.kt | 4 +- .../app/browser/menu/BrowserPopupMenu.kt | 6 +- .../BrowserLottieTrackersAnimatorHelper.kt | 6 +- .../LottiePrivacyShieldAnimationHelper.kt | 2 +- .../animations/TrackersLottieAssetDelegate.kt | 8 +- .../remotemessage/RemoteMessageMapper.kt | 6 +- .../app/browser/webview/WebViewActivity.kt | 4 +- .../java/com/duckduckgo/app/cta/ui/Cta.kt | 16 +-- .../com/duckduckgo/app/cta/ui/CtaViewModel.kt | 2 +- .../app/di/DevicePropertiesModule.kt | 2 +- .../java/com/duckduckgo/app/di/StoreModule.kt | 4 +- .../app/downloads/DownloadsActivity.kt | 14 +-- .../app/downloads/DownloadsAdapter.kt | 12 +- .../ui/EmailProtectionUnsupportedActivity.kt | 4 +- .../feedback/ui/common/FeedbackActivity.kt | 6 +- .../feedback/ui/common/FeedbackFragment.kt | 2 +- .../ui/common/FeedbackItemDecoration.kt | 2 +- .../ui/initial/InitialFeedbackFragment.kt | 6 +- .../BrokenSiteNegativeFeedbackFragment.kt | 2 +- .../negative/mainreason/MainReasonAdapter.kt | 2 +- .../MainReasonNegativeFeedbackFragment.kt | 2 +- .../ShareOpenEndedFeedbackFragment.kt | 2 +- .../ui/negative/subreason/SubReasonAdapter.kt | 2 +- .../SubReasonNegativeFeedbackFragment.kt | 2 +- .../PositiveFeedbackLandingFragment.kt | 2 +- .../ui/FireproofWebsiteAdapter.kt | 4 +- .../ui/FireproofWebsitesActivity.kt | 6 +- .../app/firebutton/FireButtonActivity.kt | 6 +- .../store/AndroidUserBrowserProperties.kt | 4 +- .../app/global/view/DividerAdapter.kt | 2 +- .../app/global/view/FaviconImageView.kt | 2 +- .../duckduckgo/app/global/view/FireDialog.kt | 10 +- .../ui/GlobalPrivacyControlActivity.kt | 4 +- .../app/icon/ui/ChangeIconActivity.kt | 8 +- .../app/launch/LaunchBridgeActivity.kt | 2 +- .../model/ClearDataNotification.kt | 2 +- .../model/PrivacyProtectionNotification.kt | 2 +- .../app/onboarding/ui/OnboardingActivity.kt | 4 +- .../onboarding/ui/page/DefaultBrowserPage.kt | 4 +- .../ui/page/OnboardingPageFragment.kt | 2 +- .../app/onboarding/ui/page/WelcomePage.kt | 2 +- .../app/permissions/PermissionsActivity.kt | 6 +- .../app/privacy/ui/AllowListActivity.kt | 10 +- .../app/privacy/ui/WebsitesAdapter.kt | 6 +- .../privatesearch/PrivateSearchActivity.kt | 4 +- .../duckduckgo/app/settings/CheckListItem.kt | 10 +- .../app/settings/FireAnimationActivity.kt | 8 +- .../app/settings/SettingsActivity.kt | 10 +- .../SitePermissionsActivity.kt | 4 +- .../sitepermissions/SitePermissionsAdapter.kt | 10 +- .../PermissionsPerWebsiteActivity.kt | 6 +- .../SurveyAvailableNotification.kt | 4 +- .../app/survey/ui/SurveyActivity.kt | 10 +- .../app/systemsearch/SystemSearchActivity.kt | 10 +- .../app/tabs/ui/GridViewColumnCalculator.kt | 4 +- .../app/tabs/ui/TabGridItemDecorator.kt | 4 +- .../app/tabs/ui/TabSwitcherActivity.kt | 4 +- .../app/tabs/ui/TabSwitcherAdapter.kt | 2 +- .../WebTrackingProtectionActivity.kt | 4 +- .../ui/AddWidgetInstructionsActivity.kt | 4 +- .../widget/FavoritesWidgetService.kt | 4 +- .../SearchAndFavoritesGridCalculator.kt | 4 +- .../content_onboarding_default_browser.xml | 8 +- .../content_onboarding_welcome.xml | 2 +- .../activity_accessibility_settings.xml | 12 +- .../main/res/layout/activity_appearance.xml | 4 +- .../main/res/layout/activity_bookmarks.xml | 2 +- .../main/res/layout/activity_downloads.xml | 2 +- .../res/layout/activity_email_unsupported.xml | 4 +- .../main/res/layout/activity_fire_button.xml | 8 +- .../activity_global_privacy_control.xml | 4 +- .../activity_permission_per_website.xml | 2 +- .../res/layout/activity_private_search.xml | 12 +- .../res/layout/activity_system_search.xml | 2 +- .../main/res/layout/activity_user_survey.xml | 6 +- .../activity_web_tracking_protection.xml | 10 +- .../layout/activity_widget_configuration.xml | 4 +- .../res/layout/content_about_duck_duck_go.xml | 14 +-- .../main/res/layout/content_broken_sites.xml | 8 +- app/src/main/res/layout/content_feedback.xml | 6 +- ...feedback_negative_broken_site_feedback.xml | 10 +- ...ck_negative_disambiguation_main_reason.xml | 6 +- ...ack_negative_disambiguation_sub_reason.xml | 6 +- .../content_feedback_open_ended_feedback.xml | 8 +- .../content_feedback_positive_landing.xml | 10 +- .../content_onboarding_default_browser.xml | 8 +- ...ontent_onboarding_default_browser_card.xml | 2 +- .../res/layout/content_onboarding_welcome.xml | 2 +- .../main/res/layout/content_permissions.xml | 6 +- app/src/main/res/layout/content_settings.xml | 2 +- .../res/layout/content_settings_about.xml | 12 +- .../res/layout/content_settings_internal.xml | 4 +- .../res/layout/content_settings_other.xml | 8 +- .../res/layout/content_settings_privacy.xml | 2 +- .../res/layout/content_settings_settings.xml | 20 ++-- ...ontent_site_location_permission_dialog.xml | 12 +- ...tent_system_location_permission_dialog.xml | 10 +- app/src/main/res/layout/content_test.xml | 2 +- .../res/layout/cookie_cosmetic_scene_1.xml | 2 +- .../res/layout/cookie_cosmetic_scene_2.xml | 2 +- app/src/main/res/layout/cookie_scene_1.xml | 2 +- app/src/main/res/layout/cookie_scene_2.xml | 2 +- .../main/res/layout/dialog_edit_allowlist.xml | 2 +- .../res/layout/dialog_fragment_saved_site.xml | 8 +- .../main/res/layout/download_confirmation.xml | 6 +- .../main/res/layout/http_authentication.xml | 6 +- ...include_add_widget_instruction_buttons.xml | 6 +- .../include_add_widget_instruction_steps.xml | 12 +- .../main/res/layout/include_cta_buttons.xml | 4 +- .../main/res/layout/include_cta_content.xml | 4 +- .../res/layout/include_dax_dialog_cta.xml | 10 +- .../main/res/layout/include_error_view.xml | 4 +- .../main/res/layout/include_find_in_page.xml | 2 +- .../res/layout/include_new_browser_tab.xml | 2 +- .../res/layout/include_omnibar_toolbar.xml | 2 +- .../layout/include_omnibar_toolbar_mockup.xml | 2 +- .../include_system_search_onboarding.xml | 16 +-- .../item_autocomplete_bookmark_suggestion.xml | 4 +- .../item_autocomplete_no_suggestions.xml | 2 +- .../item_autocomplete_search_suggestion.xml | 2 +- .../main/res/layout/item_bookmark_folder.xml | 2 +- .../res/layout/item_device_app_suggestion.xml | 2 +- ...item_site_permission_setting_selection.xml | 2 +- app/src/main/res/layout/item_tab.xml | 2 +- .../res/layout/popup_window_browser_menu.xml | 42 +++---- .../popup_window_download_item_menu.xml | 6 +- .../layout/popup_window_edit_delete_menu.xml | 4 +- .../layout/popup_window_remove_all_menu.xml | 2 +- .../res/layout/popup_window_remove_menu.xml | 2 +- .../main/res/layout/sheet_fire_clear_data.xml | 4 +- .../main/res/layout/view_check_list_item.xml | 4 +- .../main/res/layout/view_fireproof_title.xml | 2 +- .../view_fireproof_website_description.xml | 2 +- .../view_fireproof_website_empty_hint.xml | 2 +- ...w_fireproof_website_settings_selection.xml | 2 +- .../res/layout/view_item_downloads_empty.xml | 2 +- .../res/layout/view_item_downloads_header.xml | 2 +- .../layout/view_item_downloads_notify_me.xml | 2 +- .../res/layout/view_list_item_description.xml | 2 +- .../res/layout/view_list_item_empty_hint.xml | 2 +- .../view_location_permissions_toggle.xml | 2 +- .../res/layout/view_quick_access_item.xml | 2 +- .../res/layout/view_saved_site_empty_hint.xml | 2 +- .../view_site_permissions_description.xml | 2 +- .../view_site_permissions_empty_list.xml | 2 +- .../layout/view_site_permissions_title.xml | 2 +- .../layout/view_site_permissions_toggle.xml | 2 +- .../app/appearance/AppearanceViewModelTest.kt | 4 +- .../impl/ui/AutoconsentSettingsActivity.kt | 4 +- .../layout/activity_autoconsent_settings.xml | 4 +- .../EmailProtectionInContextSignupActivity.kt | 8 +- .../management/AutofillManagementActivity.kt | 16 +-- .../AutofillManagementRecyclerAdapter.kt | 2 +- .../AutofillManagementCredentialsMode.kt | 22 ++-- ...AutofillManagementDeviceUnsupportedMode.kt | 2 +- .../viewing/AutofillManagementDisabledMode.kt | 2 +- .../viewing/AutofillManagementListMode.kt | 14 +-- .../DuckAddressStatusChangeConfirmer.kt | 2 +- ...ofillUseGeneratedPasswordDialogFragment.kt | 2 +- .../res/layout/activity_autofill_settings.xml | 2 +- ...management_credential_list_empty_state.xml | 4 +- ...tent_autofill_generate_password_dialog.xml | 12 +- .../content_autofill_save_new_credentials.xml | 8 +- ...nt_autofill_select_credentials_tooltip.xml | 4 +- ...t_autofill_update_existing_credentials.xml | 10 +- .../dialog_email_protection_choose_email.xml | 6 +- ...og_email_protection_in_context_sign_up.xml | 10 +- ...autofill_management_device_unsupported.xml | 4 +- .../fragment_autofill_management_disabled.xml | 6 +- ...fragment_autofill_management_edit_mode.xml | 18 +-- ...fragment_autofill_management_list_mode.xml | 4 +- ...autofill_credentials_management_screen.xml | 2 +- ..._credentials_management_screen_divider.xml | 2 +- ...l_credentials_management_screen_header.xml | 2 +- ...fill_credentials_picker_domain_divider.xml | 2 +- ...fill_credentials_picker_primary_button.xml | 2 +- ...ll_credentials_picker_secondary_button.xml | 2 +- .../res/layout/item_row_search_no_results.xml | 2 +- .../res/layout/overflow_menu_list_item.xml | 2 +- .../AutofillInternalSettingsActivity.kt | 6 +- .../activity_autofill_internal_settings.xml | 12 +- .../browser/api/UserBrowserProperties.kt | 2 +- .../internal/ThemesPreviewInternalFeature.kt | 2 +- common/common-ui/build.gradle | 2 +- common/common-ui/lint-baseline.xml | 14 +-- common/common-ui/src/main/AndroidManifest.xml | 4 +- .../ui}/DuckDuckGoActivity.kt | 12 +- .../ui}/DuckDuckGoFragment.kt | 2 +- .../{mobile/android => common}/ui/Theming.kt | 20 ++-- .../android => common}/ui/menu/PopupMenu.kt | 2 +- .../ui/notifyme/NotifyMeView.kt | 39 ++++--- .../ui/notifyme/NotifyMeViewModel.kt | 25 ++-- .../ui/recyclerviewext/StickyHeaders.kt | 2 +- .../StickyHeadersLinearLayoutManager.kt | 4 +- .../ui/spans/DuckDuckGoClickableSpan.kt | 2 +- .../android => common}/ui/store/AppTheme.kt | 4 +- .../ui/store/ThemingDataStore.kt | 4 +- .../ui/store/ThemingSharedPreferences.kt | 4 +- .../ui/store/notifyme/NotifyMeDataStore.kt | 2 +- .../notifyme/NotifyMeSharedPreferences.kt | 4 +- .../themepreview/ui/AppComponentsActivity.kt | 12 +- .../ui/AppComponentsPagerAdapter.kt | 89 ++++++++++++++ .../themepreview/ui/component/Component.kt | 2 +- .../ui/component/ComponentAdapter.kt | 4 +- .../ui/component/ComponentFragment.kt | 6 +- .../ui/component/ComponentOtherFragment.kt | 4 +- .../ui/component/ComponentViewHolder.kt | 110 ++++++++++-------- .../buttons/ComponentButtonsFragment.kt | 8 +- .../ComponentInteractiveElementsFragment.kt | 8 +- .../cards/ComponentLayoutsFragment.kt | 10 +- .../ComponentListItemsElementsFragment.kt | 16 +-- .../navigation/ComponentMessagingFragment.kt | 8 +- .../textinput/ComponentTextInputFragment.kt | 10 +- .../ui/dialogs/DialogsFragment.kt | 20 ++-- .../ui/palette/ColorPaletteFragment.kt | 6 +- .../ui/typography/TypographyFragment.kt | 10 +- .../ui/widget/ColorAttributeView.kt | 6 +- .../themepreview/ui/widget/ColorDotView.kt | 6 +- .../android => common}/ui/view/Chip.kt | 2 +- .../android => common}/ui/view/DaxDialog.kt | 8 +- .../android => common}/ui/view/InfoPanel.kt | 8 +- .../ui/view/KeyboardAwareEditText.kt | 2 +- .../ui/view/LottieDaxDialog.kt | 8 +- .../ui/view/MenuItemView.kt | 8 +- .../android => common}/ui/view/MessageCta.kt | 10 +- .../ui/view/PopupMenuItemView.kt | 8 +- .../android => common}/ui/view/SearchBar.kt | 8 +- .../ui/view/SkeletonView.kt | 4 +- .../android => common}/ui/view/SwitchView.kt | 2 +- .../ui/view/TextExtensions.kt | 6 +- .../ui/view/TextViewExtension.kt | 2 +- .../ui/view/TypeAnimationTextView.kt | 2 +- .../ui/view/TypedArrayUtils.kt | 4 +- .../ui/view/ViewExtension.kt | 2 +- .../ui/view/button/DaxButton.kt | 6 +- .../ui/view/button/DaxButtonDestructive.kt | 4 +- .../ui/view/button/DaxButtonGhost.kt | 4 +- .../view/button/DaxButtonGhostDestructive.kt | 4 +- .../ui/view/button/DaxButtonPrimary.kt | 4 +- .../ui/view/button/DaxButtonSecondary.kt | 4 +- .../ui/view/button/IconButton.kt | 4 +- .../ui/view/button/RadioButton.kt | 4 +- .../ui/view/dialog/ActionBottomSheetDialog.kt | 6 +- .../ui/view/dialog/BackKeyListener.kt | 2 +- .../view/dialog/CustomAlertDialogBuilder.kt | 6 +- .../ui/view/dialog/DaxAlertDialog.kt | 2 +- .../ui/view/dialog/PromoBottomSheetDialog.kt | 6 +- .../dialog/RadioListAlertDialogBuilder.kt | 16 +-- .../view/dialog/StackedAlertDialogBuilder.kt | 12 +- .../ui/view/dialog/TextAlertDialogBuilder.kt | 12 +- .../ui/view/divider/HorizontalDivider.kt | 8 +- .../ui/view/divider/VerticalDivider.kt | 8 +- .../ui/view/expand/DaxExpandableMenu.kt | 4 +- .../ui/view/expand/DaxExpandableMenuDsl.kt | 2 +- .../ui/view/expand/DaxExpandableMenuItem.kt | 18 +-- .../view/expand/DaxExpandableMenuItemDsl.kt | 2 +- .../view/expand/OnExpandedChangedListener.kt | 2 +- .../ui/view/listitem/DaxListItem.kt | 18 +-- .../ui/view/listitem/OneLineListItem.kt | 22 ++-- .../ui/view/listitem/SectionHeaderListItem.kt | 12 +- .../ui/view/listitem/TwoLineListItem.kt | 22 ++-- .../ui/view/shape/DaxBubbleCardView.kt | 6 +- .../ui/view/shape/Shapes.kt | 2 +- .../ui/view/text/DaxTextInput.kt | 22 ++-- .../ui/view/text/DaxTextView.kt | 12 +- .../ActivityViewBindingDelegate.kt | 2 +- .../FragmentViewBindingDelegate.kt | 2 +- .../ui/viewbinding/ViewBindingDelegate.kt | 2 +- .../ui/AppComponentsPagerAdapter.kt | 79 ------------- .../layout-land/view_dax_dialog_animated.xml | 10 +- .../res/layout/activity_app_components.xml | 4 +- .../main/res/layout/bottom_sheet_action.xml | 6 +- .../main/res/layout/bottom_sheet_promo.xml | 8 +- .../src/main/res/layout/component_buttons.xml | 38 +++--- .../src/main/res/layout/component_card.xml | 14 +-- .../main/res/layout/component_checkbox.xml | 2 +- .../layout/component_expandable_layout.xml | 22 ++-- .../main/res/layout/component_info_panel.xml | 6 +- .../main/res/layout/component_menu_item.xml | 4 +- .../res/layout/component_one_line_item.xml | 28 ++--- .../res/layout/component_radio_button.xml | 2 +- .../res/layout/component_remote_message.xml | 14 +-- .../main/res/layout/component_search_bar.xml | 4 +- .../res/layout/component_section_divider.xml | 20 ++-- .../layout/component_section_header_item.xml | 4 +- .../src/main/res/layout/component_slider.xml | 2 +- .../main/res/layout/component_snackbar.xml | 2 +- .../src/main/res/layout/component_switch.xml | 6 +- .../res/layout/component_text_input_view.xml | 26 ++--- .../main/res/layout/component_top_app_bar.xml | 2 +- .../res/layout/component_two_line_item.xml | 38 +++--- .../main/res/layout/dialog_custom_alert.xml | 8 +- .../res/layout/dialog_single_choice_alert.xml | 12 +- .../main/res/layout/dialog_stacked_alert.xml | 4 +- .../src/main/res/layout/dialog_text_alert.xml | 12 +- .../fragment_components_color_palette.xml | 26 ++--- .../layout/fragment_components_dialogs.xml | 48 ++++---- .../layout/fragment_components_typography.xml | 62 +++++----- .../res/layout/row_one_line_list_item.xml | 2 +- .../src/main/res/layout/row_two_line_item.xml | 2 +- .../src/main/res/layout/view_chip.xml | 2 +- .../src/main/res/layout/view_dax_dialog.xml | 14 +-- .../res/layout/view_dax_dialog_animated.xml | 14 +-- .../main/res/layout/view_dax_text_input.xml | 2 +- .../res/layout/view_expandable_menu_item.xml | 6 +- ...andable_menu_item_expanded_layout_demo.xml | 6 +- .../view_expandable_option_sync_child.xml | 4 +- .../view_expandable_option_sync_parent.xml | 2 +- .../src/main/res/layout/view_info_panel.xml | 2 +- .../layout/view_layout_color_attribute.xml | 4 +- .../src/main/res/layout/view_layout_label.xml | 2 +- .../src/main/res/layout/view_menu_item.xml | 2 +- .../main/res/layout/view_notify_me_view.xml | 6 +- .../res/layout/view_one_line_list_item.xml | 4 +- .../main/res/layout/view_popup_menu_item.xml | 2 +- .../res/layout/view_promo_message_cta.xml | 6 +- .../res/layout/view_remote_message_cta.xml | 10 +- .../src/main/res/layout/view_search_bar.xml | 6 +- .../main/res/layout/view_section_header.xml | 2 +- .../layout/view_section_header_list_item.xml | 4 +- .../main/res/layout/view_two_line_item.xml | 6 +- .../ui/notifyme/NotifyMeViewModelTest.kt | 5 +- .../lint/ui/DaxButtonStylingDetector.kt | 10 +- .../lint/ui/DaxTextViewStylingDetector.kt | 2 +- .../lint/ui/DesignSystemLintExtensions.kt | 26 ++--- .../lint/ui/SkeletonViewBackgroundDetector.kt | 2 +- .../lint/ui/DaxButtonStylingDetectorTest.kt | 30 ++--- .../lint/ui/DaxTextViewStylingDetectorTest.kt | 26 ++--- ...atedAndroidWidgetsUsedInXmlDetectorTest.kt | 4 +- ...liedToDesignSystemComponentDetectorTest.kt | 14 +-- .../duckduckgo/macos_impl/MacOsActivity.kt | 4 +- .../src/main/res/layout/activity_macos.xml | 10 +- .../impl/about/AboutQAItemView.kt | 2 +- .../impl/about/NetPTermsActivity.kt | 4 +- .../impl/about/NetpAboutVpnActivity.kt | 4 +- .../impl/about/NetpFaqActivity.kt | 4 +- .../alerts/NetPAlertNotificationBuilder.kt | 6 +- .../exclusion/ui/AppExclusionListAdapter.kt | 4 +- .../ui/ManuallyDisableAppProtectionDialog.kt | 2 +- .../ui/NetpAppExclusionListActivity.kt | 8 +- .../ui/RestoreDefaultProtectionDialog.kt | 2 +- .../NetworkProtectionManagementActivity.kt | 14 +-- ...NetworkProtectionAlwaysOnDialogFragment.kt | 4 +- .../NetPDisabledNotificationBuilder.kt | 4 +- .../NetPNotificationSettingsActivity.kt | 6 +- .../impl/settings/NetPVpnSettingsActivity.kt | 4 +- .../geoswitching/NetpGeoswitchingActivity.kt | 4 +- .../geoswitching/NetpGeoswitchingAdapter.kt | 4 +- ...etpGeoswitchingCityChoiceDialogFragment.kt | 10 +- .../settings/geoswitching/RadioListItem.kt | 18 +-- .../impl/waitlist/NetPWaitlistActivity.kt | 8 +- .../waitlist/NetPWaitlistCodeNotification.kt | 4 +- .../waitlist/NetPWaitlistInvitedActivity.kt | 8 +- .../NetPWaitlistRedeemCodeActivity.kt | 6 +- .../impl/waitlist/WaitlistCheckListItem.kt | 10 +- .../res/layout/activity_netp_management.xml | 10 +- .../activity_netp_notification_settings.xml | 4 +- .../main/res/layout/activity_netp_terms.xml | 2 +- .../res/layout/activity_netp_vpn_settings.xml | 8 +- .../res/layout/activity_netp_waitlist.xml | 12 +- .../layout/activity_netp_waitlist_invited.xml | 10 +- .../activity_netp_waitlist_redeem_code.xml | 4 +- .../res/layout/dialog_geoswitching_city.xml | 4 +- .../main/res/layout/dialog_netp_always_on.xml | 8 +- .../dialog_netp_manually_disable_app.xml | 8 +- .../layout/dialog_netp_restore_defaults.xml | 8 +- .../src/main/res/layout/item_about_qa.xml | 4 +- .../res/layout/item_exclusion_list_app.xml | 2 +- .../res/layout/item_exclusion_list_filter.xml | 2 +- .../res/layout/item_exclusion_list_header.xml | 4 +- .../res/layout/item_geoswitching_divider.xml | 2 +- .../res/layout/item_geoswitching_header.xml | 2 +- .../layout/popup_exclusion_list_filter.xml | 6 +- .../src/main/res/layout/section_about.xml | 6 +- .../res/layout/section_connection_details.xml | 6 +- .../src/main/res/layout/section_settings.xml | 8 +- ...w_app_exclusion_list_app_item_skeleton.xml | 4 +- .../main/res/layout/view_radio_list_item.xml | 8 +- .../layout/view_waitlist_check_list_item.xml | 4 +- .../feature/NetPEnvironmentSettingActivity.kt | 8 +- .../feature/NetPInternalSettingsActivity.kt | 8 +- .../NetPSystemAppsExclusionListActivity.kt | 4 +- .../feature/system_apps/SystemAppView.kt | 2 +- .../activity_netp_env_internal_settings.xml | 8 +- .../activity_netp_internal_settings.xml | 30 ++--- ...ty_netp_internal_system_apps_exclusion.xml | 2 +- .../src/main/res/layout/system_app_view.xml | 2 +- .../ui/NetpVerifySubscriptionActivity.kt | 4 +- .../res/layout/activity_netp_verify_subs.xml | 2 +- .../PrivacyConfigInternalSettingsActivity.kt | 12 +- ...ivity_privacy_config_internal_settings.xml | 20 ++-- .../impl/ui/PrivacyDashboardHybridActivity.kt | 6 +- .../impl/matchers/UserAttributeMatcherTest.kt | 2 +- .../SitePermissionsDialogActivityLauncher.kt | 4 +- .../settings/plugins/SubsSettingsPlugins.kt | 2 +- .../impl/settings/views/ProSettingBuyView.kt | 2 +- .../impl/settings/views/ProSettingView.kt | 2 +- .../impl/ui/AddDeviceActivity.kt | 4 +- .../impl/ui/RestoreSubscriptionActivity.kt | 6 +- .../impl/ui/SubscriptionSettingsActivity.kt | 6 +- .../impl/ui/SubscriptionsActivity.kt | 13 +-- .../impl/ui/SubscriptionsWebViewActivity.kt | 4 +- .../main/res/layout/activity_add_device.xml | 14 +-- .../layout/activity_restore_subscription.xml | 14 +-- .../layout/activity_subscription_settings.xml | 20 ++-- .../res/layout/activity_subscriptions.xml | 18 +-- .../src/main/res/layout/view_settings.xml | 2 +- .../src/main/res/layout/view_settings_buy.xml | 2 +- .../duckduckgo/sync/impl/RecoveryCodePDF.kt | 2 +- .../sync/impl/ui/EnterCodeActivity.kt | 8 +- .../sync/impl/ui/ShowCodeActivity.kt | 4 +- .../sync/impl/ui/ShowQRCodeActivity.kt | 6 +- .../duckduckgo/sync/impl/ui/SyncActivity.kt | 12 +- .../sync/impl/ui/SyncConnectActivity.kt | 8 +- .../impl/ui/SyncInternalSettingsActivity.kt | 8 +- .../sync/impl/ui/SyncLoginActivity.kt | 4 +- .../sync/impl/ui/SyncedDevicesAdapter.kt | 6 +- .../impl/ui/setup/SaveRecoveryCodeFragment.kt | 12 +- .../impl/ui/setup/SetupAccountActivity.kt | 4 +- .../ui/setup/SyncCreateAccountFragment.kt | 4 +- .../ui/setup/SyncDeviceConnectedFragment.kt | 4 +- .../main/res/layout/activity_connect_sync.xml | 6 +- .../main/res/layout/activity_enter_code.xml | 10 +- .../activity_internal_sync_settings.xml | 56 ++++----- .../main/res/layout/activity_login_sync.xml | 4 +- .../main/res/layout/activity_show_code.xml | 10 +- .../main/res/layout/activity_show_qr_code.xml | 4 +- .../main/res/layout/dialog_edit_device.xml | 2 +- .../res/layout/fragment_create_account.xml | 12 +- .../res/layout/fragment_device_connected.xml | 14 +-- .../res/layout/fragment_recovery_code.xml | 20 ++-- .../main/res/layout/item_connected_device.xml | 4 +- .../src/main/res/layout/item_sync_device.xml | 4 +- .../res/layout/item_sync_device_loading.xml | 4 +- .../layout/popup_windows_edit_device_menu.xml | 2 +- .../popup_windows_remove_device_menu.xml | 2 +- .../main/res/layout/view_recovery_code.xml | 26 ++--- .../layout/view_square_decorated_barcode.xml | 6 +- .../main/res/layout/view_sync_disabled.xml | 20 ++-- .../src/main/res/layout/view_sync_enabled.xml | 32 ++--- .../VoiceSearchPermissionDialogsLauncher.kt | 2 +- .../impl/listeningmode/VoiceSearchActivity.kt | 4 +- .../ui/VoiceRecognizingIndicator.kt | 2 +- .../res/layout-land/activity_voice_search.xml | 4 +- .../main/res/layout/activity_voice_search.xml | 4 +- .../windows/impl/ui/WindowsActivity.kt | 4 +- .../src/main/res/layout/activity_windows.xml | 10 +- 547 files changed, 2097 insertions(+), 2035 deletions(-) rename common/common-ui/src/main/java/com/duckduckgo/{app/global => common/ui}/DuckDuckGoActivity.kt (90%) rename common/common-ui/src/main/java/com/duckduckgo/{app/global => common/ui}/DuckDuckGoFragment.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/Theming.kt (86%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/menu/PopupMenu.kt (98%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/notifyme/NotifyMeView.kt (88%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/notifyme/NotifyMeViewModel.kt (82%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/recyclerviewext/StickyHeaders.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/recyclerviewext/StickyHeadersLinearLayoutManager.kt (99%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/spans/DuckDuckGoClickableSpan.kt (95%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/store/AppTheme.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/store/ThemingDataStore.kt (87%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/store/ThemingSharedPreferences.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/store/notifyme/NotifyMeDataStore.kt (93%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/store/notifyme/NotifyMeSharedPreferences.kt (91%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/AppComponentsActivity.kt (90%) create mode 100644 common/common-ui/src/main/java/com/duckduckgo/common/ui/themepreview/ui/AppComponentsPagerAdapter.kt rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/Component.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/ComponentAdapter.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/ComponentFragment.kt (91%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/ComponentOtherFragment.kt (88%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/ComponentViewHolder.kt (79%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/buttons/ComponentButtonsFragment.kt (74%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/buttons/ComponentInteractiveElementsFragment.kt (77%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/cards/ComponentLayoutsFragment.kt (68%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/listitems/ComponentListItemsElementsFragment.kt (55%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/navigation/ComponentMessagingFragment.kt (74%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/component/textinput/ComponentTextInputFragment.kt (88%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/dialogs/DialogsFragment.kt (97%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/palette/ColorPaletteFragment.kt (88%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/typography/TypographyFragment.kt (83%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/widget/ColorAttributeView.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common/ui}/themepreview/ui/widget/ColorDotView.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/Chip.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/DaxDialog.kt (97%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/InfoPanel.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/KeyboardAwareEditText.kt (98%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/LottieDaxDialog.kt (97%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/MenuItemView.kt (90%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/MessageCta.kt (93%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/PopupMenuItemView.kt (88%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/SearchBar.kt (93%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/SkeletonView.kt (93%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/SwitchView.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/TextExtensions.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/TextViewExtension.kt (95%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/TypeAnimationTextView.kt (98%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/TypedArrayUtils.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/ViewExtension.kt (99%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/DaxButton.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/DaxButtonDestructive.kt (90%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/DaxButtonGhost.kt (90%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/DaxButtonGhostDestructive.kt (90%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/DaxButtonPrimary.kt (90%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/DaxButtonSecondary.kt (90%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/IconButton.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/button/RadioButton.kt (91%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/ActionBottomSheetDialog.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/BackKeyListener.kt (95%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/CustomAlertDialogBuilder.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/DaxAlertDialog.kt (93%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/PromoBottomSheetDialog.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/RadioListAlertDialogBuilder.kt (95%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/StackedAlertDialogBuilder.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/dialog/TextAlertDialogBuilder.kt (96%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/divider/HorizontalDivider.kt (88%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/divider/VerticalDivider.kt (87%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/expand/DaxExpandableMenu.kt (95%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/expand/DaxExpandableMenuDsl.kt (92%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/expand/DaxExpandableMenuItem.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/expand/DaxExpandableMenuItemDsl.kt (92%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/expand/OnExpandedChangedListener.kt (93%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/listitem/DaxListItem.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/listitem/OneLineListItem.kt (84%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/listitem/SectionHeaderListItem.kt (89%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/listitem/TwoLineListItem.kt (86%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/shape/DaxBubbleCardView.kt (91%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/shape/Shapes.kt (98%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/text/DaxTextInput.kt (94%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/view/text/DaxTextView.kt (93%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/viewbinding/ActivityViewBindingDelegate.kt (97%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/viewbinding/FragmentViewBindingDelegate.kt (98%) rename common/common-ui/src/main/java/com/duckduckgo/{mobile/android => common}/ui/viewbinding/ViewBindingDelegate.kt (97%) delete mode 100644 common/common-ui/src/main/java/com/duckduckgo/mobile/android/themepreview/ui/AppComponentsPagerAdapter.kt rename common/common-ui/src/test/java/com/duckduckgo/{mobile/android => common}/ui/notifyme/NotifyMeViewModelTest.kt (98%) diff --git a/anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributeToActivityStarterCodeGenerator.kt b/anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributeToActivityStarterCodeGenerator.kt index 97b72a3bbf02..ec47cf6aa801 100644 --- a/anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributeToActivityStarterCodeGenerator.kt +++ b/anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributeToActivityStarterCodeGenerator.kt @@ -131,6 +131,6 @@ class ContributeToActivityStarterCodeGenerator : CodeGenerator { private val paramToActivityMapperFqName = FqName("com.duckduckgo.navigation.api.GlobalActivityStarter.ParamToActivityMapper") private val activityParamsFqName = FqName("com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams") private val appCompatActivityFqName = FqName("androidx.appcompat.app.AppCompatActivity") - private val duckduckgoActivityFqName = FqName("com.duckduckgo.app.global.DuckDuckGoActivity") + private val duckduckgoActivityFqName = FqName("com.duckduckgo.common.ui.DuckDuckGoActivity") } } diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ExclusionListAdapter.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ExclusionListAdapter.kt index d8687c39b3a1..3d64ba91a4d3 100644 --- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ExclusionListAdapter.kt +++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ExclusionListAdapter.kt @@ -24,9 +24,9 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.duckduckgo.app.global.extensions.safeGetApplicationIcon -import com.duckduckgo.mobile.android.ui.view.gone -import com.duckduckgo.mobile.android.ui.view.quietlySetIsChecked -import com.duckduckgo.mobile.android.ui.view.show +import com.duckduckgo.common.ui.view.gone +import com.duckduckgo.common.ui.view.quietlySetIsChecked +import com.duckduckgo.common.ui.view.show import com.duckduckgo.mobile.android.vpn.R import com.duckduckgo.mobile.android.vpn.apps.AppsProtectionType import com.duckduckgo.mobile.android.vpn.apps.AppsProtectionType.AppInfoType @@ -166,7 +166,7 @@ class ExclusionListAdapter(val listener: ExclusionListListener) : ) { when (bannerContent) { BannerContent.ALL_OR_PROTECTED_APPS -> binding.excludedAppsEnabledVPNLabel.apply { - setImageResource(com.duckduckgo.mobile.android.R.drawable.ic_info_panel_info) + setImageResource(com.duckduckgo.common.ui.R.drawable.ic_info_panel_info) setClickableLink( TrackingProtectionExclusionListActivity.LEARN_WHY_ANNOTATION, context.resources.getText(R.string.atp_ExcludedAppsEnabledLearnWhyLabel), @@ -174,7 +174,7 @@ class ExclusionListAdapter(val listener: ExclusionListListener) : } BannerContent.UNPROTECTED_APPS -> binding.excludedAppsEnabledVPNLabel.apply { - setImageResource(com.duckduckgo.mobile.android.R.drawable.ic_info_panel_info) + setImageResource(com.duckduckgo.common.ui.R.drawable.ic_info_panel_info) setClickableLink( TrackingProtectionExclusionListActivity.LEARN_WHY_ANNOTATION, context.resources.getText(R.string.atp_ExcludedAppsDisabledLearnWhyLabel), @@ -182,7 +182,7 @@ class ExclusionListAdapter(val listener: ExclusionListListener) : } BannerContent.CUSTOMISED_PROTECTION -> binding.excludedAppsEnabledVPNLabel.apply { - setImageResource(com.duckduckgo.mobile.android.R.drawable.ic_info_panel_link) + setImageResource(com.duckduckgo.common.ui.R.drawable.ic_info_panel_link) setText(context.resources.getString(R.string.atp_ExcludedAppsEnabledLabel)) } } diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManageRecentAppsProtectionActivity.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManageRecentAppsProtectionActivity.kt index b46b6ede16bd..f989b0834c6f 100644 --- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManageRecentAppsProtectionActivity.kt +++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManageRecentAppsProtectionActivity.kt @@ -25,12 +25,12 @@ import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import com.duckduckgo.anvil.annotations.InjectWith import com.duckduckgo.app.di.AppCoroutineScope -import com.duckduckgo.app.global.DuckDuckGoActivity +import com.duckduckgo.common.ui.DuckDuckGoActivity import com.duckduckgo.di.scopes.ActivityScope -import com.duckduckgo.mobile.android.ui.view.addClickableLink -import com.duckduckgo.mobile.android.ui.view.gone -import com.duckduckgo.mobile.android.ui.view.show -import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding +import com.duckduckgo.common.ui.view.addClickableLink +import com.duckduckgo.common.ui.view.gone +import com.duckduckgo.common.ui.view.show +import com.duckduckgo.common.ui.viewbinding.viewBinding import com.duckduckgo.mobile.android.vpn.AppTpVpnFeature import com.duckduckgo.mobile.android.vpn.R import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt index 8531494913e7..81ec4de3f501 100644 --- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt +++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt @@ -59,7 +59,7 @@ class ManuallyDisableAppProtectionDialog : DialogFragment() { val reportCTA = rootView.findViewById