feat: improve apps toggle and cooldown timer picker (#479)

* save cooldown time on save click to prevent accidental time cahnge on picker scroll

* Update code Apps filter page, status is not required

Author: spuday90

app/src/main/java/com/parishod/watomatic/fragment/MainFragment.java

@@ -1,7 +1,6 @@
 package com.parishod.watomatic.fragment;
 
 import android.app.Activity;
-import android.app.ActivityManager;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
@@ -20,15 +19,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -42,7 +38,6 @@
 import com.parishod.watomatic.activity.about.AboutActivity;
 import com.parishod.watomatic.activity.contactselector.ContactSelectorActivity;
 import com.parishod.watomatic.activity.customreplyeditor.CustomReplyEditorActivity;
-import com.parishod.watomatic.activity.enabledapps.EnabledAppsActivity;
 import com.parishod.watomatic.activity.main.MainActivity;
 import com.parishod.watomatic.activity.settings.SettingsActivity;
 import com.parishod.watomatic.model.App;
@@ -86,7 +81,7 @@ public class MainFragment extends Fragment implements DialogActionListener {
     BottomNavigationView bottomNav;
     Button editButton;
     private int gitHubReleaseNotesId = -1;
-    private int selectedCooldownTime;
+    private int selectedCooldownTime = -1;
     private TextView replyCooldownDescription, messageTypeDescription;
     private LinearLayout contactsFilterLL, messagesTypeLL, supportedAppsLL, replyCooldownLL;
     private TextView enabledAppsCount;
@@ -630,7 +625,6 @@ private void showAppsDialog() {
                     R.drawable.ic_android_default_round,
                     app.getName(),
                     app.getPackageName(),
-                    "Auto-reply disabled", // or make this dynamic
                     app.getPackageName().equals("com.whatsapp") ? true : false
             );
             appItems.add(item);
@@ -639,7 +633,7 @@ private void showAppsDialog() {
         DialogConfig config = new DialogConfig(
                 DialogType.APPS,
                 "Apps",
-                "", // description not needed for this dialog
+                "Select the apps you want to enable auto-reply for.", // description not needed for this dialog
                 false, // showSearch
                 "Search",
                 "",
@@ -687,7 +681,7 @@ private void showCooldownDialog() {
                         "This prevents sending multiple replies in quick succession.",
                 false, // showSearch not needed
                 "",    // searchHint not needed
-                "",
+                "Save",
                 cooldownOptions
         );
 
@@ -699,9 +693,13 @@ private void showCooldownDialog() {
     @Override
     public void onSaveClicked(DialogType dialogType) {
         if (dialogType == DialogType.COOLDOWN) {
-            long cooldownInMillis = selectedCooldownTime * 60 * 1000L;
-            preferencesManager.setAutoReplyDelay(cooldownInMillis);
-            Toast.makeText(mActivity, "Cooldown settings saved", Toast.LENGTH_SHORT).show();
+            if(selectedCooldownTime != -1) {
+                long cooldownInMillis = selectedCooldownTime * 60 * 1000L;
+                preferencesManager.setAutoReplyDelay(cooldownInMillis);
+                updateCooldownFilterDisplay();
+                Toast.makeText(mActivity, "Cooldown settings saved", Toast.LENGTH_SHORT).show();
+            }
+            selectedCooldownTime = -1;//reset so that no accidental cahnges on going back to cooldown page
         }
     }
 
@@ -730,9 +728,9 @@ public void onSearchQuery(String query) {
     @Override
     public void onCooldownChanged(int totalMinutes) {
         selectedCooldownTime = totalMinutes;
-        long cooldownInMillis = selectedCooldownTime * 60 * 1000L;
+        /*long cooldownInMillis = selectedCooldownTime * 60 * 1000L;
         preferencesManager.setAutoReplyDelay(cooldownInMillis);
-        updateCooldownFilterDisplay();
+        updateCooldownFilterDisplay();*/
         Log.d("Dialog", "Total cooldown time: " + totalMinutes);
     }
 }

app/src/main/java/com/parishod/watomatic/model/adapters/AppsAdapter.kt

@@ -45,7 +45,6 @@ class AppsAdapter(
             holder.icon.setImageResource(item.iconRes)
         }
         holder.name.text = item.name
-        holder.status.text = item.status
         holder.toggle.isChecked = PreferencesManager.getPreferencesInstance(holder.icon.context).isAppEnabled(item.packageName)
 
         holder.toggle.setOnCheckedChangeListener { _, isChecked ->

app/src/main/java/com/parishod/watomatic/model/adapters/CooldownAdapter.kt

@@ -60,6 +60,7 @@ class CooldownAdapter(
             setupNumberPicker(holder)
             notifyTimeChange()
         }
+        notifyTimeChange()
     }
 
     private fun setupNumberPicker(holder: ViewHolder) {

app/src/main/java/com/parishod/watomatic/model/data/DialogTypes.kt

@@ -8,7 +8,6 @@ data class AppItem(
     val iconRes: Int,
     val name: String,
     val packageName: String,
-    val status: String,
     val isEnabled: Boolean = false
 ) : DialogItem
 

app/src/main/res/layout/item_app_toggle.xml

@@ -41,7 +41,8 @@
             android:textColor="?android:attr/textColorSecondary"
             android:layout_marginTop="2dp"
             android:maxLines="1"
-            android:ellipsize="end" />
+            android:ellipsize="end"
+            android:visibility="gone"/>
 
     </LinearLayout>