diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ccdf57..ec47718 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,4 +4,4 @@ As long as your pull request doesn't break the app in any way or conflict with a ## Branches -I don't use branches because I'm lazy. If you want to make a new branch, feel free to do so, just be aware that I will completely ignore it and push my changes to master anyway, because I'm special. +I am using the `develop` branch for all changes that will not be immediately available on bintray. Most PRs should be made to the `develop` branch. The only reason that a PR should be made to `master` is when there is a typo/inconsistency in the README or a similar issue is present. If you make a PR to `master` that changes something other than a .md file, I will stare at my screen and make ugly whale noises for approximately 10 minutes before politely asking you to change the branch. Thank you. diff --git a/README.md b/README.md index 59bce53..b288c9a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This is just sample data. It is not real. Though Jahir is lazy, so that part is The Gradle dependency is available through jCenter, which is used by default in Android Studio. To add the dependency to your project, copy this line into the dependencies section of your app's build.gradle file. ```gradle -compile 'me.jfenn:attribouter:0.0.4' +compile 'me.jfenn:attribouter:0.0.5' ``` #### Starting an Activity @@ -65,6 +65,7 @@ Link tags can exist inside of the ``, ``, or `` t |url|String|The url of the link.| |icon|String (URL) / Drawable Resource|The icon to display next to the link.| |priority|Integer|Defines how the links should be sorted - the highest priority appears first in the list, and/or is opened when the whole item is clicked.| +|hidden|Boolean|Whether to hide the link. This is useful for removing automatically generated links that you do not want to display (example: removing the 'playStore' link generated by `` using the package name if your app is not published on the play store).| Auto-generated links for the `` tag are as follows: diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml index 4836c51..d726dd8 100644 --- a/app/src/main/res/xml/about.xml +++ b/app/src/main/res/xml/about.xml @@ -9,6 +9,9 @@ name="Documentation" icon="https://jfenn.me/favicon.ico" url="https://jfenn.me/about/?Attribouter" /> + @@ -39,7 +42,11 @@ + task="^Lazy Slacker"> + + 0) { Collections.sort(links); + + List linksList = new ArrayList<>(); + for (LinkInfoData link : links) { + if (!link.isHidden()) + linksList.add(link); + } + viewHolder.links.setVisibility(View.VISIBLE); FlexboxLayoutManager layoutManager = new FlexboxLayoutManager(context); layoutManager.setFlexDirection(FlexDirection.ROW); layoutManager.setJustifyContent(JustifyContent.CENTER); viewHolder.links.setLayoutManager(layoutManager); - viewHolder.links.setAdapter(new InfoAdapter(new ArrayList(links))); + viewHolder.links.setAdapter(new InfoAdapter(linksList)); } else viewHolder.links.setVisibility(View.GONE); } diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/ContributorInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/ContributorInfoData.java index df92eca..da7afd9 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/ContributorInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/ContributorInfoData.java @@ -146,7 +146,7 @@ public void onClick(View view) { } else { LinkInfoData importantLink = null; for (LinkInfoData link : links) { - if (importantLink == null || link.getPriority() > importantLink.getPriority()) + if (!link.isHidden() && (importantLink == null || link.getPriority() > importantLink.getPriority())) importantLink = link; } diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/LicenseInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/LicenseInfoData.java index 9086469..864b0d1 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/LicenseInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/LicenseInfoData.java @@ -255,13 +255,20 @@ public void bind(Context context, ViewHolder viewHolder) { if (links.size() > 0) { Collections.sort(links); + + List linksList = new ArrayList<>(); + for (LinkInfoData link : links) { + if (!link.isHidden()) + linksList.add(link); + } + viewHolder.links.setVisibility(View.VISIBLE); FlexboxLayoutManager layoutManager = new FlexboxLayoutManager(context); layoutManager.setFlexDirection(FlexDirection.ROW); layoutManager.setJustifyContent(JustifyContent.FLEX_START); viewHolder.links.setLayoutManager(layoutManager); - viewHolder.links.setAdapter(new InfoAdapter(new ArrayList(links))); + viewHolder.links.setAdapter(new InfoAdapter(linksList)); } else viewHolder.links.setVisibility(View.GONE); LinkInfoData importantLink = null; diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/EmailLinkInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/EmailLinkInfoData.java index 1bcc0c4..f2efb8f 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/EmailLinkInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/EmailLinkInfoData.java @@ -5,7 +5,7 @@ public class EmailLinkInfoData extends LinkInfoData { public EmailLinkInfoData(@NonNull String address, int priority) { - super("email", "@string/title_attribouter_email", "mailto:" + address, "@drawable/ic_attribouter_email", priority); + super("email", "@string/title_attribouter_email", "mailto:" + address, "@drawable/ic_attribouter_email", false, priority); } } diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/GitHubLinkInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/GitHubLinkInfoData.java index 4249dd1..7a222c9 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/GitHubLinkInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/GitHubLinkInfoData.java @@ -9,7 +9,7 @@ public GitHubLinkInfoData(@NonNull String name, int priority) { } public GitHubLinkInfoData(@NonNull String item, int priority, boolean isFullUrl) { - super("github", "@string/title_attribouter_github", isFullUrl ? item : "https://github.com/" + item, "@drawable/ic_attribouter_github", priority); + super("github", "@string/title_attribouter_github", isFullUrl ? item : "https://github.com/" + item, "@drawable/ic_attribouter_github", false, priority); } } diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LicenseLinkInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LicenseLinkInfoData.java index 9a26758..67f4663 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LicenseLinkInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LicenseLinkInfoData.java @@ -14,7 +14,7 @@ public class LicenseLinkInfoData extends LinkInfoData { private LicenseInfoData license; public LicenseLinkInfoData(@NonNull LicenseInfoData license, int priority) { - super("license", "@string/title_attribouter_license", null, "@drawable/ic_attribouter_copyright", priority); + super("license", "@string/title_attribouter_license", null, "@drawable/ic_attribouter_copyright", false, priority); this.license = license; } diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LinkInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LinkInfoData.java index d91db12..59c0b6b 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LinkInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LinkInfoData.java @@ -23,6 +23,7 @@ public class LinkInfoData extends InfoData implements C private String url; @Nullable private String icon; + private boolean isHidden; int priority; public LinkInfoData(XmlResourceParser parser) { @@ -30,6 +31,7 @@ public LinkInfoData(XmlResourceParser parser) { parser.getAttributeValue(null, "name"), parser.getAttributeValue(null, "url"), parser.getAttributeValue(null, "icon"), + parser.getAttributeBooleanValue(null, "hidden", false), 0); String priorityString = parser.getAttributeValue(null, "priority"); @@ -37,12 +39,13 @@ public LinkInfoData(XmlResourceParser parser) { priority = Integer.parseInt(priorityString); } - public LinkInfoData(@Nullable String id, @Nullable String name, @Nullable String url, @Nullable String icon, int priority) { + public LinkInfoData(@Nullable String id, @Nullable String name, @Nullable String url, @Nullable String icon, boolean isHidden, int priority) { super(R.layout.item_attribouter_link); this.id = id; this.name = name; this.url = url; this.icon = icon; + this.isHidden = isHidden; this.priority = priority; } @@ -55,6 +58,8 @@ public LinkInfoData merge(LinkInfoData link) { url = link.url; if ((icon == null || !icon.startsWith("^")) && link.icon != null) icon = link.icon; + if (link.isHidden) + isHidden = true; if (link.priority != 0) priority = link.priority; @@ -89,6 +94,10 @@ public int getPriority() { return priority; } + public boolean isHidden() { + return isHidden; + } + String getUrl() { return url; } diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/PlayStoreLinkInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/PlayStoreLinkInfoData.java index 0d444da..4ef3097 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/PlayStoreLinkInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/PlayStoreLinkInfoData.java @@ -9,7 +9,7 @@ public class PlayStoreLinkInfoData extends LinkInfoData { public PlayStoreLinkInfoData(@Nullable String url, int priority) { - super("playStore", "@string/title_attribouter_rate", url, "@drawable/ic_attribouter_rate", priority); + super("playStore", "@string/title_attribouter_rate", url, "@drawable/ic_attribouter_rate", false, priority); } @Nullable diff --git a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/WebsiteLinkInfoData.java b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/WebsiteLinkInfoData.java index 188150c..c4495b2 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/WebsiteLinkInfoData.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/WebsiteLinkInfoData.java @@ -5,7 +5,7 @@ public class WebsiteLinkInfoData extends LinkInfoData { public WebsiteLinkInfoData(@NonNull String url, int priority) { - super("website", "@string/title_attribouter_website", url, "@drawable/ic_attribouter_link", priority); + super("website", "@string/title_attribouter_website", url, "@drawable/ic_attribouter_link", false, priority); } } diff --git a/attribouter/src/main/java/me/jfenn/attribouter/dialogs/UserDialog.java b/attribouter/src/main/java/me/jfenn/attribouter/dialogs/UserDialog.java index cce0fd9..7495a5b 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/dialogs/UserDialog.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/dialogs/UserDialog.java @@ -14,11 +14,13 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.List; import me.jfenn.attribouter.R; import me.jfenn.attribouter.adapters.InfoAdapter; import me.jfenn.attribouter.data.info.ContributorInfoData; import me.jfenn.attribouter.data.info.InfoData; +import me.jfenn.attribouter.data.info.link.LinkInfoData; import me.jfenn.attribouter.utils.ResourceUtils; public class UserDialog extends AppCompatDialog { @@ -52,13 +54,20 @@ protected void onCreate(Bundle savedInstanceState) { bioView.setText(ResourceUtils.getString(getContext(), contributor.bio)); if (contributor.links.size() > 0) { Collections.sort(contributor.links); + + List linksList = new ArrayList<>(); + for (LinkInfoData link : contributor.links) { + if (!link.isHidden()) + linksList.add(link); + } + links.setVisibility(View.VISIBLE); FlexboxLayoutManager layoutManager = new FlexboxLayoutManager(getContext()); layoutManager.setFlexDirection(FlexDirection.ROW); layoutManager.setJustifyContent(JustifyContent.FLEX_START); links.setLayoutManager(layoutManager); - links.setAdapter(new InfoAdapter(new ArrayList(contributor.links))); + links.setAdapter(new InfoAdapter(linksList)); } else links.setVisibility(View.GONE); } }