From 170c879b10043e02f108fa7e297cf3c34aa54f7c Mon Sep 17 00:00:00 2001 From: Alex Dibrivnyi Date: Mon, 15 May 2017 23:55:50 +0300 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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)); }