From 5f436abbdab979b5717f4df28939b1697d56a836 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 14 Jan 2014 12:57:01 -0800 Subject: [PATCH] Fix bug: in dialog, get all the views first inside onCreate --- MyTracks/AndroidManifest.xml | 2 +- MyTracks/res/values/strings.xml | 4 ++-- .../mytracks/fragments/MarkerDetailFragment.java | 6 +++--- .../fragments/ShareTrackDialogFragment.java | 14 +++++++------- .../content/DescriptionGeneratorImplTest.java | 2 +- .../maps/DynamicSpeedTrackPathDescriptorTest.java | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index 6ceded19d..2813b3565 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -16,7 +16,7 @@ limitations under the License. --> diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index d5d9a6cb0..919a66898 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -932,7 +932,7 @@ limitations under the License. translation_description="The accessibility description for a track icon, as opposed to a marker icon."> Track - + + %1$d total. E.g., '5'."> %1$d of %2$d diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java index d6cc30455..84fd6a214 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java @@ -127,6 +127,9 @@ public class MarkerDetailFragment extends Fragment { View view = inflater.inflate(R.layout.marker_detail_fragment, container, false); photo = (ImageView) view.findViewById(R.id.marker_detail_waypoint_photo); + textGradient = (ImageView) view.findViewById(R.id.marker_detail_waypoint_text_gradient); + waypointInfo = (LinearLayout) view.findViewById(R.id.marker_detail_waypoint_info); + photo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -139,9 +142,6 @@ public class MarkerDetailFragment extends Fragment { } } }); - textGradient = (ImageView) view.findViewById(R.id.marker_detail_waypoint_text_gradient); - waypointInfo = (LinearLayout) view.findViewById(R.id.marker_detail_waypoint_info); - return view; }; diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ShareTrackDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ShareTrackDialogFragment.java index 67763f2e9..d21e47348 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ShareTrackDialogFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ShareTrackDialogFragment.java @@ -111,16 +111,20 @@ public class ShareTrackDialogFragment extends AbstractMyTracksDialogFragment { .setPositiveButton(R.string.generic_ok, null).create(); } + // Get all the views View view = fragmentActivity.getLayoutInflater().inflate(R.layout.share_track, null); - - // Setup publicCheckBox publicCheckBox = (CheckBox) view.findViewById(R.id.share_track_public); + inviteCheckBox = (CheckBox) view.findViewById(R.id.share_track_invite); + multiAutoCompleteTextView = (MultiAutoCompleteTextView) view.findViewById( + R.id.share_track_emails); + accountSpinner = (Spinner) view.findViewById(R.id.share_track_account); + + // Setup publicCheckBox publicCheckBox.setChecked(PreferencesUtils.getBoolean( fragmentActivity, R.string.share_track_public_key, PreferencesUtils.SHARE_TRACK_PUBLIC_DEFAULT)); // Setup inviteCheckBox - inviteCheckBox = (CheckBox) view.findViewById(R.id.share_track_invite); inviteCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -132,10 +136,7 @@ public class ShareTrackDialogFragment extends AbstractMyTracksDialogFragment { PreferencesUtils.SHARE_TRACK_INVITE_DEFAULT)); // Setup multiAutoCompleteTextView - multiAutoCompleteTextView = (MultiAutoCompleteTextView) view.findViewById( - R.id.share_track_emails); multiAutoCompleteTextView.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer()); - SimpleCursorAdapter adapter = new SimpleCursorAdapter(fragmentActivity, R.layout.add_emails_item, getAutoCompleteCursor(fragmentActivity, null), new String[] { ContactsContract.Contacts.DISPLAY_NAME, ContactsContract.CommonDataKinds.Email.DATA }, @@ -156,7 +157,6 @@ public class ShareTrackDialogFragment extends AbstractMyTracksDialogFragment { multiAutoCompleteTextView.setAdapter(adapter); // Setup accountSpinner - accountSpinner = (Spinner) view.findViewById(R.id.share_track_account); accountSpinner.setVisibility(accounts.length > 1 ? View.VISIBLE : View.GONE); AccountUtils.setupAccountSpinner(fragmentActivity, accountSpinner, accounts); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java index de4a3c77e..2542881ca 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java @@ -57,7 +57,7 @@ public class DescriptionGeneratorImplTest extends AndroidTestCase { track.setTripStatistics(stats); track.setCategory("hiking"); String expected = "Created by" - + " Google My Tracks on Android.

" + + " Google My Tracks on Android

" + "Name: -
" + "Activity type: hiking
" + "Description: -
" diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java index 54766dd2e..ad18a243c 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java @@ -62,7 +62,7 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase { dynamicSpeedTrackPathDescriptor.setAverageMovingSpeed(50); dynamicSpeedTrackPathDescriptor.setSpeedMargin(10); assertEquals(50.0, dynamicSpeedTrackPathDescriptor.getAverageMovingSpeed()); - assertEquals(45, dynamicSpeedTrackPathDescriptor.getSlowSpeed()); + assertEquals(45.0, dynamicSpeedTrackPathDescriptor.getSlowSpeed()); } /** @@ -74,7 +74,7 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase { dynamicSpeedTrackPathDescriptor.setAverageMovingSpeed(50); dynamicSpeedTrackPathDescriptor.setSpeedMargin(10); assertEquals(50.0, dynamicSpeedTrackPathDescriptor.getAverageMovingSpeed()); - assertEquals(55, dynamicSpeedTrackPathDescriptor.getNormalSpeed()); + assertEquals(55.0, dynamicSpeedTrackPathDescriptor.getNormalSpeed()); } /**