From 5dbee7704e70e63c85b2a20498b315d0a695baba Mon Sep 17 00:00:00 2001 From: Fox2Code Date: Fri, 20 May 2022 14:40:31 +0200 Subject: [PATCH] Fix Androidacy url management bug + add gitlab monochrome icon. --- .../com/fox2code/mmm/module/ActionButtonType.java | 8 ++++---- app/src/main/res/drawable/ic_gitlab.xml | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable/ic_gitlab.xml diff --git a/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java b/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java index 02d2f98..742234a 100644 --- a/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java +++ b/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java @@ -38,8 +38,7 @@ public enum ActionButtonType { @Override public void doAction(Chip button, ModuleHolder moduleHolder) { String notesUrl = moduleHolder.repoModule.notesUrl; - if (notesUrl.startsWith("https://api.androidacy.com/magisk/readme/?module=") || - notesUrl.startsWith("https://www.androidacy.com/")) { + if (AndroidacyUtil.isAndroidacyLink(notesUrl)) { IntentHelper.openUrlAndroidacy(button.getContext(), notesUrl, false, moduleHolder.repoModule.moduleInfo.name, moduleHolder.getMainModuleConfig()); @@ -85,8 +84,7 @@ public enum ActionButtonType { String updateZipUrl = moduleHolder.getUpdateZipUrl(); if (updateZipUrl == null) return; // Androidacy manage the selection between download and install - if (updateZipUrl.startsWith("https://www.androidacy.com/") || - updateZipUrl.startsWith("https://api.androidacy.com/magisk/info/?module=")) { + if (AndroidacyUtil.isAndroidacyLink(updateZipUrl)) { IntentHelper.openUrlAndroidacy( button.getContext(), updateZipUrl, true, moduleInfo.name, moduleInfo.config); @@ -248,6 +246,8 @@ public enum ActionButtonType { icon = R.drawable.ic_baseline_discord_24; } else if (url.startsWith("https://github.com/")) { icon = R.drawable.ic_github; + } else if (url.startsWith("https://gitlab.com/")) { + icon = R.drawable.ic_gitlab; } else if (url.startsWith("https://forum.xda-developers.com/")) { icon = R.drawable.ic_xda; } diff --git a/app/src/main/res/drawable/ic_gitlab.xml b/app/src/main/res/drawable/ic_gitlab.xml new file mode 100644 index 0000000..cc2c627 --- /dev/null +++ b/app/src/main/res/drawable/ic_gitlab.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file