From 700e99e547c26df4b55611d025d1fb3a306fd9cc Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 25 Mar 2025 04:11:13 -0500 Subject: [PATCH] Set theme color everywhere --- .../main/java/com/todoroo/astrid/activity/MainActivity.kt | 5 ++++- .../java/com/todoroo/astrid/activity/TaskEditFragment.kt | 5 ++++- .../java/com/todoroo/astrid/activity/TaskListFragment.kt | 5 ++++- app/src/main/java/org/tasks/auth/SignInActivity.kt | 5 ++++- app/src/main/java/org/tasks/billing/PurchaseActivity.kt | 5 ++++- .../org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt | 5 ++++- app/src/main/java/org/tasks/calendars/CalendarPicker.kt | 5 ++++- app/src/main/java/org/tasks/compose/IconPickerActivity.kt | 5 ++++- app/src/main/java/org/tasks/dialogs/DateTimePicker.kt | 5 ++++- app/src/main/java/org/tasks/dialogs/SortSettingsActivity.kt | 5 ++++- app/src/main/java/org/tasks/dialogs/StartDatePicker.kt | 5 ++++- .../main/java/org/tasks/repeats/CustomRecurrenceActivity.kt | 5 ++++- app/src/main/java/org/tasks/sync/AddAccountDialog.kt | 5 ++++- app/src/main/java/org/tasks/tags/TagPickerActivity.kt | 5 ++++- app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt | 5 ++++- 15 files changed, 60 insertions(+), 15 deletions(-) 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 ae6ad1432..340f2611a 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt @@ -155,7 +155,10 @@ class MainActivity : AppCompatActivity() { ) setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { val drawerState = rememberDrawerState( initialValue = DrawerValue.Closed, confirmStateChange = { diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt index c9b3e305e..268bc85c6 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt @@ -56,7 +56,10 @@ class TaskEditFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ) = content { - TasksTheme(theme = theme.themeBase.index,) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { val viewState = editViewModel.viewState.collectAsStateWithLifecycle().value LaunchedEffect(viewState.isNew) { if (!viewState.isNew) { 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 493cf51fc..97e2dd78e 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt @@ -399,7 +399,10 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL search.collapseActionView() } } - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { val notificationPermissions = if (AndroidUtilities.atLeastTiramisu()) { rememberPermissionState( Manifest.permission.POST_NOTIFICATIONS, diff --git a/app/src/main/java/org/tasks/auth/SignInActivity.kt b/app/src/main/java/org/tasks/auth/SignInActivity.kt index c160ea443..fd1603ed5 100644 --- a/app/src/main/java/org/tasks/auth/SignInActivity.kt +++ b/app/src/main/java/org/tasks/auth/SignInActivity.kt @@ -106,7 +106,10 @@ class SignInActivity : ComponentActivity() { var selectedPlatform by rememberSaveable { mutableStateOf(autoSelect) } - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { selectedPlatform ?.let { Dialog(onDismissRequest = { finish() }) { diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt index d86b1616a..f8259fc02 100644 --- a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt +++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt @@ -27,7 +27,10 @@ class PurchaseActivity : AppCompatActivity(), OnPurchasesUpdated { super.onCreate(savedInstanceState) setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { BackHandler { finish() } diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt index 93d60eed9..453718cc7 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt @@ -138,7 +138,10 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv ) binding.password.setOnFocusChangeListener { _, hasFocus -> onPasswordFocused(hasFocus) } binding.serverSelector.setContent { - TasksTheme(theme = tasksTheme.themeBase.index) { + TasksTheme( + theme = tasksTheme.themeBase.index, + primary = tasksTheme.themeColor.primaryColor, + ) { var selected by rememberSaveable { serverType } ServerSelector(selected) { serverType.value = it diff --git a/app/src/main/java/org/tasks/calendars/CalendarPicker.kt b/app/src/main/java/org/tasks/calendars/CalendarPicker.kt index a1ce5e29f..b876e947e 100644 --- a/app/src/main/java/org/tasks/calendars/CalendarPicker.kt +++ b/app/src/main/java/org/tasks/calendars/CalendarPicker.kt @@ -22,7 +22,10 @@ class CalendarPicker : DialogFragment() { return dialogBuilder .newDialog() .setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { CalendarPicker( selected = arguments?.getString(EXTRA_SELECTED), onSelected = { diff --git a/app/src/main/java/org/tasks/compose/IconPickerActivity.kt b/app/src/main/java/org/tasks/compose/IconPickerActivity.kt index bdb66c047..cc28f058d 100644 --- a/app/src/main/java/org/tasks/compose/IconPickerActivity.kt +++ b/app/src/main/java/org/tasks/compose/IconPickerActivity.kt @@ -39,7 +39,10 @@ class IconPickerActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { var hasPro by remember { mutableStateOf(false) } LifecycleEventEffect(Lifecycle.Event.ON_RESUME) { hasPro = inventory.hasPro diff --git a/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt b/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt index a1f3c7c04..7b026dd49 100644 --- a/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt +++ b/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt @@ -133,7 +133,10 @@ class DateTimePicker : BaseDateTimePicker() { container: ViewGroup?, savedInstanceState: Bundle?, ) = content { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { val datePickerState = rememberDatePickerState( initialDisplayMode = remember { preferences.calendarDisplayMode }, ) diff --git a/app/src/main/java/org/tasks/dialogs/SortSettingsActivity.kt b/app/src/main/java/org/tasks/dialogs/SortSettingsActivity.kt index 75fd5bf17..43182da2c 100644 --- a/app/src/main/java/org/tasks/dialogs/SortSettingsActivity.kt +++ b/app/src/main/java/org/tasks/dialogs/SortSettingsActivity.kt @@ -76,7 +76,10 @@ class SortSettingsActivity : ComponentActivity() { super.onCreate(savedInstanceState) enableEdgeToEdge() setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { val scrimColor = if (isSystemInDarkTheme()) Color(0x52454545) else diff --git a/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt b/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt index d9329951a..5bc63800d 100644 --- a/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt +++ b/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt @@ -84,7 +84,10 @@ class StartDatePicker : BaseDateTimePicker() { container: ViewGroup?, savedInstanceState: Bundle? ) = content { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { val state = rememberDatePickerState( initialDisplayMode = remember { preferences.calendarDisplayMode }, ) diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceActivity.kt b/app/src/main/java/org/tasks/repeats/CustomRecurrenceActivity.kt index 55e2c1022..249d58c5b 100644 --- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceActivity.kt +++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceActivity.kt @@ -27,7 +27,10 @@ class CustomRecurrenceActivity : FragmentActivity() { override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { CustomRecurrence( state = viewModel.state.collectAsStateWithLifecycle().value, save = { diff --git a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt index 280d39cca..16af244f3 100644 --- a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt +++ b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt @@ -42,7 +42,10 @@ class AddAccountDialog : DialogFragment() { .newDialog() .setTitle(R.string.choose_synchronization_service) .setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { org.tasks.compose.AddAccountDialog( hasTasksAccount = hasTasksAccount, enableMicrosoftSync = preferences.getBoolean(R.string.p_microsoft_sync, false), diff --git a/app/src/main/java/org/tasks/tags/TagPickerActivity.kt b/app/src/main/java/org/tasks/tags/TagPickerActivity.kt index 1d18b4c29..ee236794c 100644 --- a/app/src/main/java/org/tasks/tags/TagPickerActivity.kt +++ b/app/src/main/java/org/tasks/tags/TagPickerActivity.kt @@ -83,7 +83,10 @@ class TagPickerActivity : ThemedInjectingAppCompatActivity() { viewModel.search("") setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { TagPicker( viewModel, onBackClicked = { handleBackPressed() }, diff --git a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt index 1287b4fc9..348037872 100644 --- a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt +++ b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt @@ -254,7 +254,10 @@ class TaskViewHolder internal constructor( val toggleSubtasks = { task: Long, collapsed: Boolean -> callback.toggleSubtasks(task, collapsed) } val onClick = { it: Filter -> callback.onClick(it) } chipGroup.setContent { - TasksTheme(theme = theme.themeBase.index) { + TasksTheme( + theme = theme.themeBase.index, + primary = theme.themeColor.primaryColor, + ) { ChipGroup( modifier = Modifier.padding( end = 16.dp,