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

Rename properties and change return types

Browse Source
pull/1004/head
Alex Baker 4 years ago
parent f1c863d2f3
commit e0571a0ed7
13 changed files with 66 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
Unescape Escape View File

@ -248,7 +248,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl
}
filter = newFilter
navigationDrawer.setSelected(filter)
defaultFilterProvider.lastViewedFilter = filter
defaultFilterProvider.lastViewedFilter = newFilter
applyTheme()
val fragmentManager = supportFragmentManager
fragmentManager

2
app/src/main/java/com/todoroo/astrid/service/TaskCreator.java
Unescape Escape View File

@ -101,7 +101,7 @@ public class TaskCreator {
caldavDao.insert(
task, new CaldavTask(task.getId(), task.getTransitory(CaldavTask.KEY)), addToTop);
} else {
Filter remoteList = defaultFilterProvider.getDefaultRemoteList();
Filter remoteList = defaultFilterProvider.getDefaultList();
if (remoteList instanceof GtasksFilter) {
googleTaskDao.insertAndShift(
new GoogleTask(task.getId(), ((GtasksFilter) remoteList).getRemoteId()), addToTop);

2
app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
Unescape Escape View File

@ -204,7 +204,7 @@ class Upgrader @Inject constructor(
} else {
val googleTaskList = googleTaskListDao.getByRemoteId(defaultGoogleTaskList!!)
if (googleTaskList != null) {
defaultFilterProvider.defaultRemoteList = GtasksFilter(googleTaskList)
defaultFilterProvider.defaultList = GtasksFilter(googleTaskList)
}
}
}

6
app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
Unescape Escape View File

@ -188,12 +188,12 @@ public class GoogleTaskSynchronizer {
nextPageToken = remoteLists.getNextPageToken();
} while (!isNullOrEmpty(nextPageToken));
gtasksListService.updateLists(account, gtaskLists);
Filter defaultRemoteList = defaultFilterProvider.getDefaultRemoteList();
Filter defaultRemoteList = defaultFilterProvider.getDefaultList();
if (defaultRemoteList instanceof GtasksFilter) {
GoogleTaskList list =
gtasksListService.getList(((GtasksFilter) defaultRemoteList).getRemoteId());
if (list == null) {
preferences.setString(R.string.p_default_remote_list, null);
preferences.setString(R.string.p_default_list, null);
}
}
for (GoogleTaskList list :
@ -264,7 +264,7 @@ public class GoogleTaskSynchronizer {
boolean newlyCreated = false;
String remoteId;
Filter defaultRemoteList = defaultFilterProvider.getDefaultRemoteList();
Filter defaultRemoteList = defaultFilterProvider.getDefaultList();
String listId =
defaultRemoteList instanceof GtasksFilter
? ((GtasksFilter) defaultRemoteList).getRemoteId()

60
app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
Unescape Escape View File

@ -25,65 +25,61 @@ class DefaultFilterProvider @Inject constructor(
private val caldavDao: CaldavDao,
private val locationDao: LocationDao) {
var dashclockFilter: Filter?
var dashclockFilter: Filter
get() = getFilterFromPreference(R.string.p_dashclock_filter)
set(filter) = setFilterPreference(filter, R.string.p_dashclock_filter)
var badgeFilter: Filter?
var badgeFilter: Filter
get() = getFilterFromPreference(R.string.p_badge_list)
set(filter) = setFilterPreference(filter, R.string.p_badge_list)
var defaultFilter: Filter?
get() = getFilterFromPreference(R.string.p_default_list)
set(filter) = setFilterPreference(filter, R.string.p_default_list)
var defaultOpenFilter: Filter
get() = getFilterFromPreference(R.string.p_default_open_filter)
set(filter) = setFilterPreference(filter, R.string.p_default_open_filter)
var lastViewedFilter: Filter?
var lastViewedFilter: Filter
get() = getFilterFromPreference(R.string.p_last_viewed_list)
set(filter) = setFilterPreference(filter, R.string.p_last_viewed_list)
var defaultRemoteList: Filter
get() = getFilterFromPreference(R.string.p_default_remote_list) ?: getAnyList()
set(filter) = setFilterPreference(filter, R.string.p_default_remote_list)
var defaultList: Filter
get() = getFilterFromPreference(R.string.p_default_list, getAnyList())
set(filter) = setFilterPreference(filter, R.string.p_default_list)
val startupFilter: Filter?
val startupFilter: Filter
get() {
return if (preferences.getBoolean(R.string.p_open_last_viewed_list, true)) {
lastViewedFilter
} else {
defaultFilter
defaultOpenFilter
}
}
fun getFilterFromPreference(resId: Int): Filter? =
fun getFilterFromPreference(resId: Int): Filter =
getFilterFromPreference(preferences.getStringValue(resId))
fun getFilterFromPreference(prefString: String?): Filter? =
fun getFilterFromPreference(prefString: String?): Filter =
getFilterFromPreference(prefString, getMyTasksFilter(context.resources))
private fun getAnyList(): Filter {
val filter = googleTaskListDao.getAllLists().getOrNull(0)
?.let { GtasksFilter(it) }
?: CaldavFilter(caldavDao.getCalendars()[0])
defaultFilter = filter
defaultList = filter
return filter
}
private fun getFilterFromPreference(preferenceValue: String?, def: Filter?): Filter? {
if (!isNullOrEmpty(preferenceValue)) {
try {
val filter = loadFilter(preferenceValue)
if (filter != null) {
return filter
}
} catch (e: Exception) {
Timber.e(e)
}
}
return def
private fun getFilterFromPreference(resId: Int, def: Filter) =
getFilterFromPreference(preferences.getStringValue(resId), def)
private fun getFilterFromPreference(preferenceValue: String?, def: Filter) = try {
preferenceValue?.let(this::loadFilter) ?: def
} catch (e: Exception) {
Timber.e(e)
def
}
private fun loadFilter(preferenceValue: String?): Filter? {
val split = preferenceValue!!.split(":".toRegex()).toTypedArray()
private fun loadFilter(preferenceValue: String): Filter? {
val split = preferenceValue.split(":")
return when (split[0].toInt()) {
TYPE_FILTER -> getBuiltInFilter(split[1].toInt())
TYPE_CUSTOM_FILTER -> customFilterExposer.getFilter(split[1].toLong())
@ -98,10 +94,10 @@ class DefaultFilterProvider @Inject constructor(
}
}
private fun setFilterPreference(filter: Filter?, prefId: Int) =
private fun setFilterPreference(filter: Filter, prefId: Int) =
getFilterPreferenceValue(filter).let { preferences.setString(prefId, it) }
fun getFilterPreferenceValue(filter: Filter?): String? = when (val filterType = getFilterType(filter)) {
fun getFilterPreferenceValue(filter: Filter): String? = when (val filterType = getFilterType(filter)) {
TYPE_FILTER -> getFilterPreference(filterType, getBuiltInFilterId(filter))
TYPE_CUSTOM_FILTER -> getFilterPreference(filterType, (filter as CustomFilter).id)
TYPE_TAG -> getFilterPreference(filterType, (filter as TagFilter).uuid)
@ -113,7 +109,7 @@ class DefaultFilterProvider @Inject constructor(
private fun <T> getFilterPreference(type: Int, value: T) = "$type:$value"
private fun getFilterType(filter: Filter?) = when (filter) {
private fun getFilterType(filter: Filter) = when (filter) {
is TagFilter -> TYPE_TAG
is GtasksFilter -> TYPE_GOOGLE_TASKS
is CustomFilter -> TYPE_CUSTOM_FILTER
@ -128,7 +124,7 @@ class DefaultFilterProvider @Inject constructor(
else -> getMyTasksFilter(context.resources)
}
private fun getBuiltInFilterId(filter: Filter?): Int {
private fun getBuiltInFilterId(filter: Filter): Int {
if (BuiltInFilterExposer.isTodayFilter(context, filter)) {
return FILTER_TODAY
} else if (BuiltInFilterExposer.isRecentlyModifiedFilter(context, filter)) {

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

@ -104,14 +104,14 @@ class LookAndFeel : InjectingPreferenceFragment() {
true
}
val defaultList = findPreference(R.string.p_default_list)
val filter: Filter? = defaultFilterProvider.defaultFilter
defaultList.summary = filter?.listingTitle
val defaultList = findPreference(R.string.p_default_open_filter)
val filter = defaultFilterProvider.defaultOpenFilter
defaultList.summary = filter.listingTitle
defaultList.onPreferenceClickListener = Preference.OnPreferenceClickListener {
val intent = Intent(context, FilterSelectionActivity::class.java)
intent.putExtra(
FilterSelectionActivity.EXTRA_FILTER,
defaultFilterProvider.defaultFilter
defaultFilterProvider.defaultOpenFilter
)
intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true)
startActivityForResult(intent, REQUEST_DEFAULT_LIST)
@ -309,8 +309,8 @@ class LookAndFeel : InjectingPreferenceFragment() {
if (resultCode == RESULT_OK) {
val filter: Filter =
data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
defaultFilterProvider.defaultFilter = filter
findPreference(R.string.p_default_list).summary = filter.listingTitle
defaultFilterProvider.defaultOpenFilter = filter
findPreference(R.string.p_default_open_filter).summary = filter.listingTitle
localBroadcastManager.broadcastRefresh()
}
} else if (requestCode == REQUEST_LOCALE) {

2
app/src/main/java/org/tasks/preferences/fragments/Notifications.kt
Unescape Escape View File

@ -76,7 +76,7 @@ class Notifications : InjectingPreferenceFragment() {
val badgePreference: Preference = findPreference(R.string.p_badge_list)
val filter = defaultFilterProvider.badgeFilter
badgePreference.summary = filter?.listingTitle
badgePreference.summary = filter.listingTitle
badgePreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
val intent = Intent(context, FilterSelectionActivity::class.java)
intent.putExtra(

10
app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt
Unescape Escape View File

@ -44,10 +44,10 @@ class TaskDefaults : InjectingPreferenceFragment() {
defaultCalendarPref.summary = defaultCalendarName
?: getString(R.string.dont_add_to_calendar)
findPreference(R.string.p_default_remote_list)
findPreference(R.string.p_default_list)
.setOnPreferenceClickListener {
ListPicker.newListPicker(
defaultFilterProvider.defaultRemoteList,
defaultFilterProvider.defaultList,
this,
REQUEST_DEFAULT_LIST)
.show(parentFragmentManager, FRAG_TAG_DEFAULT_LIST_SELECTION)
@ -62,7 +62,7 @@ class TaskDefaults : InjectingPreferenceFragment() {
if (requestCode == REQUEST_DEFAULT_LIST) {
val list: Filter? = data!!.getParcelableExtra(ListPicker.EXTRA_SELECTED_FILTER)
if (list is GtasksFilter || list is CaldavFilter) {
defaultFilterProvider.defaultRemoteList = list
defaultFilterProvider.defaultList = list
} else {
throw RuntimeException("Unhandled filter type")
}
@ -87,8 +87,8 @@ class TaskDefaults : InjectingPreferenceFragment() {
}
private fun updateRemoteListSummary() {
val defaultFilter = defaultFilterProvider.defaultRemoteList
findPreference(R.string.p_default_remote_list).summary = defaultFilter.listingTitle
val defaultFilter = defaultFilterProvider.defaultList
findPreference(R.string.p_default_list).summary = defaultFilter.listingTitle
}
override fun inject(component: FragmentComponent) = component.inject(this)

19
app/src/main/java/org/tasks/preferences/fragments/TaskerListNotification.kt
Unescape Escape View File

@ -33,7 +33,7 @@ class TaskerListNotification : InjectingPreferenceFragment() {
@Inject lateinit var defaultFilterProvider: DefaultFilterProvider
@Inject lateinit var inventory: Inventory
var filter: Filter? = null
lateinit var filter: Filter
var cancelled: Boolean = false
override fun getPreferenceXml() = R.xml.preferences_tasker
@ -42,7 +42,7 @@ class TaskerListNotification : InjectingPreferenceFragment() {
filter = if (savedInstanceState == null) {
defaultFilterProvider.getFilterFromPreference(arguments?.getString(EXTRA_FILTER))
} else {
savedInstanceState.getParcelable(EXTRA_FILTER)
savedInstanceState.getParcelable(EXTRA_FILTER)!!
}
refreshPreferences()
@ -66,7 +66,7 @@ class TaskerListNotification : InjectingPreferenceFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_SELECT_FILTER) {
if (resultCode == RESULT_OK) {
filter = data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)
filter = data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
refreshPreferences()
}
} else if (requestCode == REQUEST_SUBSCRIPTION) {
@ -86,18 +86,13 @@ class TaskerListNotification : InjectingPreferenceFragment() {
}
private fun refreshPreferences() {
findPreference(R.string.filter).summary = filter?.listingTitle
findPreference(R.string.filter).summary = filter.listingTitle
}
fun getResultBlurb(): String? {
return filter?.listingTitle
}
fun getResultBlurb(): String? = filter.listingTitle
fun getBundle(): Bundle {
return ListNotificationBundle.generateBundle(
defaultFilterProvider.getFilterPreferenceValue(filter)
)
}
fun getBundle(): Bundle =
ListNotificationBundle.generateBundle(defaultFilterProvider.getFilterPreferenceValue(filter))
override fun inject(component: FragmentComponent) = component.inject(this)
}

27
app/src/main/java/org/tasks/ui/ListFragment.kt
Unescape Escape View File

@ -35,7 +35,7 @@ class ListFragment : TaskEditControlFragment() {
@Inject lateinit var taskMover: TaskMover
@Inject lateinit var chipProvider: ChipProvider
private lateinit var originalList: Filter
private var originalList: Filter? = null
private lateinit var selectedList: Filter
private lateinit var callback: OnListChanged
@ -52,7 +52,7 @@ class ListFragment : TaskEditControlFragment() {
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val view = super.onCreateView(inflater, container, savedInstanceState)
if (savedInstanceState != null) {
originalList = savedInstanceState.getParcelable(EXTRA_ORIGINAL_LIST)!!
originalList = savedInstanceState.getParcelable(EXTRA_ORIGINAL_LIST)
setSelected(savedInstanceState.getParcelable(EXTRA_SELECTED_LIST)!!)
} else {
if (task.isNew) {
@ -67,8 +67,6 @@ class ListFragment : TaskEditControlFragment() {
if (caldav != null) {
originalList = CaldavFilter(caldav)
}
} else {
originalList = defaultFilterProvider.defaultRemoteList
}
} else {
val googleTask = googleTaskDao.getByTaskId(task.id)
@ -85,7 +83,7 @@ class ListFragment : TaskEditControlFragment() {
}
}
}
setSelected(originalList)
setSelected(originalList ?: defaultFilterProvider.defaultList)
}
return view
}
@ -110,17 +108,14 @@ class ListFragment : TaskEditControlFragment() {
override fun controlId() = TAG
override fun onRowClick() {
openPicker()
}
override fun onRowClick() = openPicker()
override val isClickable: Boolean
get() = true
private fun openPicker() {
ListPicker.newListPicker(selectedList, this, REQUEST_CODE_SELECT_LIST)
.show(parentFragmentManager, FRAG_TAG_GOOGLE_TASK_LIST_SELECTION)
}
private fun openPicker() =
ListPicker.newListPicker(selectedList, this, REQUEST_CODE_SELECT_LIST)
.show(parentFragmentManager, FRAG_TAG_GOOGLE_TASK_LIST_SELECTION)
override fun requiresId() = true
@ -131,13 +126,9 @@ class ListFragment : TaskEditControlFragment() {
}
}
override fun hasChanges(original: Task): Boolean {
return hasChanges()
}
override fun hasChanges(original: Task) = hasChanges()
private fun hasChanges(): Boolean {
return selectedList != originalList
}
private fun hasChanges() = selectedList != originalList
override fun inject(component: FragmentComponent) = component.inject(this)

4
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -286,7 +286,7 @@
<string name="p_open_last_viewed_list">open_last_viewed_list</string>
<string name="p_last_viewed_list">last_viewed_list</string>
<string name="p_default_list">default_list</string>
<string name="p_default_open_filter">default_list</string>
<string name="p_badges_enabled">badges_enabled</string>
<string name="p_badge_list">badge_list</string>
@ -321,7 +321,7 @@
<string name="p_widget_due_date_position">widget-due-date-position-</string>
<string name="p_widget_spacing">widget-spacing-</string>
<string name="p_dashclock_filter">dashclock_filter</string>
<string name="p_default_remote_list">default_remote_list</string>
<string name="p_default_list">default_remote_list</string>
<string name="debug">Debug</string>
<string name="p_start_of_week">start_of_week</string>

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

@ -36,7 +36,7 @@
android:title="@string/open_last_viewed_list" />
<Preference
android:key="@string/p_default_list"
android:key="@string/p_default_open_filter"
android:title="@string/widget_open_list"
android:dependency="@string/p_open_last_viewed_list" />

2
app/src/main/res/xml/preferences_task_defaults.xml
Unescape Escape View File

@ -10,7 +10,7 @@
<Preference
android:icon="@drawable/ic_list_24px"
android:key="@string/p_default_remote_list"
android:key="@string/p_default_list"
android:title="@string/default_list" />
<ListPreference

Write Preview
Loading…
Cancel
Save