Skip to content

Commit

Permalink
Fix track segments display
Browse files Browse the repository at this point in the history
  • Loading branch information
@andreynovikov
andreynovikov committed Jan 16, 2024
1 parent 6feddb3 commit c6c2639
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 32 deletions.
16 changes: 8 additions & 8 deletions app/src/main/java/mobi/maptrek/fragments/TrackInformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public boolean hasCurrentTrack() {
}

private void initializeTrackInformation() {
Activity activity = getActivity();
Activity activity = requireActivity();
Resources resources = getResources();

View rootView = getView();
Expand All @@ -274,8 +274,6 @@ private void initializeTrackInformation() {
String startCoords = StringFormatter.coordinates(ftp);
mStartCoordinatesView.setText(startCoords);

updateTrackInformation(activity, resources);

View startDateRow = rootView.findViewById(R.id.startDateRow);
View finishDateRow = rootView.findViewById(R.id.finishDateRow);
View timeRow = rootView.findViewById(R.id.timeRow);
Expand Down Expand Up @@ -345,6 +343,7 @@ private void initializeTrackInformation() {
ptp = point;
i++;
}
updateTrackInformation(activity, resources);

View statisticsHeader = rootView.findViewById(R.id.statisticsHeader);
if (hasElevation || hasSpeed) {
Expand Down Expand Up @@ -431,6 +430,7 @@ private void updateTrackInformation(Activity activity, Resources resources) {

int pointCount = mTrack.points.size();
mPointCountView.setText(resources.getQuantityString(R.plurals.numberOfPoints, pointCount, pointCount));
mSegmentCountView.setText(resources.getQuantityString(R.plurals.numberOfSegments, mSegmentCount, mSegmentCount));

String distance = StringFormatter.distanceHP(mTrack.getDistance());
mDistanceView.setText(distance);
Expand Down Expand Up @@ -461,8 +461,8 @@ private void updateTrackStatistics(Resources resources) {
}

private void setEditorMode(boolean enabled) {
ViewGroup rootView = (ViewGroup) getView();
assert rootView != null;
ViewGroup rootView = (ViewGroup) requireView();
Activity activity = requireActivity();

final ColorPickerSwatch colorSwatch = rootView.findViewById(R.id.colorSwatch);

Expand All @@ -482,15 +482,15 @@ private void setEditorMode(boolean enabled) {
editsState = View.VISIBLE;

if (!mTrack.source.isNativeTrack())
HelperUtils.showTargetedAdvice(getActivity(), Configuration.ADVICE_UPDATE_EXTERNAL_SOURCE, R.string.advice_update_external_source, mMoreButton, false);
HelperUtils.showTargetedAdvice(activity, Configuration.ADVICE_UPDATE_EXTERNAL_SOURCE, R.string.advice_update_external_source, mMoreButton, false);
} else {
mMoreButton.setImageDrawable(AppCompatResources.getDrawable(requireContext(), R.drawable.ic_more_vert));
((TextView) rootView.findViewById(R.id.name)).setText(mTrack.name);
viewsState = View.VISIBLE;
editsState = View.GONE;
// Hide keyboard
InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(getView().getWindowToken(), 0);
InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(rootView.getWindowToken(), 0);
}
// TODO Optimize view findings
TransitionManager.beginDelayedTransition(rootView, new Fade());
Expand Down
62 changes: 38 additions & 24 deletions app/src/main/res/layout/fragment_track_information.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Scrollbar"
android:layout_width="@dimen/fragment_width"
Expand All @@ -17,25 +18,27 @@
android:id="@+id/moreButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="@dimen/image_button_padding"
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/image_button_padding"
android:layout_marginEnd="@dimen/image_button_padding"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:importantForAccessibility="no"
android:src="@drawable/ic_more_vert"
android:tint="?attr/actionIconColor" />
app:tint="?attr/actionIconColor" />

<ImageButton
android:id="@+id/stopButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toStartOf="@id/moreButton"
android:layout_marginStart="@dimen/image_button_padding"
android:layout_toStartOf="@id/moreButton"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:importantForAccessibility="no"
android:src="@drawable/ic_record_stop"
android:tint="?attr/actionIconColor"
android:visibility="gone" />
android:visibility="gone"
app:tint="?attr/actionIconColor" />

<info.andreynovikov.androidcolorpicker.ColorPickerSwatch
android:id="@+id/colorSwatch"
Expand All @@ -50,9 +53,9 @@
android:id="@+id/namePlaceholder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/fragment_padding"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/colorSwatch">

<TextView
Expand Down Expand Up @@ -86,12 +89,12 @@
android:id="@+id/statisticsTable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_below="@id/namePlaceholder"
android:layout_marginEnd="@dimen/fragment_padding"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/fragment_padding"
android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/fragment_padding"
android:stretchColumns="1">

<TableRow
Expand All @@ -103,8 +106,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_folder"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/source"
Expand All @@ -123,8 +127,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_linear_scale"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -155,8 +160,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_straighten"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/distance"
Expand All @@ -176,8 +182,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_timer"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/timeSpan"
Expand Down Expand Up @@ -207,8 +214,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_place"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/startCoordinates"
Expand All @@ -229,8 +237,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_schedule"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/startDate"
Expand Down Expand Up @@ -259,8 +268,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_place"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/finishCoordinates"
Expand All @@ -281,8 +291,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_schedule"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/finishDate"
Expand Down Expand Up @@ -313,8 +324,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_timer"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -345,8 +357,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_trending_up"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/maxElevation"
Expand All @@ -365,8 +378,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_trending_down"
android:tint="?attr/informationIconColor" />
app:tint="?attr/informationIconColor" />

<TextView
android:id="@+id/minElevation"
Expand All @@ -381,11 +395,11 @@
android:id="@+id/charts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_below="@id/statisticsTable"
android:layout_marginEnd="@dimen/fragment_padding"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/fragment_padding"
android:layout_marginEnd="@dimen/fragment_padding"
android:orientation="vertical"
android:paddingBottom="@dimen/fragment_padding">

Expand Down

0 comments on commit c6c2639

Please sign in to comment.