Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Present distances in km/mi #624

Draft
wants to merge 140 commits into
base: master
Choose a base branch
from

Conversation

gerhardol
Copy link
Collaborator

Previously 'm' was used in most of the interface
Distances shorter than 1000m are presented in m (also statue, as there is no possibility to set feet/yard).
The Distance picker were previously in whole km/mi with separate meter, now only km/mi
Some hardcoded use of 'm' removed

This replaces PR #458 too

Will require manual checks or rewrite code

Adding GraphView twice is done to force two inclusions and 'upgrade' the version of
Android support library that GraphView was compiled with twice
(GraphView is not used in 2.2 (but 2.3 "Froyo" builds). A wrapper will maybe suppress for Froyo.)

TODO: Find how this should be handled without suppressions. The real benefit of a separate PR is to raise awareness.

Note: RunnerUp, MapBox, GraphView, Play Services all uses different versions of Support Lib. One solution may be to compile MapBox and GraphView separately and adapt to PlayServices version....

latestCompile - Classpath for compiling the latest sources.
+--- com.android.support:design:25.1.0
|    +--- com.android.support:support-v4:25.1.0
|    |    +--- com.android.support:support-compat:25.1.0
|    |    |    \--- com.android.support:support-annotations:25.1.0
|    |    +--- com.android.support:support-media-compat:25.1.0
|    |    |    +--- com.android.support:support-annotations:25.1.0
|    |    |    \--- com.android.support:support-compat:25.1.0 (*)
|    |    +--- com.android.support:support-core-utils:25.1.0
|    |    |    +--- com.android.support:support-annotations:25.1.0
|    |    |    \--- com.android.support:support-compat:25.1.0 (*)
|    |    +--- com.android.support:support-core-ui:25.1.0
|    |    |    +--- com.android.support:support-annotations:25.1.0
|    |    |    \--- com.android.support:support-compat:25.1.0 (*)
|    |    \--- com.android.support:support-fragment:25.1.0
|    |         +--- com.android.support:support-compat:25.1.0 (*)
|    |         +--- com.android.support:support-media-compat:25.1.0 (*)
|    |         +--- com.android.support:support-core-ui:25.1.0 (*)
|    |         \--- com.android.support:support-core-utils:25.1.0 (*)
|    +--- com.android.support:appcompat-v7:25.1.0
|    |    +--- com.android.support:support-annotations:25.1.0
|    |    +--- com.android.support:support-v4:25.1.0 (*)
|    |    +--- com.android.support:support-vector-drawable:25.1.0
|    |    |    +--- com.android.support:support-annotations:25.1.0
|    |    |    \--- com.android.support:support-compat:25.1.0 (*)
|    |    \--- com.android.support:animated-vector-drawable:25.1.0
|    |         \--- com.android.support:support-vector-drawable:25.1.0 (*)
|    +--- com.android.support:recyclerview-v7:25.1.0
|    |    +--- com.android.support:support-annotations:25.1.0
|    |    +--- com.android.support:support-compat:25.1.0 (*)
|    |    \--- com.android.support:support-core-ui:25.1.0 (*)
|    \--- com.android.support:transition:25.1.0
|         +--- com.android.support:support-annotations:25.1.0
|         \--- com.android.support:support-v4:25.1.0 (*)
+--- com.google.android.gms:play-services-wearable:10.0.1
|    +--- com.google.android.gms:play-services-base:10.0.1
|    |    +--- com.google.android.gms:play-services-basement:10.0.1
|    |    |    \--- com.android.support:support-v4:24.0.0 -> 25.1.0 (*)
|    |    \--- com.google.android.gms:play-services-tasks:10.0.1
|    |         \--- com.google.android.gms:play-services-basement:10.0.1 (*)
|    \--- com.google.android.gms:play-services-basement:10.0.1 (*)
+--- com.getpebble:pebblekit:4.0.1
+--- com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0
|    +--- com.android.support:support-annotations:23.4.0 -> 25.1.0
|    +--- com.android.support:support-v4:23.4.0 -> 25.1.0 (*)
|    +--- com.android.support:design:23.4.0 -> 25.1.0 (*)
|    +--- com.squareup.okhttp3:okhttp:3.4.1
|    |    \--- com.squareup.okio:okio:1.9.0
|    +--- com.mapzen.android:lost:1.1.1
|    |    +--- com.android.support:appcompat-v7:22.2.0 -> 25.1.0 (*)
|    |    +--- com.android.support:support-v4:22.2.0 -> 25.1.0 (*)
|    |    \--- com.google.guava:guava:18.0
|    \--- com.mapbox.mapboxsdk:mapbox-java-services:1.3.1
|         +--- com.squareup.retrofit2:retrofit:2.1.0
|         |    \--- com.squareup.okhttp3:okhttp:3.3.0 -> 3.4.1 (*)
|         +--- com.squareup.retrofit2:converter-gson:2.1.0
|         |    +--- com.squareup.retrofit2:retrofit:2.1.0 (*)
|         |    \--- com.google.code.gson:gson:2.7
|         \--- com.squareup.okhttp3:logging-interceptor:3.3.1
|              \--- com.squareup.okhttp3:okhttp:3.3.1 -> 3.4.1 (*)
\--- com.jjoe64:graphview:4.2.1
     \--- com.android.support:support-v4:22.1.1 -> 25.1.0 (*)
Suppress in code not working with gradle 3.0.0?
Probably bad check, it refers to MapBox
All of the usage I see uses local variables, so a static inner class is not possible. The usage seem to be within the "calling activity" so leak should be minor
Also update Android gradle plugin
The preparation has no functional change for AS2.3, but it easier to switch between the versions
Google no longer distributes libs with jcenter(), uses its own repo
…tions

# Conflicts:
#	.gitignore
#	.travis.yml
#	app/AndroidManifest.xml
#	app/latest/java/org/runnerup/feedwidget/FeedWidgetService.java
#	app/lint-baseline.xml
#	app/src/org/runnerup/db/DBHelper.java
#	app/src/org/runnerup/export/DefaultSynchronizer.java
#	app/src/org/runnerup/export/DigifitSynchronizer.java
#	app/src/org/runnerup/export/EndomondoSynchronizer.java
#	app/src/org/runnerup/export/FileSynchronizer.java
#	app/src/org/runnerup/export/FunBeatSynchronizer.java
#	app/src/org/runnerup/export/GarminSynchronizer.java
#	app/src/org/runnerup/export/GoogleFitSynchronizer.java
#	app/src/org/runnerup/export/RunKeeperSynchronizer.java
#	app/src/org/runnerup/export/RuntasticSynchronizer.java
#	app/src/org/runnerup/view/AccountListActivity.java
#	build.gradle
#	common/src/main/java/org/runnerup/common/util/Constants.java
#	hrdevice/src/org/runnerup/hr/HRManager.java
#	wear/lint-baseline.xml
unused import
unused parameters and methods
variable can be final
access can be private
array type init
constantconditions

A few suppressions
To be added when source is released
This reverts commit 3f51ea3.
Previously 'm' was used in most of the interface
Distances shorter than 1000m are presented in m (also statue, as there is no possibility to set feet/yard).
The Distance picker were previously in whole km/mi with separate meter, now only km/mi
Some hardcoded use of 'm' removed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants