diff --git a/app/src/main/java/org/y20k/trackbook/MainActivity.java b/app/src/main/java/org/y20k/trackbook/MainActivity.java index 66cef11..2d57d8d 100644 --- a/app/src/main/java/org/y20k/trackbook/MainActivity.java +++ b/app/src/main/java/org/y20k/trackbook/MainActivity.java @@ -414,6 +414,7 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys { mFloatingActionButtonSubMenu1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + // todo check -> may produce NullPointerException MainActivityMapFragment mainActivityMapFragment = (MainActivityMapFragment) mSectionsPagerAdapter.getFragment(FRAGMENT_ID_MAP); mainActivityMapFragment.onActivityResult(RESULT_SAVE_DIALOG, Activity.RESULT_OK, getIntent()); handleStateAfterSave(); @@ -474,7 +475,7 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys { mFloatingActionButtonState = FAB_STATE_RECORDING; setFloatingActionButtonState(); - // get last location from MainActivity Fragment + // get last location from MainActivity Fragment // todo check -> may produce NullPointerException MainActivityMapFragment mainActivityMapFragment = (MainActivityMapFragment) mSectionsPagerAdapter.getFragment(FRAGMENT_ID_MAP); Location lastLocation = mainActivityMapFragment.getCurrentBestLocation(); @@ -525,7 +526,7 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys { } - // update tracking state in MainActivityMapFragment + // update tracking state in MainActivityMapFragment // todo check -> may produce NullPointerException MainActivityMapFragment mainActivityMapFragment = (MainActivityMapFragment) mSectionsPagerAdapter.getFragment(FRAGMENT_ID_MAP); mainActivityMapFragment.setTrackingState(mTrackerServiceRunning); } @@ -660,7 +661,7 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys { mFloatingActionButtonState = FAB_STATE_SAVE; setFloatingActionButtonState(); - // pass tracking state to MainActivityMapFragment + // pass tracking state to MainActivityMapFragment // todo check -> may produce NullPointerException MainActivityMapFragment mainActivityMapFragment = (MainActivityMapFragment) mSectionsPagerAdapter.getFragment(FRAGMENT_ID_MAP); mainActivityMapFragment.setTrackingState(false); } diff --git a/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java b/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java index 6852645..e0602f2 100644 --- a/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java +++ b/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java @@ -36,6 +36,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; @@ -81,6 +82,8 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O private LinearLayout mTrackManagementLayout; private Spinner mDropdown; private View mStatisticsSheet; + private ImageView mStatisticsIcon; + private TextView mStatisticsHeadline; private TextView mDistanceView; private TextView mStepsView; private TextView mWaypointsView; @@ -189,6 +192,8 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O // get views for statistics sheet View statisticsView = mRootView.findViewById(R.id.statistics_view); + mStatisticsIcon = mRootView.findViewById(R.id.statistics_icon); + mStatisticsHeadline = mRootView.findViewById(R.id.statistics_headline); mStatisticsSheet = mRootView.findViewById(R.id.statistics_sheet); mDistanceView = (TextView) mRootView.findViewById(R.id.statistics_data_distance); mStepsView = (TextView) mRootView.findViewById(R.id.statistics_data_steps); @@ -427,10 +432,16 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O case BottomSheetBehavior.STATE_EXPANDED: // statistics sheet expanded mTrackManagementLayout.setVisibility(View.INVISIBLE); +// mStatisticsSheet.setBackgroundColor(ContextCompat.getColor(mActivity, R.color.trackbook_blue_85percent)); +// mStatisticsIcon.setBackgroundResource(R.drawable.ic_statistics_white_48dp); +// mStatisticsHeadline.setVisibility(View.VISIBLE); break; case BottomSheetBehavior.STATE_COLLAPSED: // statistics sheet collapsed mTrackManagementLayout.setVisibility(View.VISIBLE); +// mStatisticsSheet.setBackgroundColor(ContextCompat.getColor(mActivity, R.color.trackbook_transparent)); +// mStatisticsIcon.setBackgroundResource(R.drawable.ic_statistics_blue_48dp); +// mStatisticsHeadline.setVisibility(View.INVISIBLE); mStatisticsSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED); break; case BottomSheetBehavior.STATE_HIDDEN: @@ -449,7 +460,15 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O } else { mTrackManagementLayout.setVisibility(View.INVISIBLE); } - +// if (slideOffset < 0.125f) { +// mStatisticsSheet.setBackgroundColor(ContextCompat.getColor(mActivity, R.color.trackbook_transparent)); +// mStatisticsIcon.setBackgroundResource(R.drawable.ic_statistics_blue_48dp); +// mStatisticsHeadline.setVisibility(View.INVISIBLE); +// } else { +// mStatisticsSheet.setBackgroundColor(ContextCompat.getColor(mActivity, R.color.trackbook_blue_85percent)); +// mStatisticsIcon.setBackgroundResource(R.drawable.ic_statistics_white_48dp); +// mStatisticsHeadline.setVisibility(View.VISIBLE); +// } } }; } diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.java b/app/src/main/java/org/y20k/trackbook/TrackerService.java index a6cb245..a24256a 100644 --- a/app/src/main/java/org/y20k/trackbook/TrackerService.java +++ b/app/src/main/java/org/y20k/trackbook/TrackerService.java @@ -173,7 +173,7 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven // stopFindingLocation(); // mSensorManager.unregisterListener(this); - // todo describe + // remove TrackerService from foreground state stopForeground(true); super.onDestroy(); @@ -297,7 +297,7 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven // disable content observer for changes in System Settings this.getContentResolver().unregisterContentObserver(mSettingsContentObserver); - // todo describe + // remove TrackerService from foreground state stopForeground(false); } diff --git a/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java b/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java index f4f2f6b..0f0bfe5 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java +++ b/app/src/main/java/org/y20k/trackbook/helpers/StorageHelper.java @@ -71,7 +71,7 @@ public class StorageHelper implements TrackbookKeys { mFolder.mkdirs(); } - // create temp file object + // create temp file object // todo check -> may produce NullPointerException mTempFile = new File(mFolder.toString() + "/" + FILE_NAME_TEMP + FILE_TYPE_TRACKBOOK_EXTENSION); // delete old track - exclude temp file diff --git a/app/src/main/res/drawable/ic_info_white_24dp.xml b/app/src/main/res/drawable/ic_info_white_24dp.xml new file mode 100644 index 0000000..de69530 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_statistics_white_48dp.xml b/app/src/main/res/drawable/ic_statistics_white_48dp.xml deleted file mode 100644 index dd7aac8..0000000 --- a/app/src/main/res/drawable/ic_statistics_white_48dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/fragment_main_track.xml b/app/src/main/res/layout/fragment_main_track.xml index 8c88173..e48222c 100644 --- a/app/src/main/res/layout/fragment_main_track.xml +++ b/app/src/main/res/layout/fragment_main_track.xml @@ -76,7 +76,7 @@ android:layout_gravity="bottom" android:background="@color/trackbook_blue_85percent" app:behavior_hideable="true" - app:behavior_peekHeight="132dp" + app:behavior_peekHeight="112dp" app:layout_behavior="android.support.design.widget.BottomSheetBehavior"> + android:contentDescription="@string/descr_statistics_sheet_icon" + app:srcCompat="@drawable/ic_info_white_24dp" /> #FF455a64 #D9455a64 + #00000000 + + diff --git a/build.gradle b/build.gradle index 6952360..0b275d2 100644 --- a/build.gradle +++ b/build.gradle @@ -21,16 +21,16 @@ allprojects { } project.ext { applicationId = 'org.y20k.trackbook' - versionCode = 14 - versionName = '1.0.7' + versionCode = 15 + versionName = '1.0.8' minSdkVersion = 22 compileSdkVersion = 26 targetSdkVersion = 26 - buildToolsVersion = '26.0.1' - supportLibraryVersion = '26.0.1' + buildToolsVersion = '26.0.2' + supportLibraryVersion = '26.1.0' osmdroidVersion = '5.6.5' - gsonVersion = '2.8.1' + gsonVersion = '2.8.2' } }