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

Rename LocationFilter to PlaceFilter

Browse Source
pull/996/head
Alex Baker 5 years ago
parent bd1aa46d13
commit ea354240ea
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -92,7 +92,7 @@ import org.tasks.data.TagDataDao;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.dialogs.SortDialog; import org.tasks.dialogs.SortDialog;
import org.tasks.etesync.EteSyncCalendarSettingsActivity; import org.tasks.etesync.EteSyncCalendarSettingsActivity;
import org.tasks.filters.LocationFilter; import org.tasks.filters.PlaceFilter;
import org.tasks.injection.ForActivity; import org.tasks.injection.ForActivity;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
import org.tasks.injection.InjectingFragment; import org.tasks.injection.InjectingFragment;
@ -445,7 +445,7 @@ public final class TaskListFragment extends InjectingFragment
startActivityForResult(caldavSettings, REQUEST_LIST_SETTINGS); startActivityForResult(caldavSettings, REQUEST_LIST_SETTINGS);
return true; return true;
case R.id.menu_location_settings: case R.id.menu_location_settings:
Place place = ((LocationFilter) filter).getPlace(); Place place = ((PlaceFilter) filter).getPlace();
Intent intent = Intent intent =
new Intent( new Intent(
getActivity(), getActivity(),
@ -473,7 +473,7 @@ public final class TaskListFragment extends InjectingFragment
localBroadcastManager.broadcastRefresh(); localBroadcastManager.broadcastRefresh();
return true; return true;
case R.id.menu_open_map: case R.id.menu_open_map:
((LocationFilter) filter).openMap(context); ((PlaceFilter) filter).openMap(context);
return true; return true;
default: default:
return onOptionsItemSelected(item); return onOptionsItemSelected(item);

4
app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
Unescape Escape View File

@ -25,7 +25,7 @@ import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.api.TagFilter; import com.todoroo.astrid.api.TagFilter;
import org.tasks.R; import org.tasks.R;
import org.tasks.billing.Inventory; import org.tasks.billing.Inventory;
import org.tasks.filters.LocationFilter; import org.tasks.filters.PlaceFilter;
import org.tasks.locale.Locale; import org.tasks.locale.Locale;
import org.tasks.preferences.SyncPreferences; import org.tasks.preferences.SyncPreferences;
import org.tasks.themes.ColorProvider; import org.tasks.themes.ColorProvider;
@ -159,7 +159,7 @@ public class FilterViewHolder extends RecyclerView.ViewHolder {
return R.drawable.ic_outline_cloud_24px; return R.drawable.ic_outline_cloud_24px;
} else if (filter instanceof CustomFilter) { } else if (filter instanceof CustomFilter) {
return R.drawable.ic_outline_filter_list_24px; return R.drawable.ic_outline_filter_list_24px;
} else if (filter instanceof LocationFilter) { } else if (filter instanceof PlaceFilter) {
return R.drawable.ic_outline_place_24px; return R.drawable.ic_outline_place_24px;
} else { } else {
return filter.icon; return filter.icon;

4
app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
Unescape Escape View File

@ -13,7 +13,7 @@ import com.todoroo.astrid.activity.TaskListFragment
import org.tasks.R import org.tasks.R
import org.tasks.data.LocationDao import org.tasks.data.LocationDao
import org.tasks.data.Place import org.tasks.data.Place
import org.tasks.filters.LocationFilter import org.tasks.filters.PlaceFilter
import org.tasks.injection.ActivityComponent import org.tasks.injection.ActivityComponent
import org.tasks.location.MapFragment import org.tasks.location.MapFragment
import javax.inject.Inject import javax.inject.Inject
@ -78,7 +78,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
setResult( setResult(
Activity.RESULT_OK, Activity.RESULT_OK,
Intent(TaskListFragment.ACTION_RELOAD) Intent(TaskListFragment.ACTION_RELOAD)
.putExtra(MainActivity.OPEN_FILTER, LocationFilter(place))) .putExtra(MainActivity.OPEN_FILTER, PlaceFilter(place)))
finish() finish()
} }

4
app/src/main/java/org/tasks/filters/LocationFilters.java
Unescape Escape View File

@ -7,8 +7,8 @@ public class LocationFilters {
@Embedded public Place place; @Embedded public Place place;
public int count; public int count;
public LocationFilter toLocationFilter() { public PlaceFilter toLocationFilter() {
LocationFilter filter = new LocationFilter(place); PlaceFilter filter = new PlaceFilter(place);
filter.count = count; filter.count = count;
return filter; return filter;
} }

24
app/src/main/java/org/tasks/filters/LocationFilter.java → app/src/main/java/org/tasks/filters/PlaceFilter.java
Unescape Escape View File

@ -17,26 +17,26 @@ import org.tasks.R;
import org.tasks.data.Geofence; import org.tasks.data.Geofence;
import org.tasks.data.Place; import org.tasks.data.Place;
public class LocationFilter extends Filter { public class PlaceFilter extends Filter {
public static final Parcelable.Creator<LocationFilter> CREATOR = public static final Parcelable.Creator<PlaceFilter> CREATOR =
new Parcelable.Creator<LocationFilter>() { new Parcelable.Creator<PlaceFilter>() {
@Override @Override
public LocationFilter createFromParcel(Parcel source) { public PlaceFilter createFromParcel(Parcel source) {
return new LocationFilter(source); return new PlaceFilter(source);
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public LocationFilter[] newArray(int size) { public PlaceFilter[] newArray(int size) {
return new LocationFilter[size]; return new PlaceFilter[size];
} }
}; };
private Place place; private Place place;
private LocationFilter(Parcel source) { private PlaceFilter(Parcel source) {
super(); super();
readFromParcel(source); readFromParcel(source);
place = source.readParcelable(getClass().getClassLoader()); place = source.readParcelable(getClass().getClassLoader());
@ -48,7 +48,7 @@ public class LocationFilter extends Filter {
dest.writeParcelable(place, 0); dest.writeParcelable(place, 0);
} }
public LocationFilter(Place place) { public PlaceFilter(Place place) {
super(place.getDisplayName(), queryTemplate(place), getValuesForNewTask(place)); super(place.getDisplayName(), queryTemplate(place), getValuesForNewTask(place));
this.place = place; this.place = place;
tint = place.getColor(); tint = place.getColor();
@ -92,13 +92,13 @@ public class LocationFilter extends Filter {
@Override @Override
public boolean areItemsTheSame(@NonNull FilterListItem other) { public boolean areItemsTheSame(@NonNull FilterListItem other) {
return other instanceof LocationFilter return other instanceof PlaceFilter
&& place.getUid().equals(((LocationFilter) other).getPlace().getUid()); && place.getUid().equals(((PlaceFilter) other).getPlace().getUid());
} }
@Override @Override
public boolean areContentsTheSame(@NonNull FilterListItem other) { public boolean areContentsTheSame(@NonNull FilterListItem other) {
return place.equals(((LocationFilter) other).getPlace()) && count == other.count; return place.equals(((PlaceFilter) other).getPlace()) && count == other.count;
} }
public void openMap(Context context) { public void openMap(Context context) {

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

@ -28,7 +28,7 @@ import org.tasks.data.GoogleTaskList;
import org.tasks.data.GoogleTaskListDao; import org.tasks.data.GoogleTaskListDao;
import org.tasks.data.LocationDao; import org.tasks.data.LocationDao;
import org.tasks.data.Place; import org.tasks.data.Place;
import org.tasks.filters.LocationFilter; import org.tasks.filters.PlaceFilter;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import timber.log.Timber; import timber.log.Timber;
@ -145,7 +145,7 @@ public class DefaultFilterProvider {
return caldavCalendar == null ? null : new CaldavFilter(caldavCalendar); return caldavCalendar == null ? null : new CaldavFilter(caldavCalendar);
case TYPE_LOCATION: case TYPE_LOCATION:
Place place = locationDao.getPlace(split[1]); Place place = locationDao.getPlace(split[1]);
return place == null ? null : new LocationFilter(place); return place == null ? null : new PlaceFilter(place);
default: default:
return null; return null;
} }
@ -172,7 +172,7 @@ public class DefaultFilterProvider {
case TYPE_CALDAV: case TYPE_CALDAV:
return getFilterPreference(filterType, ((CaldavFilter) filter).getUuid()); return getFilterPreference(filterType, ((CaldavFilter) filter).getUuid());
case TYPE_LOCATION: case TYPE_LOCATION:
return getFilterPreference(filterType, ((LocationFilter) filter).getUid()); return getFilterPreference(filterType, ((PlaceFilter) filter).getUid());
} }
return null; return null;
} }
@ -190,7 +190,7 @@ public class DefaultFilterProvider {
return TYPE_CUSTOM_FILTER; return TYPE_CUSTOM_FILTER;
} else if (filter instanceof CaldavFilter) { } else if (filter instanceof CaldavFilter) {
return TYPE_CALDAV; return TYPE_CALDAV;
} else if (filter instanceof LocationFilter) { } else if (filter instanceof PlaceFilter) {
return TYPE_LOCATION; return TYPE_LOCATION;
} }
return TYPE_FILTER; return TYPE_FILTER;

6
app/src/main/java/org/tasks/ui/ChipProvider.java
Unescape Escape View File

@ -29,7 +29,7 @@ import org.tasks.billing.Inventory;
import org.tasks.data.Location; import org.tasks.data.Location;
import org.tasks.data.TagData; import org.tasks.data.TagData;
import org.tasks.data.TaskContainer; import org.tasks.data.TaskContainer;
import org.tasks.filters.LocationFilter; import org.tasks.filters.PlaceFilter;
import org.tasks.locale.Locale; import org.tasks.locale.Locale;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.themes.ColorProvider; import org.tasks.themes.ColorProvider;
@ -113,9 +113,9 @@ public class ChipProvider {
if (!hideSubtaskChip && task.hasChildren()) { if (!hideSubtaskChip && task.hasChildren()) {
chips.add(newSubtaskChip(task, !showText)); chips.add(newSubtaskChip(task, !showText));
} }
if (task.hasLocation() && !(filter instanceof LocationFilter)) { if (task.hasLocation() && !(filter instanceof PlaceFilter)) {
Location location = task.getLocation(); Location location = task.getLocation();
chips.add(newChip(new LocationFilter(location.getPlace()), R.drawable.ic_outline_place_24px)); chips.add(newChip(new PlaceFilter(location.getPlace()), R.drawable.ic_outline_place_24px));
} }
if (!isSubtask) { if (!isSubtask) {
if (!Strings.isNullOrEmpty(task.getGoogleTaskList()) && !(filter instanceof GtasksFilter)) { if (!Strings.isNullOrEmpty(task.getGoogleTaskList()) && !(filter instanceof GtasksFilter)) {

Write Preview
Loading…
Cancel
Save