Skip to content

Commit 9cc3d37

Browse files
committed
Updated Logic
1 parent cbc14ca commit 9cc3d37

21 files changed

+242
-137
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
33
android {
44
compileSdkVersion 29
55
defaultConfig {
6-
applicationId "com.ratul.topactivity"
6+
applicationId "io.github.ratul.topactivity"
77
minSdkVersion 21
88
targetSdkVersion 29
99
versionCode 15

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.ratul.topactivity">
3+
package="io.github.ratul.topactivity">
44
<!-- Ask to ignore battery optimizations -->
55
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
66
<!-- Retrieve running apps -->
@@ -103,7 +103,7 @@
103103
android:exported="false"
104104
android:enabled="true">
105105
<intent-filter>
106-
<action android:name="com.ratul.topactivity.ACTION_NOTIFICATION_RECEIVER"/>
106+
<action android:name="io.github.ratul.topactivity.ACTION_NOTIFICATION_RECEIVER"/>
107107
</intent-filter>
108108
</receiver>
109109
</application>

app/src/main/java/com/ratul/topactivity/App.java renamed to app/src/main/java/io/github/ratul/topactivity/App.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity;
17+
package io.github.ratul.topactivity;
1818

1919
import android.app.Application;
20-
import com.ratul.topactivity.R;
21-
import com.ratul.topactivity.model.CrashHandler;
20+
import io.github.ratul.topactivity.R;
21+
import io.github.ratul.topactivity.model.CrashHandler;
2222
import android.content.Context;
2323
import java.io.File;
2424
import android.app.Activity;
25-
import com.ratul.topactivity.ui.MainActivity;
25+
import io.github.ratul.topactivity.ui.MainActivity;
2626
import android.content.Intent;
27-
import com.ratul.topactivity.ui.CrashActivity;
27+
import io.github.ratul.topactivity.ui.CrashActivity;
2828
import android.widget.Toast;
2929

3030
public class App extends Application {

app/src/main/java/com/ratul/topactivity/dialog/DialogTheme.java renamed to app/src/main/java/io/github/ratul/topactivity/dialog/DialogTheme.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity.dialog;
17+
package io.github.ratul.topactivity.dialog;
1818

1919
import android.content.*;
2020
import android.content.res.*;

app/src/main/java/com/ratul/topactivity/dialog/FancyDialog.java renamed to app/src/main/java/io/github/ratul/topactivity/dialog/FancyDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity.dialog;
17+
package io.github.ratul.topactivity.dialog;
1818

1919
import android.content.*;
2020
import android.app.*;
@@ -24,7 +24,7 @@
2424
import android.view.View.OnClickListener;
2525
import android.graphics.drawable.*;
2626
import android.content.res.*;
27-
import com.ratul.topactivity.R;
27+
import io.github.ratul.topactivity.R;
2828

2929
/**
3030
* Created by Ratul on 04/05/2022.

app/src/main/java/com/ratul/topactivity/model/CrashHandler.java renamed to app/src/main/java/io/github/ratul/topactivity/model/CrashHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity.model;
17+
package io.github.ratul.topactivity.model;
1818

19-
import com.ratul.topactivity.ui.*;
19+
import io.github.ratul.topactivity.ui.*;
2020
import android.app.*;
2121
import java.text.*;
2222
import java.io.*;

app/src/main/java/com/ratul/topactivity/model/NotificationMonitor.java renamed to app/src/main/java/io/github/ratul/topactivity/model/NotificationMonitor.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity.model;
17+
package io.github.ratul.topactivity.model;
1818

1919
import android.app.ActivityManager;
2020
import android.app.NotificationManager;
@@ -27,11 +27,11 @@
2727

2828
import java.util.List;
2929
import javax.crypto.NullCipher;
30-
import com.ratul.topactivity.utils.DatabaseUtil;
31-
import com.ratul.topactivity.R;
32-
import com.ratul.topactivity.ui.MainActivity;
33-
import com.ratul.topactivity.utils.WindowUtil;
34-
import com.ratul.topactivity.service.QuickSettingsService;
30+
import io.github.ratul.topactivity.utils.DatabaseUtil;
31+
import io.github.ratul.topactivity.R;
32+
import io.github.ratul.topactivity.ui.MainActivity;
33+
import io.github.ratul.topactivity.utils.WindowUtil;
34+
import io.github.ratul.topactivity.service.QuickSettingsService;
3535
import java.lang.reflect.AnnotatedElement;
3636
import android.app.NotificationChannel;
3737
import android.graphics.Color;
@@ -50,7 +50,7 @@ public class NotificationMonitor extends BroadcastReceiver {
5050
public static NotificationManager notifManager;
5151

5252
public static void showNotification(Context context, boolean isPaused) {
53-
if (!DatabaseUtil.isNotificationToggleEnabled(context)) {
53+
if (!DatabaseUtil.isNotificationToggleEnabled()) {
5454
return;
5555
}
5656
notifManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -94,9 +94,9 @@ public static void showNotification(Context context, boolean isPaused) {
9494

9595
public static PendingIntent getPendingIntent(Context context, int command) {
9696
Intent intent = new Intent(context, NotificationMonitor.class);
97-
intent.setAction("com.ratul.topactivity.ACTION_NOTIFICATION_RECEIVER");
97+
intent.setAction("io.github.ratul.topactivity.ACTION_NOTIFICATION_RECEIVER");
9898
intent.putExtra(EXTRA_NOTIFICATION_ACTION, command);
99-
return PendingIntent.getBroadcast(context, command, intent, 0);
99+
return PendingIntent.getBroadcast(context, 0, intent, 0);
100100
}
101101

102102
public static void cancelNotification(Context context) {
@@ -110,7 +110,7 @@ public void onReceive(Context context, Intent intent) {
110110
switch (command) {
111111
case ACTION_STOP:
112112
WindowUtil.dismiss(context);
113-
DatabaseUtil.setIsShowWindow(context, false);
113+
DatabaseUtil.setIsShowWindow(false);
114114
cancelNotification(context);
115115
context.sendBroadcast(new Intent(MainActivity.ACTION_STATE_CHANGED));
116116
break;

app/src/main/java/com/ratul/topactivity/model/TypefaceSpan.java renamed to app/src/main/java/io/github/ratul/topactivity/model/TypefaceSpan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity.model;
17+
package io.github.ratul.topactivity.model;
1818

1919
import android.util.LruCache;
2020
import android.graphics.Typeface;

app/src/main/java/com/ratul/topactivity/service/AccessibilityMonitoringService.java renamed to app/src/main/java/io/github/ratul/topactivity/service/AccessibilityMonitoringService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity.service;
17+
package io.github.ratul.topactivity.service;
1818

1919
import android.accessibilityservice.AccessibilityService;
2020
import android.annotation.SuppressLint;
2121
import android.content.Intent;
2222
import android.view.accessibility.AccessibilityEvent;
2323
import android.widget.Toast;
24-
import com.ratul.topactivity.utils.WindowUtil;
25-
import com.ratul.topactivity.utils.DatabaseUtil;
26-
import com.ratul.topactivity.model.NotificationMonitor;
24+
import io.github.ratul.topactivity.utils.WindowUtil;
25+
import io.github.ratul.topactivity.utils.DatabaseUtil;
26+
import io.github.ratul.topactivity.model.NotificationMonitor;
2727

2828
/**
2929
* Created by Wen on 16/02/2017.
@@ -38,7 +38,7 @@ public static AccessibilityMonitoringService getInstance() {
3838

3939
@Override
4040
public void onAccessibilityEvent(AccessibilityEvent event) {
41-
if (WindowUtil.viewAdded && DatabaseUtil.isShowWindow(this) && DatabaseUtil.hasAccess(this)) {
41+
if (WindowUtil.viewAdded && DatabaseUtil.isShowWindow() && DatabaseUtil.hasAccess()) {
4242
String act1 = event.getClassName().toString();
4343
String act2 = event.getPackageName().toString();
4444

app/src/main/java/com/ratul/topactivity/service/MonitoringService.java renamed to app/src/main/java/io/github/ratul/topactivity/service/MonitoringService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
17-
package com.ratul.topactivity.service;
17+
package io.github.ratul.topactivity.service;
1818

1919
import android.annotation.*;
2020
import android.app.*;
@@ -27,8 +27,8 @@
2727
import java.util.*;
2828
import android.app.usage.*;
2929
import android.widget.Toast;
30-
import com.ratul.topactivity.utils.DatabaseUtil;
31-
import com.ratul.topactivity.utils.WindowUtil;
30+
import io.github.ratul.topactivity.utils.DatabaseUtil;
31+
import io.github.ratul.topactivity.utils.WindowUtil;
3232

3333
/**
3434
* Created by Wen on 16/02/2017.
@@ -89,7 +89,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
8989
Runnable runner = new Runnable() {
9090
@Override
9191
public void run() {
92-
if (!DatabaseUtil.isShowWindow(MonitoringService.INSTANCE)) {
92+
if (!DatabaseUtil.isShowWindow()) {
9393
MonitoringService.INSTANCE.mHandler.removeCallbacks(this);
9494
MonitoringService.INSTANCE.stopSelf();
9595
}
@@ -99,7 +99,7 @@ public void run() {
9999
return;
100100

101101
MonitoringService.INSTANCE.firstRun = false;
102-
if (DatabaseUtil.isShowWindow(MonitoringService.INSTANCE)) {
102+
if (DatabaseUtil.isShowWindow()) {
103103
WindowUtil.show(MonitoringService.INSTANCE, MonitoringService.INSTANCE.text, MonitoringService.INSTANCE.text1);
104104
} else {
105105
MonitoringService.INSTANCE.stopSelf();

0 commit comments

Comments
 (0)