Set theme color everywhere

pull/3450/head
Alex Baker 8 months ago
parent e494f7cc13
commit 700e99e547

@ -155,7 +155,10 @@ class MainActivity : AppCompatActivity() {
) )
setContent { setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
val drawerState = rememberDrawerState( val drawerState = rememberDrawerState(
initialValue = DrawerValue.Closed, initialValue = DrawerValue.Closed,
confirmStateChange = { confirmStateChange = {

@ -56,7 +56,10 @@ class TaskEditFragment : Fragment() {
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
) = content { ) = content {
TasksTheme(theme = theme.themeBase.index,) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
val viewState = editViewModel.viewState.collectAsStateWithLifecycle().value val viewState = editViewModel.viewState.collectAsStateWithLifecycle().value
LaunchedEffect(viewState.isNew) { LaunchedEffect(viewState.isNew) {
if (!viewState.isNew) { if (!viewState.isNew) {

@ -399,7 +399,10 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
search.collapseActionView() search.collapseActionView()
} }
} }
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
val notificationPermissions = if (AndroidUtilities.atLeastTiramisu()) { val notificationPermissions = if (AndroidUtilities.atLeastTiramisu()) {
rememberPermissionState( rememberPermissionState(
Manifest.permission.POST_NOTIFICATIONS, Manifest.permission.POST_NOTIFICATIONS,

@ -106,7 +106,10 @@ class SignInActivity : ComponentActivity() {
var selectedPlatform by rememberSaveable { var selectedPlatform by rememberSaveable {
mutableStateOf(autoSelect) mutableStateOf(autoSelect)
} }
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
selectedPlatform selectedPlatform
?.let { ?.let {
Dialog(onDismissRequest = { finish() }) { Dialog(onDismissRequest = { finish() }) {

@ -27,7 +27,10 @@ class PurchaseActivity : AppCompatActivity(), OnPurchasesUpdated {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContent { setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
BackHandler { BackHandler {
finish() finish()
} }

@ -138,7 +138,10 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv
) )
binding.password.setOnFocusChangeListener { _, hasFocus -> onPasswordFocused(hasFocus) } binding.password.setOnFocusChangeListener { _, hasFocus -> onPasswordFocused(hasFocus) }
binding.serverSelector.setContent { binding.serverSelector.setContent {
TasksTheme(theme = tasksTheme.themeBase.index) { TasksTheme(
theme = tasksTheme.themeBase.index,
primary = tasksTheme.themeColor.primaryColor,
) {
var selected by rememberSaveable { serverType } var selected by rememberSaveable { serverType }
ServerSelector(selected) { ServerSelector(selected) {
serverType.value = it serverType.value = it

@ -22,7 +22,10 @@ class CalendarPicker : DialogFragment() {
return dialogBuilder return dialogBuilder
.newDialog() .newDialog()
.setContent { .setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
CalendarPicker( CalendarPicker(
selected = arguments?.getString(EXTRA_SELECTED), selected = arguments?.getString(EXTRA_SELECTED),
onSelected = { onSelected = {

@ -39,7 +39,10 @@ class IconPickerActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContent { setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
var hasPro by remember { mutableStateOf(false) } var hasPro by remember { mutableStateOf(false) }
LifecycleEventEffect(Lifecycle.Event.ON_RESUME) { LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
hasPro = inventory.hasPro hasPro = inventory.hasPro

@ -133,7 +133,10 @@ class DateTimePicker : BaseDateTimePicker() {
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle?, savedInstanceState: Bundle?,
) = content { ) = content {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
val datePickerState = rememberDatePickerState( val datePickerState = rememberDatePickerState(
initialDisplayMode = remember { preferences.calendarDisplayMode }, initialDisplayMode = remember { preferences.calendarDisplayMode },
) )

@ -76,7 +76,10 @@ class SortSettingsActivity : ComponentActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
enableEdgeToEdge() enableEdgeToEdge()
setContent { setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
val scrimColor = if (isSystemInDarkTheme()) val scrimColor = if (isSystemInDarkTheme())
Color(0x52454545) Color(0x52454545)
else else

@ -84,7 +84,10 @@ class StartDatePicker : BaseDateTimePicker() {
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
) = content { ) = content {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
val state = rememberDatePickerState( val state = rememberDatePickerState(
initialDisplayMode = remember { preferences.calendarDisplayMode }, initialDisplayMode = remember { preferences.calendarDisplayMode },
) )

@ -27,7 +27,10 @@ class CustomRecurrenceActivity : FragmentActivity() {
override fun onPostCreate(savedInstanceState: Bundle?) { override fun onPostCreate(savedInstanceState: Bundle?) {
super.onPostCreate(savedInstanceState) super.onPostCreate(savedInstanceState)
setContent { setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
CustomRecurrence( CustomRecurrence(
state = viewModel.state.collectAsStateWithLifecycle().value, state = viewModel.state.collectAsStateWithLifecycle().value,
save = { save = {

@ -42,7 +42,10 @@ class AddAccountDialog : DialogFragment() {
.newDialog() .newDialog()
.setTitle(R.string.choose_synchronization_service) .setTitle(R.string.choose_synchronization_service)
.setContent { .setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
org.tasks.compose.AddAccountDialog( org.tasks.compose.AddAccountDialog(
hasTasksAccount = hasTasksAccount, hasTasksAccount = hasTasksAccount,
enableMicrosoftSync = preferences.getBoolean(R.string.p_microsoft_sync, false), enableMicrosoftSync = preferences.getBoolean(R.string.p_microsoft_sync, false),

@ -83,7 +83,10 @@ class TagPickerActivity : ThemedInjectingAppCompatActivity() {
viewModel.search("") viewModel.search("")
setContent { setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
TagPicker( TagPicker(
viewModel, viewModel,
onBackClicked = { handleBackPressed() }, onBackClicked = { handleBackPressed() },

@ -254,7 +254,10 @@ class TaskViewHolder internal constructor(
val toggleSubtasks = { task: Long, collapsed: Boolean -> callback.toggleSubtasks(task, collapsed) } val toggleSubtasks = { task: Long, collapsed: Boolean -> callback.toggleSubtasks(task, collapsed) }
val onClick = { it: Filter -> callback.onClick(it) } val onClick = { it: Filter -> callback.onClick(it) }
chipGroup.setContent { chipGroup.setContent {
TasksTheme(theme = theme.themeBase.index) { TasksTheme(
theme = theme.themeBase.index,
primary = theme.themeColor.primaryColor,
) {
ChipGroup( ChipGroup(
modifier = Modifier.padding( modifier = Modifier.padding(
end = 16.dp, end = 16.dp,

Loading…
Cancel
Save