Skip to content

Commit

Permalink
Support long text modal in additional items
Browse files Browse the repository at this point in the history 
This will show the long text modal for "Additional" items if they are
longer then the value set in the preferences.

This set the default max length value in the preferences to 80 as
otherwise the modal would essentially never be shown.

Fixes #2373
  • Loading branch information
@simonpoole
simonpoole committed Sep 26, 2023
1 parent ccaf75a commit 083a88a
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 45 deletions.
4 changes: 2 additions & 2 deletions src/androidTest/java/de/blau/android/propertyeditor/PropertyEditorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ public void longText() {
found = TestUtils.clickText(device, true, getTranslatedPresetItemName(main, "Restaurant"), true, false);
assertTrue(found);

// apply optional tags and check that diaper tag isn't present
// apply optional tags
assertTrue(TestUtils.clickMenuButton(device, main.getString(R.string.tag_menu_apply_preset_with_optional), false, false));
TestUtils.scrollTo("Wheelchair access details", false);

Expand All @@ -499,7 +499,7 @@ public void longText() {
} catch (UiObjectNotFoundException e) {
fail();
}

assertTrue(TestUtils.findText(device, false, "1234567890");
TestUtils.clickHome(device, true);
assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_nodeselect)));
device.waitForIdle();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/blau/android/prefs/Preferences.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ public Preferences(@NonNull Context ctx) {

useImperialUnits = prefs.getBoolean(r.getString(R.string.config_useImperialUnits_key), false);

longStringLimit = getIntPref(R.string.config_longStringLimit_key, Capabilities.DEFAULT_MAX_STRING_LENGTH);
longStringLimit = getIntPref(R.string.config_longStringLimit_key, 80);
}

/**
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/de/blau/android/propertyeditor/tagform/KeyValueRow.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
package de.blau.android.propertyeditor.tagform;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

public interface KeyValueRow {

/**
* Return the OSM key value
*
* @return the key as a String
*/
@NonNull
String getKey();

/**
* Get the current value
*
* @return the current value as a String
*/
@Nullable
String getValue();

default boolean hasKey(@Nullable String key) {
return getKey().equals(key);
}
}
3 changes: 2 additions & 1 deletion src/main/java/de/blau/android/propertyeditor/tagform/LongTextDialogRow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.widget.EditText;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AlertDialog.Builder;
import de.blau.android.R;
Expand Down Expand Up @@ -58,7 +59,7 @@ public LongTextDialogRow(@NonNull Context context, AttributeSet attrs) {
* @return an instance of TagFormDialogRow
*/
static DialogRow getRow(@NonNull final TagFormFragment caller, @NonNull final LayoutInflater inflater, @NonNull final LinearLayout rowLayout,
@NonNull final PresetItem preset, @NonNull final PresetTextField field, @NonNull final String value, int maxLength) {
@Nullable final PresetItem preset, @NonNull final PresetTextField field, @NonNull final String value, int maxLength) {
final DialogRow row = (DialogRow) inflater.inflate(R.layout.tag_form_text_dialog_row, rowLayout, false);
String key = field.getKey();
String hint = field.getHint();
Expand Down
75 changes: 40 additions & 35 deletions src/main/java/de/blau/android/propertyeditor/tagform/TagFormFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import de.blau.android.measure.Params;
import de.blau.android.nsi.Names;
import de.blau.android.osm.OsmElement;
import de.blau.android.osm.Server;
import de.blau.android.osm.Tags;
import de.blau.android.osm.Way;
import de.blau.android.osm.Wiki;
Expand Down Expand Up @@ -118,7 +117,8 @@ public class TagFormFragment extends BaseFragment implements FormUpdate {

int maxInlineValues = 3;

int maxStringLength; // maximum key, value and role length
int maxStringLength; // maximum key, value and role length
private int longStringLimit;

private Map<PresetItem, Boolean> displayOptional = new HashMap<>();

Expand Down Expand Up @@ -235,8 +235,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c

maxInlineValues = prefs.getMaxInlineValues();

Server server = prefs.getServer();
maxStringLength = server.getCachedCapabilities().getMaxStringLength();
maxStringLength = propertyEditorListener.getCapabilities().getMaxStringLength();
longStringLimit = prefs.getLongStringLimit();

if (displayMRUpresets) {
de.blau.android.propertyeditor.Util.addMRUPresetsFragment(getChildFragmentManager(), R.id.mru_layout,
Expand Down Expand Up @@ -303,7 +303,7 @@ ArrayAdapter<?> getValueAutocompleteAdapter(@Nullable String key, @Nullable List
@Nullable
ArrayAdapter<?> getValueAutocompleteAdapter(@Nullable String key, @Nullable List<String> values, @Nullable PresetItem preset,
@Nullable PresetTagField field, @NonNull Map<String, String> allTags, boolean addRuler, boolean dedup, int addMruSize) {
if (key != null && key.length() > 0) {
if (Util.notEmpty(key)) {
Set<String> usedKeys = allTags.keySet();
if (TagEditorFragment.isStreetName(key, usedKeys)) {
return nameAdapters.getStreetNameAdapter(values);
Expand Down Expand Up @@ -397,7 +397,7 @@ ArrayAdapter<?> getValueAutocompleteAdapter(@Nullable String key, @Nullable List
}
if (values != null) { // add in any non-standard non-empty values
for (String value : values) {
if (value != null && !"".equals(value) && !counter.containsKey(value)) {
if (Util.notEmpty(value) && !counter.containsKey(value)) {
StringWithDescription s = new StringWithDescription(value);
adapter2.remove(s);
adapter2.insert(s, 0);
Expand Down Expand Up @@ -608,10 +608,10 @@ public void displayOptional(PresetItem presetItem, boolean optional) {
/**
* Return the view we have our rows in and work around some android craziness
*
* @return the immutable row layout or null if it couldn't be found
* @return the non-preset row layout or null if it couldn't be found
*/
@Nullable
private View getImmutableView() {
private View getNonPresetView() {
// android.support.v4.app.NoSaveStateFrameLayout
View v = getView();
if (v != null) {
Expand Down Expand Up @@ -657,7 +657,7 @@ public void update() {
int pos = 0;
ll.addView(editableView, pos++);

LinearLayout nonEditableView = (LinearLayout) getImmutableView();
LinearLayout nonEditableView = (LinearLayout) getNonPresetView();
if (nonEditableView != null && nonEditableView.getChildCount() > 0) {
nonEditableView.removeAllViews();
}
Expand Down Expand Up @@ -819,7 +819,6 @@ private Map<String, String> addTagsToViews(@NonNull EditableLayout editableView,
linkedTags.put(field, value);
keyToLinkedPreset.put(key, l);
editableView.putTag(key, value);
i18nFound = true;
tagList.remove(key);
break;
}
Expand Down Expand Up @@ -948,6 +947,7 @@ void addRow(@Nullable final LinearLayout rowLayout, @NonNull final PresetTagFiel
Log.e(DEBUG_TAG, "addRow called for fixed field " + field);
return;
}
final boolean longString = value != null && longStringLimit <= value.length();
if (preset == null) { // no preset here so we can only handle hardwired stuff specially
if (key.endsWith(Tags.KEY_CONDITIONAL_SUFFIX)) {
rowLayout.addView(getConditionalRestrictionDialogRow(rowLayout, null, null, key, value, null, allTags));
Expand All @@ -957,6 +957,10 @@ void addRow(@Nullable final LinearLayout rowLayout, @NonNull final PresetTagFiel
rowLayout.addView(OpeningHoursDialogRow.getRow(this, inflater, rowLayout, null, null, key, value, null));
return;
}
if (longString) {
rowLayout.addView(LongTextDialogRow.getRow(this, inflater, rowLayout, null, (PresetTextField) field, value, maxStringLength));
return;
}
rowLayout.addView(TextRow.getRow(this, inflater, rowLayout, null, new PresetTextField(key), value, null, allTags));
return;
}
Expand All @@ -971,7 +975,7 @@ void addRow(@Nullable final LinearLayout rowLayout, @NonNull final PresetTagFiel
values = Util.wrapInList(value);
}
String hint = field.getHint();
if (field.isDeprecated() && (hint != null && !"".equals(hint))) {
if (field.isDeprecated() && Util.notEmpty(hint)) {
hint = getString(R.string.deprecated, hint);
}
//
Expand All @@ -994,11 +998,8 @@ void addRow(@Nullable final LinearLayout rowLayout, @NonNull final PresetTagFiel
rowLayout.addView(UrlDialogRow.getRow(this, inflater, rowLayout, preset, hint, key, value));
return;
}
final int longStringLimit = prefs.getLongStringLimit();
if (field instanceof PresetTextField
&& (longStringLimit <= ((PresetTextField) field).length() || (value != null && longStringLimit <= value.length()))) {
rowLayout.addView(LongTextDialogRow.getRow(this, inflater, rowLayout, preset, (PresetTextField) field, value,
propertyEditorListener.getCapabilities().getMaxStringLength()));
if (field instanceof PresetTextField && (longStringLimit <= ((PresetTextField) field).length() || longString)) {
rowLayout.addView(LongTextDialogRow.getRow(this, inflater, rowLayout, preset, (PresetTextField) field, value, maxStringLength));
return;
}
rowLayout.addView(TextRow.getRow(this, inflater, rowLayout, preset, field, value, values, allTags));
Expand Down Expand Up @@ -1047,7 +1048,7 @@ void addRow(@Nullable final LinearLayout rowLayout, @NonNull final PresetTagFiel
StringWithDescription tempOff = ((PresetCheckField) field).getOffValue();
final String valueOff = tempOff == null ? "" : tempOff.getValue();
String description = tempOff == null ? "" : tempOff.getDescription();
if (description == null) {
if (Util.isEmpty(description)) {
description = valueOff;
}
final CheckRow row = (CheckRow) inflater.inflate(R.layout.tag_form_check_row, rowLayout, false);
Expand Down Expand Up @@ -1093,10 +1094,11 @@ public boolean isOpeningHours(@NonNull final String key, @NonNull ValueType valu
* @param value existing value for the tag
* @param values a list containing all the predefined values in the PresetItem for the key
* @param allTags a Map of the tags currently being edited
* @return a TagFormDialogRow instance
* @return a DialogRow instance
*/
private DialogRow getConditionalRestrictionDialogRow(LinearLayout rowLayout, PresetItem preset, final String hint, final String key, final String value,
@Nullable final List<String> values, Map<String, String> allTags) {
@NonNull
private DialogRow getConditionalRestrictionDialogRow(@Nullable LinearLayout rowLayout, @Nullable PresetItem preset, @Nullable final String hint,
@Nullable final String key, @Nullable final String value, @Nullable final List<String> values, Map<String, String> allTags) {
final DialogRow row = (DialogRow) inflater.inflate(R.layout.tag_form_combo_dialog_row, rowLayout, false);
row.keyView.setText(hint != null ? hint : key);
row.keyView.setTag(key);
Expand All @@ -1112,16 +1114,19 @@ private DialogRow getConditionalRestrictionDialogRow(LinearLayout rowLayout, Pre
StringWithDescription swd = new StringWithDescription(o);
Log.d(DEBUG_TAG, "adding " + swd);
String v = swd.getValue();
if (v == null || "".equals(v)) {
if (Util.isEmpty(v)) {
continue;
}
Log.d(DEBUG_TAG, "adding " + v + " to templates");
templates.add(v);
}
}
}
if (value != null && !"".equals(value)) {
ConditionalRestrictionParser parser = new ConditionalRestrictionParser(new ByteArrayInputStream(value.getBytes()));
if (Util.notEmpty(value)) {
ConditionalRestrictionParser parser = new ConditionalRestrictionParser(new ByteArrayInputStream(value.getBytes())); // NOSONAR
// can't
// be
// null
try {
row.setValue(ch.poole.conditionalrestrictionparser.Util.prettyPrint(parser.restrictions()));
} catch (Exception ex) {
Expand Down Expand Up @@ -1165,7 +1170,7 @@ public boolean focusOnTag(@NonNull String key) {
for (int i = ll2.getChildCount() - 1; i >= 0; --i) {
View v = ll2.getChildAt(i);
boolean isTextRow = v instanceof TextRow;
if ((v instanceof DialogRow || isTextRow) && ((KeyValueRow) v).getKey().equals(key)) {
if ((v instanceof DialogRow || isTextRow) && ((KeyValueRow) v).hasKey(key)) {
Util.scrollToRow(sv, v, true, true);
if (isTextRow) {
((TextRow) v).getValueView().requestFocus();
Expand All @@ -1190,7 +1195,7 @@ private boolean focusOnEmpty() {
boolean found = false;
LinearLayout ll = (LinearLayout) getView().findViewById(R.id.form_container_layout);
if (ll == null) {
Log.d(DEBUG_TAG, "update container layout null");
Log.d(DEBUG_TAG, "container layout null");
return false;
}
int pos = 0;
Expand Down Expand Up @@ -1218,22 +1223,22 @@ private boolean focusOnEmpty() {
*/
@Nullable
public View getRow(@NonNull String key) {
View sv = getView();
LinearLayout ll = (LinearLayout) sv.findViewById(R.id.form_container_layout);
LinearLayout ll = (LinearLayout) getView().findViewById(R.id.form_container_layout);
if (ll != null) {
int pos = 0;
while (pos < ll.getChildCount()) {
final View child = ll.getChildAt(pos);
if (child instanceof LinearLayout) {
LinearLayout ll2 = (LinearLayout) child;
for (int i = ll2.getChildCount() - 1; i >= 0; --i) {
View v = ll2.getChildAt(i);
if ((v instanceof TextRow || v instanceof DialogRow) && ((KeyValueRow) v).getKey().equals(key)) {
return v;
}
pos++;
if (!(child instanceof LinearLayout)) {
continue;
}
LinearLayout ll2 = (LinearLayout) child;
for (int i = ll2.getChildCount() - 1; i >= 0; --i) {
View v = ll2.getChildAt(i);
if (v instanceof KeyValueRow && ((KeyValueRow) v).hasKey(key)) {
return v;
}
}
pos++;
}
}
return null;
Expand Down
14 changes: 12 additions & 2 deletions src/main/java/de/blau/android/util/Util.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ public static boolean supportsWebView(@NonNull Context ctx) {
* @param packageManager a PackageManager instance
* @return true if the package is installed
*/

public static boolean isPackageInstalled(@NonNull String packageName, @NonNull PackageManager packageManager) {
try {
getPackageInfo(packageName, packageManager);
Expand Down Expand Up @@ -680,7 +680,17 @@ public static String elementTypeId(@NonNull Context ctx, @NonNull String type, l
* @return true if text is neither null nor the empty String
*/
public static boolean notEmpty(@Nullable final String text) {
return text != null && !"".equals(text);
return text != null && text.length() > 0;
}

/**
* Check if a String is either null or the empty String
*
* @param text the input String
* @return true if text is either null or the empty String
*/
public static boolean isEmpty(@Nullable final String text) {
return text == null || text.length() == 0;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/xml-v19/advancedpreferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
app:spt_currentValueText="@string/config_maxInlineValues_current"
app:spt_setWrapSelectorWheel="false" />
<ch.poole.android.numberpickerpreference.NumberPickerPreference
android:defaultValue="255"
android:defaultValue="80"
android:dialogTitle="@string/config_longStringLimit_title"
android:key="@string/config_longStringLimit_key"
android:numeric="integer"
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/xml-v24/advancedpreferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
app:spt_currentValueText="@string/config_maxInlineValues_current"
app:spt_setWrapSelectorWheel="false" />
<ch.poole.android.numberpickerpreference.NumberPickerPreference
android:defaultValue="255"
android:defaultValue="80"
android:dialogTitle="@string/config_longStringLimit_title"
android:key="@string/config_longStringLimit_key"
android:numeric="integer"
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/xml-v29/advancedpreferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
app:spt_currentValueText="@string/config_maxInlineValues_current"
app:spt_setWrapSelectorWheel="false" />
<ch.poole.android.numberpickerpreference.NumberPickerPreference
android:defaultValue="255"
android:defaultValue="80"
android:dialogTitle="@string/config_longStringLimit_title"
android:key="@string/config_longStringLimit_key"
android:numeric="integer"
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/xml/advancedpreferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
app:spt_currentValueText="@string/config_maxInlineValues_current"
app:spt_setWrapSelectorWheel="false" />
<ch.poole.android.numberpickerpreference.NumberPickerPreference
android:defaultValue="255"
android:defaultValue="80"
android:dialogTitle="@string/config_longStringLimit_title"
android:key="@string/config_longStringLimit_key"
android:numeric="integer"
Expand Down

0 comments on commit 083a88a

Please sign in to comment.