archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update task list and edit preferences

Browse Source 
Move out of 'Look and feel' into top level menus
pull/1818/head
Alex Baker 2 years ago
parent a27047b6f8
commit 7bb0d0a84f
8 changed files with 249 additions and 191 deletions
Show Stats Download Patch File Download Diff File

20
app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
Unescape Escape View File

@ -10,7 +10,6 @@ import android.os.Handler
import androidx.annotation.StringRes
import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference
import androidx.preference.SwitchPreferenceCompat
import com.todoroo.astrid.api.Filter
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
@ -37,7 +36,6 @@ import org.tasks.themes.ThemeBase.DEFAULT_BASE_THEME
import org.tasks.themes.ThemeBase.EXTRA_THEME_OVERRIDE
import org.tasks.themes.ThemeColor
import org.tasks.themes.ThemeColor.getLauncherColor
import org.tasks.ui.ChipProvider
import org.tasks.ui.NavigationDrawerFragment.Companion.REQUEST_PURCHASE
import javax.inject.Inject
@ -62,7 +60,6 @@ class LookAndFeel : InjectingPreferenceFragment() {
@Inject lateinit var locale: Locale
@Inject lateinit var defaultFilterProvider: DefaultFilterProvider
@Inject lateinit var inventory: Inventory
@Inject lateinit var chipProvider: ChipProvider
override fun getPreferenceXml() = R.xml.preferences_look_and_feel
@ -76,16 +73,6 @@ class LookAndFeel : InjectingPreferenceFragment() {
false
}
findPreference(R.string.p_chip_style).setOnPreferenceChangeListener { _, newValue ->
chipProvider.setStyle(Integer.parseInt(newValue as String))
true
}
findPreference(R.string.p_chip_appearance).setOnPreferenceChangeListener { _, newValue ->
chipProvider.setAppearance(Integer.parseInt(newValue as String))
true
}
findPreference(R.string.p_desaturate_colors).setOnPreferenceChangeListener { _, _ ->
if (context?.resources?.configuration?.uiMode?.and(Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES) {
activity?.recreate()
@ -93,13 +80,6 @@ class LookAndFeel : InjectingPreferenceFragment() {
true
}
val sortGroups = findPreference(R.string.p_disable_sort_groups) as SwitchPreferenceCompat
sortGroups.isChecked = sortGroups.isChecked || preferences.usePagedQueries()
findPreference(R.string.p_use_paged_queries).setOnPreferenceChangeListener { _, value ->
sortGroups.isChecked = value as Boolean
true
}
val defaultList = findPreference(R.string.p_default_open_filter)
val filter = defaultFilterProvider.getDefaultOpenFilter()
defaultList.summary = filter.listingTitle

25
app/src/main/java/org/tasks/preferences/fragments/TaskEditPreferences.kt
Unescape Escape View File

@ -0,0 +1,25 @@
package org.tasks.preferences.fragments
import android.os.Bundle
import androidx.appcompat.content.res.AppCompatResources
import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R
import org.tasks.injection.InjectingPreferenceFragment
import org.tasks.preferences.IconPreference
@AndroidEntryPoint
class TaskEditPreferences : InjectingPreferenceFragment() {
override fun getPreferenceXml() = R.xml.preferences_task_edit
override suspend fun setupPreferences(savedInstanceState: Bundle?) {
(findPreference(R.string.customize_edit_screen) as IconPreference).apply {
drawable = AppCompatResources.getDrawable(
requireContext(),
R.drawable.ic_keyboard_arrow_right_24px
)?.mutate()
tint = context?.getColor(R.color.icon_tint_with_alpha)
iconVisible = true
}
}
}

38
app/src/main/java/org/tasks/preferences/fragments/TaskListPreferences.kt
Unescape Escape View File

@ -0,0 +1,38 @@
package org.tasks.preferences.fragments
import android.os.Bundle
import androidx.preference.SwitchPreferenceCompat
import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R
import org.tasks.injection.InjectingPreferenceFragment
import org.tasks.preferences.Preferences
import org.tasks.ui.ChipProvider
import javax.inject.Inject
@AndroidEntryPoint
class TaskListPreferences : InjectingPreferenceFragment() {
@Inject lateinit var preferences: Preferences
@Inject lateinit var chipProvider: ChipProvider
override fun getPreferenceXml() = R.xml.preferences_task_list
override suspend fun setupPreferences(savedInstanceState: Bundle?) {
findPreference(R.string.p_chip_style).setOnPreferenceChangeListener { _, newValue ->
chipProvider.setStyle(Integer.parseInt(newValue as String))
true
}
findPreference(R.string.p_chip_appearance).setOnPreferenceChangeListener { _, newValue ->
chipProvider.setAppearance(Integer.parseInt(newValue as String))
true
}
val sortGroups = findPreference(R.string.p_disable_sort_groups) as SwitchPreferenceCompat
sortGroups.isChecked = sortGroups.isChecked || preferences.usePagedQueries()
findPreference(R.string.p_use_paged_queries).setOnPreferenceChangeListener { _, value ->
sortGroups.isChecked = value as Boolean
true
}
}
}

1
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -326,6 +326,7 @@ File %1$s contained %2$s.\n\n
<string name="header_spacing">Spacing</string>
<string name="row_spacing">Row spacing</string>
<string name="customize_edit_screen">Customize edit screen</string>
<string name="customize_edit_screen_summary">Rearrange or remove fields</string>
<string name="source_code">Source code</string>
<string name="translations">Contribute translations</string>
<string name="contact_developer">Contact developer</string>

12
app/src/main/res/xml/preferences.xml
Unescape Escape View File

@ -20,9 +20,19 @@
<Preference
app:fragment="org.tasks.preferences.fragments.TaskDefaults"
app:icon="@drawable/ic_outline_edit_24px"
app:icon="@drawable/ic_outline_add_24px"
app:title="@string/task_defaults" />
<Preference
app:fragment="org.tasks.preferences.fragments.TaskListPreferences"
app:icon="@drawable/ic_list_24px"
app:title="@string/task_list_options" />
<Preference
app:fragment="org.tasks.preferences.fragments.TaskEditPreferences"
app:icon="@drawable/ic_outline_edit_24px"
app:title="@string/EPr_edit_screen_options" />
<Preference
app:fragment="org.tasks.preferences.fragments.DateAndTime"
app:icon="@drawable/ic_outline_schedule_24px"

177
app/src/main/res/xml/preferences_look_and_feel.xml
Unescape Escape View File

@ -34,6 +34,13 @@
android:entryValues="@array/map_theme_values"
android:summary="%s" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_markdown"
android:summary="@string/markdown_description"
android:title="@string/markdown"
app:allowDividerAbove="true" />
<PreferenceCategory
android:title="@string/on_launch">
@ -50,176 +57,6 @@
</PreferenceCategory>
<PreferenceCategory
android:key="@string/task_list_options"
android:title="@string/task_list_options">
<ListPreference
android:defaultValue="@integer/default_app_bar_position"
android:key="@string/p_app_bar_position"
android:entries="@array/app_bar_position"
android:summary="%s"
android:entryValues="@array/two_values"
android:title="@string/app_bar_position" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/p_app_bar_collapse"
android:title="@string/app_bar_collapse" />
<SeekBarPreference
android:defaultValue="16"
android:key="@string/p_fontSize"
android:max="48"
android:title="@string/font_size"
app:min="10"
app:showSeekBarValue="true" />
<SeekBarPreference
android:defaultValue="16"
android:key="@string/p_rowPadding"
android:max="16"
android:title="@string/row_spacing"
app:min="0"
app:showSeekBarValue="true" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_fullTaskTitle"
android:title="@string/EPr_fullTask_title"
app:singleLineTitle="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_show_description"
android:title="@string/show_description" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="@string/p_show_description"
android:key="@string/p_show_full_description"
android:title="@string/show_full_description" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_linkify_task_list"
android:summary="@string/linkify_description"
android:title="@string/linkify" />
<SwitchPreferenceCompat
android:defaultValue="true"
app:allowDividerAbove="true"
android:key="@string/p_completed_tasks_at_bottom"
android:title="@string/completed_tasks_at_bottom" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_completed_tasks_sort"
android:dependency="@string/p_completed_tasks_at_bottom"
android:title="@string/completed_tasks_sort" />
<SwitchPreferenceCompat
android:defaultValue="false"
app:allowDividerAbove="true"
android:key="@string/p_use_paged_queries"
android:disableDependentsState="true"
android:summary="@string/improve_performance_summary"
android:title="@string/improve_performance" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="@string/p_use_paged_queries"
android:key="@string/p_disable_sort_groups"
android:title="@string/disable_sort_groups" />
<PreferenceCategory
android:title="@string/chips">
<ListPreference
android:defaultValue="0"
android:entries="@array/chip_styles"
android:summary="%s"
android:entryValues="@array/chip_style_values"
android:key="@string/p_chip_style"
android:title="@string/chip_style" />
<ListPreference
android:defaultValue="0"
android:entries="@array/chip_appearance"
android:summary="%s"
android:entryValues="@array/chip_appearance_values"
android:key="@string/p_chip_appearance"
android:title="@string/chip_appearance" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_subtask_chips"
android:title="@string/subtasks" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_start_date_chip"
android:title="@string/start_date" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_place_chips"
android:title="@string/places" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_list_chips"
android:title="@string/lists" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_tag_chips"
android:title="@string/tags" />
</PreferenceCategory>
</PreferenceCategory>
<PreferenceCategory android:title="@string/EPr_edit_screen_options">
<Preference
android:key="@string/customize_edit_screen"
android:title="@string/customize_edit_screen">
<intent
android:targetClass="com.todoroo.astrid.activity.BeastModePreferences"
android:targetPackage="@string/app_package" />
</Preference>
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_markdown"
android:summary="@string/markdown_description"
android:title="@string/markdown" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_linkify_task_edit"
android:summary="@string/linkify_description"
android:title="@string/linkify" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_back_button_saves_task"
android:title="@string/back_button_saves_task" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_hide_check_button"
android:title="@string/hide_check_button" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_show_task_edit_comments"
android:title="@string/EPr_show_task_edit_comments"
app:singleLineTitle="false" />
</PreferenceCategory>
<PreferenceCategory
android:key="@string/settings_localization"
android:title="@string/settings_localization">

38
app/src/main/res/xml/preferences_task_edit.xml
Unescape Escape View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:key="@string/preference_screen">
<org.tasks.preferences.IconPreference
android:key="@string/customize_edit_screen"
android:title="@string/customize_edit_screen"
android:layout="@layout/preference_icon"
android:summary="@string/customize_edit_screen_summary">
<intent
android:targetClass="com.todoroo.astrid.activity.BeastModePreferences"
android:targetPackage="@string/app_package" />
</org.tasks.preferences.IconPreference>
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_linkify_task_edit"
android:summary="@string/linkify_description"
android:title="@string/linkify" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_back_button_saves_task"
android:title="@string/back_button_saves_task" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_hide_check_button"
android:title="@string/hide_check_button" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_show_task_edit_comments"
android:title="@string/EPr_show_task_edit_comments"
app:singleLineTitle="false" />
</PreferenceScreen>

129
app/src/main/res/xml/preferences_task_list.xml
Unescape Escape View File

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:key="@string/preference_screen">
<ListPreference
android:defaultValue="@integer/default_app_bar_position"
android:entries="@array/app_bar_position"
android:entryValues="@array/two_values"
android:key="@string/p_app_bar_position"
android:summary="%s"
android:title="@string/app_bar_position" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/p_app_bar_collapse"
android:title="@string/app_bar_collapse" />
<SeekBarPreference
android:defaultValue="16"
android:key="@string/p_fontSize"
android:max="48"
android:title="@string/font_size"
app:min="10"
app:showSeekBarValue="true" />
<SeekBarPreference
android:defaultValue="16"
android:key="@string/p_rowPadding"
android:max="16"
android:title="@string/row_spacing"
app:min="0"
app:showSeekBarValue="true" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_fullTaskTitle"
android:title="@string/EPr_fullTask_title"
app:singleLineTitle="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_show_description"
android:title="@string/show_description" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="@string/p_show_description"
android:key="@string/p_show_full_description"
android:title="@string/show_full_description" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_linkify_task_list"
android:summary="@string/linkify_description"
android:title="@string/linkify" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_completed_tasks_at_bottom"
android:title="@string/completed_tasks_at_bottom"
app:allowDividerAbove="true" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:dependency="@string/p_completed_tasks_at_bottom"
android:key="@string/p_completed_tasks_sort"
android:title="@string/completed_tasks_sort" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:disableDependentsState="true"
android:key="@string/p_use_paged_queries"
android:summary="@string/improve_performance_summary"
android:title="@string/improve_performance"
app:allowDividerAbove="true" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="@string/p_use_paged_queries"
android:key="@string/p_disable_sort_groups"
android:title="@string/disable_sort_groups" />
<PreferenceCategory android:title="@string/chips">
<ListPreference
android:defaultValue="0"
android:entries="@array/chip_styles"
android:entryValues="@array/chip_style_values"
android:key="@string/p_chip_style"
android:summary="%s"
android:title="@string/chip_style" />
<ListPreference
android:defaultValue="0"
android:entries="@array/chip_appearance"
android:entryValues="@array/chip_appearance_values"
android:key="@string/p_chip_appearance"
android:summary="%s"
android:title="@string/chip_appearance" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_subtask_chips"
android:title="@string/subtasks" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_start_date_chip"
android:title="@string/start_date" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_place_chips"
android:title="@string/places" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_list_chips"
android:title="@string/lists" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_tag_chips"
android:title="@string/tags" />
</PreferenceCategory>
</PreferenceScreen>
Write Preview
Loading…
Cancel
Save