fix UI, added github link, optimize activity behavior

Alfio010 · Apr 5, 2023 · 2ef5f28 · 2ef5f28
1 parent f71fc7f
commit 2ef5f28
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -48,7 +48,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
 
     testImplementation 'junit:junit:4.13.2'

diff --git a/app/src/main/java/com/android/whatsappbackup/NotificationListViewerBaseActivity.kt b/app/src/main/java/com/android/whatsappbackup/NotificationListViewerBaseActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.widget.EditText
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -51,5 +52,9 @@ abstract class NotificationListViewerBaseActivity : AppCompatActivity() {
         })
 
         MyApplication.executor.submit { refreshList(getNotifications()) }
+
+        onBackPressedDispatcher.addCallback {
+            finishAndRemoveTask()
+        }
     }
 }
diff --git a/app/src/main/java/com/android/whatsappbackup/activities/MainActivity.kt b/app/src/main/java/com/android/whatsappbackup/activities/MainActivity.kt
@@ -57,7 +57,6 @@ class MainActivity : AppCompatActivity() {
 
         fbSettings.setOnClickListener {
             val intent = Intent(this, SettingsActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
             startActivity(intent)
         }
     }

diff --git a/app/src/main/java/com/android/whatsappbackup/activities/adapters/BlackListActivity.kt b/app/src/main/java/com/android/whatsappbackup/activities/adapters/BlackListActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.widget.EditText
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -51,6 +52,10 @@ class BlackListActivity : AppCompatActivity() {
                 MyApplication.executor.submit { refreshList(DBUtils.packageNameSearch(s.toString())) }
             }
         })
+
+        onBackPressedDispatcher.addCallback {
+            finishAndRemoveTask()
+        }
     }
 
 }
diff --git a/app/src/main/java/com/android/whatsappbackup/activities/adapters/IsChatActivity.kt b/app/src/main/java/com/android/whatsappbackup/activities/adapters/IsChatActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.widget.EditText
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -51,5 +52,9 @@ class IsChatActivity : AppCompatActivity() {
                 MyApplication.executor.submit { refreshList(DBUtils.packageNameSearch(s.toString())) }
             }
         })
+
+        onBackPressedDispatcher.addCallback {
+            finishAndRemoveTask()
+        }
     }
 }
diff --git a/app/src/main/java/com/android/whatsappbackup/activities/home/SearchActivity.kt b/app/src/main/java/com/android/whatsappbackup/activities/home/SearchActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.widget.ArrayAdapter
 import android.widget.EditText
 import android.widget.Spinner
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import com.android.whatsappbackup.MyApplication
 import com.android.whatsappbackup.R
@@ -60,5 +61,9 @@ class SearchActivity : AppCompatActivity() {
 
             startActivity(intent)
         }
+
+        onBackPressedDispatcher.addCallback {
+            finishAndRemoveTask()
+        }
     }
 }
diff --git a/app/src/main/java/com/android/whatsappbackup/activities/home/SettingsActivity.kt b/app/src/main/java/com/android/whatsappbackup/activities/home/SettingsActivity.kt
@@ -16,7 +16,6 @@ import com.android.whatsappbackup.utils.MySharedPref
 import com.android.whatsappbackup.utils.Utils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
-
 class SettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -52,7 +51,6 @@ class SettingsActivity : AppCompatActivity() {
             if (openBlacklist != null) {
                 openBlacklist.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                     val intent = Intent(requireContext(), BlackListActivity::class.java)
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
                     startActivity(intent)
                     true
                 }
@@ -86,7 +84,6 @@ class SettingsActivity : AppCompatActivity() {
             if (isChat != null) {
                 isChat.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                     val intent = Intent(requireContext(), IsChatActivity::class.java)
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
                     startActivity(intent)
                     true
                 }
@@ -131,6 +128,18 @@ class SettingsActivity : AppCompatActivity() {
                 }
             }
 
+            val github = findPreference<Preference>("github")
+
+            if (github != null) {
+                github.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                    Utils.openLink(
+                        requireContext(),
+                        "https://github.com/Alfio010/notification-listener-android"
+                    )
+                    true
+                }
+            }
+
             val version = findPreference<Preference>("version")
             if (version != null) {
                 version.title = "${version.title} ${BuildConfig.VERSION_NAME}"

diff --git a/app/src/main/java/com/android/whatsappbackup/adapters/NotificationsAdapter.kt b/app/src/main/java/com/android/whatsappbackup/adapters/NotificationsAdapter.kt
@@ -58,7 +58,6 @@ class NotificationsAdapter(
                     R.string.show_chat
                 ) { _, _ ->
                     val intentChat = Intent(context, SpecificChatActivity::class.java)
-                    intentChat.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
                     intentChat.putExtra("pkgName", notificationItem.packageName.target.pkg)
                     intentChat.putExtra("title", notificationItem.title)
                     ContextCompat.startActivity(context, intentChat, null)

diff --git a/app/src/main/java/com/android/whatsappbackup/utils/Utils.kt b/app/src/main/java/com/android/whatsappbackup/utils/Utils.kt
@@ -162,4 +162,8 @@ object Utils {
             ActivityCompat.requestPermissions(context as Activity, arrayOf(POST_NOTIFICATIONS), 1)
         }
     }
+
+    fun openLink(context: Context, uri: String) {
+        context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(uri)))
+    }
 }
diff --git a/app/src/main/res/layout/custom_blacklist_layout.xml b/app/src/main/res/layout/custom_blacklist_layout.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5sp"
-        app:cardBackgroundColor="?colorPrimary"
+        app:cardBackgroundColor="?android:statusBarColor"
         app:cardCornerRadius="8dp"
         app:cardElevation="2dp"
         app:strokeWidth="1dp">

diff --git a/app/src/main/res/layout/custom_is_chat.xml b/app/src/main/res/layout/custom_is_chat.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5sp"
-        app:cardBackgroundColor="?colorPrimary"
+        app:cardBackgroundColor="?android:statusBarColor"
         app:cardCornerRadius="8dp"
         app:cardElevation="2dp"
         app:strokeWidth="1dp">

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -56,4 +56,5 @@
     <!-- Default values -->
     <string name="defaultSwitchValue">All applications</string>
     <string name="null_value">"No text captured"</string>
+    <string name="github" translatable="false">GitHub</string>
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
@@ -57,6 +57,12 @@
 
         </Preference>
 
+        <Preference
+            app:key="github"
+            app:title="@string/github">
+
+        </Preference>
+
         <Preference
             app:key="version"
             app:title="@string/version">