Remove support_maps bool

pull/795/head
Alex Baker 5 years ago
parent 6a34b45cbf
commit f3c7ad2648

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="support_maps">true</bool>
</resources>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<bool name="support_maps">false</bool>
<bool name="support_geofences">false</bool> <bool name="support_geofences">false</bool>
</resources> </resources>

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<bool name="support_maps">true</bool>
<bool name="support_geofences">true</bool> <bool name="support_geofences">true</bool>
</resources> </resources>

@ -21,7 +21,6 @@ import javax.inject.Inject;
import org.tasks.BuildConfig; import org.tasks.BuildConfig;
import org.tasks.R; import org.tasks.R;
import org.tasks.injection.ForActivity; import org.tasks.injection.ForActivity;
import org.tasks.preferences.Device;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.sync.SyncAdapters; import org.tasks.sync.SyncAdapters;
import org.tasks.ui.CalendarControlSet; import org.tasks.ui.CalendarControlSet;
@ -79,21 +78,16 @@ public class TaskEditControlSetFragmentManager {
} }
private final Map<String, Integer> controlSetFragments = new LinkedHashMap<>(); private final Map<String, Integer> controlSetFragments = new LinkedHashMap<>();
private final Context context;
private final List<String> displayOrder; private final List<String> displayOrder;
private final SyncAdapters syncAdapters; private final SyncAdapters syncAdapters;
private final Device device;
private int numRows; private int numRows;
@Inject @Inject
public TaskEditControlSetFragmentManager( public TaskEditControlSetFragmentManager(
@ForActivity Context context, @ForActivity Context context,
Preferences preferences, Preferences preferences,
SyncAdapters syncAdapters, SyncAdapters syncAdapters) {
Device device) {
this.context = context;
this.syncAdapters = syncAdapters; this.syncAdapters = syncAdapters;
this.device = device;
displayOrder = BeastModePreferences.constructOrderedControlList(preferences, context); displayOrder = BeastModePreferences.constructOrderedControlList(preferences, context);
displayOrder.add(0, context.getString(EditTitleControlSet.TAG)); displayOrder.add(0, context.getString(EditTitleControlSet.TAG));
displayOrder.add(1, context.getString(CommentBarFragment.TAG)); displayOrder.add(1, context.getString(CommentBarFragment.TAG));
@ -162,7 +156,7 @@ public class TaskEditControlSetFragmentManager {
case ReminderControlSet.TAG: case ReminderControlSet.TAG:
return new ReminderControlSet(); return new ReminderControlSet();
case LocationControlSet.TAG: case LocationControlSet.TAG:
return device.supportsMaps() ? new LocationControlSet() : null; return new LocationControlSet();
case FilesControlSet.TAG: case FilesControlSet.TAG:
return new FilesControlSet(); return new FilesControlSet();
case TimerControlSet.TAG: case TimerControlSet.TAG:

@ -43,10 +43,6 @@ public class Device {
return intent.resolveActivity(context.getPackageManager()) != null; return intent.resolveActivity(context.getPackageManager()) != null;
} }
public boolean supportsMaps() {
return context.getResources().getBoolean(R.bool.support_maps);
}
public boolean supportsGeofences() { public boolean supportsGeofences() {
return context.getResources().getBoolean(R.bool.support_geofences); return context.getResources().getBoolean(R.bool.support_geofences);
} }

Loading…
Cancel
Save