From 3dfe5de15a714c315d124656f2bbc9bc62afd967 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 12 Dec 2024 11:07:00 -0500 Subject: [PATCH 1/7] First pass at removing LocaleAwareActivity.kt --- .../android/designsystem/DesignSystemActivity.kt | 4 ++-- .../android/ui/AddQuickPressShortcutActivity.java | 2 +- .../org/wordpress/android/ui/AppLogViewerActivity.java | 2 +- .../android/ui/JetpackConnectionResultActivity.java | 2 +- .../org/wordpress/android/ui/LocaleAwareActivity.kt | 2 +- .../android/ui/ShareIntentReceiverActivity.java | 2 +- .../java/org/wordpress/android/ui/WPLaunchActivity.kt | 2 +- .../java/org/wordpress/android/ui/WebViewActivity.java | 2 +- .../wordpress/android/ui/about/UnifiedAboutActivity.kt | 4 ++-- .../org/wordpress/android/ui/accounts/HelpActivity.kt | 4 ++-- .../wordpress/android/ui/accounts/LoginActivity.java | 8 ++++---- .../android/ui/accounts/LoginEpilogueActivity.java | 4 ++-- .../ui/accounts/LoginMagicLinkInterceptActivity.java | 4 ++-- .../ui/accounts/PostSignupInterstitialActivity.kt | 4 ++-- .../android/ui/accounts/SignupEpilogueActivity.java | 4 ++-- .../ui/activitylog/detail/ActivityLogDetailActivity.kt | 4 ++-- .../ui/activitylog/list/ActivityLogListActivity.kt | 4 ++-- .../blazecampaigns/BlazeCampaignParentActivity.kt | 4 ++-- .../blaze/blazepromote/BlazePromoteParentActivity.kt | 4 ++-- .../promptslist/BloggingPromptsListActivity.kt | 4 ++-- .../android/ui/comments/CommentsDetailActivity.java | 8 ++++---- .../ui/comments/unified/UnifiedCommentsActivity.kt | 4 ++-- .../comments/unified/UnifiedCommentsDetailsActivity.kt | 4 ++-- .../ui/comments/unified/UnifiedCommentsEditActivity.kt | 4 ++-- .../android/ui/debug/DebugSettingsActivity.kt | 4 ++-- .../android/ui/debug/cookies/DebugCookiesActivity.kt | 4 ++-- .../deeplinks/DeepLinkingIntentReceiverActivity.java | 8 ++++---- .../android/ui/domains/DomainRegistrationActivity.kt | 4 ++-- .../android/ui/domains/DomainsDashboardActivity.kt | 4 ++-- .../android/ui/engagement/EngagedPeopleListActivity.kt | 4 ++-- .../android/ui/history/HistoryDetailActivity.kt | 4 ++-- .../jetpack/backup/download/BackupDownloadActivity.kt | 4 ++-- .../android/ui/jetpack/restore/RestoreActivity.kt | 4 ++-- .../remoteplugin/JetpackRemoteInstallActivity.kt | 4 ++-- .../wordpress/android/ui/main/ChooseSiteActivity.kt | 4 ++-- .../java/org/wordpress/android/ui/main/MeActivity.kt | 4 ++-- .../org/wordpress/android/ui/main/WPMainActivity.java | 4 ++-- .../ui/main/feedbackform/FeedbackFormActivity.kt | 4 ++-- .../jetpack/migration/JetpackMigrationViewModel.kt | 2 +- .../android/ui/media/MediaBrowserActivity.java | 4 ++-- .../android/ui/media/MediaPreviewActivity.java | 4 ++-- .../android/ui/media/MediaSettingsActivity.java | 4 ++-- .../android/ui/mediapicker/MediaPickerActivity.kt | 4 ++-- .../ui/notifications/NotificationsDetailActivity.java | 8 ++++---- .../wordpress/android/ui/pages/PageParentActivity.kt | 4 ++-- .../org/wordpress/android/ui/pages/PagesActivity.kt | 4 ++-- .../android/ui/people/PeopleManagementActivity.java | 4 ++-- .../android/ui/photopicker/PhotoPickerActivity.java | 4 ++-- .../org/wordpress/android/ui/plans/PlansActivity.kt | 4 ++-- .../android/ui/plugins/PluginBrowserActivity.java | 4 ++-- .../android/ui/plugins/PluginDetailActivity.java | 4 ++-- .../org/wordpress/android/ui/posts/EditPostActivity.kt | 4 ++-- .../android/ui/posts/PostSettingsTagsActivity.java | 4 ++-- .../wordpress/android/ui/posts/PostsListActivity.kt | 4 ++-- .../android/ui/posts/SelectCategoriesActivity.java | 4 ++-- .../android/ui/prefs/AccountSettingsActivity.java | 4 ++-- .../wordpress/android/ui/prefs/AppSettingsActivity.kt | 4 ++-- .../android/ui/prefs/BlogPreferencesActivity.java | 4 ++-- .../wordpress/android/ui/prefs/MyProfileActivity.java | 4 ++-- .../android/ui/prefs/SiteSettingsTagListActivity.java | 4 ++-- .../prefs/categories/detail/CategoryDetailActivity.kt | 4 ++-- .../ui/prefs/categories/list/CategoriesListActivity.kt | 4 ++-- .../notifications/NotificationsSettingsActivity.kt | 4 ++-- .../android/ui/publicize/PublicizeListActivity.java | 4 ++-- .../android/ui/qrcodeauth/QRCodeAuthActivity.kt | 4 ++-- .../android/ui/reader/ReaderCommentListActivity.java | 10 +++++----- .../android/ui/reader/ReaderPhotoViewerActivity.java | 4 ++-- .../android/ui/reader/ReaderPostListActivity.java | 4 ++-- .../android/ui/reader/ReaderPostPagerActivity.java | 8 ++++---- .../android/ui/reader/ReaderSearchActivity.kt | 4 ++-- .../android/ui/reader/ReaderSubsActivity.java | 4 ++-- .../android/ui/reader/ReaderUserListActivity.java | 4 ++-- .../android/ui/reader/ReaderVideoViewerActivity.java | 4 ++-- .../discover/interests/ReaderInterestsActivity.kt | 4 ++-- .../ui/selfhostedusers/SelfHostedUsersActivity.kt | 4 ++-- .../android/ui/sitecreation/SiteCreationActivity.kt | 4 ++-- .../android/ui/stats/StatsConnectJetpackActivity.kt | 4 ++-- .../android/ui/stats/refresh/StatsActivity.kt | 4 ++-- .../android/ui/stats/refresh/StatsViewAllActivity.kt | 4 ++-- .../stats/refresh/lists/detail/StatsDetailActivity.kt | 4 ++-- .../insights/management/InsightsManagementActivity.kt | 4 ++-- .../alltime/StatsAllTimeWidgetConfigureActivity.kt | 4 ++-- .../minified/StatsMinifiedWidgetConfigureActivity.kt | 4 ++-- .../widget/today/StatsTodayWidgetConfigureActivity.kt | 4 ++-- .../widget/views/StatsViewsWidgetConfigureActivity.kt | 4 ++-- .../widget/weeks/StatsWeekWidgetConfigureActivity.kt | 4 ++-- .../ui/stockmedia/StockMediaPickerActivity.java | 6 +++--- .../android/ui/suggestion/SuggestionActivity.kt | 4 ++-- .../android/ui/themes/ThemeBrowserActivity.java | 4 ++-- 89 files changed, 184 insertions(+), 184 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt index cdfca9f87357..4266ff70ae13 100644 --- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt @@ -5,10 +5,10 @@ import android.os.Bundle import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.util.extensions.setContent -class DesignSystemActivity : LocaleAwareActivity() { +class DesignSystemActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java index dcaa0d31f6d5..563b9fb1cb92 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java @@ -44,7 +44,7 @@ import javax.inject.Inject; -public class AddQuickPressShortcutActivity extends LocaleAwareActivity { +public class AddQuickPressShortcutActivity extends AppCompatActivity { public String[] blogNames; public int[] siteIds; public String[] blogUrls; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java index 3ec77481e49c..1cbf808b91dc 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java @@ -35,7 +35,7 @@ /** * views the activity log (see utils/AppLog.java) */ -public class AppLogViewerActivity extends LocaleAwareActivity { +public class AppLogViewerActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java index f83839062fbc..2f3c1432046e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java @@ -39,7 +39,7 @@ *

* Redirects users to the stats activity if the jetpack connection was succesful */ -public class JetpackConnectionResultActivity extends LocaleAwareActivity { +public class JetpackConnectionResultActivity extends AppCompatActivity { private static final String ALREADY_CONNECTED = "already-connected"; private static final String REASON_PARAM = "reason"; private static final String SOURCE_PARAM = "source"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt index 15afe4f33862..1e5f793112b9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt @@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity * the need for this class. Instead of extending from this class, we should extend * from AppCompatActivity. */ -abstract class LocaleAwareActivity : AppCompatActivity() { +abstract class AppCompatActivity : AppCompatActivity() { /** * Used to update locales on API 21 to API 25. */ diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java index 28edf0b25bab..c856e10d5118 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java @@ -43,7 +43,7 @@ * Moreover it lists what actions the user can perform and redirects the user to the activity, * along with the content passed in the intent. */ -public class ShareIntentReceiverActivity extends LocaleAwareActivity implements ShareIntentFragmentListener { +public class ShareIntentReceiverActivity extends AppCompatActivity implements ShareIntentFragmentListener { private static final String SHARE_LAST_USED_BLOG_ID_KEY = "wp-settings-share-last-used-text-blogid"; private static final String KEY_SELECTED_SITE_LOCAL_ID = "KEY_SELECTED_SITE_LOCAL_ID"; private static final String KEY_SHARE_ACTION_ID = "KEY_SHARE_ACTION_ID"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt index 79ad71aaca2b..2dd91a1b440a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt @@ -12,7 +12,7 @@ import org.wordpress.android.util.ProfilingUtils import org.wordpress.android.util.ToastUtils @SuppressLint("CustomSplashScreen") -class WPLaunchActivity : LocaleAwareActivity() { +class WPLaunchActivity : AppCompatActivity() { /* * this the main (default) activity, which does nothing more than launch the * previously active activity on startup - note that it's defined in the diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java index c71e716e6f3d..92a3c9af3b46 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java @@ -25,7 +25,7 @@ /** * Basic activity for displaying a WebView. */ -public abstract class WebViewActivity extends LocaleAwareActivity { +public abstract class WebViewActivity extends AppCompatActivity { /** * Primary webview used to display content. */ diff --git a/WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutActivity.kt index 0d79d353b1dd..da3f5ae91f47 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutActivity.kt @@ -5,13 +5,13 @@ import com.automattic.about.model.AboutConfigProvider import org.wordpress.android.R import org.wordpress.android.WordPress import org.wordpress.android.ui.ActivityLauncher -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.about.UnifiedAboutNavigationAction.Dismiss import org.wordpress.android.ui.about.UnifiedAboutNavigationAction.OpenBlog import org.wordpress.android.viewmodel.observeEvent import javax.inject.Inject -class UnifiedAboutActivity : LocaleAwareActivity(), AboutConfigProvider { +class UnifiedAboutActivity : AppCompatActivity(), AboutConfigProvider { @Inject lateinit var viewModel: UnifiedAboutViewModel diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt index 373d3ebac9bc..058631609ba1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt @@ -35,7 +35,7 @@ import org.wordpress.android.support.ZendeskHelper import org.wordpress.android.ui.ActivityId import org.wordpress.android.ui.ActivityLauncher import org.wordpress.android.ui.AppLogViewerActivity -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.debug.DebugSettingsActivity import org.wordpress.android.ui.main.utils.MeGravatarLoader import org.wordpress.android.ui.prefs.AppPrefs @@ -50,7 +50,7 @@ import javax.inject.Inject import android.R as AndroidR @AndroidEntryPoint -class HelpActivity : LocaleAwareActivity() { +class HelpActivity : AppCompatActivity() { @Inject lateinit var accountStore: AccountStore diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java index bb4aee4850b8..c57298505ded 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java @@ -9,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -49,7 +50,6 @@ import org.wordpress.android.support.ZendeskHelper; import org.wordpress.android.ui.ActivityLauncher; import org.wordpress.android.ui.JetpackConnectionSource; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.accounts.HelpActivity.Origin; import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowNoJetpackSites; @@ -87,15 +87,15 @@ import javax.inject.Inject; +import static org.wordpress.android.util.ActivityUtils.hideKeyboard; + import dagger.android.AndroidInjector; import dagger.android.DispatchingAndroidInjector; import dagger.android.HasAndroidInjector; import dagger.hilt.android.AndroidEntryPoint; -import static org.wordpress.android.util.ActivityUtils.hideKeyboard; - @AndroidEntryPoint -public class LoginActivity extends LocaleAwareActivity implements ConnectionCallbacks, OnConnectionFailedListener, +public class LoginActivity extends AppCompatActivity implements ConnectionCallbacks, OnConnectionFailedListener, Callback, LoginListener, GoogleListener, LoginPrologueListener, HasAndroidInjector, BasicDialogPositiveClickInterface { public static final String ARG_JETPACK_CONNECT_SOURCE = "ARG_JETPACK_CONNECT_SOURCE"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java index 79f8c6140185..03e4f978d998 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java @@ -4,6 +4,7 @@ import android.os.Bundle; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -12,7 +13,6 @@ import org.wordpress.android.fluxc.store.AccountStore; import org.wordpress.android.fluxc.store.SiteStore; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.accounts.LoginNavigationEvents.CloseWithResultOk; import org.wordpress.android.ui.accounts.LoginNavigationEvents.CreateNewSite; @@ -35,7 +35,7 @@ import dagger.hilt.android.AndroidEntryPoint; @AndroidEntryPoint -public class LoginEpilogueActivity extends LocaleAwareActivity implements LoginEpilogueListener { +public class LoginEpilogueActivity extends AppCompatActivity implements LoginEpilogueListener { public static final String EXTRA_DO_LOGIN_UPDATE = "EXTRA_DO_LOGIN_UPDATE"; public static final String EXTRA_SHOW_AND_RETURN = "EXTRA_SHOW_AND_RETURN"; public static final String ARG_OLD_SITES_IDS = "ARG_OLD_SITES_IDS"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginMagicLinkInterceptActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginMagicLinkInterceptActivity.java index b9c04c8eb213..4c0cbb58d67b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginMagicLinkInterceptActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginMagicLinkInterceptActivity.java @@ -5,10 +5,10 @@ import android.os.Bundle; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.login.LoginAnalyticsListener; import org.wordpress.android.ui.JetpackConnectionSource; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.main.WPMainActivity; import javax.inject.Inject; @@ -20,7 +20,7 @@ * or signup based on deep link scheme, host, and parameters. */ @AndroidEntryPoint -public class LoginMagicLinkInterceptActivity extends LocaleAwareActivity { +public class LoginMagicLinkInterceptActivity extends AppCompatActivity { private static final String PARAMETER_FLOW = "flow"; private static final String PARAMETER_FLOW_JETPACK = "jetpack"; private static final String PARAMETER_SOURCE = "source"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt index fb54be449500..a0a3feb0dd0a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt @@ -8,7 +8,7 @@ import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R import org.wordpress.android.databinding.PostSignupInterstitialActivityBinding import org.wordpress.android.ui.ActivityLauncher -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.jetpackoverlay.individualplugin.WPJetpackIndividualPluginFragment import org.wordpress.android.ui.sitecreation.misc.SiteCreationSource import org.wordpress.android.viewmodel.accounts.PostSignupInterstitialViewModel @@ -21,7 +21,7 @@ import org.wordpress.android.viewmodel.accounts.PostSignupInterstitialViewModel. import javax.inject.Inject @AndroidEntryPoint -class PostSignupInterstitialActivity : LocaleAwareActivity() { +class PostSignupInterstitialActivity : AppCompatActivity() { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory private lateinit var viewModel: PostSignupInterstitialViewModel diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignupEpilogueActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignupEpilogueActivity.java index dae2831880dc..3bf57c44f271 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignupEpilogueActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignupEpilogueActivity.java @@ -3,12 +3,12 @@ import android.os.Bundle; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentTransaction; import org.wordpress.android.R; import org.wordpress.android.fluxc.store.SiteStore; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.accounts.signup.SignupEpilogueFragment; import org.wordpress.android.ui.accounts.signup.SignupEpilogueListener; @@ -17,7 +17,7 @@ import dagger.hilt.android.AndroidEntryPoint; @AndroidEntryPoint -public class SignupEpilogueActivity extends LocaleAwareActivity implements SignupEpilogueListener { +public class SignupEpilogueActivity extends AppCompatActivity implements SignupEpilogueListener { public static final String EXTRA_SIGNUP_DISPLAY_NAME = "EXTRA_SIGNUP_DISPLAY_NAME"; public static final String EXTRA_SIGNUP_EMAIL_ADDRESS = "EXTRA_SIGNUP_EMAIL_ADDRESS"; public static final String EXTRA_SIGNUP_IS_EMAIL = "EXTRA_SIGNUP_IS_EMAIL"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt index 568c3712edf5..a97d83af50e1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt @@ -5,12 +5,12 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.ActivityLogDetailActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes import android.R as AndroidR @AndroidEntryPoint -class ActivityLogDetailActivity : LocaleAwareActivity() { +class ActivityLogDetailActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt index fac1258d5ada..aad049b6cd1c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt @@ -9,7 +9,7 @@ import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R import org.wordpress.android.databinding.ActivityLogListActivityBinding import org.wordpress.android.models.JetpackPoweredScreen -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes import org.wordpress.android.ui.ScrollableViewInitializedListener import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailActivity @@ -27,7 +27,7 @@ import javax.inject.Inject import android.R as AndroidR @AndroidEntryPoint -class ActivityLogListActivity : LocaleAwareActivity(), ScrollableViewInitializedListener { +class ActivityLogListActivity : AppCompatActivity(), ScrollableViewInitializedListener { @Inject lateinit var jetpackBrandingUtils: JetpackBrandingUtils diff --git a/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/BlazeCampaignParentActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/BlazeCampaignParentActivity.kt index 76f3d042d1a1..4011cffa7fd7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/BlazeCampaignParentActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/BlazeCampaignParentActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.activity.viewModels import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.blaze.blazecampaigns.campaigndetail.CampaignDetailFragment import org.wordpress.android.ui.blaze.blazecampaigns.campaignlisting.CampaignListingFragment import org.wordpress.android.util.extensions.getParcelableCompat @@ -13,7 +13,7 @@ import org.wordpress.android.util.extensions.getParcelableExtraCompat const val ARG_EXTRA_BLAZE_CAMPAIGN_PAGE = "blaze_campaign_page" @AndroidEntryPoint -class BlazeCampaignParentActivity : LocaleAwareActivity() { +class BlazeCampaignParentActivity : AppCompatActivity() { private val viewModel: CampaignViewModel by viewModels() private var campaignPage: BlazeCampaignPage? = null diff --git a/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazepromote/BlazePromoteParentActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazepromote/BlazePromoteParentActivity.kt index 3660fa62a21b..56516e97759a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazepromote/BlazePromoteParentActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/blaze/blazepromote/BlazePromoteParentActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.activity.viewModels import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.blaze.BlazeFlowSource import org.wordpress.android.ui.blaze.BlazeUIModel import org.wordpress.android.ui.blaze.BlazeUiState @@ -20,7 +20,7 @@ const val ARG_BLAZE_FLOW_SOURCE = "blaze_flow_source" const val ARG_BLAZE_SHOULD_SHOW_OVERLAY = "blaze_flow_should_show_overlay" @AndroidEntryPoint -class BlazePromoteParentActivity : LocaleAwareActivity() { +class BlazePromoteParentActivity : AppCompatActivity() { private val viewModel: BlazeViewModel by viewModels() private var shouldShowOverlay = false private var source: BlazeFlowSource = BlazeFlowSource.DASHBOARD_CARD diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt index 4492bdc88912..cd2f23c20c74 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt @@ -11,14 +11,14 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import org.wordpress.android.ui.ActivityLauncher -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.bloggingprompts.promptslist.compose.BloggingPromptsListScreen import org.wordpress.android.ui.compose.theme.AppThemeM3 import org.wordpress.android.ui.posts.PostUtils import org.wordpress.android.util.extensions.setContent @AndroidEntryPoint -class BloggingPromptsListActivity : LocaleAwareActivity() { +class BloggingPromptsListActivity : AppCompatActivity() { private val viewModel: BloggingPromptsListViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java index 346897f63d4c..77543537c991 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.viewpager.widget.ViewPager; import org.greenrobot.eventbus.Subscribe; @@ -28,7 +29,6 @@ import org.wordpress.android.fluxc.store.CommentStore.OnCommentChanged; import org.wordpress.android.models.CommentList; import org.wordpress.android.ui.CollapseFullScreenDialogFragment; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.ScrollableViewInitializedListener; import org.wordpress.android.ui.comments.unified.CommentConstants; import org.wordpress.android.ui.comments.unified.CommentsStoreAdapter; @@ -43,10 +43,10 @@ import javax.inject.Inject; -import dagger.hilt.android.AndroidEntryPoint; - import static org.wordpress.android.ui.comments.unified.CommentConstants.COMMENTS_PER_PAGE; +import dagger.hilt.android.AndroidEntryPoint; + /** * @deprecated * Comments are being refactored as part of Comments Unification project. If you are adding any @@ -55,7 +55,7 @@ @Deprecated @AndroidEntryPoint @SuppressWarnings({"deprecation", "DeprecatedIsStillUsed"}) -public class CommentsDetailActivity extends LocaleAwareActivity +public class CommentsDetailActivity extends AppCompatActivity implements OnLoadMoreListener, CommentActions.OnCommentActionListener, ScrollableViewInitializedListener { public static final String COMMENT_ID_EXTRA = "commentId"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsActivity.kt index 468adecc10b0..ddbb645f2166 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsActivity.kt @@ -13,7 +13,7 @@ import org.wordpress.android.WordPress import org.wordpress.android.analytics.AnalyticsTracker import org.wordpress.android.analytics.AnalyticsTracker.Stat.COMMENT_FILTER_CHANGED import org.wordpress.android.databinding.UnifiedCommentActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.comments.unified.CommentFilter.ALL import org.wordpress.android.ui.comments.unified.CommentFilter.APPROVED import org.wordpress.android.ui.comments.unified.CommentFilter.PENDING @@ -27,7 +27,7 @@ import javax.inject.Inject import android.R as AndroidR import com.google.android.material.R as MaterialR -class UnifiedCommentsActivity : LocaleAwareActivity() { +class UnifiedCommentsActivity : AppCompatActivity() { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsDetailsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsDetailsActivity.kt index ecf927abc872..aa3f2fa785de 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsDetailsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsDetailsActivity.kt @@ -4,9 +4,9 @@ import android.os.Bundle import androidx.viewpager2.widget.ViewPager2 import org.wordpress.android.WordPress import org.wordpress.android.databinding.UnifiedCommentsDetailsActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity -class UnifiedCommentsDetailsActivity : LocaleAwareActivity() { +class UnifiedCommentsDetailsActivity : AppCompatActivity() { private var binding: UnifiedCommentsDetailsActivityBinding? = null private lateinit var pagerAdapter: UnifiedCommentsDetailPagerAdapter diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditActivity.kt index d8a4e70dab6f..7f4ca3bf0db8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditActivity.kt @@ -7,11 +7,11 @@ import org.wordpress.android.R import org.wordpress.android.WordPress import org.wordpress.android.databinding.UnifiedCommentsEditActivityBinding import org.wordpress.android.fluxc.model.SiteModel -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.util.extensions.getParcelableExtraCompat import org.wordpress.android.util.extensions.getSerializableExtraCompat -class UnifiedCommentsEditActivity : LocaleAwareActivity() { +class UnifiedCommentsEditActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsActivity.kt index bd2ed4d6c75d..7530d497e515 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsActivity.kt @@ -9,14 +9,14 @@ import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R import org.wordpress.android.databinding.DebugSettingsActivityBinding import org.wordpress.android.ui.ActivityLauncher -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.debug.previews.PreviewFragmentActivity.Companion.previewFragmentInActivity import org.wordpress.android.viewmodel.observeEvent import javax.inject.Inject import android.R as AndroidR @AndroidEntryPoint -class DebugSettingsActivity : LocaleAwareActivity() { +class DebugSettingsActivity : AppCompatActivity() { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory diff --git a/WordPress/src/main/java/org/wordpress/android/ui/debug/cookies/DebugCookiesActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/debug/cookies/DebugCookiesActivity.kt index a4cdcc6179b1..d998d516e4e6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/debug/cookies/DebugCookiesActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/debug/cookies/DebugCookiesActivity.kt @@ -3,10 +3,10 @@ package org.wordpress.android.ui.debug.cookies import android.os.Bundle import android.view.MenuItem import org.wordpress.android.databinding.DebugCookiesActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR -class DebugCookiesActivity : LocaleAwareActivity() { +class DebugCookiesActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(DebugCookiesActivityBinding.inflate(layoutInflater).root) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java index 045e9d457b48..b705acfe9101 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java @@ -8,10 +8,10 @@ import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.ViewModelProvider; import org.wordpress.android.ui.ActivityLauncherWrapper; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureFullScreenOverlayFragment; import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureFullScreenOverlayViewModel; @@ -27,11 +27,11 @@ import javax.inject.Inject; -import dagger.hilt.android.AndroidEntryPoint; - import static org.wordpress.android.WordPress.getContext; import static org.wordpress.android.ui.main.WPMainActivity.ARG_BYPASS_MIGRATION; +import dagger.hilt.android.AndroidEntryPoint; + /** * An activity to handle deep linking and intercepting links like: *

@@ -40,7 +40,7 @@ * Redirects users to the reader activity along with IDs passed in the intent */ @AndroidEntryPoint -public class DeepLinkingIntentReceiverActivity extends LocaleAwareActivity { +public class DeepLinkingIntentReceiverActivity extends AppCompatActivity { @Inject DeepLinkNavigator mDeeplinkNavigator; @Inject DeepLinkUriUtils mDeepLinkUriUtils; @Inject ViewModelProvider.Factory mViewModelFactory; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt index 946730b9d311..b7fea869d283 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt @@ -10,7 +10,7 @@ import org.wordpress.android.R import org.wordpress.android.WordPress import org.wordpress.android.databinding.DomainRegistrationActivityBinding import org.wordpress.android.fluxc.model.SiteModel -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.ScrollableViewInitializedListener import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewActivity.OpenCheckout.CheckoutDetails import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewActivity.OpenPlans.PlanDetails @@ -26,7 +26,7 @@ import javax.inject.Inject import android.R as AndroidR @AndroidEntryPoint -class DomainRegistrationActivity : LocaleAwareActivity(), ScrollableViewInitializedListener { +class DomainRegistrationActivity : AppCompatActivity(), ScrollableViewInitializedListener { enum class DomainRegistrationPurpose { AUTOMATED_TRANSFER, CTA_DOMAIN_CREDIT_REDEMPTION, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsDashboardActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsDashboardActivity.kt index eedb9b041fdb..8536f954b158 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsDashboardActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsDashboardActivity.kt @@ -3,10 +3,10 @@ package org.wordpress.android.ui.domains import android.os.Bundle import android.view.MenuItem import org.wordpress.android.databinding.DomainsDashboardActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR -class DomainsDashboardActivity : LocaleAwareActivity() { +class DomainsDashboardActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(DomainsDashboardActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListActivity.kt index fbf82600b5d3..337742517d9a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListActivity.kt @@ -5,13 +5,13 @@ import android.view.MenuItem import org.wordpress.android.R import org.wordpress.android.WordPress import org.wordpress.android.databinding.EngagedPeopleListActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper import org.wordpress.android.util.extensions.getParcelableExtraCompat import javax.inject.Inject import android.R as AndroidR -class EngagedPeopleListActivity : LocaleAwareActivity() { +class EngagedPeopleListActivity : AppCompatActivity() { @Inject lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper diff --git a/WordPress/src/main/java/org/wordpress/android/ui/history/HistoryDetailActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/history/HistoryDetailActivity.kt index 09f053a4982a..7b8537fbd8d7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/history/HistoryDetailActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/history/HistoryDetailActivity.kt @@ -6,12 +6,12 @@ import org.wordpress.android.R import org.wordpress.android.analytics.AnalyticsTracker import org.wordpress.android.analytics.AnalyticsTracker.Stat import org.wordpress.android.databinding.HistoryDetailActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.history.HistoryListItem.Revision import org.wordpress.android.util.extensions.getParcelableCompat import org.wordpress.android.util.extensions.onBackPressedCompat -class HistoryDetailActivity : LocaleAwareActivity() { +class HistoryDetailActivity : AppCompatActivity() { companion object { const val KEY_HISTORY_DETAIL_FRAGMENT = "history_detail_fragment" } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadActivity.kt index be6b84522c4d..caa252938fae 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadActivity.kt @@ -3,10 +3,10 @@ package org.wordpress.android.ui.jetpack.backup.download import android.os.Bundle import android.view.MenuItem import org.wordpress.android.databinding.BackupDownloadActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR -class BackupDownloadActivity : LocaleAwareActivity() { +class BackupDownloadActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(BackupDownloadActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreActivity.kt index 859bbfd34a4d..7a739671fed7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreActivity.kt @@ -3,10 +3,10 @@ package org.wordpress.android.ui.jetpack.restore import android.os.Bundle import android.view.MenuItem import org.wordpress.android.databinding.RestoreActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR -class RestoreActivity : LocaleAwareActivity() { +class RestoreActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(RestoreActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt index 07faece920ba..8e358b2b8cc1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt @@ -15,7 +15,7 @@ import org.wordpress.android.login.LoginMode import org.wordpress.android.ui.ActivityLauncher import org.wordpress.android.ui.JetpackConnectionSource import org.wordpress.android.ui.JetpackConnectionWebViewActivity -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes import org.wordpress.android.ui.accounts.HelpActivity import org.wordpress.android.ui.accounts.LoginActivity @@ -32,7 +32,7 @@ import org.wordpress.android.util.extensions.onBackPressedCompat import org.wordpress.android.util.extensions.setContent @AndroidEntryPoint -class JetpackRemoteInstallActivity : LocaleAwareActivity() { +class JetpackRemoteInstallActivity : AppCompatActivity() { private val viewModel: JetpackRemoteInstallViewModel by viewModels() public override fun onCreate(savedInstanceState: Bundle?) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/ChooseSiteActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/ChooseSiteActivity.kt index ba1dd84c0b22..c135a6572e46 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/ChooseSiteActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/ChooseSiteActivity.kt @@ -26,7 +26,7 @@ import org.wordpress.android.fluxc.store.SiteStore import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged import org.wordpress.android.fluxc.store.SiteStore.OnSiteRemoved import org.wordpress.android.ui.ActivityId -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes import org.wordpress.android.ui.mysite.SelectedSiteRepository import org.wordpress.android.ui.prefs.AppPrefsWrapper @@ -43,7 +43,7 @@ import org.wordpress.android.widgets.WPDialogSnackbar import javax.inject.Inject @AndroidEntryPoint -class ChooseSiteActivity : LocaleAwareActivity() { +class ChooseSiteActivity : AppCompatActivity() { private val viewModel: SiteViewModel by viewModels() private val adapter = ChooseSiteAdapter() private val mode by lazy { SitePickerMode.valueOf(intent.getStringExtra(KEY_SITE_PICKER_MODE)!!) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt index 91d0a0207aa1..d8f742b5d13c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt @@ -5,13 +5,13 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes import org.wordpress.android.ui.prefs.AppSettingsFragment.LANGUAGE_CHANGED import android.R as AndroidR @AndroidEntryPoint -class MeActivity : LocaleAwareActivity() { +class MeActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.me_activity) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index ea9f02ba0cb1..57154cce875d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -80,7 +80,7 @@ import org.wordpress.android.ui.ActivityNavigator; import org.wordpress.android.ui.JetpackConnectionSource; import org.wordpress.android.ui.JetpackConnectionWebViewActivity; -import org.wordpress.android.ui.LocaleAwareActivity; +import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.ui.PagePostCreationSourcesDetail; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.Shortcut; @@ -202,7 +202,7 @@ * Main activity which hosts sites, reader, me and notifications pages */ @AndroidEntryPoint -public class WPMainActivity extends LocaleAwareActivity implements +public class WPMainActivity extends AppCompatActivity implements OnPageListener, BottomNavController, BasicDialogPositiveClickInterface, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt index c187a28ddc15..167d6710859f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt @@ -8,11 +8,11 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import dagger.hilt.android.AndroidEntryPoint -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes @AndroidEntryPoint -class FeedbackFormActivity : LocaleAwareActivity() { +class FeedbackFormActivity : AppCompatActivity() { private val viewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModel.kt index 29584be672ee..dda1b9350851 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModel.kt @@ -240,7 +240,7 @@ class JetpackMigrationViewModel @Inject constructor( migrationAnalyticsTracker.trackPleaseDeleteWordPressScreenShown() // We need to manually apply the app language for the Compose UI since the host JetpackMigrationActivity - // does not inherit from LocaleAwareActivity on purpose, in order to avoid possible issues + // does not inherit from AppCompatActivity on purpose, in order to avoid possible issues // when the Ui mode (dark/light) and the language are manually set by the user. emitLanguageRefreshIfNeeded(localeManagerWrapper.getLanguage()) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java index 5896abf4dc14..20f6bbcc3704 100755 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java @@ -30,6 +30,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.view.ActionMode; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SearchView.OnQueryTextListener; @@ -64,7 +65,6 @@ import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged; import org.wordpress.android.push.NotificationType; import org.wordpress.android.ui.ActivityId; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper; import org.wordpress.android.ui.media.MediaGridFragment.MediaFilter; @@ -109,7 +109,7 @@ /** * The main activity in which the user can browse their media. */ -public class MediaBrowserActivity extends LocaleAwareActivity implements MediaGridListener, +public class MediaBrowserActivity extends AppCompatActivity implements MediaGridListener, OnQueryTextListener, OnActionExpandListener, WPMediaUtils.LaunchCameraCallback { public static final String ARG_BROWSER_TYPE = "media_browser_type"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java index 4a23c5d37a0d..f89c6c52fa12 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java @@ -15,6 +15,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityOptionsCompat; @@ -30,7 +31,6 @@ import org.wordpress.android.fluxc.model.MediaModel; import org.wordpress.android.fluxc.model.SiteModel; import org.wordpress.android.fluxc.store.MediaStore; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.util.AniUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.ToastUtils; @@ -41,7 +41,7 @@ import javax.inject.Inject; -public class MediaPreviewActivity extends LocaleAwareActivity implements MediaPreviewFragment.OnMediaTappedListener { +public class MediaPreviewActivity extends AppCompatActivity implements MediaPreviewFragment.OnMediaTappedListener { private static final String ARG_ID_OR_URL_LIST = "id_list"; private static final String ARG_PREVIEW_TYPE = "preview_type"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java index b1fe511abc3b..b74a3cc30e2d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java @@ -71,7 +71,7 @@ import org.wordpress.android.fluxc.store.MediaStore; import org.wordpress.android.fluxc.store.MediaStore.MediaPayload; import org.wordpress.android.fluxc.store.MediaStore.OnMediaChanged; -import org.wordpress.android.ui.LocaleAwareActivity; +import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.media.MediaPreviewActivity.MediaPreviewSwiped; import org.wordpress.android.ui.utils.AuthenticationUtils; @@ -109,7 +109,7 @@ import static org.wordpress.android.editor.EditorImageMetaData.ARG_EDITOR_IMAGE_METADATA; -public class MediaSettingsActivity extends LocaleAwareActivity +public class MediaSettingsActivity extends AppCompatActivity implements ActivityCompat.OnRequestPermissionsResultCallback { private static final String ARG_MEDIA_LOCAL_ID = "media_local_id"; private static final String ARG_ID_LIST = "id_list"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt index 4732b8ddac8e..c1075c513e08 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt @@ -15,7 +15,7 @@ import org.wordpress.android.databinding.PhotoPickerActivityBinding import org.wordpress.android.fluxc.Dispatcher import org.wordpress.android.fluxc.model.SiteModel import org.wordpress.android.fluxc.store.MediaStore -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes.IMAGE_EDITOR_EDIT_IMAGE import org.wordpress.android.ui.RequestCodes.MEDIA_LIBRARY import org.wordpress.android.ui.RequestCodes.PHOTO_PICKER @@ -55,7 +55,7 @@ import java.io.File import javax.inject.Inject import android.R as AndroidR -class MediaPickerActivity : LocaleAwareActivity(), MediaPickerListener { +class MediaPickerActivity : AppCompatActivity(), MediaPickerListener { private var mediaCapturePath: String? = null private lateinit var mediaPickerSetup: MediaPickerSetup diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java index a85d3c1ee5ab..a43db3bf36cb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.Lifecycle; @@ -36,7 +37,6 @@ import org.wordpress.android.push.GCMMessageHandler; import org.wordpress.android.ui.ActivityLauncher; import org.wordpress.android.ui.CollapseFullScreenDialogFragment; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.ScrollableViewInitializedListener; import org.wordpress.android.ui.WPWebViewActivity; import org.wordpress.android.ui.comments.CommentActions; @@ -76,17 +76,17 @@ import javax.inject.Inject; -import dagger.hilt.android.AndroidEntryPoint; - import static org.wordpress.android.models.Note.NOTE_COMMENT_LIKE_TYPE; import static org.wordpress.android.models.Note.NOTE_COMMENT_TYPE; import static org.wordpress.android.models.Note.NOTE_FOLLOW_TYPE; import static org.wordpress.android.models.Note.NOTE_LIKE_TYPE; import static org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter.IS_TAPPED_ON_NOTIFICATION; +import dagger.hilt.android.AndroidEntryPoint; + @AndroidEntryPoint @SuppressWarnings("deprecation") -public class NotificationsDetailActivity extends LocaleAwareActivity implements +public class NotificationsDetailActivity extends AppCompatActivity implements CommentActions.OnNoteCommentActionListener, BasicFragmentDialog.BasicDialogPositiveClickInterface, ScrollableViewInitializedListener { private static final String ARG_TITLE = "activityTitle"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt index d30b477d80ba..4ee33effe5c7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt @@ -2,9 +2,9 @@ package org.wordpress.android.ui.pages import android.os.Bundle import org.wordpress.android.databinding.PagesParentActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity -class PageParentActivity : LocaleAwareActivity() { +class PageParentActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val binding = PagesParentActivityBinding.inflate(layoutInflater) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt index 60fd832f768c..d363323fa3ee 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt @@ -8,7 +8,7 @@ import org.wordpress.android.WordPress import org.wordpress.android.databinding.PagesActivityBinding import org.wordpress.android.push.NotificationType import org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.notifications.SystemNotificationsTracker import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogNegativeClickInterface import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogPositiveClickInterface @@ -23,7 +23,7 @@ const val EXTRA_PAGE_REMOTE_ID_KEY = "extra_page_remote_id_key" const val EXTRA_PAGE_PARENT_ID_KEY = "extra_page_parent_id_key" const val EXTRA_PAGE_LIST_TYPE_KEY = "extra_page_list_type_key" -class PagesActivity : LocaleAwareActivity(), +class PagesActivity : AppCompatActivity(), BasicDialogPositiveClickInterface, BasicDialogNegativeClickInterface, PostResolutionOverlayListener { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java index ca3a29e92275..a3d331cc95f3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java @@ -9,6 +9,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -29,7 +30,6 @@ import org.wordpress.android.fluxc.store.SiteStore.OnUserRolesChanged; import org.wordpress.android.models.PeopleListFilter; import org.wordpress.android.models.Person; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.people.utils.PeopleUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.NetworkUtils; @@ -44,7 +44,7 @@ import dagger.hilt.android.AndroidEntryPoint; @AndroidEntryPoint -public class PeopleManagementActivity extends LocaleAwareActivity +public class PeopleManagementActivity extends AppCompatActivity implements PeopleListFragment.OnPersonSelectedListener, PeopleListFragment.OnFetchPeopleListener { private static final String KEY_PEOPLE_LIST_FRAGMENT = "people-list-fragment"; private static final String KEY_PERSON_DETAIL_FRAGMENT = "person-detail-fragment"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java index db908316a905..b5ced93084ca 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; @@ -23,7 +24,6 @@ import org.wordpress.android.fluxc.store.MediaStore; import org.wordpress.android.imageeditor.preview.PreviewImageFragment; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.media.MediaBrowserActivity; import org.wordpress.android.ui.media.MediaBrowserType; @@ -52,7 +52,7 @@ * {@link org.wordpress.android.ui.mediapicker.MediaPickerActivity} */ @Deprecated -public class PhotoPickerActivity extends LocaleAwareActivity +public class PhotoPickerActivity extends AppCompatActivity implements PhotoPickerFragment.PhotoPickerListener { private static final String PICKER_FRAGMENT_TAG = "picker_fragment_tag"; private static final String KEY_MEDIA_CAPTURE_PATH = "media_capture_path"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt index c903e7517a24..558b7ffe82a6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import org.wordpress.android.databinding.PlansActivityBinding import org.wordpress.android.fluxc.model.plans.PlanOffersModel import org.wordpress.android.ui.FullScreenDialogFragment -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.plans.PlansListFragment.PlansListInterface import org.wordpress.android.util.StringUtils -class PlansActivity : LocaleAwareActivity(), PlansListInterface { +class PlansActivity : AppCompatActivity(), PlansListInterface { public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(PlansActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java index 7fa8d41dbede..fb50e8c9f829 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java @@ -18,6 +18,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; @@ -37,7 +38,6 @@ import org.wordpress.android.fluxc.model.plugin.ImmutablePluginModel; import org.wordpress.android.models.networkresource.ListState; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.util.ActivityUtils; import org.wordpress.android.util.AniUtils; import org.wordpress.android.util.ColorUtils; @@ -59,7 +59,7 @@ import javax.inject.Inject; -public class PluginBrowserActivity extends LocaleAwareActivity +public class PluginBrowserActivity extends AppCompatActivity implements SearchView.OnQueryTextListener, MenuItem.OnActionExpandListener { @Inject ViewModelProvider.Factory mViewModelFactory; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java index af0326208eeb..c1cf20f2db42 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java @@ -63,7 +63,7 @@ import org.wordpress.android.fluxc.store.SiteStore.OnPlansFetched; import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; +import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.domains.DomainRegistrationActivity; import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose; @@ -103,7 +103,7 @@ import static org.wordpress.android.ui.plans.PlanUtilsKt.isDomainCreditAvailable; import static org.wordpress.android.util.DomainRegistrationUtilsKt.requestEmailValidation; -public class PluginDetailActivity extends LocaleAwareActivity implements OnDomainRegistrationRequestedListener, +public class PluginDetailActivity extends AppCompatActivity implements OnDomainRegistrationRequestedListener, BasicDialogPositiveClickInterface { public static final String KEY_PLUGIN_SLUG = "KEY_PLUGIN_SLUG"; private static final String KEY_IS_CONFIGURING_PLUGIN = "KEY_IS_CONFIGURING_PLUGIN"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt index 1f7e03f7c192..8a3dd57e2a5a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt @@ -123,7 +123,7 @@ import org.wordpress.android.networking.ConnectionChangeReceiver.ConnectionChang import org.wordpress.android.support.ZendeskHelper import org.wordpress.android.ui.ActivityId import org.wordpress.android.ui.ActivityLauncher -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.PrivateAtCookieRefreshProgressDialog.Companion.dismissIfNecessary import org.wordpress.android.ui.PrivateAtCookieRefreshProgressDialog.Companion.isShowing import org.wordpress.android.ui.PrivateAtCookieRefreshProgressDialog.Companion.showIfNecessary @@ -263,7 +263,7 @@ import javax.inject.Inject import kotlin.math.max @Suppress("LargeClass") -class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorImageSettingsListener, +class EditPostActivity : AppCompatActivity(), EditorFragmentActivity, EditorImageSettingsListener, EditorImagePreviewListener, EditorEditMediaListener, EditorDragAndDropListener, EditorFragmentListener, ActivityCompat.OnRequestPermissionsResultCallback, PhotoPickerListener, EditorPhotoPickerListener, EditorMediaListener, EditPostActivityHook, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsTagsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsTagsActivity.java index ae34f0b4a455..b05a8b8f4522 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsTagsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsTagsActivity.java @@ -8,17 +8,17 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import org.wordpress.android.R; import org.wordpress.android.WordPress; import org.wordpress.android.fluxc.model.SiteModel; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.util.ToastUtils; import org.wordpress.android.util.extensions.CompatExtensionsKt; -public class PostSettingsTagsActivity extends LocaleAwareActivity implements TagsSelectedListener { +public class PostSettingsTagsActivity extends AppCompatActivity implements TagsSelectedListener { public static final String KEY_TAGS = "KEY_TAGS"; public static final String KEY_SELECTED_TAGS = "KEY_SELECTED_TAGS"; private SiteModel mSite; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt index e065f764c6bd..b3f5f94162b1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt @@ -32,7 +32,7 @@ import org.wordpress.android.push.NotificationType import org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE import org.wordpress.android.ui.ActivityId import org.wordpress.android.ui.ActivityLauncher -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.RequestCodes import org.wordpress.android.ui.ScrollableViewInitializedListener import org.wordpress.android.ui.blaze.BlazeFeatureUtils @@ -70,7 +70,7 @@ const val EXTRA_TARGET_POST_LOCAL_ID = "targetPostLocalId" const val STATE_KEY_PREVIEW_STATE = "stateKeyPreviewState" const val STATE_KEY_BOTTOMSHEET_POST_ID = "stateKeyBottomSheetPostId" -class PostsListActivity : LocaleAwareActivity(), +class PostsListActivity : AppCompatActivity(), EditPostActivityHook, PrepublishingBottomSheetListener, BasicDialogPositiveClickInterface, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java index 1c6c93ad2fa0..ae79a5445987 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java @@ -14,6 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; @@ -34,7 +35,6 @@ import org.wordpress.android.fluxc.store.TaxonomyStore.OnTermUploaded; import org.wordpress.android.fluxc.store.TaxonomyStore.RemoteTermPayload; import org.wordpress.android.models.CategoryNode; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.util.NetworkUtils; import org.wordpress.android.util.ToastUtils; import org.wordpress.android.util.ToastUtils.Duration; @@ -52,7 +52,7 @@ import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_POST_LOCAL_ID; import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper; -public class SelectCategoriesActivity extends LocaleAwareActivity { +public class SelectCategoriesActivity extends AppCompatActivity { public static final String KEY_SELECTED_CATEGORY_IDS = "KEY_SELECTED_CATEGORY_IDS"; private ListView mListView; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AccountSettingsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AccountSettingsActivity.java index 4905c930cea7..f7ce4e61261b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AccountSettingsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AccountSettingsActivity.java @@ -6,15 +6,15 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import org.wordpress.android.R; -import org.wordpress.android.ui.LocaleAwareActivity; import dagger.hilt.android.AndroidEntryPoint; @AndroidEntryPoint -public class AccountSettingsActivity extends LocaleAwareActivity { +public class AccountSettingsActivity extends AppCompatActivity { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.kt index 14a44a5ae931..f70e298e0948 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsActivity.kt @@ -6,10 +6,10 @@ import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R import org.wordpress.android.databinding.AppSettingsActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity @AndroidEntryPoint -class AppSettingsActivity : LocaleAwareActivity() { +class AppSettingsActivity : AppCompatActivity() { private lateinit var binding: AppSettingsActivityBinding public override fun onCreate(savedInstanceState: Bundle?) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java index 19f8339409d5..c8fc3a8d1b8c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java @@ -7,6 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import org.apache.commons.text.StringEscapeUtils; @@ -23,7 +24,6 @@ import org.wordpress.android.fluxc.store.SiteStore.OnSiteDeleted; import org.wordpress.android.fluxc.store.SiteStore.OnSiteRemoved; import org.wordpress.android.networking.ConnectionChangeReceiver; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.util.SiteUtils; import org.wordpress.android.util.ToastUtils; import org.wordpress.android.util.ToastUtils.Duration; @@ -33,7 +33,7 @@ /** * Activity for configuring blog specific settings. */ -public class BlogPreferencesActivity extends LocaleAwareActivity { +public class BlogPreferencesActivity extends AppCompatActivity { private static final String KEY_SETTINGS_FRAGMENT = "settings-fragment"; private SiteModel mSite; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java index 764528c999e2..f62839913e5f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MyProfileActivity.java @@ -6,17 +6,17 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import org.wordpress.android.R; import org.wordpress.android.WordPress; import org.wordpress.android.fluxc.Dispatcher; import org.wordpress.android.fluxc.store.AccountStore; -import org.wordpress.android.ui.LocaleAwareActivity; import javax.inject.Inject; -public class MyProfileActivity extends LocaleAwareActivity { +public class MyProfileActivity extends AppCompatActivity { @Inject Dispatcher mDispatcher; @Inject AccountStore mAccountStore; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTagListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTagListActivity.java index 25994867ac1a..6bfdef2eb1a4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTagListActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTagListActivity.java @@ -21,6 +21,7 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.FragmentTransaction; @@ -43,7 +44,6 @@ import org.wordpress.android.fluxc.store.TaxonomyStore; import org.wordpress.android.fluxc.store.TaxonomyStore.OnTaxonomyChanged; import org.wordpress.android.ui.ActionableEmptyView; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.util.ActivityUtils; import org.wordpress.android.util.AniUtils; import org.wordpress.android.util.AppLog; @@ -60,7 +60,7 @@ import javax.inject.Inject; -public class SiteSettingsTagListActivity extends LocaleAwareActivity +public class SiteSettingsTagListActivity extends AppCompatActivity implements SearchView.OnQueryTextListener, MenuItem.OnActionExpandListener, SiteSettingsTagDetailFragment.OnTagDetailListener { @Inject Dispatcher mDispatcher; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/detail/CategoryDetailActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/detail/CategoryDetailActivity.kt index 12e8445daf9d..d6c98627bb54 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/detail/CategoryDetailActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/detail/CategoryDetailActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.CategoryDetailActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class CategoryDetailActivity : LocaleAwareActivity() { +class CategoryDetailActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(CategoryDetailActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/list/CategoriesListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/list/CategoriesListActivity.kt index e06d19813d64..3c94594c202d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/list/CategoriesListActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/list/CategoriesListActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.SiteSettingsCategoriesListActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class CategoriesListActivity : LocaleAwareActivity() { +class CategoriesListActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(SiteSettingsCategoriesListActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.kt index 32a4f5910436..c0d489e47e93 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.kt @@ -20,7 +20,7 @@ import org.wordpress.android.analytics.AnalyticsTracker import org.wordpress.android.analytics.AnalyticsTracker.Stat.NOTIFICATION_SETTINGS_APP_NOTIFICATIONS_DISABLED import org.wordpress.android.analytics.AnalyticsTracker.Stat.NOTIFICATION_SETTINGS_APP_NOTIFICATIONS_ENABLED import org.wordpress.android.modules.APPLICATION_SCOPE -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.notifications.NotificationEvents.NotificationsSettingsStatusChanged import org.wordpress.android.ui.prefs.notifications.PrefMainSwitchToolbarView.MainSwitchToolbarListener import org.wordpress.android.ui.prefs.notifications.usecase.UpdateNotificationSettingsUseCase @@ -29,7 +29,7 @@ import javax.inject.Named import android.R as AndroidR @AndroidEntryPoint -class NotificationsSettingsActivity : LocaleAwareActivity(), MainSwitchToolbarListener { +class NotificationsSettingsActivity : AppCompatActivity(), MainSwitchToolbarListener { @Inject lateinit var updateNotificationSettingsUseCase: UpdateNotificationSettingsUseCase diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListActivity.java index 20eae91206d1..e39921ec1f7d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListActivity.java @@ -9,6 +9,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; @@ -29,7 +30,6 @@ import org.wordpress.android.models.PublicizeConnection; import org.wordpress.android.models.PublicizeService; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.ScrollableViewInitializedListener; import org.wordpress.android.ui.publicize.PublicizeConstants.ConnectAction; import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter; @@ -48,7 +48,7 @@ import dagger.hilt.android.AndroidEntryPoint; @AndroidEntryPoint -public class PublicizeListActivity extends LocaleAwareActivity +public class PublicizeListActivity extends AppCompatActivity implements PublicizeActions.OnPublicizeActionListener, PublicizeServiceAdapter.OnServiceClickListener, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthActivity.kt index 11b63c0223b6..0b1f9f546958 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthActivity.kt @@ -5,10 +5,10 @@ import android.content.Intent import android.os.Bundle import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.QrcodeauthActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity @AndroidEntryPoint -class QRCodeAuthActivity : LocaleAwareActivity() { +class QRCodeAuthActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java index 9f99c10cd9cb..2cd1ee9e41d5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java @@ -20,6 +20,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; @@ -55,7 +56,6 @@ import org.wordpress.android.ui.CollapseFullScreenDialogFragment.OnCollapseListener; import org.wordpress.android.ui.CollapseFullScreenDialogFragment.OnConfirmListener; import org.wordpress.android.ui.CommentFullScreenDialogFragment; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.comments.unified.CommentIdentifier.ReaderCommentIdentifier; import org.wordpress.android.ui.comments.unified.UnifiedCommentsEditActivity; @@ -96,17 +96,17 @@ import javax.inject.Inject; -import dagger.hilt.android.AndroidEntryPoint; -import kotlin.Unit; - import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_REPLY; import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_SELECTION_END; import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_SELECTION_START; import static org.wordpress.android.ui.reader.FollowConversationUiStateKt.FOLLOW_CONVERSATION_UI_STATE_FLAGS_KEY; import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper; +import dagger.hilt.android.AndroidEntryPoint; +import kotlin.Unit; + @AndroidEntryPoint -public class ReaderCommentListActivity extends LocaleAwareActivity implements OnConfirmListener, +public class ReaderCommentListActivity extends AppCompatActivity implements OnConfirmListener, OnCollapseListener { private static final String KEY_REPLY_TO_COMMENT_ID = "reply_to_comment_id"; private static final String KEY_HAS_UPDATED_COMMENTS = "has_updated_comments"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPhotoViewerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPhotoViewerActivity.java index 1a8b72744da6..64f32f93a194 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPhotoViewerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPhotoViewerActivity.java @@ -12,6 +12,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; @@ -19,7 +20,6 @@ import androidx.viewpager.widget.ViewPager; import org.wordpress.android.R; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.reader.models.ReaderImageList; import org.wordpress.android.ui.reader.utils.ReaderImageScanner; import org.wordpress.android.ui.reader.views.ReaderPhotoView.PhotoViewListener; @@ -33,7 +33,7 @@ * Full-screen photo viewer - uses a ViewPager to enable scrolling between images in a blog * post, but also supports viewing a single image */ -public class ReaderPhotoViewerActivity extends LocaleAwareActivity +public class ReaderPhotoViewerActivity extends AppCompatActivity implements PhotoViewListener { private String mInitialImageUrl; private boolean mIsPrivate; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java index ba69c23927b3..5e6b57244b0a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java @@ -13,6 +13,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.Fragment; @@ -34,7 +35,6 @@ import org.wordpress.android.models.ReaderBlog; import org.wordpress.android.models.ReaderTag; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.mysite.SelectedSiteRepository; import org.wordpress.android.ui.posts.EditPostActivity; @@ -55,7 +55,7 @@ * serves as the host for ReaderPostListFragment when showing blog preview & tag preview */ @AndroidEntryPoint -public class ReaderPostListActivity extends LocaleAwareActivity { +public class ReaderPostListActivity extends AppCompatActivity { private String mSource; private ReaderPostListType mPostListType; private long mSiteId; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java index 3519185e7cb5..ebec0f3cd69f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java @@ -16,6 +16,7 @@ import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; @@ -40,7 +41,6 @@ import org.wordpress.android.models.ReaderPost; import org.wordpress.android.models.ReaderTag; import org.wordpress.android.ui.ActivityLauncher; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.WPLaunchActivity; import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInReader; @@ -98,11 +98,11 @@ import javax.inject.Inject; -import dagger.hilt.android.AndroidEntryPoint; - import static org.wordpress.android.ui.main.WPMainActivity.ARG_OPEN_PAGE; import static org.wordpress.android.ui.main.WPMainActivity.ARG_READER; +import dagger.hilt.android.AndroidEntryPoint; + /* * shows reader post detail fragments in a ViewPager - primarily used for easy swiping between * posts with a specific tag or in a specific blog, but can also be used to show a single @@ -117,7 +117,7 @@ * Will also handle jumping to the comments section, liking a commend and liking a post directly */ @AndroidEntryPoint -public class ReaderPostPagerActivity extends LocaleAwareActivity { +public class ReaderPostPagerActivity extends AppCompatActivity { /** * Type of URL intercepted */ diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSearchActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSearchActivity.kt index 63a8a4809421..b3b9e09f4f17 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSearchActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSearchActivity.kt @@ -5,7 +5,7 @@ import android.os.Bundle import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R import org.wordpress.android.WordPress -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.reader.tracker.ReaderTracker import org.wordpress.android.ui.reader.tracker.ReaderTrackerType.MAIN_READER import org.wordpress.android.util.JetpackBrandingUtils @@ -17,7 +17,7 @@ import javax.inject.Inject * into new tested classes without requiring us to change the search behavior. */ @AndroidEntryPoint -class ReaderSearchActivity : LocaleAwareActivity() { +class ReaderSearchActivity : AppCompatActivity() { @Inject lateinit var readerTracker: ReaderTracker diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java index e572199e46f8..84893d3c9b51 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java @@ -14,6 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; @@ -38,7 +39,6 @@ import org.wordpress.android.fluxc.store.AccountStore; import org.wordpress.android.models.ReaderTag; import org.wordpress.android.models.ReaderTagType; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.prefs.AppPrefs; import org.wordpress.android.ui.reader.ReaderEvents.FollowedBlogsFetched; @@ -71,7 +71,7 @@ * activity which shows the user's subscriptions - includes * followed tags and followed blogs */ -public class ReaderSubsActivity extends LocaleAwareActivity +public class ReaderSubsActivity extends AppCompatActivity implements ReaderTagAdapter.TagDeletedListener, ReaderTagAdapter.TagAddedListener { private EditText mEditAdd; private FloatingActionButton mFabButton; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java index c6fa07fe2bce..cc31935f5ddb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java @@ -4,6 +4,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.LinearLayoutManager; @@ -15,7 +16,6 @@ import org.wordpress.android.datasets.ReaderUserTable; import org.wordpress.android.models.ReaderPost; import org.wordpress.android.models.ReaderUserList; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.reader.adapters.ReaderUserAdapter; import org.wordpress.android.ui.reader.utils.ReaderUtils; import org.wordpress.android.ui.reader.views.ReaderRecyclerView; @@ -25,7 +25,7 @@ /* * displays a list of users who like a specific reader post */ -public class ReaderUserListActivity extends LocaleAwareActivity { +public class ReaderUserListActivity extends AppCompatActivity { private ReaderRecyclerView mRecyclerView; private ReaderUserAdapter mAdapter; private AppBarLayout mAppBarLayout; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java index 2017aedd13b0..87ae7abc2e21 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java @@ -9,10 +9,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.R; import org.wordpress.android.fluxc.network.UserAgent; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.util.helpers.WebChromeClientWithVideoPoster; import javax.inject.Inject; @@ -20,7 +20,7 @@ /** * Full screen video player for the reader */ -public class ReaderVideoViewerActivity extends LocaleAwareActivity { +public class ReaderVideoViewerActivity extends AppCompatActivity { private String mVideoUrl; private WebView mWebView; private ProgressBar mProgress; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsActivity.kt index 1259e9ccf0db..2fe660bf07a5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsActivity.kt @@ -4,10 +4,10 @@ import android.os.Bundle import android.view.MenuItem import org.wordpress.android.R import org.wordpress.android.databinding.ReaderInterestsActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR -class ReaderInterestsActivity : LocaleAwareActivity() { +class ReaderInterestsActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt index 4a625cad5837..7b4d5889a813 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt @@ -9,13 +9,13 @@ import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R import org.wordpress.android.WordPress import org.wordpress.android.fluxc.model.SiteModel -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.util.ToastUtils import org.wordpress.android.util.extensions.getSerializableCompat import org.wordpress.android.util.extensions.getSerializableExtraCompat @AndroidEntryPoint -class SelfHostedUsersActivity : LocaleAwareActivity() { +class SelfHostedUsersActivity : AppCompatActivity() { private val viewModel by viewModels() private var site: SiteModel? = null diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt index 38ebaa1b95c2..a97b7564197c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt @@ -16,7 +16,7 @@ import org.wordpress.android.ui.ActivityLauncher import org.wordpress.android.ui.ActivityLauncherWrapper import org.wordpress.android.ui.ActivityLauncherWrapper.Companion.CAMPAIGN_SITE_CREATION import org.wordpress.android.ui.ActivityLauncherWrapper.Companion.JETPACK_PACKAGE_NAME -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.accounts.HelpActivity.Origin import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewActivity.OpenCheckout import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureFullScreenOverlayFragment @@ -71,7 +71,7 @@ import javax.inject.Inject import android.R as AndroidR @AndroidEntryPoint -class SiteCreationActivity : LocaleAwareActivity(), +class SiteCreationActivity : AppCompatActivity(), IntentsScreenListener, SiteNameScreenListener, DomainsScreenListener, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsConnectJetpackActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsConnectJetpackActivity.kt index 50eb02fe11ca..ed9af96b58da 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsConnectJetpackActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsConnectJetpackActivity.kt @@ -17,7 +17,7 @@ import org.wordpress.android.fluxc.store.AccountStore import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged import org.wordpress.android.ui.JetpackConnectionSource.STATS import org.wordpress.android.ui.JetpackConnectionWebViewActivity -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.WPWebViewActivity import org.wordpress.android.util.AppLog import org.wordpress.android.util.AppLog.T.API @@ -30,7 +30,7 @@ import android.R as AndroidR * An activity that shows when user tries to open Stats without Jetpack connected. * It offers a link to the Jetpack connection flow. */ -class StatsConnectJetpackActivity : LocaleAwareActivity() { +class StatsConnectJetpackActivity : AppCompatActivity() { private var mIsJetpackConnectStarted = false @Inject diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt index c814de1dfacb..2d55a5f73cc8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt @@ -12,7 +12,7 @@ import org.wordpress.android.fluxc.model.SiteModel import org.wordpress.android.push.NotificationType import org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE import org.wordpress.android.ui.ActivityLauncher -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper import org.wordpress.android.ui.stats.StatsTimeframe import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom @@ -22,7 +22,7 @@ import javax.inject.Inject import android.R as AndroidR @AndroidEntryPoint -class StatsActivity : LocaleAwareActivity() { +class StatsActivity : AppCompatActivity() { @Inject lateinit var statsSiteProvider: StatsSiteProvider diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt index 297b50cd96b5..869ee28f1205 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt @@ -10,13 +10,13 @@ import org.wordpress.android.analytics.AnalyticsTracker import org.wordpress.android.analytics.AnalyticsTracker.Stat import org.wordpress.android.databinding.StatsViewAllActivityBinding import org.wordpress.android.fluxc.network.utils.StatsGranularity -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.stats.StatsViewType import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDateProvider.SelectedDate import android.R as AndroidR @AndroidEntryPoint -class StatsViewAllActivity : LocaleAwareActivity() { +class StatsViewAllActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt index a78ff06f39f4..2ce3ef109c2d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt @@ -12,7 +12,7 @@ import org.wordpress.android.WordPress import org.wordpress.android.databinding.StatsDetailActivityBinding import org.wordpress.android.fluxc.model.SiteModel import org.wordpress.android.fluxc.network.utils.StatsGranularity -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.stats.StatsViewType import org.wordpress.android.ui.stats.refresh.StatsViewAllFragment import org.wordpress.android.ui.stats.refresh.lists.StatsListFragment @@ -28,7 +28,7 @@ const val POST_TITLE = "POST_TITLE" const val POST_URL = "POST_URL" @AndroidEntryPoint -class StatsDetailActivity : LocaleAwareActivity() { +class StatsDetailActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val binding = StatsDetailActivityBinding.inflate(layoutInflater) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt index a18f9d33803d..70987c2d8893 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt @@ -5,11 +5,11 @@ import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.R import org.wordpress.android.databinding.InsightsManagementActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class InsightsManagementActivity : LocaleAwareActivity() { +class InsightsManagementActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(InsightsManagementActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt index 87085cd229c0..19faf302c1d0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.StatsAllTimeWidgetConfigureActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class StatsAllTimeWidgetConfigureActivity : LocaleAwareActivity() { +class StatsAllTimeWidgetConfigureActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(StatsAllTimeWidgetConfigureActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt index 26053234979c..0ed01717ca58 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.StatsMinifiedWidgetConfigureActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class StatsMinifiedWidgetConfigureActivity : LocaleAwareActivity() { +class StatsMinifiedWidgetConfigureActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(StatsMinifiedWidgetConfigureActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt index 368e42e2f790..819c87639b15 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.StatsTodayWidgetConfigureActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class StatsTodayWidgetConfigureActivity : LocaleAwareActivity() { +class StatsTodayWidgetConfigureActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(StatsTodayWidgetConfigureActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt index 06d48b356310..7e23d55837a4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.StatsViewsWidgetConfigureActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class StatsViewsWidgetConfigureActivity : LocaleAwareActivity() { +class StatsViewsWidgetConfigureActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(StatsViewsWidgetConfigureActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/weeks/StatsWeekWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/weeks/StatsWeekWidgetConfigureActivity.kt index 4a70596d0e8b..5fdc3e87b929 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/weeks/StatsWeekWidgetConfigureActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/weeks/StatsWeekWidgetConfigureActivity.kt @@ -4,11 +4,11 @@ import android.os.Bundle import android.view.MenuItem import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.databinding.StatsWeekViewsWidgetConfigureActivityBinding -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import android.R as AndroidR @AndroidEntryPoint -class StatsWeekWidgetConfigureActivity : LocaleAwareActivity() { +class StatsWeekWidgetConfigureActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) with(StatsWeekViewsWidgetConfigureActivityBinding.inflate(layoutInflater)) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java index 389882465d63..acd004107e20 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java @@ -17,6 +17,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; import androidx.core.text.HtmlCompat; @@ -41,7 +42,6 @@ import org.wordpress.android.fluxc.store.StockMediaStore.FetchStockMediaListPayload; import org.wordpress.android.fluxc.store.StockMediaStore.OnStockMediaListFetched; import org.wordpress.android.ui.ActionableEmptyView; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.media.MediaPreviewActivity; import org.wordpress.android.ui.photopicker.MediaPickerConstants; @@ -56,8 +56,8 @@ import org.wordpress.android.util.PhotonUtils; import org.wordpress.android.util.StringUtils; import org.wordpress.android.util.ToastUtils; -import org.wordpress.android.util.extensions.ViewExtensionsKt; import org.wordpress.android.util.WPLinkMovementMethod; +import org.wordpress.android.util.extensions.ViewExtensionsKt; import org.wordpress.android.util.image.ImageManager; import org.wordpress.android.util.image.ImageType; @@ -68,7 +68,7 @@ import javax.inject.Inject; -public class StockMediaPickerActivity extends LocaleAwareActivity implements SearchView.OnQueryTextListener { +public class StockMediaPickerActivity extends AppCompatActivity implements SearchView.OnQueryTextListener { private static final int MIN_SEARCH_QUERY_SIZE = 3; private static final String TAG_RETAINED_FRAGMENT = "retained_fragment"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionActivity.kt index 7648211bec4a..42f7bdd597b3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionActivity.kt @@ -17,7 +17,7 @@ import org.wordpress.android.WordPress import org.wordpress.android.databinding.SuggestUsersActivityBinding import org.wordpress.android.fluxc.model.SiteModel import org.wordpress.android.networking.ConnectionChangeReceiver.ConnectionChangeEvent -import org.wordpress.android.ui.LocaleAwareActivity +import androidx.appcompat.app.AppCompatActivity import org.wordpress.android.ui.suggestion.FinishAttempt.NotExactlyOneAvailable import org.wordpress.android.ui.suggestion.FinishAttempt.OnlyOneAvailable import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter @@ -29,7 +29,7 @@ import org.wordpress.android.util.extensions.onBackPressedCompat import org.wordpress.android.widgets.SuggestionAutoCompleteText import javax.inject.Inject -class SuggestionActivity : LocaleAwareActivity() { +class SuggestionActivity : AppCompatActivity() { private var suggestionAdapter: SuggestionAdapter? = null private var siteId: Long? = null diff --git a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java index b1c3505aeceb..03058c2dd8d3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java @@ -13,6 +13,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.FragmentManager; @@ -38,7 +39,6 @@ import org.wordpress.android.fluxc.store.ThemeStore.SiteThemePayload; import org.wordpress.android.models.JetpackPoweredScreen; import org.wordpress.android.ui.ActivityId; -import org.wordpress.android.ui.LocaleAwareActivity; import org.wordpress.android.ui.ScrollableViewInitializedListener; import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredBottomSheetFragment; import org.wordpress.android.ui.prefs.AppPrefs; @@ -60,7 +60,7 @@ import dagger.hilt.android.AndroidEntryPoint; @AndroidEntryPoint -public class ThemeBrowserActivity extends LocaleAwareActivity implements ThemeBrowserFragmentCallback, +public class ThemeBrowserActivity extends AppCompatActivity implements ThemeBrowserFragmentCallback, ScrollableViewInitializedListener { public static final int ACTIVATE_THEME = 1; public static final String THEME_ID = "theme_id"; From 7576fbb3982c6c8ca126eda4db0e401059f8a93c Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 12 Dec 2024 11:08:14 -0500 Subject: [PATCH 2/7] Second pass at removing LocaleAwareActivity.kt --- .../wordpress/android/ui/main/WPMainActivity.java | 14 +++++++------- .../android/ui/plugins/PluginDetailActivity.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index 57154cce875d..b40dc6de29cf 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -20,6 +20,7 @@ import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.NotificationManagerCompat; import androidx.core.app.RemoteInput; import androidx.fragment.app.Fragment; @@ -80,7 +81,6 @@ import org.wordpress.android.ui.ActivityNavigator; import org.wordpress.android.ui.JetpackConnectionSource; import org.wordpress.android.ui.JetpackConnectionWebViewActivity; -import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.ui.PagePostCreationSourcesDetail; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.Shortcut; @@ -126,7 +126,6 @@ import org.wordpress.android.ui.prefs.AppSettingsActivity; import org.wordpress.android.ui.prefs.AppSettingsFragment; import org.wordpress.android.ui.prefs.SiteSettingsFragment; -import org.wordpress.android.util.PerAppLocaleManager; import org.wordpress.android.ui.prefs.privacy.banner.PrivacyBannerFragment; import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts; import org.wordpress.android.ui.quickstart.QuickStartTracker; @@ -154,6 +153,7 @@ import org.wordpress.android.util.DeviceUtils; import org.wordpress.android.util.FluxCUtils; import org.wordpress.android.util.NetworkUtils; +import org.wordpress.android.util.PerAppLocaleManager; import org.wordpress.android.util.ProfilingUtils; import org.wordpress.android.util.QuickStartUtils; import org.wordpress.android.util.QuickStartUtilsWrapper; @@ -186,11 +186,6 @@ import javax.inject.Inject; -import dagger.hilt.android.AndroidEntryPoint; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function3; - import static androidx.lifecycle.Lifecycle.State.STARTED; import static org.wordpress.android.WordPress.SITE; import static org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartVariant.NEXT_STEPS; @@ -198,6 +193,11 @@ import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE; import static org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS; +import dagger.hilt.android.AndroidEntryPoint; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function3; + /** * Main activity which hosts sites, reader, me and notifications pages */ diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java index c1cf20f2db42..2d9492605696 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java @@ -21,6 +21,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.text.HtmlCompat; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentTransaction; @@ -63,7 +64,6 @@ import org.wordpress.android.fluxc.store.SiteStore.OnPlansFetched; import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged; import org.wordpress.android.ui.ActivityLauncher; -import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.domains.DomainRegistrationActivity; import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose; From 18a731a15d048fdf7b1862b0f9943ecd642a540d Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 12 Dec 2024 11:10:15 -0500 Subject: [PATCH 3/7] Fixed detekt errors --- .../main/java/org/wordpress/android/ui/LocaleAwareActivity.kt | 2 +- .../main/java/org/wordpress/android/util/PerAppLocaleManager.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt index 1e5f793112b9..15afe4f33862 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt @@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity * the need for this class. Instead of extending from this class, we should extend * from AppCompatActivity. */ -abstract class AppCompatActivity : AppCompatActivity() { +abstract class LocaleAwareActivity : AppCompatActivity() { /** * Used to update locales on API 21 to API 25. */ diff --git a/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt b/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt index 822abcb43cf8..4eb5a11db067 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt @@ -126,7 +126,7 @@ class PerAppLocaleManager @Inject constructor( /** * Called when the device language is changed from our in-app language picker - * TODO: Detect when language changed from app settings dialog + * TODO Detect when language changed from app settings dialog */ fun onLanguageChanged(languageCode: String) { if (languageCode.isEmpty()) { From 97f1914aed088b083cd82fc7649839647c71638f Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 12 Dec 2024 11:29:28 -0500 Subject: [PATCH 4/7] Fixed lint errors --- .../org/wordpress/android/ui/AddQuickPressShortcutActivity.java | 1 + .../main/java/org/wordpress/android/ui/AppLogViewerActivity.java | 1 + .../wordpress/android/ui/JetpackConnectionResultActivity.java | 1 + .../org/wordpress/android/ui/ShareIntentReceiverActivity.java | 1 + .../src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt | 1 + .../src/main/java/org/wordpress/android/ui/WebViewActivity.java | 1 + 6 files changed, 6 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java index 563b9fb1cb92..a78d27798830 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java @@ -19,6 +19,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.core.content.pm.ShortcutInfoCompat; import androidx.core.content.pm.ShortcutManagerCompat; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java index 1cbf808b91dc..75e4477962cf 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java @@ -19,6 +19,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.core.text.HtmlCompat; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java index 2f3c1432046e..d1df0b10f01a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java @@ -8,6 +8,7 @@ import androidx.activity.OnBackPressedCallback; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import org.wordpress.android.R; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java index c856e10d5118..1b8558ba4d03 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java @@ -8,6 +8,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.TaskStackBuilder; import androidx.preference.PreferenceManager; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt index 2dd91a1b440a..d768c4431a89 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/WPLaunchActivity.kt @@ -3,6 +3,7 @@ package org.wordpress.android.ui import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.wordpress.android.R import org.wordpress.android.WordPress diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java index 92a3c9af3b46..c12b4ca51b32 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java @@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import org.wordpress.android.R; From d2abbf1981444c0575e521d8d446fa8e315d6d84 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 12 Dec 2024 11:31:11 -0500 Subject: [PATCH 5/7] Removed LocaleAwareActivity.kt --- .../android/ui/LocaleAwareActivity.kt | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt diff --git a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt deleted file mode 100644 index 15afe4f33862..000000000000 --- a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt +++ /dev/null @@ -1,26 +0,0 @@ -package org.wordpress.android.ui - -import android.content.Context -import android.content.res.Configuration -import androidx.appcompat.app.AppCompatActivity - -/** - * Update Dec 2024: We've added support for per-app language preferences which negate - * the need for this class. Instead of extending from this class, we should extend - * from AppCompatActivity. - */ -abstract class LocaleAwareActivity : AppCompatActivity() { - /** - * Used to update locales on API 21 to API 25. - */ - override fun attachBaseContext(newBase: Context?) { - super.attachBaseContext(newBase) - } - - /** - * Used to update locales on API 26 and beyond. - */ - override fun applyOverrideConfiguration(overrideConfiguration: Configuration?) { - super.applyOverrideConfiguration(overrideConfiguration) - } -} From 38b3baf1674f2c519308ec9b4ca09278c3b400f4 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 12 Dec 2024 14:31:53 -0500 Subject: [PATCH 6/7] Fixed checkstyle import errors --- .../wordpress/android/ui/accounts/LoginActivity.java | 4 ++-- .../android/ui/comments/CommentsDetailActivity.java | 4 ++-- .../deeplinks/DeepLinkingIntentReceiverActivity.java | 4 ++-- .../org/wordpress/android/ui/main/WPMainActivity.java | 10 +++++----- .../android/ui/media/MediaSettingsActivity.java | 2 +- .../ui/notifications/NotificationsDetailActivity.java | 4 ++-- .../android/ui/reader/ReaderCommentListActivity.java | 6 +++--- .../android/ui/reader/ReaderPostPagerActivity.java | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java index c57298505ded..deda35fc37fc 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java @@ -87,13 +87,13 @@ import javax.inject.Inject; -import static org.wordpress.android.util.ActivityUtils.hideKeyboard; - import dagger.android.AndroidInjector; import dagger.android.DispatchingAndroidInjector; import dagger.android.HasAndroidInjector; import dagger.hilt.android.AndroidEntryPoint; +import static org.wordpress.android.util.ActivityUtils.hideKeyboard; + @AndroidEntryPoint public class LoginActivity extends AppCompatActivity implements ConnectionCallbacks, OnConnectionFailedListener, Callback, LoginListener, GoogleListener, LoginPrologueListener, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java index 77543537c991..bf5fafea28e1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java @@ -43,10 +43,10 @@ import javax.inject.Inject; -import static org.wordpress.android.ui.comments.unified.CommentConstants.COMMENTS_PER_PAGE; - import dagger.hilt.android.AndroidEntryPoint; +import static org.wordpress.android.ui.comments.unified.CommentConstants.COMMENTS_PER_PAGE; + /** * @deprecated * Comments are being refactored as part of Comments Unification project. If you are adding any diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java index b705acfe9101..48b2ccbdccee 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java @@ -27,11 +27,11 @@ import javax.inject.Inject; +import dagger.hilt.android.AndroidEntryPoint; + import static org.wordpress.android.WordPress.getContext; import static org.wordpress.android.ui.main.WPMainActivity.ARG_BYPASS_MIGRATION; -import dagger.hilt.android.AndroidEntryPoint; - /** * An activity to handle deep linking and intercepting links like: *

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index b40dc6de29cf..b187af605256 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -186,6 +186,11 @@ import javax.inject.Inject; +import dagger.hilt.android.AndroidEntryPoint; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function3; + import static androidx.lifecycle.Lifecycle.State.STARTED; import static org.wordpress.android.WordPress.SITE; import static org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartVariant.NEXT_STEPS; @@ -193,11 +198,6 @@ import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE; import static org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS; -import dagger.hilt.android.AndroidEntryPoint; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function3; - /** * Main activity which hosts sites, reader, me and notifications pages */ diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java index b74a3cc30e2d..db13656067d9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java @@ -46,6 +46,7 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.content.res.AppCompatResources; import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityOptionsCompat; @@ -71,7 +72,6 @@ import org.wordpress.android.fluxc.store.MediaStore; import org.wordpress.android.fluxc.store.MediaStore.MediaPayload; import org.wordpress.android.fluxc.store.MediaStore.OnMediaChanged; -import androidx.appcompat.app.AppCompatActivity; import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.media.MediaPreviewActivity.MediaPreviewSwiped; import org.wordpress.android.ui.utils.AuthenticationUtils; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java index a43db3bf36cb..6d7feb152a4b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java @@ -76,14 +76,14 @@ import javax.inject.Inject; +import dagger.hilt.android.AndroidEntryPoint; + import static org.wordpress.android.models.Note.NOTE_COMMENT_LIKE_TYPE; import static org.wordpress.android.models.Note.NOTE_COMMENT_TYPE; import static org.wordpress.android.models.Note.NOTE_FOLLOW_TYPE; import static org.wordpress.android.models.Note.NOTE_LIKE_TYPE; import static org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter.IS_TAPPED_ON_NOTIFICATION; -import dagger.hilt.android.AndroidEntryPoint; - @AndroidEntryPoint @SuppressWarnings("deprecation") public class NotificationsDetailActivity extends AppCompatActivity implements diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java index 2cd1ee9e41d5..916fb5f6c361 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java @@ -96,15 +96,15 @@ import javax.inject.Inject; +import kotlin.Unit; +import dagger.hilt.android.AndroidEntryPoint; + import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_REPLY; import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_SELECTION_END; import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_SELECTION_START; import static org.wordpress.android.ui.reader.FollowConversationUiStateKt.FOLLOW_CONVERSATION_UI_STATE_FLAGS_KEY; import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper; -import dagger.hilt.android.AndroidEntryPoint; -import kotlin.Unit; - @AndroidEntryPoint public class ReaderCommentListActivity extends AppCompatActivity implements OnConfirmListener, OnCollapseListener { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java index ebec0f3cd69f..88825b9c7c20 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java @@ -98,11 +98,11 @@ import javax.inject.Inject; +import dagger.hilt.android.AndroidEntryPoint; + import static org.wordpress.android.ui.main.WPMainActivity.ARG_OPEN_PAGE; import static org.wordpress.android.ui.main.WPMainActivity.ARG_READER; -import dagger.hilt.android.AndroidEntryPoint; - /* * shows reader post detail fragments in a ViewPager - primarily used for easy swiping between * posts with a specific tag or in a specific blog, but can also be used to show a single From e7f0947c65a6f446d88087ce06bc8bbd571c7ae1 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 16 Dec 2024 08:34:19 -0500 Subject: [PATCH 7/7] Updated TODO --- .../java/org/wordpress/android/util/PerAppLocaleManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt b/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt index 5abfc8ef09ab..e37a2ec80685 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt @@ -124,9 +124,10 @@ class PerAppLocaleManager @Inject constructor( } } + @Suppress("ForbiddenComment") /** * Called when the device language is changed from our in-app language picker - * TODO Detect when language changed from app settings dialog + * TODO: Detect when language changed from app settings dialog */ fun onLanguageChanged(languageCode: String) { if (languageCode.isEmpty()) {