From 5cc5dd9b0da730193f10dd0ce4b5a1a05c3cbfb4 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 29 Mar 2013 17:48:51 -0700 Subject: [PATCH] Removed Nook and Amazon Market Strategies --- .../astrid/actfm/ActFmLoginActivity.java | 3 - .../astrid/activity/EditPreferences.java | 4 +- .../todoroo/astrid/adapter/FilterAdapter.java | 15 +-- .../astrid/service/MarketStrategy.java | 98 ------------------- build.xml | 19 +--- 5 files changed, 4 insertions(+), 135 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java index 305dad199..6f1ffe214 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java @@ -103,7 +103,6 @@ import com.todoroo.astrid.data.UserActivityOutstanding; import com.todoroo.astrid.gtasks.auth.ModernAuthManager; import com.todoroo.astrid.helper.UUIDHelper; import com.todoroo.astrid.service.AstridDependencyInjector; -import com.todoroo.astrid.service.MarketStrategy.AmazonMarketStrategy; import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.SyncV2Service; @@ -302,8 +301,6 @@ public class ActFmLoginActivity extends SherlockFragmentActivity { loginButton.setReadPermissions(Arrays.asList("email", "offline_access")); View googleLogin = findViewById(R.id.gg_login); - if(AmazonMarketStrategy.isKindleFire()) - googleLogin.setVisibility(View.GONE); googleLogin.setOnClickListener(googleListener); View fbLogin = findViewById(R.id.fb_login_dummy); diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 7bf3c0e01..c4023e721 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -53,7 +53,6 @@ import com.todoroo.astrid.gcal.CalendarStartupReceiver; import com.todoroo.astrid.gtasks.GtasksPreferences; import com.todoroo.astrid.helper.MetadataHelper; import com.todoroo.astrid.service.AddOnService; -import com.todoroo.astrid.service.MarketStrategy.AmazonMarketStrategy; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; @@ -349,8 +348,7 @@ public class EditPreferences extends TodorooPreferenceActivity { intent.setClassName(resolveInfo.activityInfo.packageName, resolveInfo.activityInfo.name); - if (GtasksPreferences.class.getName().equals(resolveInfo.activityInfo.name) - && AmazonMarketStrategy.isKindleFire()) + if (GtasksPreferences.class.getName().equals(resolveInfo.activityInfo.name)) continue; Preference preference = new Preference(this); diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index 1284ea66a..317787119 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -58,10 +58,8 @@ import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.api.FilterWithUpdate; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.helper.AsyncImageView; -import com.todoroo.astrid.service.MarketStrategy.NookMarketStrategy; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.tags.TagService; -import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.ResourceDrawableCache; public class FilterAdapter extends ArrayAdapter { @@ -113,8 +111,6 @@ public class FilterAdapter extends ArrayAdapter { private FilterDataSourceChangedListener listener; - private final boolean nook; - // Previous solution involved a queue of filters and a filterSizeLoadingThread. The filterSizeLoadingThread had // a few problems: how to make sure that the thread is resumed when the controlling activity is resumed, and @@ -144,8 +140,6 @@ public class FilterAdapter extends ArrayAdapter { this.selectable = selectable; this.filterCounts = new HashMap(); - this.nook = (Constants.MARKET_STRATEGY instanceof NookMarketStrategy); - if (activity instanceof AstridActivity && ((AstridActivity) activity).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE) filterStyle = R.style.TextAppearance_FLA_Filter_Tablet; @@ -510,7 +504,7 @@ public class FilterAdapter extends ArrayAdapter { viewHolder.urlImage.setVisibility(View.GONE); viewHolder.icon.setVisibility(View.GONE); - if(!nook && filter.listingIcon != null) { + if(filter.listingIcon != null) { viewHolder.icon.setVisibility(View.VISIBLE); viewHolder.icon.setImageBitmap(filter.listingIcon); } @@ -553,7 +547,7 @@ public class FilterAdapter extends ArrayAdapter { viewHolder.name.setTextColor(Color.GRAY); viewHolder.name.getLayoutParams().height = (int) (58 * metrics.density); - if(!nook && filter instanceof FilterWithUpdate) { + if(filter instanceof FilterWithUpdate) { String defaultImageId = RemoteModel.NO_UUID; FilterWithUpdate fwu = (FilterWithUpdate) filter; Bundle customExtras = fwu.customExtras; @@ -567,11 +561,6 @@ public class FilterAdapter extends ArrayAdapter { viewHolder.urlImage.setUrl(((FilterWithUpdate)filter).imageUrl); } - if (nook) { - RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) viewHolder.name.getLayoutParams(); - params.setMargins((int) (8 * metrics.density), 0, 0, 0); - } - if (filter.color != 0) viewHolder.name.setTextColor(filter.color); diff --git a/astrid/src/com/todoroo/astrid/service/MarketStrategy.java b/astrid/src/com/todoroo/astrid/service/MarketStrategy.java index 805019b63..2c42ff103 100644 --- a/astrid/src/com/todoroo/astrid/service/MarketStrategy.java +++ b/astrid/src/com/todoroo/astrid/service/MarketStrategy.java @@ -8,8 +8,6 @@ package com.todoroo.astrid.service; import android.content.Intent; import android.net.Uri; -import com.timsu.astrid.R; - public abstract class MarketStrategy { /** @@ -103,100 +101,4 @@ public abstract class MarketStrategy { } - public static class AmazonMarketStrategy extends MarketStrategy { - - @Override - public Intent generateMarketLink(String packageName) { - return new Intent(Intent.ACTION_VIEW, - Uri.parse("http://www.amazon.com/gp/mas/dl/android?p=" + //$NON-NLS-1$ - packageName)); - } - - @Override - public boolean includesLocalePlugin() { - return false; - } - - @Override - public boolean showAddonMenu() { - return !isKindleFire(); - } - - /** - * @return true if the device is a kindle fire and needs special treatment - */ - public static boolean isKindleFire() { - return android.os.Build.MANUFACTURER.equals("Amazon") && //$NON-NLS-1$ - android.os.Build.MODEL.contains("Kindle"); //$NON-NLS-1$ - } - - @Override - public int[] excludedSettings() { - return new int[] { - R.string.p_theme_widget, - R.string.p_voicePrefSection, - R.string.p_end_at_deadline, - R.string.p_field_missed_calls - }; - } - - @Override - public String strategyId() { - return "amazon_market"; //$NON-NLS-1$ - } - - } - - public static class NookMarketStrategy extends MarketStrategy { - - @Override - public Intent generateMarketLink(String packageName) { - return new Intent(Intent.ACTION_VIEW, - Uri.parse("market://search?q=pname:" + //$NON-NLS-1$ - packageName)); - } - - @Override - public boolean includesLocalePlugin() { - return false; - } - - @Override - public boolean showAddonMenu() { - return false; - } - - @Override - public boolean allowIdeasTab() { - return false; - } - - @Override - public int[] excludedSettings() { - return new int[] { - R.string.p_theme_widget, - R.string.p_voicePrefSection, - R.string.p_end_at_deadline, - R.string.p_field_missed_calls, - R.string.p_rmd_vibrate, - R.string.gcal_p_default, - R.string.p_theme_widget, - R.string.p_voiceInputEnabled, - R.string.p_voiceInputCreatesTask, - R.string.p_use_contact_picker - }; - } - - @Override - public boolean defaultPhoneLayout() { - return true; - } - - @Override - public String strategyId() { - return "nook_market"; //$NON-NLS-1$ - } - - } - } diff --git a/build.xml b/build.xml index 43a3848a2..3aef11f83 100644 --- a/build.xml +++ b/build.xml @@ -32,7 +32,7 @@ - + @@ -44,15 +44,6 @@ - - - - - - - - - @@ -69,14 +60,6 @@ - - - - - - - -