Rename properties and change return types

pull/1004/head
Alex Baker 4 years ago
parent f1c863d2f3
commit e0571a0ed7

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

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

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

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

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

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

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

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

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

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

@ -286,7 +286,7 @@
<string name="p_open_last_viewed_list">open_last_viewed_list</string> <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_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_badges_enabled">badges_enabled</string>
<string name="p_badge_list">badge_list</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_due_date_position">widget-due-date-position-</string>
<string name="p_widget_spacing">widget-spacing-</string> <string name="p_widget_spacing">widget-spacing-</string>
<string name="p_dashclock_filter">dashclock_filter</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="debug">Debug</string>
<string name="p_start_of_week">start_of_week</string> <string name="p_start_of_week">start_of_week</string>

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

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

Loading…
Cancel
Save