Rename Tasks to TasksApplication

pull/3134/head
Alex Baker 12 months ago
parent 6eba2d68d0
commit 87c5ec9f14

@ -155,7 +155,7 @@
android:icon="@mipmap/ic_launcher_blue" android:icon="@mipmap/ic_launcher_blue"
android:label="@string/app_name" android:label="@string/app_name"
android:manageSpaceActivity="org.tasks.preferences.ManageSpaceActivity" android:manageSpaceActivity="org.tasks.preferences.ManageSpaceActivity"
android:name=".Tasks" android:name=".TasksApplication"
android:roundIcon="@mipmap/ic_launcher_blue" android:roundIcon="@mipmap/ic_launcher_blue"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Tasks" android:theme="@style/Tasks"

@ -44,7 +44,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.tasks.BuildConfig import org.tasks.BuildConfig
import org.tasks.R import org.tasks.R
import org.tasks.Tasks import org.tasks.TasksApplication
import org.tasks.activities.GoogleTaskListSettingsActivity import org.tasks.activities.GoogleTaskListSettingsActivity
import org.tasks.activities.TagSettingsActivity import org.tasks.activities.TagSettingsActivity
import org.tasks.analytics.Firebase import org.tasks.analytics.Firebase
@ -249,7 +249,7 @@ class MainActivity : AppCompatActivity() {
viewModel.closeDrawer() viewModel.closeDrawer()
when (it) { when (it) {
DrawerAction.PURCHASE -> DrawerAction.PURCHASE ->
if (Tasks.IS_GENERIC) if (TasksApplication.IS_GENERIC)
context.openUri(R.string.url_donate) context.openUri(R.string.url_donate)
else else
context.startActivity( context.startActivity(

@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import org.tasks.LocalBroadcastManager 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.billing.Inventory
import org.tasks.compose.drawer.DrawerItem import org.tasks.compose.drawer.DrawerItem
import org.tasks.data.NO_COUNT import org.tasks.data.NO_COUNT

@ -28,9 +28,7 @@ import androidx.appcompat.view.ActionMode
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.app.ShareCompat import androidx.core.app.ShareCompat
@ -80,7 +78,7 @@ import kotlinx.coroutines.withContext
import org.tasks.LocalBroadcastManager import org.tasks.LocalBroadcastManager
import org.tasks.R import org.tasks.R
import org.tasks.ShortcutManager import org.tasks.ShortcutManager
import org.tasks.Tasks import org.tasks.TasksApplication
import org.tasks.activities.FilterSettingsActivity import org.tasks.activities.FilterSettingsActivity
import org.tasks.activities.GoogleTaskListSettingsActivity import org.tasks.activities.GoogleTaskListSettingsActivity
import org.tasks.activities.PlaceSettingsActivity import org.tasks.activities.PlaceSettingsActivity
@ -404,7 +402,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
visible = showSubscriptionNag, visible = showSubscriptionNag,
subscribe = { subscribe = {
listViewModel.dismissPurchaseBanner(clickedPurchase = true) listViewModel.dismissPurchaseBanner(clickedPurchase = true)
if (Tasks.IS_GOOGLE_PLAY) { if (TasksApplication.IS_GOOGLE_PLAY) {
context.startActivity(Intent(context, PurchaseActivity::class.java)) context.startActivity(Intent(context, PurchaseActivity::class.java))
} else { } else {
preferences.lastSubscribeRequest = currentTimeMillis() preferences.lastSubscribeRequest = currentTimeMillis()

@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
@HiltAndroidApp @HiltAndroidApp
class Tasks : Application(), Configuration.Provider { class TasksApplication : Application(), Configuration.Provider {
@Inject @ApplicationContext lateinit var context: Context @Inject @ApplicationContext lateinit var context: Context
@Inject lateinit var preferences: Preferences @Inject lateinit var preferences: Preferences

@ -39,7 +39,7 @@ import net.openid.appauth.RegistrationRequest
import net.openid.appauth.RegistrationResponse import net.openid.appauth.RegistrationResponse
import net.openid.appauth.ResponseTypeValues import net.openid.appauth.ResponseTypeValues
import org.tasks.R 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.analytics.Firebase
import org.tasks.billing.Inventory import org.tasks.billing.Inventory
import org.tasks.billing.PurchaseActivity import org.tasks.billing.PurchaseActivity

@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import org.tasks.R import org.tasks.R
import org.tasks.Tasks import org.tasks.TasksApplication
import org.tasks.compose.components.AnimatedBanner import org.tasks.compose.components.AnimatedBanner
import org.tasks.themes.TasksTheme import org.tasks.themes.TasksTheme
@ -57,14 +57,14 @@ fun SubscriptionNagBanner(
AnimatedBanner( AnimatedBanner(
visible = visible, visible = visible,
title = stringResource(id = R.string.enjoying_tasks), 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 R.string.donate_nag
} else { } else {
R.string.support_development_subscribe R.string.support_development_subscribe
}), }),
dismissText = stringResource(id = R.string.donate_maybe_later), dismissText = stringResource(id = R.string.donate_maybe_later),
onDismiss = dismiss, onDismiss = dismiss,
action = stringResource(id = if (Tasks.IS_GENERIC) { action = stringResource(id = if (TasksApplication.IS_GENERIC) {
R.string.donate_today R.string.donate_today
} else { } else {
R.string.button_subscribe R.string.button_subscribe

@ -11,7 +11,7 @@ import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.tasks.BuildConfig import org.tasks.BuildConfig
import org.tasks.R 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.analytics.Firebase
import org.tasks.dialogs.WhatsNewDialog import org.tasks.dialogs.WhatsNewDialog
import org.tasks.injection.InjectingPreferenceFragment import org.tasks.injection.InjectingPreferenceFragment

Loading…
Cancel
Save