ReVanced-Mirror/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2024-12-01 00:02:55 +01:00
Code Issues Projects Releases Wiki Activity

feat(YouTube): Add donation link to settings about screen (#688)

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2024-09-09 03:21:05 -04:00 committed by GitHub
parent 0f5dfb4e76
commit b816c45838
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/app/revanced/integrations/shared/settings/preference/ReVancedAboutPreference.java
View File

@ -1,5 +1,6 @@
package app.revanced.integrations.shared.settings.preference; package app.revanced.integrations.shared.settings.preference;
import static app.revanced.integrations.shared.StringRef.sf;
import static app.revanced.integrations.shared.StringRef.str; import static app.revanced.integrations.shared.StringRef.str;
import static app.revanced.integrations.youtube.requests.Route.Method.GET; import static app.revanced.integrations.youtube.requests.Route.Method.GET;
@ -71,7 +72,7 @@ public class ReVancedAboutPreference extends Preference {
return Color.BLACK; return Color.BLACK;
} }
private String createDialogHtml(ReVancedSocialLink[] socialLinks) { private String createDialogHtml(WebLink[] socialLinks) {
final boolean isNetworkConnected = Utils.isNetworkConnected(); final boolean isNetworkConnected = Utils.isNetworkConnected();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
@ -122,7 +123,7 @@ public class ReVancedAboutPreference extends Preference {
.append("</h2>"); .append("</h2>");
builder.append("<div>"); builder.append("<div>");
for (ReVancedSocialLink social : socialLinks) { for (WebLink social : socialLinks) {
builder.append("<div style=\"margin-bottom: 20px;\">"); builder.append("<div style=\"margin-bottom: 20px;\">");
builder.append(String.format("<a href=\"%s\">%s</a>", social.url, social.name)); builder.append(String.format("<a href=\"%s\">%s</a>", social.url, social.name));
builder.append("</div>"); builder.append("</div>");
@ -151,7 +152,7 @@ public class ReVancedAboutPreference extends Preference {
} }
private void fetchLinksAndShowDialog(@Nullable ProgressDialog progress) { private void fetchLinksAndShowDialog(@Nullable ProgressDialog progress) {
ReVancedSocialLink[] socialLinks = SocialLinksRoutes.fetchSocialLinks(); WebLink[] socialLinks = SocialLinksRoutes.fetchSocialLinks();
String htmlDialog = createDialogHtml(socialLinks); String htmlDialog = createDialogHtml(socialLinks);
Utils.runOnMainThreadNowOrLater(() -> { Utils.runOnMainThreadNowOrLater(() -> {
@ -221,19 +222,19 @@ class WebViewDialog extends Dialog {
} }
} }
class ReVancedSocialLink { class WebLink {
final boolean preferred; final boolean preferred;
final String name; final String name;
final String url; final String url;
ReVancedSocialLink(JSONObject json) throws JSONException { WebLink(JSONObject json) throws JSONException {
this(json.getBoolean("preferred"), this(json.getBoolean("preferred"),
json.getString("name"), json.getString("name"),
json.getString("url") json.getString("url")
); );
} }
ReVancedSocialLink(boolean preferred, String name, String url) { WebLink(boolean preferred, String name, String url) {
this.preferred = preferred; this.preferred = preferred;
this.name = name; this.name = name;
this.url = url; this.url = url;
@ -251,24 +252,33 @@ class ReVancedSocialLink {
} }
class SocialLinksRoutes { class SocialLinksRoutes {
/**
* Simple link to the website donate page,
* rather than fetching and parsing the donation links using the API.
*/
public static final WebLink DONATE_LINK = new WebLink(true,
sf("revanced_settings_about_links_donate").toString(),
"https://revanced.app/donate");
/** /**
* Links to use if fetch links api call fails. * Links to use if fetch links api call fails.
*/ */
private static final ReVancedSocialLink[] NO_CONNECTION_STATIC_LINKS = { private static final WebLink[] NO_CONNECTION_STATIC_LINKS = {
new ReVancedSocialLink(true, "ReVanced.app", "https://revanced.app") new WebLink(true, "ReVanced.app", "https://revanced.app"),
DONATE_LINK,
}; };
private static final String SOCIAL_LINKS_PROVIDER = "https://api.revanced.app/v2"; private static final String SOCIAL_LINKS_PROVIDER = "https://api.revanced.app/v2";
private static final Route.CompiledRoute GET_SOCIAL = new Route(GET, "/socials").compile(); private static final Route.CompiledRoute GET_SOCIAL = new Route(GET, "/socials").compile();
@Nullable @Nullable
private static volatile ReVancedSocialLink[] fetchedLinks; private static volatile WebLink[] fetchedLinks;
static boolean hasFetchedLinks() { static boolean hasFetchedLinks() {
return fetchedLinks != null; return fetchedLinks != null;
} }
static ReVancedSocialLink[] fetchSocialLinks() { static WebLink[] fetchSocialLinks() {
try { try {
if (hasFetchedLinks()) return fetchedLinks; if (hasFetchedLinks()) return fetchedLinks;
@ -290,14 +300,17 @@ class SocialLinksRoutes {
JSONObject json = Requester.parseJSONObjectAndDisconnect(connection); JSONObject json = Requester.parseJSONObjectAndDisconnect(connection);
JSONArray socials = json.getJSONArray("socials"); JSONArray socials = json.getJSONArray("socials");
List<ReVancedSocialLink> links = new ArrayList<>(); List<WebLink> links = new ArrayList<>();
links.add(DONATE_LINK); // Show donate link first.
for (int i = 0, length = socials.length(); i < length; i++) { for (int i = 0, length = socials.length(); i < length; i++) {
ReVancedSocialLink link = new ReVancedSocialLink(socials.getJSONObject(i)); WebLink link = new WebLink(socials.getJSONObject(i));
links.add(link); links.add(link);
} }
Logger.printDebug(() -> "links: " + links); Logger.printDebug(() -> "links: " + links);
return fetchedLinks = links.toArray(new ReVancedSocialLink[0]); return fetchedLinks = links.toArray(new WebLink[0]);
} catch (SocketTimeoutException ex) { } catch (SocketTimeoutException ex) {
Logger.printInfo(() -> "Could not fetch social links", ex); // No toast. Logger.printInfo(() -> "Could not fetch social links", ex); // No toast.