Skip to content

Customize smallIcon on Android #21

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.

Sign up for GitHub

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

Open
Gp2mv3 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Customize smallIcon on Android #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6022202
🤖 Added smallIcon configuration in notifications
Gp2mv3 Oct 7, 2020
cabc68a
🤖 Retrocompatibility if no smallIcon is specified
Gp2mv3 Oct 7, 2020
538add9
📝 Added smallIcon in README
Gp2mv3 Oct 7, 2020
e113cd5
🐛 Corrected bugs in android with smallIcon
Gp2mv3 Jan 28, 2022
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
25 changes: 17 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,23 +146,27 @@ export default class App extends Component {
start: {
notify: true,
title: "Start Tracking",
description: "You are now tracked"
description: "You are now tracked",
smallIcon: "ic_notification",
},
stop: {
notify: true,
title: "Stopped Tracking",
description: "You are not tracked any longer"
description: "You are not tracked any longer",
smallIcon: "ic_notification",
},
enter: {
notify: true,
title: "Attention",
//[value] will be replaced ob geofences' value attribute
description: "You entered a [value] Zone"
description: "You entered a [value] Zone",
smallIcon: "ic_notification",
},
exit: {
notify: true,
title: "Left Zone",
description: "You left a [value] Zone"
description: "You left a [value] Zone",
smallIcon: "ic_notification",
}
}
);
Expand Down Expand Up @@ -242,26 +246,31 @@ type SettingObject {
notify: boolean, // If Notification should be fired on start tracking
title: string, // Title of Notification
description: string // Content of Notification
smallIcon: string // Android Only: Name of the drawable for smallIcon (optional)
},
stop: {
notify: boolean,
title: string,
description: string
description: string,
smallIcon: string
},
timeout: { // automatic stop by end of duration
notify: boolean,
title: string,
description: string
description: string,
smallIcon: string
},
enter: {
notify: boolean,
title: string,
description: string
description: string,
smallIcon: string
},
exit: {
notify: boolean,
title: string,
description: string
description: string,
smallIcon: string
},
channel: { // Only Android specific
title: string,
Expand Down
17 changes: 14 additions & 3 deletions .../src/main/java/com/simplegeofencing/reactnative/GeofenceTransitionsBroadcastReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;

import android.content.res.Resources;
import com.google.android.gms.location.Geofence;
import com.google.android.gms.location.GeofencingEvent;
import com.facebook.react.bridge.ReactApplicationContext;
Expand Down Expand Up @@ -97,6 +97,8 @@ public void onReceive(Context context, Intent intent) {
Geofence geofence = geofencesWithoutMonitor.get(0);
String title = intent.getStringExtra("notifyEnterStringTitle");
String description = intent.getStringExtra("notifyEnterStringDescription");
String smallIcon = intent.getStringExtra("notifyEnterStringSmallIcon");

ArrayList<String> geofenceValues = intent.getStringArrayListExtra("geofenceValues");
ArrayList<String> geofenceKeys = intent.getStringArrayListExtra("geofenceKeys");
int index = geofenceKeys.indexOf(geofence.getRequestId());
Expand All @@ -110,6 +112,7 @@ public void onReceive(Context context, Intent intent) {
postNotification(
title,
description,
smallIcon,
intent.getStringExtra("notifyChannelStringTitle"),
intent.getStringExtra("notifyChannelStringDescription"),
intent
Expand All @@ -125,6 +128,7 @@ public void onReceive(Context context, Intent intent) {
Geofence geofence = geofencesWithoutMonitor.get(0);
String title = intent.getStringExtra("notifyExitStringTitle");
String description = intent.getStringExtra("notifyExitStringDescription");
String smallIcon = intent.getStringExtra("notifyExitStringSmallIcon");
ArrayList<String> geofenceValues = intent.getStringArrayListExtra("geofenceValues");
ArrayList<String> geofenceKeys = intent.getStringArrayListExtra("geofenceKeys");
int index = geofenceKeys.indexOf(geofence.getRequestId());
Expand All @@ -138,6 +142,7 @@ public void onReceive(Context context, Intent intent) {
postNotification(
title,
description,
smallIcon,
intent.getStringExtra("notifyChannelStringTitle"),
intent.getStringExtra("notifyChannelStringDescription"),
intent
Expand Down Expand Up @@ -199,6 +204,7 @@ private String getTransitionString(int transitionType) {
*/
private NotificationCompat.Builder getNotificationBuilder(String title,
String content,
String smallIcon,
String channelTitle,
String channelDescription,
Intent pIntent
Expand All @@ -211,11 +217,15 @@ private NotificationCompat.Builder getNotificationBuilder(String title,
//PendingIntent contentIntent = PendingIntent.getBroadcast(this.mContext, NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);

//Build notification
Resources res = this.mContext.getResources();
String packageName = this.mContext.getPackageName();
int smallIconDrawable = res.getIdentifier(smallIcon, "drawable", packageName);

NotificationCompat.Builder notification = new NotificationCompat.Builder(this.mContext, CHANNEL_ID)
.setContentTitle(title)
.setStyle(new NotificationCompat.BigTextStyle().bigText(content))
.setContentText(content)
.setSmallIcon(this.mContext.getApplicationInfo().icon)
.setSmallIcon((smallIconDrawable != 0) ? smallIconDrawable : this.mContext.getApplicationInfo().icon)
.setContentIntent(contentIntent)
.setAutoCancel(true);

Expand All @@ -238,6 +248,7 @@ private NotificationCompat.Builder getNotificationBuilder(String title,

public void postNotification(String title,
String content,
String smallIcon,
String channelTitle,
String channelDescription,
Intent pIntent
Expand All @@ -246,7 +257,7 @@ public void postNotification(String title,

// notificationId is a unique int for each notification that you must define
notificationManager.notify(NOTIFICATION_TAG, NOTIFICATION_ID,
getNotificationBuilder(title, content, channelTitle, channelDescription, pIntent).build());
getNotificationBuilder(title, content, smallIcon, channelTitle, channelDescription, pIntent).build());
}
public void clearNotification(){
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this.mContext);
Expand Down
45 changes: 31 additions & 14 deletions android/src/main/java/com/simplegeofencing/reactnative/RNSimpleNativeGeofencingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import com.google.android.gms.location.GeofencingClient;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;

import android.content.res.Resources;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -53,10 +53,10 @@ public class RNSimpleNativeGeofencingModule extends ReactContextBaseJavaModule {
private boolean notifyStop = false;
private boolean notifyEnter = false;
private boolean notifyExit = false;
private String[] notifyStartString = new String[2];
private String[] notifyStopString = new String[2];
private String[] notifyEnterString = new String[2];
private String[] notifyExitString = new String[2];
private String[] notifyStartString = new String[3];
private String[] notifyStopString = new String[3];
private String[] notifyEnterString = new String[3];
private String[] notifyExitString = new String[3];
private Long mStartTime;
private int mDuration;
private LocalBroadcastReceiver mLocalBroadcastReceiver;
Expand Down Expand Up @@ -96,29 +96,34 @@ public void initNotification(ReadableMap pText){
ReadableMap pChannel = pText.getMap("channel");
notifyChannelString[0] = pChannel.getString("title");
notifyChannelString[1] = pChannel.getString("description");

ReadableMap pStart = pText.getMap("start");
if(pStart.getBoolean("notify")){
notifyStart = true;
notifyStartString[0] = pStart.getString("title");
notifyStartString[1] = pStart.getString("description");
notifyStartString[2] = pChannel.getString("smallIcon");
}
ReadableMap pStop = pText.getMap("stop");
if(pStop.getBoolean("notify")){
notifyStop = true;
notifyStopString[0] = pStop.getString("title");
notifyStopString[1] = pStop.getString("description");
notifyStopString[2] = pStop.getString("smallIcon");
}
ReadableMap pEnter = pText.getMap("enter");
if(pEnter.getBoolean("notify")){
notifyEnter = true;
notifyEnterString[0] = pEnter.getString("title");
notifyEnterString[1] = pEnter.getString("description");
notifyEnterString[2] = pEnter.getString("smallIcon");
}
ReadableMap pExit = pText.getMap("exit");
if(pExit.getBoolean("notify")){
notifyExit = true;
notifyExitString[0] = pExit.getString("title");
notifyExitString[1] = pExit.getString("description");
notifyExitString[2] = pExit.getString("smallIcon");
}
}

Expand Down Expand Up @@ -218,8 +223,10 @@ public void onSuccess(Void aVoid) {
Intent notificationIntent = new Intent(reactContext, ShowTimeoutNotification.class);
notificationIntent.putExtra("notifyChannelStringTitle", notifyChannelString[0]);
notificationIntent.putExtra("notifyChannelStringDescription", notifyChannelString[1]);

notificationIntent.putExtra("notifyStringTitle", notifyStopString[0]);
notificationIntent.putExtra("notifyStringDescription", notifyStopString[1]);
notificationIntent.putExtra("notifyStringSmallIcon", notifyStopString[2]);

PendingIntent contentIntent = PendingIntent.getService(reactContext, 0, notificationIntent,
PendingIntent.FLAG_CANCEL_CURRENT);
Expand All @@ -231,9 +238,7 @@ public void onSuccess(Void aVoid) {
}else{
am.setExact(AlarmManager.RTC_WAKEUP, System.currentTimeMillis()+mDuration, contentIntent);
}

}

}
})
.addOnFailureListener(new OnFailureListener() {
Expand Down Expand Up @@ -282,8 +287,10 @@ public void onSuccess(Void aVoid) {
Intent notificationIntent = new Intent(reactContext, ShowTimeoutNotification.class);
notificationIntent.putExtra("notifyChannelStringTitle", notifyChannelString[0]);
notificationIntent.putExtra("notifyChannelStringDescription", notifyChannelString[1]);

notificationIntent.putExtra("notifyStringTitle", notifyStopString[0]);
notificationIntent.putExtra("notifyStringDescription", notifyStopString[1]);
notificationIntent.putExtra("notifyStringSmallIcon", notifyStopString[2]);

PendingIntent contentIntent = PendingIntent.getService(reactContext, 0, notificationIntent,
PendingIntent.FLAG_CANCEL_CURRENT);
Expand Down Expand Up @@ -322,7 +329,7 @@ public void onFailure(@NonNull Exception e) {
@ReactMethod
public void testNotify(){
Log.i(TAG, "TestNotify Callback worked");
postNotification("TestNotify", "Callback worked", false);
postNotification("TestNotify", "Callback worked", "ic_notification", false);
}

/*
Expand All @@ -347,20 +354,26 @@ private PendingIntent getGeofencePendingIntent() {
if(notifyEnter == true){
intent.putExtra("notifyEnterStringTitle", notifyEnterString[0]);
intent.putExtra("notifyEnterStringDescription", notifyEnterString[1]);
intent.putExtra("notifyEnterStringSmallIcon", notifyEnterString[2]);
}else{
intent.putExtra("notifyEnterStringTitle", "");
intent.putExtra("notifyEnterStringDescription", "");
intent.putExtra("notifyEnterStringSmallIcon", "ic_notification");
}
intent.putExtra("notifyExit", notifyExit);
if(notifyExit == true){
intent.putExtra("notifyExitStringTitle", notifyExitString[0]);
intent.putExtra("notifyExitStringDescription", notifyExitString[1]);
intent.putExtra("notifyExitStringSmallIcon", notifyExitString[2]);

}else{
intent.putExtra("notifyExitStringTitle", "");
intent.putExtra("notifyExitStringDescription", "");
intent.putExtra("notifyExitStringSmallIcon", "ic_notification");
}
intent.putExtra("notifyChannelStringTitle", notifyChannelString[0]);
intent.putExtra("notifyChannelStringDescription", notifyChannelString[1]);

intent.putExtra("startTime", (Long) System.currentTimeMillis());
intent.putExtra("duration", mDuration);
intent.putStringArrayListExtra("geofenceKeys", geofenceKeys);
Expand All @@ -378,16 +391,16 @@ private PendingIntent getGeofencePendingIntent() {
private void notifyNow(String action){
if(action == "start"){
if(notifyStart == true){
postNotification(notifyStartString[0], notifyStartString[1], true);
postNotification(notifyStartString[0], notifyStartString[1], notifyStartString[2], true);
}
}
if(action == "stop"){
if(notifyStop == true){
postNotification(notifyStopString[0], notifyStopString[1], false);
postNotification(notifyStopString[0], notifyStopString[1], notifyStopString[2], false);
}
}
}
private NotificationCompat.Builder getNotificationBuilder(String title, String content) {
private NotificationCompat.Builder getNotificationBuilder(String title, String content, String smallIcon) {
//Onclick
Intent intent = new Intent(getReactApplicationContext(), this.getCurrentActivity().getClass());
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
Expand All @@ -396,11 +409,15 @@ private NotificationCompat.Builder getNotificationBuilder(String title, String c
//PendingIntent contentIntent = PendingIntent.getBroadcast(this.getReactApplicationContext(), NOTIFICATION_ID_STOP, intent, PendingIntent.FLAG_UPDATE_CURRENT);

//Build notification
Resources res = this.reactContext.getResources();
String packageName = this.reactContext.getPackageName();
int smallIconDrawable = res.getIdentifier(smallIcon != null ? smallIcon : "", "drawable", packageName);

NotificationCompat.Builder notification = new NotificationCompat.Builder(this.reactContext, CHANNEL_ID)
.setContentTitle(title)
.setStyle(new NotificationCompat.BigTextStyle().bigText(content))
.setContentText(content)
.setSmallIcon(getReactApplicationContext().getApplicationInfo().icon)
.setSmallIcon((smallIconDrawable != 0) ? smallIconDrawable : this.reactContext.getApplicationInfo().icon)
.setContentIntent(contentIntent);
// Create the NotificationChannel, but only on API 26+ because
// the NotificationChannel class is new and not in the support library
Expand All @@ -418,14 +435,14 @@ private NotificationCompat.Builder getNotificationBuilder(String title, String c
}
return notification;
}
public void postNotification(String title, String content, boolean start){
public void postNotification(String title, String content, String smallIcon, boolean start){
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this.reactContext);

int notifyID = NOTIFICATION_ID_STOP;
if(start == true){
notifyID = NOTIFICATION_ID_START;
}
notificationManager.notify(NOTIFICATION_TAG, notifyID, getNotificationBuilder(title, content).build());
notificationManager.notify(NOTIFICATION_TAG, notifyID, getNotificationBuilder(title, content, smallIcon).build());
}
/*
private static int getNextNotifId(Context context) {
Expand Down
Loading