mirror/UrlChecker
0
0
Fork 0
mirror of https://github.com/TrianguloY/UrlChecker.git synced 2024-09-19 20:02:16 +02:00
Code

query removal displays the value and when clicked sets it

Browse Source 
part of issue #9
This commit is contained in:
TrianguloY 2022-07-30 13:28:47 +02:00
parent 45600dc2a5
commit f79ecfb4e9
2 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/java/com/trianguloy/urlchecker/modules/list/RemoveQueriesModule.java
View File

@ -1,7 +1,5 @@
package com.trianguloy.urlchecker.modules.list;
import android.text.SpannableStringBuilder;
import android.text.style.ClickableSpan;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
@ -18,6 +16,7 @@ import com.trianguloy.urlchecker.url.UrlData;
import com.trianguloy.urlchecker.utilities.AndroidUtils;
import com.trianguloy.urlchecker.utilities.Inflater;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -95,34 +94,35 @@ class RemoveQueriesDialog extends AModuleDialog implements View.OnClickListener
remove.setEnabled(false); // disable the remove button
} else {
// queries present, notify
SpannableStringBuilder text = new SpannableStringBuilder(
parts.getQueries() == 1
? getActivity().getString(R.string.mRemove_found1) // 1 query
: getActivity().getString(R.string.mRemove_found, parts.getQueries()) // 2+ queries
info.setText(parts.getQueries() == 1
? getActivity().getString(R.string.mRemove_found1) // 1 query
: getActivity().getString(R.string.mRemove_found, parts.getQueries()) // 2+ queries
);
// mark the text as clickable (but the click does nothing, it is managed when clicked the view)
text.setSpan(new ClickableSpan() {
@Override
public void onClick(View ignored) {
}
}, 0, text.length(), 0);
info.setText(text);
AndroidUtils.setAsClickable(info);
AndroidUtils.setRoundedColor(R.color.warning, info, getActivity());
remove.setEnabled(true); // enable the remove all button
// for each query, create a button
for (int i = 0; i < parts.getQueries(); i++) {
Button queryRemover = Inflater.inflate(R.layout.button_text, box, getActivity())
.findViewById(R.id.button);
queryRemover.setTag(i); // will remove this i query when clicked
queryRemover.setOnClickListener(this);
View button_text = Inflater.inflate(R.layout.button_text, box, getActivity());
button_text.setTag(i); // to mark the query this button/text must act on
// button that removes the query
Button button = button_text.findViewById(R.id.button);
String queryName = parts.getQueryName(i);
queryRemover.setText(queryName.isEmpty()
button.setText(queryName.isEmpty()
// if no name
? getActivity().getString(R.string.mRemove_empty)
// with name
: getActivity().getString(R.string.mRemove_one, queryName)
);
button.setOnClickListener(this);
// text that displays the query value and sets it
TextView text = button_text.findViewById(R.id.text);
text.setText(parts.getQueryValue(i));
AndroidUtils.setAsClickable(text);
text.setOnClickListener(this);
}
}
@ -133,13 +133,21 @@ class RemoveQueriesDialog extends AModuleDialog implements View.OnClickListener
@Override
public void onClick(View v) {
UrlParts parts = new UrlParts(getUrl());
Integer tag = (Integer) ((View) v.getParent()).getTag();
if (v instanceof Button) {
// remove all queries (no tag) or a specific one
parts.removeQuery(tag == null ? -1 : tag);
// join and set
setUrl(parts.getUrl());
} else if (v instanceof TextView) {
// replace the query url
setUrl(parts.getQueryValue(tag));
} else {
AndroidUtils.assertError("Invalid view " + v.getClass().getName());
}
// remove all queries (no tag) or a specific one
Integer tag = (Integer) v.getTag();
parts.removeQuery(tag == null ? -1 : tag);
// join and set
setUrl(parts.getUrl());
}
/**
@ -208,6 +216,20 @@ class RemoveQueriesDialog extends AModuleDialog implements View.OnClickListener
return queries.get(i).split("=")[0];
}
/**
* Returns the decoded value of the query
*/
public String getQueryValue(int i) {
String[] split = queries.get(i).split("=");
if (split.length == 1) return "";
try {
return URLDecoder.decode(split[1]);
} catch (Exception e) {
// can't decode, return it directly
return split[1];
}
}
/**
* Removes a query by its index i, or all if -1
*/

17
app/src/main/java/com/trianguloy/urlchecker/utilities/AndroidUtils.java
View File

@ -5,8 +5,11 @@ import android.content.Context;
import android.content.res.Configuration;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.text.SpannableStringBuilder;
import android.text.style.ClickableSpan;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import com.trianguloy.urlchecker.BuildConfig;
import com.trianguloy.urlchecker.R;
@ -54,4 +57,18 @@ public class AndroidUtils {
public static void clearRoundedColor(View view) {
view.setBackgroundDrawable(null);
}
/**
* Makes the text of a textview display as a link (which does nothing when clicked)
*/
public static void setAsClickable(TextView textview) {
SpannableStringBuilder text = new SpannableStringBuilder(textview.getText());
text.setSpan(new ClickableSpan() {
@Override
public void onClick(View ignored) {
// do nothing
}
}, 0, text.length(), 0);
textview.setText(text);
}
}