From 87c5ec9f144e448c8fdfd3fc160b951f01e80ae0 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 17 Dec 2024 00:09:32 -0600 Subject: [PATCH] Rename Tasks to TasksApplication --- app/src/main/AndroidManifest.xml | 2 +- .../main/java/com/todoroo/astrid/activity/MainActivity.kt | 4 ++-- .../com/todoroo/astrid/activity/MainActivityViewModel.kt | 2 +- .../java/com/todoroo/astrid/activity/TaskListFragment.kt | 6 ++---- .../main/java/org/tasks/{Tasks.kt => TasksApplication.kt} | 2 +- app/src/main/java/org/tasks/auth/SignInActivity.kt | 2 +- app/src/main/java/org/tasks/compose/Banner.kt | 6 +++--- .../java/org/tasks/preferences/fragments/HelpAndFeedback.kt | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) rename app/src/main/java/org/tasks/{Tasks.kt => TasksApplication.kt} (99%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5842d8a6d..d456c4856 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -155,7 +155,7 @@ android:icon="@mipmap/ic_launcher_blue" android:label="@string/app_name" android:manageSpaceActivity="org.tasks.preferences.ManageSpaceActivity" - android:name=".Tasks" + android:name=".TasksApplication" android:roundIcon="@mipmap/ic_launcher_blue" android:supportsRtl="true" android:theme="@style/Tasks" diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt index 24d2fca14..c5a750964 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt @@ -44,7 +44,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.tasks.BuildConfig import org.tasks.R -import org.tasks.Tasks +import org.tasks.TasksApplication import org.tasks.activities.GoogleTaskListSettingsActivity import org.tasks.activities.TagSettingsActivity import org.tasks.analytics.Firebase @@ -249,7 +249,7 @@ class MainActivity : AppCompatActivity() { viewModel.closeDrawer() when (it) { DrawerAction.PURCHASE -> - if (Tasks.IS_GENERIC) + if (TasksApplication.IS_GENERIC) context.openUri(R.string.url_donate) else context.startActivity( diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt index f114e6844..6821c3c11 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt @@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import org.tasks.LocalBroadcastManager -import org.tasks.Tasks.Companion.IS_GENERIC +import org.tasks.TasksApplication.Companion.IS_GENERIC import org.tasks.billing.Inventory import org.tasks.compose.drawer.DrawerItem import org.tasks.data.NO_COUNT diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt index 7d70d27d1..c098db7ab 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt @@ -28,9 +28,7 @@ import androidx.appcompat.view.ActionMode import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.Toolbar import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.app.ShareCompat @@ -80,7 +78,7 @@ import kotlinx.coroutines.withContext import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.ShortcutManager -import org.tasks.Tasks +import org.tasks.TasksApplication import org.tasks.activities.FilterSettingsActivity import org.tasks.activities.GoogleTaskListSettingsActivity import org.tasks.activities.PlaceSettingsActivity @@ -404,7 +402,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL visible = showSubscriptionNag, subscribe = { listViewModel.dismissPurchaseBanner(clickedPurchase = true) - if (Tasks.IS_GOOGLE_PLAY) { + if (TasksApplication.IS_GOOGLE_PLAY) { context.startActivity(Intent(context, PurchaseActivity::class.java)) } else { preferences.lastSubscribeRequest = currentTimeMillis() diff --git a/app/src/main/java/org/tasks/Tasks.kt b/app/src/main/java/org/tasks/TasksApplication.kt similarity index 99% rename from app/src/main/java/org/tasks/Tasks.kt rename to app/src/main/java/org/tasks/TasksApplication.kt index b55fb970b..7ad86699a 100644 --- a/app/src/main/java/org/tasks/Tasks.kt +++ b/app/src/main/java/org/tasks/TasksApplication.kt @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit import javax.inject.Inject @HiltAndroidApp -class Tasks : Application(), Configuration.Provider { +class TasksApplication : Application(), Configuration.Provider { @Inject @ApplicationContext lateinit var context: Context @Inject lateinit var preferences: Preferences diff --git a/app/src/main/java/org/tasks/auth/SignInActivity.kt b/app/src/main/java/org/tasks/auth/SignInActivity.kt index 7c94eba8f..5b6997293 100644 --- a/app/src/main/java/org/tasks/auth/SignInActivity.kt +++ b/app/src/main/java/org/tasks/auth/SignInActivity.kt @@ -39,7 +39,7 @@ import net.openid.appauth.RegistrationRequest import net.openid.appauth.RegistrationResponse import net.openid.appauth.ResponseTypeValues import org.tasks.R -import org.tasks.Tasks.Companion.IS_GENERIC +import org.tasks.TasksApplication.Companion.IS_GENERIC import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.billing.PurchaseActivity diff --git a/app/src/main/java/org/tasks/compose/Banner.kt b/app/src/main/java/org/tasks/compose/Banner.kt index d3665fe8b..db241e840 100644 --- a/app/src/main/java/org/tasks/compose/Banner.kt +++ b/app/src/main/java/org/tasks/compose/Banner.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import org.tasks.R -import org.tasks.Tasks +import org.tasks.TasksApplication import org.tasks.compose.components.AnimatedBanner import org.tasks.themes.TasksTheme @@ -57,14 +57,14 @@ fun SubscriptionNagBanner( AnimatedBanner( visible = visible, title = stringResource(id = R.string.enjoying_tasks), - body = stringResource(id = if (Tasks.IS_GENERIC) { + body = stringResource(id = if (TasksApplication.IS_GENERIC) { R.string.donate_nag } else { R.string.support_development_subscribe }), dismissText = stringResource(id = R.string.donate_maybe_later), onDismiss = dismiss, - action = stringResource(id = if (Tasks.IS_GENERIC) { + action = stringResource(id = if (TasksApplication.IS_GENERIC) { R.string.donate_today } else { R.string.button_subscribe diff --git a/app/src/main/java/org/tasks/preferences/fragments/HelpAndFeedback.kt b/app/src/main/java/org/tasks/preferences/fragments/HelpAndFeedback.kt index cfd2a7e06..800f82832 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/HelpAndFeedback.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/HelpAndFeedback.kt @@ -11,7 +11,7 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import org.tasks.BuildConfig import org.tasks.R -import org.tasks.Tasks.Companion.IS_GENERIC +import org.tasks.TasksApplication.Companion.IS_GENERIC import org.tasks.analytics.Firebase import org.tasks.dialogs.WhatsNewDialog import org.tasks.injection.InjectingPreferenceFragment