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

The copy URL button is now a preference that can be toggled on or off in the modules tab.

Browse Source
This commit is contained in:
bjbjorn 2023-05-18 15:36:18 +02:00
parent a104052c6c
commit 04a9bbb15d
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/trianguloy/urlchecker/modules/list/OpenModule.java
View File

@ -43,6 +43,10 @@ public class OpenModule extends AModuleData {
return new GenericPref.Bool("open_noReferrer", true, cntx); return new GenericPref.Bool("open_noReferrer", true, cntx);
} }
public static GenericPref.Bool MERGEBUTTON_PREF(Context cntx) {
return new GenericPref.Bool("", false, cntx);
}
@Override @Override
public String getId() { public String getId() {
return "open"; return "open";
@ -71,6 +75,7 @@ class OpenDialog extends AModuleDialog {
private final GenericPref.Bool closeOpenPref; private final GenericPref.Bool closeOpenPref;
private final GenericPref.Bool closeSharePref; private final GenericPref.Bool closeSharePref;
private final GenericPref.Bool noReferrerPref; private final GenericPref.Bool noReferrerPref;
private final GenericPref.Bool mergePref;
private final GenericPref.Enumeration<CTabs.Config> ctabsPref; private final GenericPref.Enumeration<CTabs.Config> ctabsPref;
private boolean ctabs = false; private boolean ctabs = false;
@ -89,6 +94,8 @@ class OpenDialog extends AModuleDialog {
closeOpenPref = OpenModule.CLOSEOPEN_PREF(dialog); closeOpenPref = OpenModule.CLOSEOPEN_PREF(dialog);
closeSharePref = OpenModule.CLOSESHARE_PREF(dialog); closeSharePref = OpenModule.CLOSESHARE_PREF(dialog);
noReferrerPref = OpenModule.NOREFERRER_PREF(dialog); noReferrerPref = OpenModule.NOREFERRER_PREF(dialog);
mergePref = OpenModule.MERGEBUTTON_PREF(dialog);
} }
@Override @Override
@ -149,10 +156,13 @@ class OpenDialog extends AModuleDialog {
// init share // init share
View btn_share = views.findViewById(R.id.share); View btn_share = views.findViewById(R.id.share);
btn_share.setOnClickListener(v -> shareUrl()); btn_share.setOnClickListener(v -> shareUrl());
btn_share.setOnLongClickListener(v -> { if (mergePref.get()) {
AndroidUtils.copyToClipboard(getActivity(), R.string.mOpen_clipboard, getUrl()); btn_copy.setVisibility(View.GONE);
return true; btn_share.setOnLongClickListener(v -> {
}); AndroidUtils.copyToClipboard(getActivity(), R.string.mOpen_clipboard, getUrl());
return true;
});
}
// init openWith popup // init openWith popup
popup = new PopupMenu(getActivity(), btn_open); popup = new PopupMenu(getActivity(), btn_open);
@ -317,6 +327,7 @@ class OpenConfig extends AModuleConfig {
private final GenericPref.Bool closeOpenPref; private final GenericPref.Bool closeOpenPref;
private final GenericPref.Bool closeSharePref; private final GenericPref.Bool closeSharePref;
private final GenericPref.Bool noReferrerPref; private final GenericPref.Bool noReferrerPref;
private final GenericPref.Bool mergePref;
private final GenericPref.Enumeration<CTabs.Config> ctabsPref; private final GenericPref.Enumeration<CTabs.Config> ctabsPref;
private final GenericPref.Bool perDomainPref; private final GenericPref.Bool perDomainPref;
@ -328,6 +339,7 @@ class OpenConfig extends AModuleConfig {
closeSharePref = OpenModule.CLOSESHARE_PREF(activity); closeSharePref = OpenModule.CLOSESHARE_PREF(activity);
noReferrerPref = OpenModule.NOREFERRER_PREF(activity); noReferrerPref = OpenModule.NOREFERRER_PREF(activity);
perDomainPref = LastOpened.PERDOMAIN_PREF(activity); perDomainPref = LastOpened.PERDOMAIN_PREF(activity);
mergePref = OpenModule.MERGEBUTTON_PREF(activity);
} }
@ -347,6 +359,7 @@ class OpenConfig extends AModuleConfig {
closeSharePref.attachToSwitch(views.findViewById(R.id.closeshare_pref)); closeSharePref.attachToSwitch(views.findViewById(R.id.closeshare_pref));
noReferrerPref.attachToSwitch(views.findViewById(R.id.noReferrer)); noReferrerPref.attachToSwitch(views.findViewById(R.id.noReferrer));
perDomainPref.attachToSwitch(views.findViewById(R.id.perDomain)); perDomainPref.attachToSwitch(views.findViewById(R.id.perDomain));
mergePref.attachToSwitch(views.findViewById((R.id.mergeButtons_pref)));
} }
} }

7
app/src/main/res/layout/config_open.xml
View File

@ -58,4 +58,11 @@
android:layout_marginTop="@dimen/smallPadding" android:layout_marginTop="@dimen/smallPadding"
android:text="@string/mOpen_noReferrer" /> android:text="@string/mOpen_noReferrer" />
<Switch
android:id="@+id/mergeButtons_pref"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/smallPadding"
android:text="@string/mOpen_mergeButtons" />
</LinearLayout> </LinearLayout>

1
app/src/main/res/values/strings.xml
View File

@ -150,6 +150,7 @@ Note: if you edit the patterns, new built-in patterns from app updates will not
<string name="mOpen_closeShare">Close dialog after sharing</string> <string name="mOpen_closeShare">Close dialog after sharing</string>
<string name="mOpen_perDomain">Sort different domains independently</string> <string name="mOpen_perDomain">Sort different domains independently</string>
<string name="mOpen_noReferrer">Hide the source app (referrer)</string> <string name="mOpen_noReferrer">Hide the source app (referrer)</string>
<string name="mOpen_mergeButtons">Merge Copy URL and Share into a single button (long press to copy)</string>
<string name="mOpen_with">Open with %s</string> <string name="mOpen_with">Open with %s</string>
<string name="mOpen_open">Open</string> <string name="mOpen_open">Open</string>
<string name="mOpen_share">Share</string> <string name="mOpen_share">Share</string>