From 9d708b650fbfcdf0b5740145ded5db1136dd4def Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 14:22:22 -0700 Subject: [PATCH 01/13] Switched to proper link to Publisher, per official documentation. --- .../main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index 3b5dace..013dabd 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -66,8 +66,9 @@ public final class AboutBoxUtils { String webURI = null; switch (buildType) { case GOOGLE: - appURI = "market://search?q=pub:" + publisher; - webURI = "http://play.google.com/store/search?q=pub:" + publisher; + // see: https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher + appURI = "market://dev?id=" + publisher; + webURI = "http://play.google.com/store/dev?id=" + publisher; break; case AMAZON: appURI = "amzn://apps/android?showAll=1&p=" + packageName; From 852005c24ed2438cc6f102173b554637d480c9f9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 14:52:44 -0700 Subject: [PATCH 02/13] Fixed home page URL cleaning for display. --- .../java/com/eggheadgames/aboutbox/activity/AboutActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java index 7d292dc..5d12e2b 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -184,7 +184,7 @@ public class AboutActivity extends MaterialAboutActivity { if (!TextUtils.isEmpty(config.webHomePage)) { card.addItem(new MaterialAboutActionItem.Builder() .text(R.string.egab_web_label) - .subText(config.webHomePage.replace("https://", "").replace("http://", "").replace("/", "")) + .subText(config.webHomePage.replaceFirst("^https?://", "").replaceAll("/$", "")) .icon(R.drawable.ic_web_black_24dp) .setOnClickListener(new MaterialAboutItemOnClickListener() { @Override From 0ebb47877189df08556bdc02fc6b8cf8f37ddae3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 15:22:16 -0700 Subject: [PATCH 03/13] Added default shareMessage if not set. --- .../eggheadgames/aboutbox/AboutBoxUtils.java | 7 +++++-- .../aboutbox/share/ShareUtil.java | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index 013dabd..6f4bbf1 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -8,6 +8,9 @@ import android.widget.Toast; public final class AboutBoxUtils { + public static String playStoreAppURI = "https://play.google.com/store/apps/details?id="; + public static String amznStoreAppURI = "https://www.amazon.com/gp/mas/dl/android?p="; + private AboutBoxUtils() { //nothing } @@ -49,11 +52,11 @@ public final class AboutBoxUtils { switch (buildType) { case GOOGLE: appURI = "market://details?id=" + packageName; - webURI = "http://play.google.com/store/apps/details?id=" + packageName; + webURI = playStoreAppURI + packageName; break; case AMAZON: appURI = "amzn://apps/android?p=" + packageName; - webURI = "http://www.amazon.com/gp/mas/dl/android?p=" + packageName; + webURI = amznStoreAppURI + packageName; break; default: //nothing diff --git a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java index 61a4511..716c1ca 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java @@ -2,7 +2,9 @@ package com.eggheadgames.aboutbox.share; import android.app.Activity; import android.content.Intent; +import android.text.TextUtils; +import com.eggheadgames.aboutbox.AboutBoxUtils; import com.eggheadgames.aboutbox.AboutConfig; public final class ShareUtil { @@ -17,7 +19,22 @@ public final class ShareUtil { Intent intent2 = new Intent(); intent2.setAction(Intent.ACTION_SEND); intent2.setType("text/plain"); - intent2.putExtra(Intent.EXTRA_TEXT, config.shareMessage); + + String shareMessage = config.shareMessage; + + if (!TextUtils.isEmpty(config.packageName) && !TextUtils.isEmpty(shareMessage) && config.buildType != null) { + switch (config.buildType) { + case GOOGLE: + shareMessage = AboutBoxUtils.playStoreAppURI + config.packageName; + break; + case AMAZON: + shareMessage = AboutBoxUtils.amznStoreAppURI + config.packageName; + break; + } + } + + intent2.putExtra(Intent.EXTRA_TEXT, shareMessage); + activity.startActivity(Intent.createChooser(intent2, config.sharingTitle)); } } From 134ebebb61605e03a1af530eb5c4ce6e01696328 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 23:56:46 -0700 Subject: [PATCH 04/13] Force CircleCI trigger. --- .../src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index 6f4bbf1..fa66e42 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -69,7 +69,7 @@ public final class AboutBoxUtils { String webURI = null; switch (buildType) { case GOOGLE: - // see: https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher + // per: https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher appURI = "market://dev?id=" + publisher; webURI = "http://play.google.com/store/dev?id=" + publisher; break; From 3ae1c381d1e62547bb1f3cc36c2c730d4869ead2 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 00:09:03 -0700 Subject: [PATCH 05/13] Made constants final per FindBugs report. --- .../main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index fa66e42..fc3f654 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -8,8 +8,8 @@ import android.widget.Toast; public final class AboutBoxUtils { - public static String playStoreAppURI = "https://play.google.com/store/apps/details?id="; - public static String amznStoreAppURI = "https://www.amazon.com/gp/mas/dl/android?p="; + public final static String playStoreAppURI = "https://play.google.com/store/apps/details?id="; + public final static String amznStoreAppURI = "https://www.amazon.com/gp/mas/dl/android?p="; private AboutBoxUtils() { //nothing From 337b7dafb3a9ae838c1d030902568081efb2f09b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 00:23:15 -0700 Subject: [PATCH 06/13] Added default case to switch per PMD report. --- .../main/java/com/eggheadgames/aboutbox/share/ShareUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java index 716c1ca..851ec00 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java @@ -30,6 +30,8 @@ public final class ShareUtil { case AMAZON: shareMessage = AboutBoxUtils.amznStoreAppURI + config.packageName; break; + default: + break; } } From 5f556fe8ce7f4b5d7a1f2a10c023c3ad255c4774 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 10:55:31 -0700 Subject: [PATCH 07/13] Do not display config.aboutLabelTitle if empty. --- .../java/com/eggheadgames/aboutbox/activity/AboutActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java index 5d12e2b..b5aea47 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -130,7 +130,7 @@ public class AboutActivity extends MaterialAboutActivity { } })); } - if (!TextUtils.isEmpty(config.companyHtmlPath)) { + if (!TextUtils.isEmpty(config.companyHtmlPath) && !TextUtils.isEmpty(config.aboutLabelTitle)) { card.addItem(new MaterialAboutActionItem.Builder() .text(config.aboutLabelTitle) .icon(R.drawable.ic_about_black) From 666ae831379cab0d8815a40ef105cb83cdd72505 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 10:56:18 -0700 Subject: [PATCH 08/13] Added config.author, config.extra and config.extraTitle to general info card. --- .../com/eggheadgames/aboutbox/AboutConfig.java | 3 +++ .../aboutbox/activity/AboutActivity.java | 15 +++++++++++++++ library/src/main/res/values-pt/strings.xml | 1 + library/src/main/res/values/strings.xml | 1 + 4 files changed, 20 insertions(+) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java index ed456c3..4929ab6 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java @@ -8,6 +8,9 @@ public class AboutConfig { public String appName; public int appIcon; public String version; + public String author; + public String extra; + public String extraTitle; public String aboutLabelTitle; public String logUiEventName; public String facebookUserName; diff --git a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java index b5aea47..f470937 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -54,6 +54,21 @@ public class AboutActivity extends MaterialAboutActivity { .text(R.string.egab_version) .subText(config.version) .build()); + + if (!TextUtils.isEmpty(config.author)) { + generalInfoCardBuilder.addItem(new MaterialAboutActionItem.Builder() + .text(R.string.egab_author) + .subText(config.author) + .build()); + } + + if (!TextUtils.isEmpty(config.extra) && !TextUtils.isEmpty(config.extraTitle)) { + generalInfoCardBuilder.addItem(new MaterialAboutActionItem.Builder() + .text(config.extraTitle) + .subText(config.extra) + .build()); + } + return generalInfoCardBuilder.build(); } diff --git a/library/src/main/res/values-pt/strings.xml b/library/src/main/res/values-pt/strings.xml index 0e6a643..18a0b23 100644 --- a/library/src/main/res/values-pt/strings.xml +++ b/library/src/main/res/values-pt/strings.xml @@ -3,6 +3,7 @@ Contactar o Suporte Experimentar outras aplicações Versão + Autor Facebook Twitter Web diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index b979e55..894f9ae 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ Contact Support Try Other Apps Version + Author Facebook Twitter Web From 546a95373af7be395f2b5c527346c2e9426909a4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 11:13:23 -0700 Subject: [PATCH 09/13] Added support for HTML in config.extra. --- .../java/com/eggheadgames/aboutbox/activity/AboutActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java index f470937..d1b678d 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -65,7 +65,7 @@ public class AboutActivity extends MaterialAboutActivity { if (!TextUtils.isEmpty(config.extra) && !TextUtils.isEmpty(config.extraTitle)) { generalInfoCardBuilder.addItem(new MaterialAboutActionItem.Builder() .text(config.extraTitle) - .subText(config.extra) + .subTextHtml(config.extra) .build()); } From 71c6c60762b0c78210b0e788aa577b5bc51c48a4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 25 Aug 2017 08:58:18 -0700 Subject: [PATCH 10/13] Bring intent to font, to treat the activity as a single instance on background/resume. --- .../java/com/eggheadgames/aboutbox/activity/AboutActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java index d1b678d..f2073b6 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -23,6 +23,7 @@ public class AboutActivity extends MaterialAboutActivity { public static void launch(Activity activity) { Intent intent = new Intent(activity, AboutActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); activity.startActivity(intent); } From e957ef5b561369499466f9b649e0afeb26c5c9de Mon Sep 17 00:00:00 2001 From: Michael Mee Date: Wed, 30 Aug 2017 15:57:45 -0700 Subject: [PATCH 11/13] Release 1.2.1 --- README.md | 5 ++++- library/build.gradle | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 72a96a6..6c0da9d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ [![Circle CI](https://circleci.com/gh/eggheadgames/android-about-box.svg?style=svg)](https://circleci.com/gh/eggheadgames/android-about-box) [![Release](https://jitpack.io/v/eggheadgames/android-about-box.svg)](https://jitpack.io/#eggheadgames/android-about-box) +![Downloads](https://jitpack.io/v/daniel-stoneuk/material-about-library/month.svg) +[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)]](https://github.com/eggheadgames/android-about-box/blob/develop/LICENSE) # About Box A modern About Box for an Android App built on the [daniel-stoneuk/material-about-library](https://github.com/daniel-stoneuk/material-about-library). @@ -12,7 +14,7 @@ Android About Box is configured with a set of (mostly) strings for the company n When triggered from a menu item, it will display the app name, icon and version, provide links to contact support, leave a review, share the app, go to other apps by the same company in the app store -- as well as links to Facebook etc. -As of version 1.2.0, you can omit many features that don't apply (e.g. like website), by not setting the values. +You can omit most features if they don't apply (e.g. like website), by not setting the values. ## Installation Instructions @@ -43,6 +45,7 @@ Add AboutBox configuration to your Application class aboutConfig.appName = getString(R.string.app_name); aboutConfig.appIcon = R.mipmap.ic_launcher; aboutConfig.version = "1.0.0"; + aboutConfig.author = "Tolstoy"; aboutConfig.aboutLabelTitle = "About App"; aboutConfig.packageName = getApplicationContext().getPackageName(); aboutConfig.buildType = google ? AboutConfig.BuildType.GOOGLE : AboutConfig.BuildType.AMAZON; diff --git a/library/build.gradle b/library/build.gradle index 33530f1..123c681 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 15 targetSdkVersion 24 versionCode 4 - versionName "1.2.0" + versionName "1.2.1" } buildTypes { release { From d6fe7c697549e6084c2bdbb2ca640dfcabfecfd6 Mon Sep 17 00:00:00 2001 From: Michael Mee Date: Wed, 30 Aug 2017 15:59:26 -0700 Subject: [PATCH 12/13] Fix bracket imbalance for License badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c0da9d..ff5b86b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Circle CI](https://circleci.com/gh/eggheadgames/android-about-box.svg?style=svg)](https://circleci.com/gh/eggheadgames/android-about-box) [![Release](https://jitpack.io/v/eggheadgames/android-about-box.svg)](https://jitpack.io/#eggheadgames/android-about-box) ![Downloads](https://jitpack.io/v/daniel-stoneuk/material-about-library/month.svg) -[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)]](https://github.com/eggheadgames/android-about-box/blob/develop/LICENSE) +[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/eggheadgames/android-about-box/blob/develop/LICENSE) # About Box A modern About Box for an Android App built on the [daniel-stoneuk/material-about-library](https://github.com/daniel-stoneuk/material-about-library). From 0fb1c6fb8d3fd53d3b087ba7c34856005e7de0df Mon Sep 17 00:00:00 2001 From: Michael Mee Date: Wed, 30 Aug 2017 16:00:52 -0700 Subject: [PATCH 13/13] Correct downloads URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff5b86b..9598017 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Circle CI](https://circleci.com/gh/eggheadgames/android-about-box.svg?style=svg)](https://circleci.com/gh/eggheadgames/android-about-box) [![Release](https://jitpack.io/v/eggheadgames/android-about-box.svg)](https://jitpack.io/#eggheadgames/android-about-box) -![Downloads](https://jitpack.io/v/daniel-stoneuk/material-about-library/month.svg) +![Downloads](https://jitpack.io/v/eggheadgames/android-about-box/month.svg) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/eggheadgames/android-about-box/blob/develop/LICENSE) # About Box