luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-29 00:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

#52 OpenStreetMap attribution in the record screen

Browse Source
This commit is contained in:
jannis 2020-03-10 21:25:27 +01:00
parent a336015818
commit 4a27bdba26
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java
View File

@ -75,6 +75,7 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
private final InfoViewHolder[] infoViews = new InfoViewHolder[4]; private final InfoViewHolder[] infoViews = new InfoViewHolder[4];
private TextView timeView; private TextView timeView;
private TextView gpsStatusView; private TextView gpsStatusView;
private TextView attribution;
private View waitingForGPSOverlay; private View waitingForGPSOverlay;
private boolean gpsFound = false; private boolean gpsFound = false;
private boolean isResumed = false; private boolean isResumed = false;
@ -100,6 +101,8 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
waitingForGPSOverlay= findViewById(R.id.recorderWaitingOverlay); waitingForGPSOverlay= findViewById(R.id.recorderWaitingOverlay);
waitingForGPSOverlay.setVisibility(View.VISIBLE); waitingForGPSOverlay.setVisibility(View.VISIBLE);
attribution = findViewById(R.id.recordMapAttribution);
checkPermissions(); checkPermissions();
recorder= new WorkoutRecorder(this, ACTIVITY, this); recorder= new WorkoutRecorder(this, ACTIVITY, this);
@ -135,7 +138,9 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
waitingForGPSOverlay.clearAnimation(); waitingForGPSOverlay.clearAnimation();
waitingForGPSOverlay.animate().alpha(0f).setDuration(1000).setListener(new Animator.AnimatorListener() { waitingForGPSOverlay.animate().alpha(0f).setDuration(1000).setListener(new Animator.AnimatorListener() {
@Override public void onAnimationStart(Animator animator) { } @Override public void onAnimationStart(Animator animator) { }
@Override public void onAnimationCancel(Animator animator) { } @Override public void onAnimationCancel(Animator animator) { }
@Override public void onAnimationRepeat(Animator animator) { } @Override public void onAnimationRepeat(Animator animator) { }
@Override @Override
@ -143,6 +148,11 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
waitingForGPSOverlay.setVisibility(View.GONE); waitingForGPSOverlay.setVisibility(View.GONE);
} }
}).start(); }).start();
hideOSMAttribution();
}
private void hideOSMAttribution() {
attribution.animate().alpha(0f).setDuration(1000).setStartDelay(5000).start();
} }
private void setupMap(){ private void setupMap(){

8
app/src/main/res/layout/activity_record_workout.xml
View File

@ -55,6 +55,14 @@
android:text="@string/gps" android:text="@string/gps"
android:textColor="@android:color/transparent" /> android:textColor="@android:color/transparent" />
<TextView
android:id="@+id/recordMapAttribution"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:layout_margin="5dp"
android:text="@string/OpenStreetMapAttribution" />
</FrameLayout> </FrameLayout>

1
app/src/main/res/values/strings.xml
View File

@ -171,4 +171,5 @@
<string name="savedToDownloads">Saved to Downloads</string> <string name="savedToDownloads">Saved to Downloads</string>
<string name="savingFailed">Saving failed</string> <string name="savingFailed">Saving failed</string>
<string name="info">Info</string> <string name="info">Info</string>
<string name="OpenStreetMapAttribution">© OpenStreetMap contributors</string>
</resources> </resources>