added search engine selection

2022-12-27 18:05:54 +03:00
parent af1d175415
commit 8eb725148f
2 changed files with 58 additions and 40 deletions
@@ -16,6 +16,7 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;

 import com.vk.core.dialogs.actionspopup.ActionsPopup;
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.ui.themes.VKThemeHelper;
 import com.vk.core.util.ContextExtKt;
 import com.vk.core.util.ToastUtils;
@@ -39,6 +40,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.LifecycleUtils;

 public class PhotoViewer {
    static OkHttpClient client = VtOkHttpClient.getInstance();
@@ -46,12 +48,12 @@ public class PhotoViewer {
    public static boolean interceptClick(AttachmentWithMedia attachment, MenuItem item, View view) {
        if (item.getItemId() == R.id.search_photo) {
            if (attachment instanceof PhotoAttachment) {
-                searchPhoto(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
+                searchDialog(LifecycleUtils.getCurrentActivity(), getUrlFromPhotoAttachment((PhotoAttachment) attachment));
            } else if (attachment instanceof DocumentAttachment) {
                var documentAttachment = (DocumentAttachment) attachment;
                if (documentAttachment.J != null)
                    try {
-                        searchPhoto(getUrlFromDocumentAttachment(documentAttachment));
+                        searchDialog(LifecycleUtils.getCurrentActivity(), getUrlFromDocumentAttachment(documentAttachment));
                    } catch (Exception e) {
                        ToastUtils.a(R.string.photo_get_error);
                    }
@@ -100,12 +102,12 @@ public class PhotoViewer {
                false,
                () -> {
                    if (attachment instanceof PhotoAttachment) {
-                        searchPhoto(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
+                        searchDialog(LifecycleUtils.getCurrentActivity(), getUrlFromPhotoAttachment((PhotoAttachment) attachment));
                    } else if (attachment instanceof DocumentAttachment) {
                        var documentAttachment = (DocumentAttachment) attachment;
                        if (documentAttachment.J != null)
                            try {
-                                searchPhoto(getUrlFromDocumentAttachment(documentAttachment));
+                                searchDialog(LifecycleUtils.getCurrentActivity(), getUrlFromDocumentAttachment(documentAttachment));
                            } catch (Exception e) {
                                ToastUtils.a(R.string.photo_get_error);
                            }
@@ -184,30 +186,54 @@ public class PhotoViewer {
        return max.url;
    }

-    private static void searchPhoto(String url) {
-        if (url == null || url.isEmpty()) return;
-        switch (getPreferences().getInt("search_engine", 0)) {
-            case 0:
+    private static void searchDialog(Context context, String url) {
+        if (selectedEngine() == 0) {
+            var items = new String[]{
+                    "Google", "Yandex", "Bing", "TraceMoe", "Ascii2d", "Saucenao"
+            };
+
+            new VkAlertDialog.Builder(context)
+                    .setItems(items, (dl, i) -> {
+                        searchPhoto(i + 1, url);
+                    })
+                    .show();
+        } else {
+            searchPhoto(selectedEngine(), url);
+        }
+    }
+
+    private static int selectedEngine() {
+        return getPreferences().getInt("search_engine", 0);
+    }
+
+    private static void searchPhoto(int i, String url) {
+        switch (i) {
+            case 1:
                searchWithYandex(url);
                break;
-            case 1:
+            case 2:
                searchWithGoogle(url);
                break;
-            case 2:
+            case 3:
                searchWithBing(url);
                break;
-            case 3:
+            case 4:
                searchWithTraceMoe(url);
                break;
-            case 4:
+            case 5:
                searchWithAscii2d(url);
                break;
-            case 5:
+            case 6:
                searchWithSaucenao(url);
                break;
        }
    }

+    private static void searchPhoto(String url) {
+        if (url == null || url.isEmpty()) return;
+        searchPhoto(selectedEngine(), url);
+    }
+
    private static void searchWithYandex(String url) {
        var request = new Request.a()
                .b(String.format("https://yandex.ru/images-apphost/image-download?url=%s&images_avatars_size=preview&images_avatars_namespace=images-cbir",
@@ -1,23 +1,7 @@
 package ru.vtosters.lite.ui.fragments;

-import static bruhcollective.itaysonlab.libvkx.client.LibVKXClient.isVkxInstalled;
-import static ru.vtosters.lite.music.LastFMScrobbler.isLoggedIn;
-import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
-import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
-import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
-import static ru.vtosters.lite.utils.Preferences.getBoolValue;
-import static ru.vtosters.lite.utils.Preferences.isEnableExternalOpening;
-import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
-import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
-import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
-
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -25,25 +9,16 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-
 import androidx.preference.Preference;
-
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.network.Network;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import org.json.JSONObject;
 import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.downloaders.VideoDownloader;
 import ru.vtosters.lite.music.LastFMScrobbler;
@@ -52,6 +27,22 @@ import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ThemesUtils;

+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static bruhcollective.itaysonlab.libvkx.client.LibVKXClient.isVkxInstalled;
+import static ru.vtosters.lite.music.LastFMScrobbler.isLoggedIn;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
+import static ru.vtosters.lite.utils.AndroidUtils.*;
+import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+import static ru.vtosters.lite.utils.Preferences.isEnableExternalOpening;
+import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
+import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
+
 public class MediaFragment extends MaterialPreferenceToolbarFragment {
    private static final ExecutorService executor = Executors.newCachedThreadPool();

@@ -148,6 +139,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {

        findPreference("select_photo_search_engine").setOnPreferenceClickListener(preference -> {
            var items = Arrays.asList(
+                    new ImagineArrayAdapter.ImagineArrayAdapterItem(null, "По выбору"),
                    new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.yandex, "Yandex"),
                    new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.google, "Google"),
                    new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.microsoft, "Bing"),