Set theme color everywhere

8 months ago · 700e99e547
parent e494f7cc13
commit 700e99e547
15 changed files with 60 additions and 15 deletions
--- 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 = {
--- 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) {
--- 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,
--- 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() }) {
--- 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()
                }
--- 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
--- 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 = {
--- 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
--- 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 },
            )
--- 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
--- 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 },
            )
--- 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 = {
--- 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),
--- 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() },
--- 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,