diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2da3581a490812f77f3dc5bb52cfcd2a2d96fa48..07c88e644804024850df829678f57dc2013d0d5b 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ 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 f9ab67b0d0d2c2fc2ae98ba7be27bf486a644f8d..3197c8799f7c4a37d96ad82e4b5e3b719bd723e8 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 64c30979f84dc8ec0a61b7f1b9d3c4fb3661f63f..07610afba84200cf095bc2aa89f882e875efe0b2 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" >