From aa7b740b0c1bb71c8a1b74532821bfe87bc5af42 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 12 Dec 2020 15:06:40 +0300 Subject: [PATCH 1/3] reduce to simple notification icon --- .../services/ControlsService.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/ControlsService.java b/app/src/main/java/com/github/axet/audiorecorder/services/ControlsService.java index 5738be4..2880a81 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/ControlsService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/ControlsService.java @@ -20,6 +20,7 @@ import android.view.WindowManager; import android.widget.RemoteViews; import com.github.axet.androidlibrary.app.AlarmManager; +import com.github.axet.androidlibrary.app.NotificationManagerCompat; import com.github.axet.androidlibrary.app.ProximityShader; import com.github.axet.androidlibrary.preferences.OptimizationPreferenceCompat; import com.github.axet.androidlibrary.services.PersistentService; @@ -91,7 +92,28 @@ public class ControlsService extends PersistentService { intent = new Intent(); else intent = null; - super.updateIcon(intent); + NotificationManagerCompat nm = NotificationManagerCompat.from(context); + if (intent != null || isOptimization()) { + Notification n = build(intent); + if (notification == null) { + nm.notify(id, n); + } else { + String co = NotificationChannelCompat.getChannelId(notification); + String cn = NotificationChannelCompat.getChannelId(n); + if (co == null && cn != null || co != null && cn == null || co != null && cn != null && !co.equals(cn)) + nm.cancel(id); + nm.notify(id, n); + } + notification = n; + } else { + hideIcon(); + } + } + + public void hideIcon() { + NotificationManagerCompat nm = NotificationManagerCompat.from(context); + nm.cancel(id); + notification = null; } @Override From 2d806e115d3a2d818f09430538184ba8b8b33c9f Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 14 Dec 2020 16:33:00 +0300 Subject: [PATCH 2/3] update libs --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 4 ++-- .../github/axet/audiorecorder/activities/MainActivity.java | 2 -- .../axet/audiorecorder/activities/RecordingActivity.java | 2 -- .../axet/audiorecorder/activities/SettingsActivity.java | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index eaa3060..3345b3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,7 @@ android { dependencies { testImplementation 'junit:junit:4.12' - implementation 'com.github.axet:android-audio-library:1.0.178' // implementation project(':android-audio-library') + implementation 'com.github.axet:android-audio-library:1.0.179' // implementation project(':android-audio-library') implementation ('com.github.axet:wget:1.7.0') { exclude group: 'org.json', module: 'json' } assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd59451..a8d6768 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" - android:theme="@style/RecThemeLight"> + android:theme="@android:style/Theme.Translucent"> @@ -45,7 +45,7 @@ android:exported="true" android:label="@string/app_name" android:launchMode="singleInstance" - android:theme="@style/RecThemeLight.NoActionBar"> + android:theme="@android:style/Theme.Translucent.NoTitleBar"> diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java index cbc1838..c38c199 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java @@ -70,8 +70,6 @@ public class MainActivity extends AppCompatThemeActivity { public static void startActivity(Context context) { Intent i = new Intent(context, MainActivity.class); - i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); context.startActivity(i); } diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index 5a98b6f..f8cf485 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -152,8 +152,6 @@ public class RecordingActivity extends AppCompatThemeActivity { Intent i = new Intent(context, RecordingActivity.class); if (pause) i.setAction(RecordingActivity.START_PAUSE); - i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); context.startActivity(i); } diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java index 8308e9c..d6644a7 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java @@ -119,8 +119,8 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements @Override public void onBackPressed() { - MainActivity.startActivity(this); finish(); + MainActivity.startActivity(this); } @Override From 5fa4230eeafc5aed825623d507ec5cd354247972 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 14 Dec 2020 16:33:28 +0300 Subject: [PATCH 3/3] Bump version audiorecorder-3.4.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3345b3d..f237517 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 29 - versionCode 350 - versionName "3.4.0" + versionCode 351 + versionName "3.4.1" } signingConfigs { release {