From 11f7abc55f2824d327bd5a7bb4af3e91b32bfdc3 Mon Sep 17 00:00:00 2001 From: Alex Dibrivnyi Date: Mon, 15 May 2017 23:13:25 +0300 Subject: [PATCH 1/7] added null checks to protect lib from crashes --- .../aboutbox/activity/AboutActivity.java | 280 +++++++++--------- 1 file changed, 144 insertions(+), 136 deletions(-) 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 74ec6fc..8d346f3 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -34,13 +34,13 @@ public class AboutActivity extends MaterialAboutActivity { final AboutConfig config = AboutConfig.getInstance(); return new MaterialAboutList.Builder() - .addCard(buildGeneralInfoCard(config)) - .addCard(buildSupportCard(config)) - .addCard(buildShareCard(config)) - .addCard(buildAboutCard(config)) - .addCard(buildSocialNetworksCard(config)) - .addCard(buildPrivacyCard(config)) - .build(); + .addCard(buildGeneralInfoCard(config)) + .addCard(buildSupportCard(config)) + .addCard(buildShareCard(config)) + .addCard(buildAboutCard(config)) + .addCard(buildSocialNetworksCard(config)) + .addCard(buildPrivacyCard(config)) + .build(); } @NonNull @@ -65,27 +65,27 @@ public class AboutActivity extends MaterialAboutActivity { if (!TextUtils.isEmpty(config.guideHtmlPath)) { card.addItem(itemHelper(R.string.egab_guide, R.drawable.ic_help_green, - new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - if (config.dialog == null) { - openHTMLPage(config.guideHtmlPath); - } else { - config.dialog.open(AboutActivity.this, config.guideHtmlPath, getString(R.string.egab_guide)); + new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + if (config.dialog == null) { + openHTMLPage(config.guideHtmlPath); + } else { + config.dialog.open(AboutActivity.this, config.guideHtmlPath, getString(R.string.egab_guide)); + } + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_guide)); } - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_guide)); - } - }) + }) ); } card.addItem(itemHelper(R.string.egab_contact_support, R.drawable.ic_email_black, - new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - EmailUtil.contactUs(AboutActivity.this); - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_contact_log_event)); - } - })); + new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + EmailUtil.contactUs(AboutActivity.this); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_contact_log_event)); + } + })); return card.build(); } @@ -93,24 +93,24 @@ public class AboutActivity extends MaterialAboutActivity { @NonNull private MaterialAboutCard buildShareCard(final AboutConfig config) { MaterialAboutCard.Builder card = new MaterialAboutCard.Builder(); - - card.addItem(itemHelper(R.string.egab_leave_review, R.drawable.ic_review, - new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - openApp(config.buildType, config.packageName); - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_review_log_event)); - } - })); - + if (config.buildType != null && !TextUtils.isEmpty(config.packageName)) { + card.addItem(itemHelper(R.string.egab_leave_review, R.drawable.ic_review, + new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + openApp(config.buildType, config.packageName); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_review_log_event)); + } + })); + } card.addItem(itemHelper(R.string.egab_share, R.drawable.ic_share_black, - new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - ShareUtil.share(AboutActivity.this); - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_share_log_event)); - } - })); + new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + ShareUtil.share(AboutActivity.this); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_share_log_event)); + } + })); return card.build(); } @@ -118,119 +118,127 @@ public class AboutActivity extends MaterialAboutActivity { @NonNull private MaterialAboutCard buildAboutCard(final AboutConfig config) { MaterialAboutCard.Builder card = new MaterialAboutCard.Builder(); - - card.addItem(itemHelper(R.string.egab_try_other_apps, R.drawable.ic_try_other_apps, - new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - openPublisher(config.buildType, config.appPublisher, config.packageName); - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_try_other_app_log_event)); - } - })); - card.addItem(new MaterialAboutActionItem.Builder() - .text(config.aboutLabelTitle) - .icon(R.drawable.ic_about_black) - .setOnClickListener(new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - if (config.dialog == null) { - openHTMLPage(config.companyHtmlPath); - } else { - config.dialog.open(AboutActivity.this, config.companyHtmlPath, config.aboutLabelTitle); - } - logUIEventName(config.analytics, config.logUiEventName, config.aboutLabelTitle); - } - }) - .build()); - + if (config.buildType != null && !TextUtils.isEmpty(config.appPublisher) && !TextUtils.isEmpty(config.packageName)) { + card.addItem(itemHelper(R.string.egab_try_other_apps, R.drawable.ic_try_other_apps, + new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + openPublisher(config.buildType, config.appPublisher, config.packageName); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_try_other_app_log_event)); + } + })); + } + if (!TextUtils.isEmpty(config.companyHtmlPath)) { + card.addItem(new MaterialAboutActionItem.Builder() + .text(config.aboutLabelTitle) + .icon(R.drawable.ic_about_black) + .setOnClickListener(new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + if (config.dialog == null) { + openHTMLPage(config.companyHtmlPath); + } else { + config.dialog.open(AboutActivity.this, config.companyHtmlPath, config.aboutLabelTitle); + } + logUIEventName(config.analytics, config.logUiEventName, config.aboutLabelTitle); + } + }) + .build()); + } return card.build(); } @NonNull private MaterialAboutCard buildSocialNetworksCard(final AboutConfig config) { MaterialAboutCard.Builder card = new MaterialAboutCard.Builder(); - - card.addItem(new MaterialAboutActionItem.Builder() - .text(R.string.egab_facebook_label) - .subText(config.facebookUserName) - .icon(R.drawable.ic_facebook_24) - .setOnClickListener(new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - getOpenFacebookIntent(AboutActivity.this, config.facebookUserName); - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_facebook_log_event)); - } - }) - .build()); - card.addItem(new MaterialAboutActionItem.Builder() - .text(R.string.egab_twitter_label) - .subText(config.twitterUserName) - .icon(R.drawable.ic_twitter_24dp) - .setOnClickListener(new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - startTwitter(AboutActivity.this, config.twitterUserName); - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_twitter_log_event)); - } - }) - .build()); - - card.addItem(new MaterialAboutActionItem.Builder() - .text(R.string.egab_web_label) - .subText(config.webHomePage.replace("https://", "").replace("http://", "").replace("/", "")) - .icon(R.drawable.ic_web_black_24dp) - .setOnClickListener(new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - openHTMLPage(config.webHomePage); - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_website_log_event)); - } - }) - .build()); - + if (!TextUtils.isEmpty(config.facebookUserName)) { + card.addItem(new MaterialAboutActionItem.Builder() + .text(R.string.egab_facebook_label) + .subText(config.facebookUserName) + .icon(R.drawable.ic_facebook_24) + .setOnClickListener(new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + getOpenFacebookIntent(AboutActivity.this, config.facebookUserName); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_facebook_log_event)); + } + }) + .build()); + } + if (!TextUtils.isEmpty(config.twitterUserName)) { + card.addItem(new MaterialAboutActionItem.Builder() + .text(R.string.egab_twitter_label) + .subText(config.twitterUserName) + .icon(R.drawable.ic_twitter_24dp) + .setOnClickListener(new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + startTwitter(AboutActivity.this, config.twitterUserName); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_twitter_log_event)); + } + }) + .build()); + } + if (!TextUtils.isEmpty(config.webHomePage)) { + card.addItem(new MaterialAboutActionItem.Builder() + .text(R.string.egab_web_label) + .subText(config.webHomePage.replace("https://", "").replace("http://", "").replace("/", "")) + .icon(R.drawable.ic_web_black_24dp) + .setOnClickListener(new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + openHTMLPage(config.webHomePage); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_website_log_event)); + } + }) + .build()); + } return card.build(); } @NonNull private MaterialAboutCard buildPrivacyCard(final AboutConfig config) { MaterialAboutCard.Builder card = new MaterialAboutCard.Builder(); + if (!TextUtils.isEmpty(config.privacyHtmlPath)) { + card.addItem(itemHelper(R.string.egab_privacy_policy, R.drawable.ic_privacy, + new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + if (config.dialog == null) { + openHTMLPage(config.privacyHtmlPath); + } else { + config.dialog.open(AboutActivity.this, config.privacyHtmlPath, getString(R.string.egab_privacy_policy)); + } - card.addItem(itemHelper(R.string.egab_privacy_policy, R.drawable.ic_privacy, - new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - if (config.dialog == null) { - openHTMLPage(config.privacyHtmlPath); - } else { - config.dialog.open(AboutActivity.this, config.privacyHtmlPath, getString(R.string.egab_privacy_policy)); - } - - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_privacy_log_event)); - } - }) - ); - card.addItem(itemHelper(R.string.egab_acknowledgements, R.drawable.ic_acknowledgements, - new MaterialAboutItemOnClickListener() { - @Override - public void onClick(boolean b) { - if (config.dialog == null) { - openHTMLPage(config.acknowledgmentHtmlPath); - } else { - config.dialog.open(AboutActivity.this, config.acknowledgmentHtmlPath, getString(R.string.egab_acknowledgements)); - } - logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_acknowledgements_log_event)); - } - }) - ); + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_privacy_log_event)); + } + }) + ); + } + if (!TextUtils.isEmpty(config.acknowledgmentHtmlPath)) { + card.addItem(itemHelper(R.string.egab_acknowledgements, R.drawable.ic_acknowledgements, + new MaterialAboutItemOnClickListener() { + @Override + public void onClick(boolean b) { + if (config.dialog == null) { + openHTMLPage(config.acknowledgmentHtmlPath); + } else { + config.dialog.open(AboutActivity.this, config.acknowledgmentHtmlPath, getString(R.string.egab_acknowledgements)); + } + logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_acknowledgements_log_event)); + } + }) + ); + } return card.build(); } private MaterialAboutActionItem itemHelper(int name, int icon, MaterialAboutItemOnClickListener listener) { return new MaterialAboutActionItem.Builder() - .text(name) - .icon(icon) - .setOnClickListener(listener) - .build(); + .text(name) + .icon(icon) + .setOnClickListener(listener) + .build(); } From a3ea5e4d90f29280a9e80de806ed64fb4274ce39 Mon Sep 17 00:00:00 2001 From: Alex Dibrivnyi Date: Mon, 15 May 2017 23:40:57 +0300 Subject: [PATCH 2/7] Tried to fix GOD class pmd fail --- .../eggheadgames/aboutbox/AboutBoxUtils.java | 97 ++++++++++++++++ .../aboutbox/activity/AboutActivity.java | 106 ++---------------- 2 files changed, 108 insertions(+), 95 deletions(-) create mode 100644 library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java new file mode 100644 index 0000000..3b5dace --- /dev/null +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -0,0 +1,97 @@ +package com.eggheadgames.aboutbox; + +import android.app.Activity; +import android.content.ActivityNotFoundException; +import android.content.Intent; +import android.net.Uri; +import android.widget.Toast; + +public final class AboutBoxUtils { + + private AboutBoxUtils() { + //nothing + } + + public static void getOpenFacebookIntent(Activity context, String name) { + try { + context.getPackageManager().getPackageInfo("com.facebook.katana", 0); + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://profile/" + name)); + context.startActivity(intent); + } catch (Exception e) { + try { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + name)); + context.startActivity(intent); + } catch (Exception e1) { + Toast.makeText(context, R.string.egab_can_not_open, Toast.LENGTH_SHORT).show(); + } + } + } + + public static void startTwitter(Activity context, String name) { + try { + context.getPackageManager().getPackageInfo("com.twitter.android", 0); + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("twitter://user?screen_name=" + name)); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(intent); + } catch (Exception e) { + try { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/" + name)); + context.startActivity(intent); + } catch (Exception e1) { + Toast.makeText(context, R.string.egab_can_not_open, Toast.LENGTH_SHORT).show(); + } + } + } + + public static void openApp(Activity context, AboutConfig.BuildType buildType, String packageName) { + String appURI = null; + String webURI = null; + switch (buildType) { + case GOOGLE: + appURI = "market://details?id=" + packageName; + webURI = "http://play.google.com/store/apps/details?id=" + packageName; + break; + case AMAZON: + appURI = "amzn://apps/android?p=" + packageName; + webURI = "http://www.amazon.com/gp/mas/dl/android?p=" + packageName; + break; + default: + //nothing + } + openApplication(context, appURI, webURI); + } + + public static void openPublisher(Activity context, AboutConfig.BuildType buildType, String publisher, String packageName) { + String appURI = null; + String webURI = null; + switch (buildType) { + case GOOGLE: + appURI = "market://search?q=pub:" + publisher; + webURI = "http://play.google.com/store/search?q=pub:" + publisher; + break; + case AMAZON: + appURI = "amzn://apps/android?showAll=1&p=" + packageName; + webURI = "http://www.amazon.com/gp/mas/dl/android?showAll=1&p=" + packageName; + break; + default: + //nothing + } + openApplication(context, appURI, webURI); + } + + public static void openApplication(Activity context, String appURI, String webURI) { + try { + context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(appURI))); + } catch (ActivityNotFoundException e1) { + try { + openHTMLPage(context, webURI); + } catch (ActivityNotFoundException e2) { + Toast.makeText(context, R.string.egab_can_not_open, Toast.LENGTH_SHORT).show(); + } + } + } + + public static void openHTMLPage(Activity context, String htmlPath) { + context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(htmlPath))); + } +} 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 8d346f3..ea724d1 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -1,13 +1,10 @@ package com.eggheadgames.aboutbox.activity; import android.app.Activity; -import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; -import android.net.Uri; import android.support.annotation.NonNull; import android.text.TextUtils; -import android.widget.Toast; import com.danielstone.materialaboutlibrary.MaterialAboutActivity; import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem; @@ -15,6 +12,7 @@ import com.danielstone.materialaboutlibrary.items.MaterialAboutItemOnClickListen import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem; import com.danielstone.materialaboutlibrary.model.MaterialAboutCard; import com.danielstone.materialaboutlibrary.model.MaterialAboutList; +import com.eggheadgames.aboutbox.AboutBoxUtils; import com.eggheadgames.aboutbox.AboutConfig; import com.eggheadgames.aboutbox.IAnalytic; import com.eggheadgames.aboutbox.R; @@ -69,7 +67,7 @@ public class AboutActivity extends MaterialAboutActivity { @Override public void onClick(boolean b) { if (config.dialog == null) { - openHTMLPage(config.guideHtmlPath); + AboutBoxUtils.openHTMLPage(AboutActivity.this, config.guideHtmlPath); } else { config.dialog.open(AboutActivity.this, config.guideHtmlPath, getString(R.string.egab_guide)); } @@ -98,7 +96,7 @@ public class AboutActivity extends MaterialAboutActivity { new MaterialAboutItemOnClickListener() { @Override public void onClick(boolean b) { - openApp(config.buildType, config.packageName); + AboutBoxUtils.openApp(AboutActivity.this, config.buildType, config.packageName); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_review_log_event)); } })); @@ -123,7 +121,8 @@ public class AboutActivity extends MaterialAboutActivity { new MaterialAboutItemOnClickListener() { @Override public void onClick(boolean b) { - openPublisher(config.buildType, config.appPublisher, config.packageName); + AboutBoxUtils.openPublisher(AboutActivity.this, config.buildType, + config.appPublisher, config.packageName); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_try_other_app_log_event)); } })); @@ -136,7 +135,7 @@ public class AboutActivity extends MaterialAboutActivity { @Override public void onClick(boolean b) { if (config.dialog == null) { - openHTMLPage(config.companyHtmlPath); + AboutBoxUtils.openHTMLPage(AboutActivity.this, config.companyHtmlPath); } else { config.dialog.open(AboutActivity.this, config.companyHtmlPath, config.aboutLabelTitle); } @@ -159,7 +158,7 @@ public class AboutActivity extends MaterialAboutActivity { .setOnClickListener(new MaterialAboutItemOnClickListener() { @Override public void onClick(boolean b) { - getOpenFacebookIntent(AboutActivity.this, config.facebookUserName); + AboutBoxUtils.getOpenFacebookIntent(AboutActivity.this, config.facebookUserName); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_facebook_log_event)); } }) @@ -173,7 +172,7 @@ public class AboutActivity extends MaterialAboutActivity { .setOnClickListener(new MaterialAboutItemOnClickListener() { @Override public void onClick(boolean b) { - startTwitter(AboutActivity.this, config.twitterUserName); + AboutBoxUtils.startTwitter(AboutActivity.this, config.twitterUserName); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_twitter_log_event)); } }) @@ -187,7 +186,7 @@ public class AboutActivity extends MaterialAboutActivity { .setOnClickListener(new MaterialAboutItemOnClickListener() { @Override public void onClick(boolean b) { - openHTMLPage(config.webHomePage); + AboutBoxUtils.openHTMLPage(AboutActivity.this, config.webHomePage); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_website_log_event)); } }) @@ -205,7 +204,7 @@ public class AboutActivity extends MaterialAboutActivity { @Override public void onClick(boolean b) { if (config.dialog == null) { - openHTMLPage(config.privacyHtmlPath); + AboutBoxUtils.openHTMLPage(AboutActivity.this, config.privacyHtmlPath); } else { config.dialog.open(AboutActivity.this, config.privacyHtmlPath, getString(R.string.egab_privacy_policy)); } @@ -221,7 +220,7 @@ public class AboutActivity extends MaterialAboutActivity { @Override public void onClick(boolean b) { if (config.dialog == null) { - openHTMLPage(config.acknowledgmentHtmlPath); + AboutBoxUtils.openHTMLPage(AboutActivity.this, config.acknowledgmentHtmlPath); } else { config.dialog.open(AboutActivity.this, config.acknowledgmentHtmlPath, getString(R.string.egab_acknowledgements)); } @@ -247,89 +246,6 @@ public class AboutActivity extends MaterialAboutActivity { return getString(R.string.egab_about_screen_title); } - public static void getOpenFacebookIntent(Activity context, String name) { - try { - context.getPackageManager().getPackageInfo("com.facebook.katana", 0); - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://profile/" + name)); - context.startActivity(intent); - } catch (Exception e) { - try { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + name)); - context.startActivity(intent); - } catch (Exception e1) { - Toast.makeText(context, R.string.egab_can_not_open, Toast.LENGTH_SHORT).show(); - } - } - } - - public static void startTwitter(Activity context, String name) { - try { - context.getPackageManager().getPackageInfo("com.twitter.android", 0); - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("twitter://user?screen_name=" + name)); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } catch (Exception e) { - try { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/" + name)); - context.startActivity(intent); - } catch (Exception e1) { - Toast.makeText(context, R.string.egab_can_not_open, Toast.LENGTH_SHORT).show(); - } - } - } - - public void openApp(AboutConfig.BuildType buildType, String packageName) { - String appURI = null; - String webURI = null; - switch (buildType) { - case GOOGLE: - appURI = "market://details?id=" + packageName; - webURI = "http://play.google.com/store/apps/details?id=" + packageName; - break; - case AMAZON: - appURI = "amzn://apps/android?p=" + packageName; - webURI = "http://www.amazon.com/gp/mas/dl/android?p=" + packageName; - break; - default: - //nothing - } - openApplication(appURI, webURI); - } - - public void openPublisher(AboutConfig.BuildType buildType, String publisher, String packageName) { - String appURI = null; - String webURI = null; - switch (buildType) { - case GOOGLE: - appURI = "market://search?q=pub:" + publisher; - webURI = "http://play.google.com/store/search?q=pub:" + publisher; - break; - case AMAZON: - appURI = "amzn://apps/android?showAll=1&p=" + packageName; - webURI = "http://www.amazon.com/gp/mas/dl/android?showAll=1&p=" + packageName; - break; - default: - //nothing - } - openApplication(appURI, webURI); - } - - private void openApplication(String appURI, String webURI) { - try { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(appURI))); - } catch (ActivityNotFoundException e1) { - try { - openHTMLPage(webURI); - } catch (ActivityNotFoundException e2) { - Toast.makeText(this, R.string.egab_can_not_open, Toast.LENGTH_SHORT).show(); - } - } - } - - private void openHTMLPage(String htmlPath) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(htmlPath))); - } - private void logUIEventName(IAnalytic analytics, String eventType, String eventValue) { if (analytics != null) { analytics.logUiEvent(eventType, eventValue); From 170c879b10043e02f108fa7e297cf3c34aa54f7c Mon Sep 17 00:00:00 2001 From: Alex Dibrivnyi Date: Mon, 15 May 2017 23:55:50 +0300 Subject: [PATCH 3/7] Removed branch io. We need to try to integrate this version to real app and test (CLose #24) --- library/build.gradle | 3 - .../eggheadgames/aboutbox/AboutConfig.java | 4 +- .../com/eggheadgames/aboutbox/IShare.java | 7 +++ .../aboutbox/activity/AboutActivity.java | 6 +- .../aboutbox/share/ShareUtil.java | 57 +++---------------- 5 files changed, 21 insertions(+), 56 deletions(-) create mode 100644 library/src/main/java/com/eggheadgames/aboutbox/IShare.java diff --git a/library/build.gradle b/library/build.gradle index aeb3fb9..a80bf55 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -29,7 +29,4 @@ android { dependencies { compile 'com.github.daniel-stoneuk:material-about-library:1.8.2' - compile('io.branch.sdk.android:library:2.6.1') { - exclude module: 'answers.shim' - } } diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java index 64bb21d..ed456c3 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java @@ -21,9 +21,10 @@ public class AboutConfig { public BuildType buildType; public String packageName; - // custom analytics and dialog + // custom analytics, dialog and share public IAnalytic analytics; public IDialog dialog; + public IShare share; // email public String emailAddress; @@ -31,7 +32,6 @@ public class AboutConfig { public String emailBody; // share - public String shareMessageTitle; public String shareMessage; public String sharingTitle; diff --git a/library/src/main/java/com/eggheadgames/aboutbox/IShare.java b/library/src/main/java/com/eggheadgames/aboutbox/IShare.java new file mode 100644 index 0000000..6ee62db --- /dev/null +++ b/library/src/main/java/com/eggheadgames/aboutbox/IShare.java @@ -0,0 +1,7 @@ +package com.eggheadgames.aboutbox; + + +public interface IShare { + + void share(); +} 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 74ec6fc..a8638f5 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -107,7 +107,11 @@ public class AboutActivity extends MaterialAboutActivity { new MaterialAboutItemOnClickListener() { @Override public void onClick(boolean b) { - ShareUtil.share(AboutActivity.this); + if (config.share != null) { + config.share.share(); + } else { + ShareUtil.share(AboutActivity.this); + } logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_share_log_event)); } })); 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 364c9ab..61a4511 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java @@ -1,17 +1,10 @@ package com.eggheadgames.aboutbox.share; import android.app.Activity; -import android.text.TextUtils; +import android.content.Intent; import com.eggheadgames.aboutbox.AboutConfig; -import io.branch.indexing.BranchUniversalObject; -import io.branch.referral.Branch; -import io.branch.referral.BranchError; -import io.branch.referral.SharingHelper; -import io.branch.referral.util.LinkProperties; -import io.branch.referral.util.ShareSheetStyle; - public final class ShareUtil { private ShareUtil() { @@ -19,48 +12,12 @@ public final class ShareUtil { } public static void share(Activity activity) { - BranchUniversalObject branchUniversalObject = new BranchUniversalObject(); - final AboutConfig config = AboutConfig.getInstance(); - - ShareSheetStyle shareSheetStyle = new ShareSheetStyle(activity, config.shareMessageTitle, - config.shareMessage) - .setCopyUrlStyle(activity.getResources().getDrawable(android.R.drawable.ic_menu_send), - "Copy", "Added to clipboard") - .setMoreOptionStyle(activity.getResources().getDrawable(android.R.drawable.ic_menu_search), "Show more") - .addPreferredSharingOption(SharingHelper.SHARE_WITH.FACEBOOK) - .addPreferredSharingOption(SharingHelper.SHARE_WITH.EMAIL) - .setSharingTitle(config.sharingTitle); - - branchUniversalObject.showShareSheet(activity, - new LinkProperties(), shareSheetStyle, new Branch.BranchLinkShareListener() { - @Override - public void onShareLinkDialogLaunched() { - //nothing - } - - @Override - public void onShareLinkDialogDismissed() { - if (config.analytics != null) { - config.analytics.logUiEvent("Share", "Dismissed"); - } - } - - @Override - public void onLinkShareResponse(String sharedLink, String sharedChannel, BranchError error) { - if (config.analytics != null) { - if (error == null || TextUtils.isEmpty(error.getMessage())) { - config.analytics.logUiEvent("Share", sharedChannel); - } else { - config.analytics.logUiEvent("Share Failure", error.getMessage()); - } - } - } - - @Override - public void onChannelSelected(String channelName) { - //nothing - } - }); + AboutConfig config = AboutConfig.getInstance(); + Intent intent2 = new Intent(); + intent2.setAction(Intent.ACTION_SEND); + intent2.setType("text/plain"); + intent2.putExtra(Intent.EXTRA_TEXT, config.shareMessage); + activity.startActivity(Intent.createChooser(intent2, config.sharingTitle)); } } From fc4c2ee3abb7ba69bcaafc3b4c0b65c0d0dcd6e9 Mon Sep 17 00:00:00 2001 From: Alex Dibrivnyi Date: Tue, 16 May 2017 00:01:42 +0300 Subject: [PATCH 4/7] Fixed pmd --- .../com/eggheadgames/aboutbox/activity/AboutActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a8638f5..d84ff14 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -107,10 +107,10 @@ public class AboutActivity extends MaterialAboutActivity { new MaterialAboutItemOnClickListener() { @Override public void onClick(boolean b) { - if (config.share != null) { - config.share.share(); - } else { + if (config.share == null) { ShareUtil.share(AboutActivity.this); + } else { + config.share.share(); } logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_share_log_event)); } From 1ad0a6900221b798c53bbc5d21448cb3dca831e2 Mon Sep 17 00:00:00 2001 From: Alexandr Dibrivnyi Date: Tue, 16 May 2017 12:50:32 +0300 Subject: [PATCH 5/7] Added activity context --- library/src/main/java/com/eggheadgames/aboutbox/IShare.java | 4 +++- .../com/eggheadgames/aboutbox/activity/AboutActivity.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/IShare.java b/library/src/main/java/com/eggheadgames/aboutbox/IShare.java index 6ee62db..b9b5520 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/IShare.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/IShare.java @@ -1,7 +1,9 @@ package com.eggheadgames.aboutbox; +import android.app.Activity; + public interface IShare { - void share(); + void share(Activity activity); } 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 d84ff14..7860214 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -110,7 +110,7 @@ public class AboutActivity extends MaterialAboutActivity { if (config.share == null) { ShareUtil.share(AboutActivity.this); } else { - config.share.share(); + config.share.share(AboutActivity.this); } logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_share_log_event)); } From 139cd117413f3bcdcab0c0518eb6fb13fa90fb8a Mon Sep 17 00:00:00 2001 From: Alex Dibrivnyi Date: Tue, 16 May 2017 22:13:11 +0300 Subject: [PATCH 6/7] Updated Readme file. Incremented version number --- README.md | 28 ++++++++++++++++++++-------- library/build.gradle | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4dc387a..15dafe8 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,7 @@ dependencies { } ``` -## Example -### Setup Branch.io - -Branch.io integration can be found [here](https://github.com/BranchMetrics/android-branch-deep-linking) - -### Setup AboutBox +## Setup AboutBox Add AboutBox configuration to your Application class @@ -90,12 +85,29 @@ Add AboutBox configuration to your Application class aboutConfig.emailSubject = EMAIL_SUBJECT; aboutConfig.emailBody = EMAIL_BODY; - // Branch.io labels. - aboutConfig.shareMessageTitle = getString(R.string.share_message_title); + +``` + +You need to provide only one sharing solution. + +Android Native share. +Android share intent will be called when you specify only `shareMessage` and `sharingTitle`. +``` aboutConfig.shareMessage = getString(R.string.share_message); aboutConfig.sharingTitle = getString(R.string.sharing_title); ``` +Custom share. +Override this callback if you want to call your own share implementation. In this case no need to specify `shareMessage` and `sharingTitle`. + ``` + aboutConfig.share = new IShare() { + @Override + public void share(Activity activity) { + // do custom sharing + } + }; +``` + Open AboutBox screen ```java diff --git a/library/build.gradle b/library/build.gradle index a80bf55..33530f1 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 15 targetSdkVersion 24 versionCode 4 - versionName "1.1.0" + versionName "1.2.0" } buildTypes { release { From 1a79efd84a783d7aafd0c2c7a8c258dbc4a39651 Mon Sep 17 00:00:00 2001 From: mikemee Date: Tue, 16 May 2017 12:25:38 -0700 Subject: [PATCH 7/7] Edit sharing information, adjust styling --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 15dafe8..72a96a6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,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.1.0, you can also optionally provide a help file with the `aboutConfig.guideHtmlPath` setting. Leave it unset (null or empty string) and the behaviour is compatible with version 1.0.x. +As of version 1.2.0, you can omit many features that don't apply (e.g. like website), by not setting the values. ## Installation Instructions @@ -88,18 +88,24 @@ Add AboutBox configuration to your Application class ``` -You need to provide only one sharing solution. +## Open the About Box from your app -Android Native share. -Android share intent will be called when you specify only `shareMessage` and `sharingTitle`. +```java + AboutActivity.launch(activity); ``` + + + +## Sharing + +By default, the default Android share intent will be called with the values specified in `shareMessage` and `sharingTitle`. For example: +```java aboutConfig.shareMessage = getString(R.string.share_message); aboutConfig.sharingTitle = getString(R.string.sharing_title); ``` -Custom share. -Override this callback if you want to call your own share implementation. In this case no need to specify `shareMessage` and `sharingTitle`. - ``` +Alternatively, you can provide a custom sharing function (and omit `shareMessage` and `sharingTitle`): + ```java aboutConfig.share = new IShare() { @Override public void share(Activity activity) { @@ -108,17 +114,11 @@ Override this callback if you want to call your own share implementation. In thi }; ``` -Open AboutBox screen - -```java - AboutActivity.launch(activity); -``` - ## Theme -Add to your AndroidManifest.xml file +If you add the following to your AndroidManifest.xml file, the About Box will use these colours. This allows you to match your app colours: -``` +```xml @@ -132,7 +132,7 @@ Theme.Mal.Dark.LightActionBar Theme.Mal.Dark.DarkActionBar ``` -``` +```xml