Refactoring and Update UI

app/build.gradle.kts

@@ -13,7 +13,7 @@ android {
         minSdk = 30
         targetSdk = 34
         versionCode = 1
-        versionName = "3.0.4"
+        versionName = "3.0.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
         tools:targetApi="31" >
 
         <receiver
-            android:name=".components.service.BootReceiver"
+            android:name=".service.BootReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -28,7 +28,7 @@
         </receiver>
 
         <service
-            android:name=".components.service.NotificationService"
+            android:name=".service.NotificationService"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
             android:exported="true">
             <intent-filter>
@@ -37,7 +37,7 @@
         </service>
 
         <activity
-            android:name=".components.permission.PermissionRequestActivity"
+            android:name=".permission.PermissionRequestActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.NotificationCode" />

app/src/main/assets/xposed_init

@@ -1 +1 @@
-ru.n00byara.notificationcode.components.hook.Hook_YukiHookXposedInit
+ru.n00byara.notificationcode.hook.Hook_YukiHookXposedInit

app/src/main/java/ru/n00byara/notificationcode/components/application/ApplicationsList.kt → app/src/main/java/ru/n00byara/notificationcode/application/ApplicationsList.kt

@@ -1,16 +1,16 @@
-package ru.n00byara.notificationcode.components.application
+package ru.n00byara.notificationcode.application
 
 import android.content.Context
 import android.content.pm.PackageManager
 
 class ApplicationsList(private val context: Context) {
-    private val pm = context.packageManager
-    private val allInstalledApplications = pm.getInstalledApplications(PackageManager.GET_META_DATA)
+    private val pm = this.context.packageManager
+    private val allInstalledApplications = this.pm.getInstalledApplications(PackageManager.GET_META_DATA)
 
     fun getApplications(): List<InstalledAppInfo> {
-        var result = mutableListOf<InstalledAppInfo>()
+        val result = mutableListOf<InstalledAppInfo>()
 
-        allInstalledApplications.forEach { applicationInfo ->
+        this.allInstalledApplications.forEach { applicationInfo ->
             val appInfo = InstalledAppInfo(this.pm, applicationInfo)
 
             if (!appInfo.isSystem && appInfo.name != "Shazam") {
@@ -22,9 +22,9 @@ class ApplicationsList(private val context: Context) {
     }
 
     fun getAllApplications(): List<InstalledAppInfo> {
-        var result = mutableListOf<InstalledAppInfo>()
+        val result = mutableListOf<InstalledAppInfo>()
 
-        allInstalledApplications.forEach { applicationInfo ->
+        this.allInstalledApplications.forEach { applicationInfo ->
             val appInfo = InstalledAppInfo(this.pm, applicationInfo)
 
             if (!appInfo.isSystem) {

app/src/main/java/ru/n00byara/notificationcode/application/HookedAppInfo.kt

@@ -0,0 +1,25 @@
+package ru.n00byara.notificationcode.application
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import com.highcapable.yukihookapi.hook.factory.prefs
+import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication
+import ru.n00byara.notificationcode.Constants
+
+class HookedAppInfo(private val hookedContext: Context) {
+    val prefs = ModuleApplication().prefs(Constants.SETTINGS_NAME)
+    val isActive: Boolean
+    val isSystem: Boolean
+    val name: String
+    val packageName: String
+
+    init {
+        val pm = this.hookedContext.packageManager
+        val applicationInfo = this.hookedContext.applicationInfo
+
+        this.name = applicationInfo.loadLabel(pm).toString()
+        this.packageName = applicationInfo.packageName
+        this.isSystem = !((applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 0)
+        this.isActive = this.prefs.getBoolean(Constants.APPLICATION_PREF + packageName)
+    }
+}

app/src/main/java/ru/n00byara/notificationcode/application/InstalledAppInfo.kt

@@ -0,0 +1,24 @@
+package ru.n00byara.notificationcode.application
+
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.graphics.drawable.Drawable
+import ru.n00byara.notificationcode.Constants
+import ru.n00byara.notificationcode.settings.Settings
+
+class InstalledAppInfo(private val pm: PackageManager, private val applicationInfo: ApplicationInfo) {
+    val settings = Settings()
+    val name: String
+    val icon: Drawable
+    val isSystem: Boolean
+    val packageName: String
+    val isActive: Boolean
+
+    init {
+        this.name = this.applicationInfo.loadLabel(this.pm).toString()
+        this.packageName = this.applicationInfo.packageName
+        this.isSystem = !((this.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 0)
+        this.isActive = this.settings.getBoolean(Constants.APPLICATION_PREF + packageName)
+        this.icon = this.applicationInfo.loadIcon(this.pm)
+    }
+}

app/src/main/java/ru/n00byara/notificationcode/components/clip/Clip.kt → app/src/main/java/ru/n00byara/notificationcode/clip/Clip.kt

@@ -1,4 +1,4 @@
-package ru.n00byara.notificationcode.components.clip
+package ru.n00byara.notificationcode.clip
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -25,14 +25,13 @@ class Clip(
     private var found = false
 
     init {
-
-        if (contentTitle != null) {
-            addToClipBoard("${contentTitle} ${contentText}")
+        if (this.contentTitle != null) {
+            this.addToClipBoard("${this.contentTitle} ${this.contentText}")
         } else {
             val text = getText()
 
             text?.let { contentText ->
-                addToClipBoard(contentText)
+                this.addToClipBoard(contentText)
             }
         }
     }
@@ -79,7 +78,7 @@ class Clip(
         this.matcher = pattern.matcher(this.contentText)
         this.found = matcher.matches()
 
-        if (this.found) return matcher.group(2) + matcher.group(3)
+        if (this.found) return this.matcher.group(2) + this.matcher.group(3)
 
         return null
     }

app/src/main/java/ru/n00byara/notificationcode/components/clip/RegExps.kt → app/src/main/java/ru/n00byara/notificationcode/clip/RegExps.kt

@@ -1,4 +1,4 @@
-package ru.n00byara.notificationcode.components.clip
+package ru.n00byara.notificationcode.clip
 
 object RegExps {
     val regExps = listOf(

app/src/main/java/ru/n00byara/notificationcode/components/hook/Hook.kt → app/src/main/java/ru/n00byara/notificationcode/hook/Hook.kt

@@ -1,11 +1,11 @@
-package ru.n00byara.notificationcode.components.hook
+package ru.n00byara.notificationcode.hook
 
 import com.highcapable.yukihookapi.YukiHookAPI.encase
 import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed
 import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit
 import ru.n00byara.notificationcode.Constants
 
-import ru.n00byara.notificationcode.components.hook.entity.SystemUIHooker
+import ru.n00byara.notificationcode.hook.entity.SystemUIHooker
 
 @InjectYukiHookWithXposed
 object Hook : IYukiHookXposedInit {

app/src/main/java/ru/n00byara/notificationcode/components/hook/entity/SystemUIHooker.kt → app/src/main/java/ru/n00byara/notificationcode/hook/entity/SystemUIHooker.kt

@@ -1,4 +1,4 @@
-package ru.n00byara.notificationcode.components.hook.entity
+package ru.n00byara.notificationcode.hook.entity
 
 import android.app.Notification
 import android.content.Context
@@ -11,8 +11,8 @@ import com.highcapable.yukihookapi.hook.type.android.Notification_BuilderClass
 import com.highcapable.yukihookapi.hook.type.android.ParcelClass
 import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication
 import ru.n00byara.notificationcode.Constants
-import ru.n00byara.notificationcode.components.application.HookedAppInfo
-import ru.n00byara.notificationcode.components.clip.Clip
+import ru.n00byara.notificationcode.application.HookedAppInfo
+import ru.n00byara.notificationcode.clip.Clip
 
 object SystemUIHooker : YukiBaseHooker() {
     override fun onHook() {
@@ -40,7 +40,11 @@ object SystemUIHooker : YukiBaseHooker() {
                         if (appInfo.isSystem) {
                             notification.extras?.let { extras ->
                                 extras.getCharSequence(Constants.EXTRA_TEXT)?.let { contentText ->
-                                    Clip(appContext!!, contentText, prefs = prefs)
+                                    Clip(
+                                        context = appContext!!,
+                                        contentText = contentText,
+                                        prefs = prefs
+                                    )
                                 }
                             }
                         } else {
@@ -50,14 +54,23 @@ object SystemUIHooker : YukiBaseHooker() {
                                         if (appInfo.name == Constants.SHAZAM_APP_NAME && notification.getChannelId() == Constants.SHAZAM_CHANNEL_ID) {
                                             val contentTitle = extras.getCharSequence(Constants.EXTRA_TITLE)
 
-                                            Clip(appContext!!, contentText, contentTitle, prefs = prefs)
+                                            Clip(
+                                                context = appContext!!,
+                                                contentText = contentText,
+                                                contentTitle = contentTitle,
+                                                prefs = prefs
+                                            )
                                         } else {
-                                            Clip(appContext!!, contentText, prefs = prefs)
+                                            Clip(
+                                                context = appContext!!,
+                                                contentText = contentText,
+                                                prefs = prefs
+                                            )
                                         }
                                     }
                                 }
                             } else {
-                                // .. ??
+                                // Do nothing
                             }
                         }
                     }

app/src/main/java/ru/n00byara/notificationcode/components/permission/Permission.kt → app/src/main/java/ru/n00byara/notificationcode/permission/Permission.kt

@@ -1,4 +1,4 @@
-package ru.n00byara.notificationcode.components.permission
+package ru.n00byara.notificationcode.permission
 
 import android.content.Context
 import android.content.Intent
@@ -8,12 +8,12 @@ class Permission(private val context: Context) {
     fun requestPermissions() {
         val intent = Intent(this.context, PermissionRequestActivity::class.java)
             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        context.startActivity(intent)
+        this.context.startActivity(intent)
     }
 
     fun checkPermission(): Boolean {
         val notificationListener =
-            arrayOf(Settings.Secure.getString(context.contentResolver, "enabled_notification_listeners")).joinToString()
+            arrayOf(Settings.Secure.getString(this.context.contentResolver, "enabled_notification_listeners")).joinToString()
 
         return notificationListener.contains(this.context.packageName)
     }

app/src/main/java/ru/n00byara/notificationcode/components/permission/PermissionRequestActivity.kt → app/src/main/java/ru/n00byara/notificationcode/permission/PermissionRequestActivity.kt

@@ -1,4 +1,4 @@
-package ru.n00byara.notificationcode.components.permission
+package ru.n00byara.notificationcode.permission
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/ru/n00byara/notificationcode/components/service/BootReceiver.kt → app/src/main/java/ru/n00byara/notificationcode/service/BootReceiver.kt

@@ -1,4 +1,4 @@
-package ru.n00byara.notificationcode.components.service
+package ru.n00byara.notificationcode.service
 
 import android.content.BroadcastReceiver
 import android.content.Context

app/src/main/java/ru/n00byara/notificationcode/components/service/NotificationService.kt → app/src/main/java/ru/n00byara/notificationcode/service/NotificationService.kt

@@ -1,27 +1,31 @@
-package ru.n00byara.notificationcode.components.service
+package ru.n00byara.notificationcode.service
 
 import android.service.notification.NotificationListenerService
 import android.service.notification.StatusBarNotification
 import com.highcapable.yukihookapi.hook.factory.prefs
 import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication
 import ru.n00byara.notificationcode.Constants
-import ru.n00byara.notificationcode.components.application.ApplicationsList
-import ru.n00byara.notificationcode.components.clip.Clip
+import ru.n00byara.notificationcode.application.ApplicationsList
+import ru.n00byara.notificationcode.clip.Clip
 
 class NotificationService : NotificationListenerService() {
     val prefs = ModuleApplication.appContext.prefs(Constants.SETTINGS_NAME)
     override fun onNotificationPosted(sbn: StatusBarNotification) {
         val applicationsList = ApplicationsList(this.baseContext).getAllApplications()
         val appInfo = applicationsList.find { it.packageName == sbn.packageName }
 
-        if (prefs.getInt(Constants.USE_CASE) == 1) {
+        if (this.prefs.getInt(Constants.USE_CASE) == 1) {
             appInfo?.let { appInfo ->
                 val notification = sbn.notification
 
                 if (appInfo.isSystem) {
                     notification.extras?.let { extras ->
                         extras.getCharSequence(Constants.EXTRA_TEXT)?.let { contentText ->
-                            Clip(this.baseContext, contentText, prefs = prefs)
+                            Clip(
+                                context = this.baseContext,
+                                contentText = contentText,
+                                prefs = this.prefs
+                            )
                         }
                     }
                 } else {
@@ -31,14 +35,22 @@ class NotificationService : NotificationListenerService() {
                                 if (appInfo.name == Constants.SHAZAM_APP_NAME && notification.channelId == Constants.SHAZAM_CHANNEL_ID) {
                                     val contentTitle = extras.getCharSequence(Constants.EXTRA_TITLE)
 
-                                    Clip(this.baseContext, contentText, contentTitle, prefs = prefs)
+                                    Clip(
+                                        context = this.baseContext,
+                                        contentText = contentText,
+                                        contentTitle = contentTitle,
+                                        prefs = this.prefs
+                                    )
                                 } else {
-                                    Clip(this.baseContext, contentText, prefs = prefs)
+                                    Clip(context = this.baseContext,
+                                        contentText = contentText,
+                                        prefs = this.prefs
+                                    )
                                 }
                             }
                         }
                     } else {
-                        // .. ??
+                        // Do nothing
                     }
                 }
             }