Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-10-01 13:34:03 +02:00
commit 7269dd5b5f
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/build.gradle
View file

@ -18,7 +18,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion "26.0.0" buildToolsVersion "26.0.1"
signingConfigs { signingConfigs {
development { development {
@ -385,10 +385,10 @@ dependencies {
// compile project(':eclipse-compile:design') // compile project(':eclipse-compile:design')
// compile project(':eclipse-compile:cardview') // compile project(':eclipse-compile:cardview')
// compile project(':eclipse-compile:gridlayout') // compile project(':eclipse-compile:gridlayout')
compile 'com.android.support:gridlayout-v7:25.+' compile 'com.android.support:gridlayout-v7:26.1.0'
compile 'com.android.support:cardview-v7:25.+' compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.android.support:appcompat-v7:25.+' compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:25.+' compile 'com.android.support:design:26.1.0'
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar" legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"

14
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java
View file

@ -1,11 +1,9 @@
package net.osmand.plus.audionotes; package net.osmand.plus.audionotes;
import android.animation.ValueAnimator;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.support.v4.animation.AnimatorCompatHelper;
import android.support.v4.animation.AnimatorUpdateListenerCompat;
import android.support.v4.animation.ValueAnimatorCompat;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@ -25,7 +23,7 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
protected ImageView imageview; protected ImageView imageview;
protected ProgressBar progressBar; protected ProgressBar progressBar;
protected ValueAnimatorCompat animatorCompat; protected ValueAnimator animatorCompat;
public AudioVideoNoteRecordingMenuFullScreen(AudioVideoNotesPlugin plugin, double lat, double lon) { public AudioVideoNoteRecordingMenuFullScreen(AudioVideoNotesPlugin plugin, double lat, double lon) {
super(plugin, lat, lon); super(plugin, lat, lon);
@ -133,14 +131,14 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
ViewCompat.setAlpha(progressBar, 1f); ViewCompat.setAlpha(progressBar, 1f);
progressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);
animatorCompat = AnimatorCompatHelper.emptyValueAnimator(); animatorCompat = ValueAnimator.ofInt(0);
final Interpolator interpolator = new LinearInterpolator(); final Interpolator interpolator = new LinearInterpolator();
animatorCompat.setDuration(duration); animatorCompat.setDuration(duration);
animatorCompat.setTarget(progressBar); animatorCompat.setTarget(progressBar);
animatorCompat.addUpdateListener(new AnimatorUpdateListenerCompat() { animatorCompat.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override @Override
public void onAnimationUpdate(ValueAnimatorCompat animation) { public void onAnimationUpdate(ValueAnimator valueAnimator) {
float fraction = interpolator.getInterpolation(animation.getAnimatedFraction()); float fraction = interpolator.getInterpolation(valueAnimator.getAnimatedFraction());
progressBar.setProgress((int)(500 * fraction)); progressBar.setProgress((int)(500 * fraction));
} }
}); });

6
OsmAndCore-sample/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion "26.0.0" buildToolsVersion "26.0.1"
dexOptions { dexOptions {
jumboMode true jumboMode true
@ -110,8 +110,8 @@ repositories {
dependencies { dependencies {
compile project(path: ':OsmAnd-java', configuration: 'android') compile project(path: ':OsmAnd-java', configuration: 'android')
compile 'com.android.support:appcompat-v7:25.+' compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:25.+' compile 'com.android.support:design:26.1.0'
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"