From e8bec7642ceb53ce6db34b38c311bf71ed1b69fa Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Wed, 24 Apr 2019 16:14:22 +0300 Subject: [PATCH 1/4] New gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 17dfb1d..0ffd552 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0ec6ffe..1c3482e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Feb 15 11:13:49 MSK 2019 +#Wed Apr 24 16:14:02 MSK 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip From 63c8dc80241d3aeb908e0d70f805d614dda7fac5 Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Wed, 24 Apr 2019 16:14:42 +0300 Subject: [PATCH 2/4] Version update in Readme.MD --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f1995c4..34acb6d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Simple Android audio view with a few controls. Basically it's a MediaPlayer wrap ``` gradle dependencies { - implementation 'com.4ert:audioview:0.4' + implementation 'com.4ert:audioview:1.2' } ``` From 6ab9db522559a82813edd7c84af70d39e268f9f7 Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Wed, 24 Apr 2019 16:20:53 +0300 Subject: [PATCH 3/4] AndroidX conversion --- app/build.gradle | 6 +++--- .../java/com/keenfin/audioviewdemo/AudioAdapter.java | 4 ++-- .../java/com/keenfin/audioviewdemo/ListActivity.java | 6 +++--- .../java/com/keenfin/audioviewdemo/MainActivity.java | 4 ++-- app/src/main/res/layout/activity_list.xml | 2 +- audioview/build.gradle | 12 ++++++------ .../java/com/keenfin/audioview/AudioService.java | 2 +- .../main/java/com/keenfin/audioview/AudioView.java | 2 +- .../main/java/com/keenfin/audioview/AudioView2.java | 2 +- .../java/com/keenfin/audioview/BaseAudioView.java | 10 +++++----- audioview/src/main/res/layout/audioview.xml | 2 +- audioview/src/main/res/layout/audioview_min.xml | 2 +- gradle.properties | 4 +++- 13 files changed, 30 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 95d67bd..938fd4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.4ert:sfcdialog:0.2' implementation project(':audioview') - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:support-compat:28.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.core:core:1.0.1' } diff --git a/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java b/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java index abe0f94..3d0e0cb 100644 --- a/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java +++ b/app/src/main/java/com/keenfin/audioviewdemo/AudioAdapter.java @@ -7,8 +7,8 @@ package com.keenfin.audioviewdemo; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java b/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java index 9ccfce5..8309743 100644 --- a/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java +++ b/app/src/main/java/com/keenfin/audioviewdemo/ListActivity.java @@ -13,9 +13,9 @@ import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.keenfin.audioview.AudioService; import java.util.ArrayList; diff --git a/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java b/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java index 849ba6e..c4b4871 100644 --- a/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java +++ b/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java @@ -9,8 +9,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import com.keenfin.audioview.AudioService; import com.keenfin.audioview.AudioView; diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index 2218d39..adb36d9 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" tools:context=".ListActivity"> - - - Date: Mon, 26 Aug 2019 20:37:22 +0300 Subject: [PATCH 4/4] Gradle and AndroidX updated --- app/build.gradle | 6 +++--- .../main/java/com/keenfin/audioviewdemo/MainActivity.java | 2 ++ .../src/main/java/com/keenfin/audioview/AudioService.java | 4 ++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 938fd4e..2949a78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,12 +8,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "com.keenfin.audioviewdemo" minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -31,5 +31,5 @@ dependencies { implementation project(':audioview') implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.core:core:1.0.1' + implementation 'androidx.core:core:1.0.2' } diff --git a/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java b/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java index a44d5fd..4b1bac6 100644 --- a/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java +++ b/app/src/main/java/com/keenfin/audioviewdemo/MainActivity.java @@ -15,6 +15,8 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; + import android.view.View; import com.keenfin.audioview.AudioService; import com.keenfin.audioview.AudioView; diff --git a/audioview/src/main/java/com/keenfin/audioview/AudioService.java b/audioview/src/main/java/com/keenfin/audioview/AudioService.java index 4041e09..fb1062b 100644 --- a/audioview/src/main/java/com/keenfin/audioview/AudioService.java +++ b/audioview/src/main/java/com/keenfin/audioview/AudioService.java @@ -16,7 +16,11 @@ import android.os.Binder; import android.os.Build; import android.os.IBinder; +import android.view.View; +import android.widget.RemoteViews; + import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import java.io.FileDescriptor; import java.io.IOException; diff --git a/build.gradle b/build.gradle index 037b5a4..2b032a3 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 596c019..2db5f21 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed May 22 18:21:14 MSK 2019 +#Mon Aug 26 20:31:10 MSK 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip