From 5f556fe8ce7f4b5d7a1f2a10c023c3ad255c4774 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 10:55:31 -0700 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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); }