voussoir
/
trkpt
1
0
Fork 0
Code Issues Packages Projects Releases Activity

record button was showing up on last tracks screen (fixes this hopefully)

master
y20k 2018-10-06 00:22:09 +02:00
parent 309267e9f2
commit f746887e61
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/y20k/trackbook/MainActivity.java
View File

@ -596,22 +596,22 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
case FAB_STATE_DEFAULT: case FAB_STATE_DEFAULT:
mFloatingActionButtonMain.hide(); // workaround todo remove asap mFloatingActionButtonMain.hide(); // workaround todo remove asap
mFloatingActionButtonMain.setImageResource(R.drawable.ic_fiber_manual_record_white_24dp); mFloatingActionButtonMain.setImageResource(R.drawable.ic_fiber_manual_record_white_24dp);
mFloatingActionButtonMain.show(); // workaround todo remove asap if (mSelectedTab == FRAGMENT_ID_MAP) mFloatingActionButtonMain.show(); // workaround todo remove asap
break; break;
case FAB_STATE_RECORDING: case FAB_STATE_RECORDING:
mFloatingActionButtonMain.hide(); // workaround todo remove asap mFloatingActionButtonMain.hide(); // workaround todo remove asap
mFloatingActionButtonMain.setImageResource(R.drawable.ic_fiber_manual_record_red_24dp); mFloatingActionButtonMain.setImageResource(R.drawable.ic_fiber_manual_record_red_24dp);
mFloatingActionButtonMain.show(); // workaround todo remove asap if (mSelectedTab == FRAGMENT_ID_MAP) mFloatingActionButtonMain.show(); // workaround todo remove asap
break; break;
case FAB_STATE_SAVE: case FAB_STATE_SAVE:
mFloatingActionButtonMain.hide(); // workaround todo remove asap mFloatingActionButtonMain.hide(); // workaround todo remove asap
mFloatingActionButtonMain.setImageResource(R.drawable.ic_save_white_24dp); mFloatingActionButtonMain.setImageResource(R.drawable.ic_save_white_24dp);
mFloatingActionButtonMain.show(); // workaround todo remove asap if (mSelectedTab == FRAGMENT_ID_MAP) mFloatingActionButtonMain.show(); // workaround todo remove asap
break; break;
default: default:
mFloatingActionButtonMain.hide(); // workaround todo remove asap mFloatingActionButtonMain.hide(); // workaround todo remove asap
mFloatingActionButtonMain.setImageResource(R.drawable.ic_fiber_manual_record_white_24dp); mFloatingActionButtonMain.setImageResource(R.drawable.ic_fiber_manual_record_white_24dp);
mFloatingActionButtonMain.show(); // workaround todo remove asap if (mSelectedTab == FRAGMENT_ID_MAP) mFloatingActionButtonMain.show(); // workaround todo remove asap
break; break;
} }
} }

2
app/src/main/java/org/y20k/trackbook/TrackerService.java
View File

@ -234,7 +234,7 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven
// load temp track file // load temp track file
mTrack = storageHelper.loadTrack(FILE_TEMP_TRACK); mTrack = storageHelper.loadTrack(FILE_TEMP_TRACK);
// try to mark last waypoint as stopover // try to mark last waypoint as stopover
int lastWayPoint = mTrack.getWayPoints().size() - 1; int lastWayPoint = mTrack.getSize() - 1;
if (lastWayPoint >= 0) { if (lastWayPoint >= 0) {
mTrack.getWayPoints().get(lastWayPoint).setIsStopOver(true); mTrack.getWayPoints().get(lastWayPoint).setIsStopOver(true);
} }