Add preference for linkifying task edit screen

pull/996/head
Alex Baker 4 years ago
parent 05f5d7d9b8
commit 1d01c5d7b4

@ -61,6 +61,7 @@ public class Upgrader {
private static final int V7_0 = 617;
public static final int V8_2 = 675;
private static final int V8_5 = 700;
private static final int V8_8 = 715;
private final Context context;
private final Preferences preferences;
private final Tracker tracker;
@ -122,6 +123,7 @@ public class Upgrader {
run(from, V7_0, this::applyCaldavSubtasks);
run(from, V8_2, this::migrateColors);
run(from, V8_5, this::applyCaldavGeo);
run(from, V8_8, () -> preferences.setBoolean(R.string.p_linkify_task_edit, true));
}
preferences.setCurrentVersion(to);
}

@ -30,6 +30,7 @@ import org.tasks.R;
import org.tasks.dialogs.Linkify;
import org.tasks.injection.ForApplication;
import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.Preferences;
import org.tasks.ui.CheckBoxProvider;
import org.tasks.ui.TaskEditControlFragment;
@ -51,6 +52,7 @@ public class EditTitleControlSet extends TaskEditControlFragment {
@Inject TaskCompleter taskCompleter;
@Inject Linkify linkify;
@Inject CheckBoxProvider checkBoxProvider;
@Inject Preferences preferences;
@BindView(R.id.title)
EditText editText;
@ -93,7 +95,9 @@ public class EditTitleControlSet extends TaskEditControlFragment {
editText.setLines(1);
editText.setMaxLines(Integer.MAX_VALUE);
linkify.linkify(editText);
if (preferences.getBoolean(R.string.p_linkify_task_edit, false)) {
linkify.linkify(editText);
}
updateCompleteBox();
return view;

@ -15,6 +15,7 @@ import javax.inject.Inject;
import org.tasks.R;
import org.tasks.dialogs.Linkify;
import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.Preferences;
public class DescriptionControlSet extends TaskEditControlFragment {
@ -22,6 +23,7 @@ public class DescriptionControlSet extends TaskEditControlFragment {
private static final String EXTRA_DESCRIPTION = "extra_description";
@Inject Linkify linkify;
@Inject Preferences preferences;
@BindView(R.id.notes)
EditText editText;
@ -46,7 +48,9 @@ public class DescriptionControlSet extends TaskEditControlFragment {
editText.setTextKeepState(description);
}
linkify.linkify(editText);
if (preferences.getBoolean(R.string.p_linkify_task_edit, false)) {
linkify.linkify(editText);
}
return view;
}

@ -280,6 +280,7 @@
<string name="p_show_description">show_description</string>
<string name="p_show_full_description">show_full_description</string>
<string name="p_linkify_task_list">linkify_task_list</string>
<string name="p_linkify_task_edit">linkify_task_edit</string>
<string name="p_show_list_indicators">show_list_indicators</string>
<string name="map_provider_mapbox">Mapbox</string>
<string name="map_provider_google">Google</string>

@ -124,6 +124,12 @@
android:targetPackage="@string/app_package" />
</Preference>
<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"

Loading…
Cancel
Save