erik/android-about-box
erik/android-about-box
1
0
Fork 0
mirror of https://github.com/ethauvin/android-about-box.git synced 2025-04-25 02:37:11 -07:00
Code Releases Activity

Merge pull request #37 from ethauvin/develop

Browse source 
Move to Material About Library 2.2.1
This commit is contained in:
mikemee 2017-10-08 10:59:16 -07:00 • committed by GitHub
commit 210c48d2ed
4 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/build.gradle
View file

@ -28,5 +28,5 @@ android {
} }
dependencies { dependencies {
compile 'com.github.daniel-stoneuk:material-about-library:1.8.2' compile 'com.github.daniel-stoneuk:material-about-library:2.2.1'
} }

5
library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java
View file

@ -72,12 +72,13 @@ public final class AboutBoxUtils {
// see: // see:
// https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher // https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher
// https://stackoverflow.com/questions/32029408/how-to-open-developer-page-on-google-play-store-market // https://stackoverflow.com/questions/32029408/how-to-open-developer-page-on-google-play-store-market
// https://issuetracker.google.com/65244694
if (publisher.matches("\\d+")) { if (publisher.matches("\\d+")) {
webURI = "http://play.google.com/store/dev?id=" + publisher; webURI = "https://play.google.com/store/apps/dev?id=" + publisher;
appURI = webURI; appURI = webURI;
} else { } else {
appURI = "market://search?q=pub:" + publisher; appURI = "market://search?q=pub:" + publisher;
webURI = "http://play.google.com/store/search?q=pub:" + publisher; webURI = "https://play.google.com/store/search?q=pub:" + publisher;
} }
break; break;
case AMAZON: case AMAZON:

50
library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java
View file

@ -8,7 +8,7 @@ import android.text.TextUtils;
import com.danielstone.materialaboutlibrary.MaterialAboutActivity; import com.danielstone.materialaboutlibrary.MaterialAboutActivity;
import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem; import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem;
import com.danielstone.materialaboutlibrary.items.MaterialAboutItemOnClickListener; import com.danielstone.materialaboutlibrary.items.MaterialAboutItemOnClickAction;
import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem; import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem;
import com.danielstone.materialaboutlibrary.model.MaterialAboutCard; import com.danielstone.materialaboutlibrary.model.MaterialAboutCard;
import com.danielstone.materialaboutlibrary.model.MaterialAboutList; import com.danielstone.materialaboutlibrary.model.MaterialAboutList;
@ -79,9 +79,9 @@ public class AboutActivity extends MaterialAboutActivity {
if (!TextUtils.isEmpty(config.guideHtmlPath)) { if (!TextUtils.isEmpty(config.guideHtmlPath)) {
card.addItem(itemHelper(R.string.egab_guide, R.drawable.ic_help_green, card.addItem(itemHelper(R.string.egab_guide, R.drawable.ic_help_green,
new MaterialAboutItemOnClickListener() { new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
if (config.dialog == null) { if (config.dialog == null) {
AboutBoxUtils.openHTMLPage(AboutActivity.this, config.guideHtmlPath); AboutBoxUtils.openHTMLPage(AboutActivity.this, config.guideHtmlPath);
} else { } else {
@ -93,9 +93,9 @@ public class AboutActivity extends MaterialAboutActivity {
); );
} }
card.addItem(itemHelper(R.string.egab_contact_support, R.drawable.ic_email_black, card.addItem(itemHelper(R.string.egab_contact_support, R.drawable.ic_email_black,
new MaterialAboutItemOnClickListener() { new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
EmailUtil.contactUs(AboutActivity.this); EmailUtil.contactUs(AboutActivity.this);
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_contact_log_event)); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_contact_log_event));
} }
@ -109,18 +109,18 @@ public class AboutActivity extends MaterialAboutActivity {
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder(); MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
if (config.buildType != null && !TextUtils.isEmpty(config.packageName)) { if (config.buildType != null && !TextUtils.isEmpty(config.packageName)) {
card.addItem(itemHelper(R.string.egab_leave_review, R.drawable.ic_review, card.addItem(itemHelper(R.string.egab_leave_review, R.drawable.ic_review,
new MaterialAboutItemOnClickListener() { new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
AboutBoxUtils.openApp(AboutActivity.this, config.buildType, config.packageName); AboutBoxUtils.openApp(AboutActivity.this, config.buildType, config.packageName);
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_review_log_event)); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_review_log_event));
} }
})); }));
} }
card.addItem(itemHelper(R.string.egab_share, R.drawable.ic_share_black, card.addItem(itemHelper(R.string.egab_share, R.drawable.ic_share_black,
new MaterialAboutItemOnClickListener() { new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
if (config.share == null) { if (config.share == null) {
ShareUtil.share(AboutActivity.this); ShareUtil.share(AboutActivity.this);
} else { } else {
@ -137,9 +137,9 @@ public class AboutActivity extends MaterialAboutActivity {
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder(); MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
if (config.buildType != null && !TextUtils.isEmpty(config.appPublisher) && !TextUtils.isEmpty(config.packageName)) { 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, card.addItem(itemHelper(R.string.egab_try_other_apps, R.drawable.ic_try_other_apps,
new MaterialAboutItemOnClickListener() { new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
AboutBoxUtils.openPublisher(AboutActivity.this, config.buildType, AboutBoxUtils.openPublisher(AboutActivity.this, config.buildType,
config.appPublisher, config.packageName); config.appPublisher, config.packageName);
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_try_other_app_log_event)); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_try_other_app_log_event));
@ -150,9 +150,9 @@ public class AboutActivity extends MaterialAboutActivity {
card.addItem(new MaterialAboutActionItem.Builder() card.addItem(new MaterialAboutActionItem.Builder()
.text(config.aboutLabelTitle) .text(config.aboutLabelTitle)
.icon(R.drawable.ic_about_black) .icon(R.drawable.ic_about_black)
.setOnClickListener(new MaterialAboutItemOnClickListener() { .setOnClickAction(new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
if (config.dialog == null) { if (config.dialog == null) {
AboutBoxUtils.openHTMLPage(AboutActivity.this, config.companyHtmlPath); AboutBoxUtils.openHTMLPage(AboutActivity.this, config.companyHtmlPath);
} else { } else {
@ -174,9 +174,9 @@ public class AboutActivity extends MaterialAboutActivity {
.text(R.string.egab_facebook_label) .text(R.string.egab_facebook_label)
.subText(config.facebookUserName) .subText(config.facebookUserName)
.icon(R.drawable.ic_facebook_24) .icon(R.drawable.ic_facebook_24)
.setOnClickListener(new MaterialAboutItemOnClickListener() { .setOnClickAction(new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
AboutBoxUtils.getOpenFacebookIntent(AboutActivity.this, config.facebookUserName); AboutBoxUtils.getOpenFacebookIntent(AboutActivity.this, config.facebookUserName);
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_facebook_log_event)); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_facebook_log_event));
} }
@ -188,9 +188,9 @@ public class AboutActivity extends MaterialAboutActivity {
.text(R.string.egab_twitter_label) .text(R.string.egab_twitter_label)
.subText(config.twitterUserName) .subText(config.twitterUserName)
.icon(R.drawable.ic_twitter_24dp) .icon(R.drawable.ic_twitter_24dp)
.setOnClickListener(new MaterialAboutItemOnClickListener() { .setOnClickAction(new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
AboutBoxUtils.startTwitter(AboutActivity.this, config.twitterUserName); AboutBoxUtils.startTwitter(AboutActivity.this, config.twitterUserName);
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_twitter_log_event)); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_twitter_log_event));
} }
@ -202,9 +202,9 @@ public class AboutActivity extends MaterialAboutActivity {
.text(R.string.egab_web_label) .text(R.string.egab_web_label)
.subText(config.webHomePage.replaceFirst("^https?://", "").replaceAll("/$", "")) .subText(config.webHomePage.replaceFirst("^https?://", "").replaceAll("/$", ""))
.icon(R.drawable.ic_web_black_24dp) .icon(R.drawable.ic_web_black_24dp)
.setOnClickListener(new MaterialAboutItemOnClickListener() { .setOnClickAction(new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
AboutBoxUtils.openHTMLPage(AboutActivity.this, config.webHomePage); AboutBoxUtils.openHTMLPage(AboutActivity.this, config.webHomePage);
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_website_log_event)); logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_website_log_event));
} }
@ -219,9 +219,9 @@ public class AboutActivity extends MaterialAboutActivity {
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder(); MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
if (!TextUtils.isEmpty(config.privacyHtmlPath)) { if (!TextUtils.isEmpty(config.privacyHtmlPath)) {
card.addItem(itemHelper(R.string.egab_privacy_policy, R.drawable.ic_privacy, card.addItem(itemHelper(R.string.egab_privacy_policy, R.drawable.ic_privacy,
new MaterialAboutItemOnClickListener() { new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
if (config.dialog == null) { if (config.dialog == null) {
AboutBoxUtils.openHTMLPage(AboutActivity.this, config.privacyHtmlPath); AboutBoxUtils.openHTMLPage(AboutActivity.this, config.privacyHtmlPath);
} else { } else {
@ -235,9 +235,9 @@ public class AboutActivity extends MaterialAboutActivity {
} }
if (!TextUtils.isEmpty(config.acknowledgmentHtmlPath)) { if (!TextUtils.isEmpty(config.acknowledgmentHtmlPath)) {
card.addItem(itemHelper(R.string.egab_acknowledgements, R.drawable.ic_acknowledgements, card.addItem(itemHelper(R.string.egab_acknowledgements, R.drawable.ic_acknowledgements,
new MaterialAboutItemOnClickListener() { new MaterialAboutItemOnClickAction() {
@Override @Override
public void onClick(boolean b) { public void onClick() {
if (config.dialog == null) { if (config.dialog == null) {
AboutBoxUtils.openHTMLPage(AboutActivity.this, config.acknowledgmentHtmlPath); AboutBoxUtils.openHTMLPage(AboutActivity.this, config.acknowledgmentHtmlPath);
} else { } else {
@ -251,11 +251,11 @@ public class AboutActivity extends MaterialAboutActivity {
return card.build(); return card.build();
} }
private MaterialAboutActionItem itemHelper(int name, int icon, MaterialAboutItemOnClickListener listener) { private MaterialAboutActionItem itemHelper(int name, int icon, MaterialAboutItemOnClickAction clickAction) {
return new MaterialAboutActionItem.Builder() return new MaterialAboutActionItem.Builder()
.text(name) .text(name)
.icon(icon) .icon(icon)
.setOnClickListener(listener) .setOnClickAction(clickAction)
.build(); .build();
} }

2
library/src/main/res/values/styles.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="AppTheme.MaterialAboutActivity" parent="Theme.Mal" > <style name="AppTheme.MaterialAboutActivity" parent="Theme.Mal.Light.DarkActionBar" >
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>