From 2251d58e229e495b49b723fd6ad5282eccee71e3 Mon Sep 17 00:00:00 2001
From: massimiliano <massimiliano@disroot.org>
Date: Fri, 17 May 2019 10:24:53 +0200
Subject: [PATCH] Added Disroot purple light notification
---
.idea/caches/build_file_checksums.ser | Bin 534 -> 534 bytes
.../org/disroot/disrootapp/ui/MainActivity.java | 8 ++++----
app/src/main/res/xml/changelog_master.xml | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 2da3581a490812f77f3dc5bb52cfcd2a2d96fa48..07c88e644804024850df829678f57dc2013d0d5b 100644
GIT binary patch
delta 34
scmV+-0NwwV1eOGlmj!CX*(E)(oM{0OZr22>*!WWb;$9@_W}XCUc>Jjj-~a#s
delta 34
scmV+-0NwwV1eOGlmj!5rpfKIBoM{0OD3u1cuBp;mtnjFi%wZ-3c>miEV*mgE
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index f9ab67b..3197c87 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -1913,7 +1913,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
checkDate.edit().putString( "storeDate", stateDate).apply();
//return null;
}
- else if (!stateDate.equals( dateStored )&& !stateDate.equals( "" ))//dateStored
+ else if (!stateDate.equals( "2" )&& !stateDate.equals( "" ))//dateStored
{
checkDate.edit().putString( "storeDate", stateDate).apply();
Log.e(TAG, "date: " + dateStored);
@@ -1946,7 +1946,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
//Notification
private void sendNotification() throws JSONException {
- String CHANNEL_ID = "316865431";
+ String CHANNEL_ID = "3168654312";
String CHANNEL_NAME = "StateNotification";
HttpHandler sh = new HttpHandler();
String jsonStrincidents0 = sh.makeServiceCall(incidenturl0);
@@ -1972,7 +1972,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
// I would suggest that you use IMPORTANCE_DEFAULT instead of IMPORTANCE_HIGH
NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH);
channel.enableVibration(true);
- channel.setLightColor(Color.MAGENTA);
+ channel.setLightColor(Color.rgb( 80,22,45 ));
channel.enableLights(true);
channel.setVibrationPattern(new long[]{50,500,100,300,50,300});
notificationManager.createNotificationChannel(channel);
@@ -1989,7 +1989,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
notificationBuilder.setSound(alarmSound)
.setVibrate(new long[]{50,500,100,300,50,300})
- .setLights(Color.MAGENTA, 3000, 3000);
+ .setLights(Color.BLUE, 3000, 3000);
NotificationManager mNotificationManager =
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 64c3097..07610af 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -2,6 +2,7 @@
<changelog>
<release version="1.1.5" versioncode="18" >
<change>Notifications works on Android 8 and higher now</change>
+ <change>Added Disroot purple light notification</change>
<change>Updated Serbian translation</change>
</release>
<release version="1.1.4" versioncode="17" >
--
GitLab