Skip to content
This repository has been archived by the owner. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ repositories {

dependencies {
compile "com.facebook.react:react-native:+"
compile "com.android.support:support-v4:27.0.2"
compile 'androidx.legacy:legacy-support-v4:1.0.0'
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.tanguyantoine.react;

import android.support.v4.media.RatingCompat;
import android.support.v4.media.VolumeProviderCompat;
import androidx.media.VolumeProviderCompat;
import android.support.v4.media.session.MediaSessionCompat;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReactApplicationContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.content.ComponentName;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
Expand All @@ -16,8 +15,8 @@
import android.support.v4.media.RatingCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.media.app.NotificationCompat.MediaStyle;
import androidx.media.app.NotificationCompat.MediaStyle;

import android.util.Log;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
Expand All @@ -41,7 +40,7 @@ public class MusicControlModule extends ReactContextBaseJavaModule implements Co

private MediaMetadataCompat.Builder md;
private PlaybackStateCompat.Builder pb;
private android.support.v4.app.NotificationCompat.Builder nb;
private androidx.core.app.NotificationCompat.Builder nb;

private PlaybackStateCompat state;

Expand Down Expand Up @@ -108,7 +107,7 @@ public void init() {
md = new MediaMetadataCompat.Builder();
pb = new PlaybackStateCompat.Builder();
pb.setActions(controls);
nb = new android.support.v4.app.NotificationCompat.Builder(context);
nb = new androidx.core.app.NotificationCompat.Builder(context);
nb.setStyle(new MediaStyle().setMediaSession(session.getSessionToken()));

state = pb.build();
Expand Down Expand Up @@ -183,7 +182,7 @@ synchronized public void setNowPlaying(ReadableMap metadata) {
String description = metadata.hasKey("description") ? metadata.getString("description") : null;
String date = metadata.hasKey("date") ? metadata.getString("date") : null;
long duration = metadata.hasKey("duration") ? (long)(metadata.getDouble("duration") * 1000) : 0;
int notificationColor = metadata.hasKey("color") ? metadata.getInt("color") : android.support.v4.app.NotificationCompat.COLOR_DEFAULT;
int notificationColor = metadata.hasKey("color") ? metadata.getInt("color") : androidx.core.app.NotificationCompat.COLOR_DEFAULT;
String notificationIcon = metadata.hasKey("notificationIcon") ? metadata.getString("notificationIcon") : null;

RatingCompat rating;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
import android.content.Intent;
import android.content.res.Resources;
import android.os.IBinder;
import android.support.v4.app.NotificationManagerCompat;
import androidx.core.app.NotificationManagerCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.support.v4.app.NotificationCompat.Builder;
import android.view.KeyEvent;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReadableMap;

import java.util.Map;

Expand All @@ -25,7 +23,7 @@ public class MusicControlNotification {

private int smallIcon;
private int customIcon;
private android.support.v4.app.NotificationCompat.Action play, pause, stop, next, previous, skipForward, skipBackward;
private androidx.core.app.NotificationCompat.Action play, pause, stop, next, previous, skipForward, skipBackward;

public MusicControlNotification(MusicControlModule module, ReactApplicationContext context) {
this.context = context;
Expand Down Expand Up @@ -71,7 +69,7 @@ public synchronized void updateActions(long mask, Map<String, Integer> options)
}
}

public synchronized void show(android.support.v4.app.NotificationCompat.Builder builder, boolean isPlaying) {
public synchronized void show(androidx.core.app.NotificationCompat.Builder builder, boolean isPlaying) {
// Add the buttons
builder.mActions.clear();
if(previous != null) builder.addAction(previous);
Expand Down Expand Up @@ -136,7 +134,7 @@ private int toKeyCode(long action) {
return KeyEvent.KEYCODE_UNKNOWN;
}

private android.support.v4.app.NotificationCompat.Action createAction(String iconName, String title, long mask, long action, android.support.v4.app.NotificationCompat.Action oldAction) {
private androidx.core.app.NotificationCompat.Action createAction(String iconName, String title, long mask, long action, androidx.core.app.NotificationCompat.Action oldAction) {
if((mask & action) == 0) return null; // When this action is not enabled, return null
if(oldAction != null) return oldAction; // If this action was already created, we won't create another instance

Expand All @@ -152,7 +150,7 @@ private android.support.v4.app.NotificationCompat.Action createAction(String ico
intent.putExtra(PACKAGE_NAME, packageName);
PendingIntent i = PendingIntent.getBroadcast(context, keyCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);

return new android.support.v4.app.NotificationCompat.Action(icon, title, i);
return new androidx.core.app.NotificationCompat.Action(icon, title, i);
}

public static class NotificationService extends Service {
Expand Down