karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

rename TrackDetail to TrackEditActivity

Browse Source
This commit is contained in:
Jimmy Shih
2012-03-27 16:41:14 -07:00
parent 6afa67acad
commit 0091755c70
8 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+2 -1
View File
@@ -523,7 +523,8 @@ public class MapActivity extends com.google.android.maps.MapActivity
long trackId = dataHub.getSelectedTrackId();
switch (item.getItemId()) {
case Constants.MENU_EDIT:
intent = new Intent(this, TrackDetail.class).putExtra(TrackDetail.TRACK_ID, trackId);
intent = new Intent(this, TrackEditActivity.class)
.putExtra(TrackEditActivity.TRACK_ID, trackId);
startActivity(intent);
return true;
case Constants.MENU_PLAY:
MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+3 -3
View File
@@ -523,9 +523,9 @@ public class MyTracks extends TabActivity implements OnTouchListener {
serviceConnection.stop();
if (currentTrackId > 0) {
Intent intent = new Intent(MyTracks.this, TrackDetail.class);
intent.putExtra(TrackDetail.TRACK_ID, currentTrackId);
intent.putExtra(TrackDetail.SHOW_CANCEL, false);
Intent intent = new Intent(MyTracks.this, TrackEditActivity.class)
.putExtra(TrackEditActivity.SHOW_CANCEL, false)
.putExtra(TrackEditActivity.TRACK_ID, currentTrackId);
startActivity(intent);
}
}
MyTracks/src/com/google/android/apps/mytracks/TrackDetail.java → MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
+10 -10
View File
@@ -35,12 +35,12 @@ import android.widget.EditText;
*
* @author Leif Hendrik Wilden
*/
public class TrackDetail extends Activity implements OnClickListener {
public class TrackEditActivity extends Activity implements OnClickListener {
public static final String TRACK_ID = "trackId";
public static final String SHOW_CANCEL = "showCancel";
private static final String TAG = TrackDetail.class.getSimpleName();
private static final String TAG = TrackEditActivity.class.getSimpleName();
private Long trackId;
private MyTracksProviderUtils myTracksProviderUtils;
@@ -53,7 +53,7 @@ public class TrackDetail extends Activity implements OnClickListener {
@Override
protected void onCreate(Bundle bundle) {
super.onCreate(bundle);
setContentView(R.layout.track_detail);
setContentView(R.layout.track_edit);
trackId = getIntent().getLongExtra(TRACK_ID, -1);
if (trackId < 0) {
@@ -71,22 +71,22 @@ public class TrackDetail extends Activity implements OnClickListener {
return;
}
trackName = (EditText) findViewById(R.id.track_detail_track_name);
trackName = (EditText) findViewById(R.id.track_edit_track_name);
trackName.setText(track.getName());
activityType = (AutoCompleteTextView) findViewById(R.id.track_detail_activity_type);
activityType = (AutoCompleteTextView) findViewById(R.id.track_edit_activity_type);
activityType.setText(track.getCategory());
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
activityType.setAdapter(adapter);
trackDescription = (EditText) findViewById(R.id.track_detail_track_description);
trackDescription = (EditText) findViewById(R.id.track_edit_track_description);
trackDescription.setText(track.getDescription());
Button save = (Button) findViewById(R.id.track_detail_save);
Button save = (Button) findViewById(R.id.track_edit_save);
save.setOnClickListener(this);
Button cancel = (Button) findViewById(R.id.track_detail_cancel);
Button cancel = (Button) findViewById(R.id.track_edit_cancel);
if (getIntent().getBooleanExtra(SHOW_CANCEL, true)) {
cancel.setOnClickListener(this);
cancel.setVisibility(View.VISIBLE);
@@ -98,11 +98,11 @@ public class TrackDetail extends Activity implements OnClickListener {
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.track_detail_save:
case R.id.track_edit_save:
save();
finish();
break;
case R.id.track_detail_cancel:
case R.id.track_edit_cancel:
finish();
break;
default:
MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+3 -3
View File
@@ -348,9 +348,9 @@ public class TrackListActivity extends FragmentActivity {
try {
service.endCurrentTrack();
if (recordingTrackId != -1L) {
Intent intent = new Intent(this, TrackDetail.class)
.putExtra(TrackDetail.SHOW_CANCEL, false)
.putExtra(TrackDetail.TRACK_ID, recordingTrackId);
Intent intent = new Intent(this, TrackEditActivity.class)
.putExtra(TrackEditActivity.SHOW_CANCEL, false)
.putExtra(TrackEditActivity.TRACK_ID, recordingTrackId);
startActivity(intent);
}
recordingTrackId = -1L;