upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-04 10:23:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update marker list and marker detail title

Browse Source
This commit is contained in:
Jimmy Shih
2013-12-13 15:19:33 -08:00
parent 18ac53b6ce
commit e31550c524
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
+2 -1
View File
@@ -130,7 +130,8 @@ public class MarkerDetailActivity extends AbstractMyTracksActivity implements De
@Override
public Fragment getItem(int position) {
return MarkerDetailFragment.newInstance(markerIds.get(position));
String title = getString(R.string.marker_title, position + 1, getCount());
return MarkerDetailFragment.newInstance(markerIds.get(position), title);
}
@Override
MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+13 -3
View File
@@ -61,9 +61,10 @@ import android.widget.TextView;
*/
public class MarkerDetailFragment extends Fragment {
public static MarkerDetailFragment newInstance(long markerId) {
public static MarkerDetailFragment newInstance(long markerId, String title) {
Bundle bundle = new Bundle();
bundle.putLong(KEY_MARKER_ID, markerId);
bundle.putString(KEY_TITLE, title);
MarkerDetailFragment fragment = new MarkerDetailFragment();
fragment.setArguments(bundle);
@@ -72,6 +73,7 @@ public class MarkerDetailFragment extends Fragment {
private static final String TAG = MarkerDetailFragment.class.getSimpleName();
private static final String KEY_MARKER_ID = "markerId";
private static final String KEY_TITLE = "title";
private static final long HIDE_TEXT_DELAY = 4000L; // 4 seconds
private MyTracksProviderUtils myTracksProviderUtils;
@@ -158,6 +160,14 @@ public class MarkerDetailFragment extends Fragment {
handler.removeCallbacks(hideText);
}
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (isVisibleToUser) {
getActivity().setTitle(getArguments().getString(KEY_TITLE));
}
}
@Override
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
@@ -190,10 +200,10 @@ public class MarkerDetailFragment extends Fragment {
String photoUrl = waypoint.getPhotoUrl();
boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);
TrackIconUtils.setMenuIconColor(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
long markerId = getArguments().getLong(KEY_MARKER_ID);