Remapped listeners to be more sensitive to taps

tretdm · tretdm · commit 4509755d3d8c · 2023-04-22T08:15:56.000+07:00
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/QuickSearchActivity.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/QuickSearchActivity.java
@@ -3,7 +3,11 @@
 import static java.security.AccessController.getContext;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -18,12 +22,17 @@
 import com.kieronquinn.monetcompat.app.MonetCompatActivity;
 import com.mancj.materialsearchbar.MaterialSearchBar;
 
+import java.util.List;
+
 import io.github.luizgrp.sectionedrecyclerviewadapter.SectionedRecyclerViewAdapter;
 import uk.openvk.android.refresh.Global;
 import uk.openvk.android.refresh.R;
 import uk.openvk.android.refresh.api.Groups;
 import uk.openvk.android.refresh.api.Users;
 import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
+import uk.openvk.android.refresh.api.models.Group;
+import uk.openvk.android.refresh.api.models.User;
+import uk.openvk.android.refresh.api.models.WallPost;
 import uk.openvk.android.refresh.api.wrappers.DownloadManager;
 import uk.openvk.android.refresh.api.wrappers.OvkAPIWrapper;
 import uk.openvk.android.refresh.ui.list.sections.CommunitiesSearchSection;
@@ -127,4 +136,46 @@ private void receiveState(int message, Bundle data) {
 
     private void setMonetTheme() {
     }
+
+    public void openProfile(int position) {
+        User user = users.getList().get(position);
+        String url = "";
+        if(user.id > 0) {
+            url = String.format("openvk://profile/id%s", user.id);
+        }
+        if(url.length() > 0) {
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse(url));
+            final PackageManager pm = getPackageManager();
+            @SuppressLint("QueryPermissionsNeeded") List<ResolveInfo> activityList = pm.queryIntentActivities(i, 0);
+            for (int index = 0; index < activityList.size(); index++) {
+                ResolveInfo app = activityList.get(index);
+                if (app.activityInfo.name.contains("uk.openvk.android.refresh")) {
+                    i.setClassName(app.activityInfo.packageName, app.activityInfo.name);
+                }
+            }
+            startActivity(i);
+        }
+    }
+
+    public void openGroup(int position) {
+        Group group = groups.getList().get(position);
+        String url = "";
+        if(group.id > 0) {
+            url = String.format("openvk://group/club%s", group.id);
+        }
+        if(url.length() > 0) {
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse(url));
+            final PackageManager pm = getPackageManager();
+            @SuppressLint("QueryPermissionsNeeded") List<ResolveInfo> activityList = pm.queryIntentActivities(i, 0);
+            for (int index = 0; index < activityList.size(); index++) {
+                ResolveInfo app = activityList.get(index);
+                if (app.activityInfo.name.contains("uk.openvk.android.refresh")) {
+                    i.setClassName(app.activityInfo.packageName, app.activityInfo.name);
+                }
+            }
+            startActivity(i);
+        }
+    }
 }
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/FriendsAdapter.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/FriendsAdapter.java
@@ -78,6 +78,9 @@ void bind(final int position) {
                     .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
                     .dontAnimate().centerCrop()
                     .into((ImageView) convertView.findViewById(R.id.friend_avatar));
+            verified_icon.setFocusable(false);
+            convertView.findViewById(R.id.friend_avatar).setFocusable(false);
+            friend_title.setFocusable(false);
             if(item.verified) {
                 verified_icon.setVisibility(View.VISIBLE);
             } else {
@@ -94,8 +97,7 @@ public void onClick(View v) {
                 }
             };
             setTheme(convertView);
-            ((ImageView) convertView.findViewById(R.id.friend_avatar)).setOnClickListener(openProfileListener);
-            friend_title.setOnClickListener(openProfileListener);
+            convertView.setOnClickListener(openProfileListener);
         }
     }
 
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/GroupsAdapter.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/GroupsAdapter.java
@@ -75,6 +75,10 @@ void bind(final int position) {
                     .dontAnimate().centerCrop()
                     .into((ImageView) convertView.findViewById(R.id.group_avatar));
 
+            convertView.findViewById(R.id.group_avatar).setFocusable(false);
+            group_title.setFocusable(false);
+            group_summary.setFocusable(false);
+
             convertView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/items/ListCategory.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/items/ListCategory.java
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/sections/CommunitiesSearchSection.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/sections/CommunitiesSearchSection.java
@@ -14,6 +14,7 @@
 import uk.openvk.android.refresh.R;
 import uk.openvk.android.refresh.api.models.Group;
 import uk.openvk.android.refresh.api.models.User;
+import uk.openvk.android.refresh.ui.core.activities.QuickSearchActivity;
 
 public class CommunitiesSearchSection extends Section {
     private Context ctx;
@@ -53,12 +54,23 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
         Holder itemHolder = (Holder) holder;
         Group item = items.get(position);
         itemHolder.title.setText(item.name);
+        itemHolder.title.setFocusable(false);
+        itemHolder.view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(ctx instanceof QuickSearchActivity) {
+                    ((QuickSearchActivity) ctx).openGroup(position);
+                }
+            }
+        });
     }
 
     public static class Holder extends RecyclerView.ViewHolder {
         public TextView title;
+        public View view;
         public Holder(@NonNull View view) {
             super(view);
+            this.view = view;
             title = view.findViewById(R.id.search_result_title);
         }
     }
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/sections/PeopleSearchSection.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/sections/PeopleSearchSection.java
@@ -16,6 +16,7 @@
 import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
 import uk.openvk.android.refresh.R;
 import uk.openvk.android.refresh.api.models.User;
+import uk.openvk.android.refresh.ui.core.activities.QuickSearchActivity;
 
 public class PeopleSearchSection extends Section {
     private Context ctx;
@@ -55,12 +56,23 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
         Holder itemHolder = (Holder) holder;
         User item = items.get(position);
         itemHolder.title.setText(String.format("%s %s", item.first_name, item.last_name));
+        itemHolder.title.setFocusable(false);
+        itemHolder.view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(ctx instanceof QuickSearchActivity) {
+                    ((QuickSearchActivity) ctx).openProfile(position);
+                }
+            }
+        });
     }
 
     public static class Holder extends RecyclerView.ViewHolder {
         public TextView title;
+        public View view;
         public Holder(@NonNull View view) {
             super(view);
+            this.view = view;
             title = view.findViewById(R.id.search_result_title);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ void bind(final int position) {`
`78`	`78`	`.diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)`
`79`	`79`	`.dontAnimate().centerCrop()`
`80`	`80`	`.into((ImageView) convertView.findViewById(R.id.friend_avatar));`
	`81`	`+ verified_icon.setFocusable(false);`
	`82`	`+ convertView.findViewById(R.id.friend_avatar).setFocusable(false);`
	`83`	`+ friend_title.setFocusable(false);`
`81`	`84`	`if(item.verified) {`
`82`	`85`	`verified_icon.setVisibility(View.VISIBLE);`
`83`	`86`	`} else {`
`@@ -94,8 +97,7 @@ public void onClick(View v) {`
`94`	`97`	`}`
`95`	`98`	`};`
`96`	`99`	`setTheme(convertView);`
`97`		`- ((ImageView) convertView.findViewById(R.id.friend_avatar)).setOnClickListener(openProfileListener);`
`98`		`- friend_title.setOnClickListener(openProfileListener);`
	`100`	`+ convertView.setOnClickListener(openProfileListener);`
`99`	`101`	`}`
`100`	`102`	`}`
`101`	`103`