From cf535a2f8f9bed3daf7e13391d2ea7546067ab5f Mon Sep 17 00:00:00 2001 From: Rodrigo Damazio Date: Wed, 16 Mar 2011 12:42:20 -0700 Subject: [PATCH] Getting rid of the strings provider (we can now reference string resources again) --- .../apps/mytracks/io/MyMapsFactory.java | 32 +------------------ .../mytracks/io/mymaps/MapsFacadeImpl.java | 13 ++++---- .../apps/mytracks/io/mymaps/MapsService.java | 3 +- .../io/mymaps/MapsStringsProvider.java | 18 ----------- 4 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsStringsProvider.java diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/MyMapsFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/MyMapsFactory.java index 8d17e1667..d7108d352 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/MyMapsFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/MyMapsFactory.java @@ -2,13 +2,10 @@ package com.google.android.apps.mytracks.io; import com.google.android.apps.mytracks.io.gdata.GDataClientFactory; import com.google.android.apps.mytracks.io.mymaps.MapsFacade; -import com.google.android.apps.mytracks.io.mymaps.MapsService; -import com.google.android.apps.mytracks.io.mymaps.MapsStringsProvider; import com.google.android.apps.mytracks.io.mymaps.MapsFacade.AuthenticationRefresher; -import com.google.android.maps.mytracks.R; +import com.google.android.apps.mytracks.io.mymaps.MapsService; import android.app.Activity; -import android.content.Context; /** * Factory to easily instantiate a {@link MapsFacade}. @@ -17,32 +14,6 @@ import android.content.Context; */ public class MyMapsFactory { - /** - * Simple provider for reading strings from resources. - */ - private static class MyMapsStringProvider implements MapsStringsProvider { - private final Context context; - - public MyMapsStringProvider(Context context) { - this.context = context; - } - - @Override - public String getNewMapDescription() { - return context.getString(R.string.new_map_description); - } - - @Override - public String getStart() { - return context.getString(R.string.start); - } - - @Override - public String getEnd() { - return context.getString(R.string.end); - } - } - /** * Creates a new Maps faŤade interface instance. * @@ -53,7 +24,6 @@ public class MyMapsFactory { public static MapsFacade newMapsClient(Activity context, final AuthManager auth) { MapsFacade client = MapsService.newClient(context, GDataClientFactory.getGDataClient(context), - new MyMapsStringProvider(context), auth.getAuthToken()); client.setAuthenticationRefresher(new AuthenticationRefresher() { @Override diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacadeImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacadeImpl.java index 4fc162e71..2f3a5fc45 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacadeImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacadeImpl.java @@ -2,6 +2,7 @@ package com.google.android.apps.mytracks.io.mymaps; import com.google.android.maps.GeoPoint; +import com.google.android.maps.mytracks.R; import com.google.wireless.gdata.client.GDataClient; import com.google.wireless.gdata.client.HttpException; import com.google.wireless.gdata.data.Entry; @@ -29,14 +30,14 @@ class MapsFacadeImpl implements MapsFacade { private static final String START_ICON_URL = "http://maps.google.com/mapfiles/ms/micons/green-dot.png"; + private final Context context; private final MyMapsGDataWrapper wrapper; private final MyMapsGDataConverter gdataConverter; - private final MapsStringsProvider stringProvider; private final String authToken; public MapsFacadeImpl(Context context, GDataClient gdataClient, - MapsStringsProvider stringProvider, String authToken) { - this.stringProvider = stringProvider; + String authToken) { + this.context = context; this.authToken = authToken; wrapper = new MyMapsGDataWrapper(context, gdataClient); @@ -101,7 +102,7 @@ class MapsFacadeImpl implements MapsFacade { MyMapsMapMetadata metaData = new MyMapsMapMetadata(); metaData.setTitle(title); metaData.setDescription(description + " - " - + category + " - " + stringProvider.getNewMapDescription()); + + category + " - " + context.getString(R.string.new_map_description)); metaData.setSearchable(isPublic); Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData); Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle()); @@ -172,8 +173,8 @@ class MapsFacadeImpl implements MapsFacade { iconUrl = END_ICON_URL; } String title = trackName + " " - + (isStart ? stringProvider.getStart() - : stringProvider.getEnd()); + + (isStart ? context.getString(R.string.start) + : context.getString(R.string.end)); String description = isStart ? "" : trackDescription; return buildMyMapsPlacemarkFeature(title, description, iconUrl, geoPoint); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsService.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsService.java index 80db8deae..d1b61b20f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsService.java @@ -25,9 +25,8 @@ public class MapsService { public static MapsFacade newClient( Activity context, GDataClient gDataClient, - MapsStringsProvider stringProvider, String authToken) { - return new MapsFacadeImpl(context, gDataClient, stringProvider, authToken); + return new MapsFacadeImpl(context, gDataClient, authToken); } /** Returns the service name to authenticate to for providing the authentication token above. */ diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsStringsProvider.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsStringsProvider.java deleted file mode 100644 index cd75df529..000000000 --- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsStringsProvider.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2011 Google Inc. All Rights Reserved. -package com.google.android.apps.mytracks.io.mymaps; - -/** - * Interface to provide i18n'ed string resources to the Maps library. - * - * @author Rodrigo Damazio - */ -public interface MapsStringsProvider { - /** Returns the contents of R.string.new_map_description. */ - String getNewMapDescription(); - - /** Returns the contents of R.string.start. */ - String getStart(); - - /** Returns the contents of R.string.end. */ - String getEnd(); -}