entries() {
+ return Arrays.asList(
+ entry(
+ TAG_MAIN,
+ "Browse Material icons and add them to your project as vector drawables.",
+ "Opens the Icons Repository tab: a searchable grid of the"
+ + " bundled Material icons, which work offline.
"
+ + "Tap an icon to import it. You choose the drawable name,"
+ + " the module and an optional tint, and the plugin writes a"
+ + " 24dp vector drawable into that module's"
+ + " res/drawable folder.
",
+ "Icons Repository guide",
+ "index.html"),
+ entry(
+ TAG_SEARCH,
+ "Type to filter the icon grid by name.",
+ "Matches icon names as you type, for example arrow or"
+ + " home. The clear button empties the field and"
+ + " shows every icon again.
",
+ "Searching icons",
+ "index.html"),
+ entry(
+ TAG_ICON,
+ "Tap an icon to import it into your project.",
+ "Tapping an icon opens the import dialog, where you set the"
+ + " drawable name, the target module and the tint before"
+ + " anything is written.
",
+ "Importing an icon",
+ "index.html"),
+ entry(
+ TAG_NAME,
+ "The drawable's resource name, used as the file name.",
+ "Use lowercase letters, digits and single underscores, starting"
+ + " with a letter, for example ic_arrow_back. The"
+ + " icon is saved as res/drawable/<name>.xml."
+ + " A file with the same name is replaced.
",
+ "Naming the drawable",
+ "index.html"),
+ entry(
+ TAG_MODULE,
+ "Which module's res/drawable folder receives the icon.",
+ "All modules writes a copy into every Android module the"
+ + " plugin finds. Pick a single module to write it only"
+ + " there.
",
+ "Choosing a module",
+ "index.html"),
+ entry(
+ TAG_COLOR,
+ "The tint applied to the icon: none, a theme color, or a custom hex value.",
+ "None leaves the icon untinted (black)."
+ + " A theme color such as colorPrimary is written as"
+ + " ?attr/colorPrimary, so the icon follows the app"
+ + " theme. Custom takes a hex value in"
+ + " #RRGGBB or #AARRGGBB form.
",
+ "Choosing a tint",
+ "index.html"),
+ entry(
+ TAG_IMPORT,
+ "The preview shows the chosen tint. Import writes the drawable; Cancel closes without changes.",
+ "The preview shows the icon with the chosen tint. Import"
+ + " checks the name and color, then writes the file. If"
+ + " something is wrong, the field shows an error and nothing"
+ + " is written.
",
+ "Importing an icon",
+ "index.html"));
+ }
+
+ @NonNull
+ private static PluginTooltipEntry entry(
+ @NonNull String tag,
+ @NonNull String summary,
+ @NonNull String detail,
+ @NonNull String buttonLabel,
+ @NonNull String uri) {
+ return new PluginTooltipEntry(
+ tag,
+ summary,
+ detail,
+ Collections.singletonList(new PluginTooltipButton(buttonLabel, uri, 0, false)));
+ }
+
+ /** Long-press on {@code view} shows the tooltip for {@code tag}. */
+ public static void wire(@Nullable View view, @NonNull String tag) {
+ if (view == null) return;
+ view.setOnLongClickListener(anchor -> show(anchor, tag));
+ }
+
+ /**
+ * Long-press on the field's start and end icons shows the tooltip for {@code tag}. The text
+ * field itself keeps long-press for text selection.
+ */
+ public static void wireFieldIcons(@Nullable TextInputLayout layout, @NonNull String tag) {
+ if (layout == null) return;
+ layout.setStartIconOnLongClickListener(anchor -> show(anchor, tag));
+ layout.setEndIconOnLongClickListener(anchor -> show(anchor, tag));
+ }
+
+ private static boolean show(@NonNull View anchor, @NonNull String tag) {
+ IdeTooltipService service = tooltipService();
+ if (service == null) return false;
+ service.showTooltip(anchor, CATEGORY, tag);
+ return true;
+ }
+
+ @Nullable
+ private static IdeTooltipService tooltipService() {
+ try {
+ ServiceRegistry registry = PluginFragmentHelper.getServiceRegistry(Main.PLUGIN_ID);
+ return registry != null ? registry.get(IdeTooltipService.class) : null;
+ } catch (Exception ignored) {
+ // Help is optional; without the service a long-press simply does nothing.
+ return null;
+ }
+ }
+}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconModelDiffCallback.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconModelDiffCallback.java
index 6de1476a9..f0e62fe16 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconModelDiffCallback.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconModelDiffCallback.java
@@ -2,7 +2,7 @@
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.DiffUtil;
-import dev.omar.plugin.iconsrepo.models.IconModel;
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
public class IconModelDiffCallback extends DiffUtil.ItemCallback {
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconViewHolder.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconViewHolder.java
index 0bddfe788..48a8789ac 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconViewHolder.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconViewHolder.java
@@ -12,7 +12,8 @@
import com.google.android.material.textview.MaterialTextView;
import dev.omar.plugin.iconsrepo.R;
-import dev.omar.plugin.iconsrepo.models.IconModel;
+import dev.omar.plugin.iconsrepo.help.IconsRepositoryHelp;
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
import dev.omar.plugin.iconsrepo.utils.ImageUtils;
public class IconViewHolder extends RecyclerView.ViewHolder {
@@ -28,6 +29,7 @@ public IconViewHolder(View view, IconsAdapter adapter) {
this.adapter = adapter;
icon = view.findViewById(R.id.iconImageView);
txt = view.findViewById(R.id.iconNameTextView);
+ IconsRepositoryHelp.wire(itemView, IconsRepositoryHelp.TAG_ICON);
}
public void bindView(@NonNull final IconModel model) {
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconsAdapter.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconsAdapter.java
index a4d3efc0f..3a71300b7 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconsAdapter.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconsAdapter.java
@@ -17,20 +17,21 @@
import androidx.recyclerview.widget.ListAdapter;
import androidx.recyclerview.widget.RecyclerView;
+import dev.omar.plugin.iconsrepo.utils.FastSearchIndexV2;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import dev.omar.plugin.iconsrepo.R;
-import dev.omar.plugin.iconsrepo.models.IconModel;
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
import dev.omar.plugin.iconsrepo.utils.FastSearchIndex;
public class IconsAdapter extends ListAdapter
implements Filterable, TextWatcher {
private List originalList;
- private FastSearchIndex searchIndex;
+ private FastSearchIndexV2 searchIndex;
private final ExecutorService searchExecutor;
private final ExecutorService renderExecutor;
private final Handler mainHandler;
@@ -75,7 +76,7 @@ public void setOriginalList(List fullList) {
for (IconModel model : fullList) {
names.add(model.getIconName());
}
- searchIndex = new FastSearchIndex(names);
+ searchIndex = new FastSearchIndexV2(names);
});
submitList(fullList);
}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/dialog/IconImportDialogManager.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/dialog/IconImportDialogManager.java
new file mode 100644
index 000000000..01eeb933a
--- /dev/null
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/dialog/IconImportDialogManager.java
@@ -0,0 +1,256 @@
+package dev.omar.plugin.iconsrepo.ui.dialog;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.PictureDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+import com.itsaky.androidide.plugins.extensions.IModule;
+import com.itsaky.androidide.plugins.extensions.IProject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import dev.omar.plugin.iconsrepo.R;
+import dev.omar.plugin.iconsrepo.help.IconsRepositoryHelp;
+import dev.omar.plugin.iconsrepo.data.importer.AppPathResolver;
+import dev.omar.plugin.iconsrepo.data.importer.ImportIconResult;
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
+import dev.omar.plugin.iconsrepo.data.validation.HexColorRule;
+import dev.omar.plugin.iconsrepo.data.validation.IconNameRule;
+import dev.omar.plugin.iconsrepo.data.validation.ValidationTextWatcher;
+import dev.omar.plugin.iconsrepo.data.validation.Validator;
+import dev.omar.plugin.iconsrepo.databinding.DialogImportIconBinding;
+import dev.omar.plugin.iconsrepo.domain.IconImportUseCase;
+import dev.omar.plugin.iconsrepo.utils.DynamicColorHelper;
+import dev.omar.plugin.iconsrepo.utils.ImageUtils;
+
+public class IconImportDialogManager {
+
+ private final Context context;
+ private final LayoutInflater inflater;
+ private final IconImportUseCase importUseCase;
+ private final List moduleTargetNames = new ArrayList<>();
+
+ public IconImportDialogManager(@NonNull Context context, @NonNull LayoutInflater inflater) {
+ this(context, inflater, new IconImportUseCase());
+ }
+
+ public IconImportDialogManager(
+ @NonNull Context context,
+ @NonNull LayoutInflater inflater,
+ @NonNull IconImportUseCase importUseCase) {
+ this.context = context;
+ this.inflater = inflater;
+ this.importUseCase = importUseCase;
+ }
+
+ public void showImportDialog(
+ @NonNull IconModel model,
+ @Nullable IProject currentProject) {
+
+ final DialogImportIconBinding binding = DialogImportIconBinding.inflate(inflater);
+
+ setupInputName(binding, model);
+ setupModulesList(binding, currentProject);
+ setupColorsList(binding);
+ setupIconPreview(binding, model);
+
+ final MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(context);
+ dialogBuilder.setTitle("Import vector icon");
+ dialogBuilder.setView(binding.getRoot());
+ dialogBuilder.setPositiveButton("Import", null);
+ dialogBuilder.setNegativeButton("Cancel", null);
+
+ final AlertDialog alertDialog = dialogBuilder.show();
+ wireHelp(binding, alertDialog);
+
+ alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
+ if (handleImportSubmitted(binding, currentProject, model)) {
+ alertDialog.dismiss();
+ }
+ });
+ }
+
+ private void wireHelp(@NonNull DialogImportIconBinding binding, @NonNull AlertDialog dialog) {
+ IconsRepositoryHelp.wire(binding.iconPreview, IconsRepositoryHelp.TAG_IMPORT);
+ binding.inputNameLayout.setStartIconDrawable(R.drawable.ic_category);
+ binding.inputNameLayout.setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);
+ IconsRepositoryHelp.wireFieldIcons(binding.inputNameLayout, IconsRepositoryHelp.TAG_NAME);
+ IconsRepositoryHelp.wire(binding.moduleSelectionLayout, IconsRepositoryHelp.TAG_MODULE);
+ IconsRepositoryHelp.wire(binding.txtListModules, IconsRepositoryHelp.TAG_MODULE);
+ IconsRepositoryHelp.wire(binding.txtListColors, IconsRepositoryHelp.TAG_COLOR);
+ binding.inputColorLayout.setStartIconDrawable(R.drawable.ic_category);
+ binding.inputColorLayout.setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);
+ IconsRepositoryHelp.wireFieldIcons(binding.inputColorLayout, IconsRepositoryHelp.TAG_COLOR);
+ IconsRepositoryHelp.wire(dialog.getButton(AlertDialog.BUTTON_POSITIVE), IconsRepositoryHelp.TAG_IMPORT);
+ IconsRepositoryHelp.wire(dialog.getButton(AlertDialog.BUTTON_NEGATIVE), IconsRepositoryHelp.TAG_IMPORT);
+ }
+
+ private void setupInputName(@NonNull DialogImportIconBinding binding, @NonNull IconModel model) {
+ String defaultName = "ic_" + model.getIconName().replace("-", "_");
+ binding.inputName.setText(defaultName);
+ binding.inputName.addTextChangedListener(
+ new ValidationTextWatcher(binding.inputName, List.of(new IconNameRule())));
+ }
+
+ private void setupModulesList(@NonNull DialogImportIconBinding binding, @Nullable IProject currentProject) {
+ moduleTargetNames.clear();
+ List availableModules = AppPathResolver.getAvailableModules(currentProject);
+
+ List displayNames = new ArrayList<>();
+ String allModulesTitle = "All modules (" + availableModules.size() + ")";
+ displayNames.add(allModulesTitle);
+ moduleTargetNames.add(AppPathResolver.TARGET_ALL_MODULES);
+
+ for (IModule module : availableModules) {
+ String name = module.getName();
+ String formattedName = name.startsWith(":") ? name : ":" + name;
+ displayNames.add(formattedName);
+ moduleTargetNames.add(name);
+ }
+
+ binding.txtListModules.setAdapter(
+ new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, displayNames));
+
+ // Default to "All modules" (position 0)
+ binding.txtListModules.setSelection(0);
+ }
+
+ private void setupIconPreview(@NonNull DialogImportIconBinding binding, @NonNull IconModel model) {
+ try {
+ int defaultColor = DynamicColorHelper.resolveDynamicColor(
+ context,
+ DynamicColorHelper.getDefaultColorModel());
+ PictureDrawable pd = new PictureDrawable(model.getSvgIcon().renderToPicture());
+ Bitmap rawBitmap = ImageUtils.drawable2Bitmap(pd);
+ Bitmap coloredBitmap = ImageUtils.drawColor(rawBitmap, defaultColor);
+ binding.iconPreview.setImageBitmap(coloredBitmap);
+ } catch (Exception ignored) {
+ // Fallback layout preview
+ }
+ }
+
+ private void setupColorsList(@NonNull DialogImportIconBinding binding) {
+ int defaultColor = DynamicColorHelper.resolveDynamicColor(
+ context,
+ DynamicColorHelper.getDefaultColorModel());
+
+ List colorsNames = DynamicColorHelper.getDisplayNames();
+ colorsNames.add(0, "None");
+ colorsNames.add(1, "Custom");
+
+ binding.txtListColors.setAdapter(
+ new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, colorsNames));
+
+ binding.txtListColors.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+ binding.inputColorLayout.setVisibility(position == 1 ? View.VISIBLE : View.GONE);
+ updatePreviewColor(binding, position);
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {}
+ });
+
+ binding.inputColor.addTextChangedListener(
+ new ValidationTextWatcher(
+ binding.inputColor,
+ List.of(new HexColorRule()),
+ (text, isValid) -> {
+ if (isValid) {
+ try {
+ int parsedColor = Color.parseColor(text);
+ binding.iconPreview.setColorFilter(parsedColor, PorterDuff.Mode.SRC_IN);
+ } catch (Exception ignored) {
+ }
+ }
+ }));
+
+ // Initial default color filter
+ binding.iconPreview.setColorFilter(defaultColor, PorterDuff.Mode.SRC_IN);
+ }
+
+ private void updatePreviewColor(@NonNull DialogImportIconBinding binding, int position) {
+ try {
+ switch (position) {
+ case 0 -> binding.iconPreview.setColorFilter(Color.BLACK, PorterDuff.Mode.SRC_IN);
+ case 1 -> {
+ String colorText = binding.inputColor.getText() != null ? binding.inputColor.getText().toString() : "";
+ int color = Color.parseColor(colorText);
+ binding.iconPreview.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+ }
+ default -> {
+ int colorAttrIndex = Math.max(0, position - 2);
+ DynamicColorHelper.ColorReferenceModel colorModel =
+ DynamicColorHelper.getDynamicColors().get(colorAttrIndex);
+ int resolvedColor = DynamicColorHelper.resolveDynamicColor(context, colorModel);
+ binding.iconPreview.setColorFilter(resolvedColor, PorterDuff.Mode.SRC_IN);
+ }
+ }
+ } catch (Exception e) {
+ binding.iconPreview.setColorFilter(Color.BLACK, PorterDuff.Mode.SRC_IN);
+ }
+ }
+
+ private boolean handleImportSubmitted(
+ @NonNull DialogImportIconBinding binding,
+ @Nullable IProject currentProject,
+ @NonNull IconModel model) {
+
+ boolean isValidName = Validator.validate(binding.inputName, List.of(new IconNameRule()));
+ int selectedColorPosition = binding.txtListColors.getSelectedItemPosition();
+
+ boolean isValidColor = selectedColorPosition != 1
+ || Validator.validate(binding.inputColor, List.of(new HexColorRule()));
+
+ if (!isValidName || !isValidColor) {
+ return false;
+ }
+
+ try {
+ String name = binding.inputName.getText() != null ? binding.inputName.getText().toString() : "";
+ String colorTint = resolveColorValue(binding, selectedColorPosition);
+
+ int selectedModulePos = binding.txtListModules.getSelectedItemPosition();
+ String targetModule = (selectedModulePos >= 0 && selectedModulePos < moduleTargetNames.size())
+ ? moduleTargetNames.get(selectedModulePos)
+ : AppPathResolver.TARGET_ALL_MODULES;
+
+ ImportIconResult result = importUseCase.execute(currentProject, model, name, colorTint, targetModule);
+ if (!result.isSuccess()) {
+ Toast.makeText(context, "Error: " + result.message(), Toast.LENGTH_LONG).show();
+ return false;
+ }
+ return true;
+ } catch (Exception err) {
+ Toast.makeText(context, "Error: " + err.getMessage(), Toast.LENGTH_LONG).show();
+ return false;
+ }
+ }
+
+ @Nullable
+ private String resolveColorValue(@NonNull DialogImportIconBinding binding, int selectedPosition) {
+ if (selectedPosition > 1) {
+ DynamicColorHelper.ColorReferenceModel colorModel =
+ DynamicColorHelper.getDynamicColors().get(selectedPosition - 2);
+ return colorModel.getRef();
+ } else if (selectedPosition == 1 && binding.inputColor.getText() != null) {
+ return binding.inputColor.getText().toString();
+ }
+ return null;
+ }
+}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/MainFragment.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/MainFragment.java
index 1e840a3a1..054b9d92f 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/MainFragment.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/MainFragment.java
@@ -1,275 +1,151 @@
package dev.omar.plugin.iconsrepo.ui.fragments;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Toast;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.github.megatronking.svg.generator.svg.SvgSAXReader;
-import com.github.megatronking.svg.generator.svg.model.Svg;
-import com.github.megatronking.svg.generator.writer.impl.Svg2VectorTemplateWriter;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.itsaky.androidide.plugins.extensions.IModule;
import com.itsaky.androidide.plugins.extensions.IProject;
-import com.itsaky.androidide.plugins.extensions.ModuleType;
-import com.itsaky.androidide.plugins.extensions.ProjectType;
-import com.itsaky.androidide.plugins.extensions.SourceSet;
import com.itsaky.androidide.plugins.services.IdeProjectService;
-import dev.omar.plugin.iconsrepo.data.importer.AppPathResolver;
-import dev.omar.plugin.iconsrepo.data.importer.AssetIconSource;
-import dev.omar.plugin.iconsrepo.data.importer.ImportIconResult;
-import dev.omar.plugin.iconsrepo.data.importer.ImportParams;
-import dev.omar.plugin.iconsrepo.data.importer.SvgToVectorImporter;
-import org.dom4j.DocumentException;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Collections;
-import java.util.List;
-
+import dev.omar.plugin.iconsrepo.help.IconsRepositoryHelp;
import dev.omar.plugin.iconsrepo.Main;
-import dev.omar.plugin.iconsrepo.data.validation.HexColorRule;
-import dev.omar.plugin.iconsrepo.data.validation.IconNameRule;
-import dev.omar.plugin.iconsrepo.data.validation.ValidationTextWatcher;
-import dev.omar.plugin.iconsrepo.data.validation.Validator;
-import dev.omar.plugin.iconsrepo.databinding.DialogImportIconBinding;
+import com.google.android.material.textfield.TextInputLayout;
+
+import dev.omar.plugin.iconsrepo.R;
import dev.omar.plugin.iconsrepo.databinding.FragmentMainBinding;
-import dev.omar.plugin.iconsrepo.models.IconModel;
-import dev.omar.plugin.iconsrepo.repository.IconRepository;
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
+import dev.omar.plugin.iconsrepo.data.repository.IconRepository;
import dev.omar.plugin.iconsrepo.ui.adapter.IconsAdapter;
-import dev.omar.plugin.iconsrepo.utils.DynamicColorHelper;
+import dev.omar.plugin.iconsrepo.ui.dialog.IconImportDialogManager;
+import dev.omar.plugin.iconsrepo.ui.viewmodel.MainUiState;
+import dev.omar.plugin.iconsrepo.ui.viewmodel.MainViewModel;
+import dev.omar.plugin.iconsrepo.ui.viewmodel.MainViewModelFactory;
public class MainFragment extends PluginFragment {
private FragmentMainBinding binding;
+ private MainViewModel viewModel;
+ private IconsAdapter adapter;
+ private IconImportDialogManager dialogManager;
@Override
public View onCreateView(
- @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ @NonNull LayoutInflater inflater,
+ @Nullable ViewGroup container,
+ @Nullable Bundle savedInstanceState) {
binding = FragmentMainBinding.inflate(inflater, container, false);
return binding.getRoot();
}
@Override
@MainThread
- public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setupRecyclerView();
- final IconsAdapter adapter = new IconsAdapter();
- adapter.setOnItemClickListener(
- (model, itemView, position) -> {
- showImportIconDialog(model);
- });
- binding.searchEditText.addTextChangedListener(adapter);
- binding.iconsRecyclerView.setAdapter(adapter);
+ initViewsAndAdapter();
+ initViewModel();
+ observeUiState();
- binding.loadingProgressBar.setVisibility(View.VISIBLE);
- binding.iconsRecyclerView.setVisibility(View.GONE);
+ viewModel.loadIcons();
+ }
- binding.searchEditText.setEnabled(false);
+ private void initViewsAndAdapter() {
+ dialogManager = new IconImportDialogManager(requireContext(), getLayoutInflater());
- Main.getInstance()
- .getIconRepository()
- .loadAllIconsAsync(
- new IconRepository.LoadIconsCallback() {
+ adapter = new IconsAdapter();
+ adapter.setOnItemClickListener((model, itemView, position) -> showImportDialog(model));
- @Override
- public void onLoadded(List list) {
- binding.searchEditText.setEnabled(true);
- binding.loadingProgressBar.setVisibility(View.GONE);
- if (list != null && list.isEmpty()) {
- binding.emptyStateText.setVisibility(View.VISIBLE);
- } else {
- binding.iconsRecyclerView.setVisibility(View.VISIBLE);
- adapter.setOriginalList(list);
- if (list != null) {
- binding.searchInputLayout.setHint(
- "Search in " + list.size() + " icon");
- }
- }
- }
+ setupRecyclerView();
- @Override
- public void onError(Throwable th) {
- binding.loadingProgressBar.setVisibility(View.GONE);
- binding.emptyStateText.setVisibility(View.VISIBLE);
- binding.emptyStateText.setText("Error: " + th.getMessage());
- }
- });
+ binding.searchEditText.addTextChangedListener(adapter);
+ binding.iconsRecyclerView.setAdapter(adapter);
+ binding.searchInputLayout.setStartIconDrawable(R.drawable.ic_search);
+ binding.searchInputLayout.setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);
+ IconsRepositoryHelp.wireFieldIcons(binding.searchInputLayout, IconsRepositoryHelp.TAG_SEARCH);
}
private void setupRecyclerView() {
final RecyclerView recyclerView = binding.iconsRecyclerView;
- recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 4));
+ recyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 4));
recyclerView.setHasFixedSize(true);
recyclerView.setItemViewCacheSize(20);
-
- final RecyclerView.RecycledViewPool pool = new RecyclerView.RecycledViewPool();
- pool.setMaxRecycledViews(0, 30);
- recyclerView.setRecycledViewPool(pool);
}
- private void showImportIconDialog(@NonNull final IconModel model) {
-
- final DialogImportIconBinding dialogBinding =
- DialogImportIconBinding.inflate(getLayoutInflater());
- setupInputName(dialogBinding, model);
- setupColorsList(dialogBinding);
-
- final IdeProjectService projectService = Main.getInstance().getProjectService();
- final IProject currentProject = projectService.getCurrentProject();
-
- final MaterialAlertDialogBuilder dialog = new MaterialAlertDialogBuilder(requireContext());
- dialog.setTitle("Import vector icon");
- dialog.setView(dialogBinding.getRoot());
- dialog.setPositiveButton("Import", null);
- dialog.setNegativeButton("Cancel", null);
- final AlertDialog alertDialog = dialog.show();
-
- alertDialog
- .getButton(AlertDialog.BUTTON_POSITIVE)
- .setOnClickListener(
- v -> {
- boolean isValidName =
- Validator.validate(
- dialogBinding.inputName, List.of(new IconNameRule()));
- int selectedColorPosition =
- dialogBinding.txtListColors.getSelectedItemPosition();
- boolean isValidColor = selectedColorPosition > 1;
-
- if (selectedColorPosition == 0) {
- isValidColor = true;
- } else if (selectedColorPosition == 1) {
- isValidColor =
- Validator.validate(
- dialogBinding.inputColor,
- List.of(new HexColorRule()));
- }
- if (isValidName && isValidColor) {
-
- try {
- importVectorIcon(dialogBinding, currentProject, model);
- alertDialog.dismiss();
- } catch (Exception err) {
- Toast.makeText(
- getContext(),
- "Error : " + err.getMessage(),
- Toast.LENGTH_LONG)
- .show();
- }
- }
- });
+ private void initViewModel() {
+ IconRepository repository = Main.getInstance().getIconRepository();
+ MainViewModelFactory factory = new MainViewModelFactory(repository);
+ viewModel = new ViewModelProvider(this, factory).get(MainViewModel.class);
}
- private void importVectorIcon(
- DialogImportIconBinding dialogBinding, IProject currentProject, IconModel model)
- throws IllegalArgumentException {
-
- ImportParams params =
- new ImportParams(currentProject, new AssetIconSource(dialogBinding.inputName.getText().toString(),model.getData()), new AppPathResolver());
- params.useTint(resolveColorValue(dialogBinding));
- ImportIconResult result = new SvgToVectorImporter().importIcon(params);
- if (!result.isSuccess()) {
- throw new IllegalArgumentException(result.getMessage());
- }
+ private void observeUiState() {
+ viewModel.getUiState().observe(getViewLifecycleOwner(), this::renderUiState);
}
- private String resolveColorValue(DialogImportIconBinding dialogBinding) {
- int selectedColorPosition = dialogBinding.txtListColors.getSelectedItemPosition();
- if(selectedColorPosition > 1){
- DynamicColorHelper.ColorReferenceModel model = DynamicColorHelper.getDynamicColors().get(selectedColorPosition - 2);
- return model.getRef();
- }else if(selectedColorPosition == 1){
- return dialogBinding.inputColor.getText().toString();
+ private void renderUiState(@NonNull MainUiState state) {
+ switch (state.getStatus()) {
+ case LOADING:
+ showLoadingState();
+ break;
+ case SUCCESS:
+ showSuccessState(state);
+ break;
+ case EMPTY:
+ showEmptyState(getString(R.string.no_icons_found));
+ break;
+ case ERROR:
+ showEmptyState("Error: " + (state.getErrorMessage() != null ? state.getErrorMessage() : ""));
+ break;
}
- return null;
}
- private void setupInputName(DialogImportIconBinding dialogBinding, IconModel model) {
- dialogBinding.inputName.setText("ic_" + model.getIconName().replaceAll("-", "_"));
- dialogBinding.inputName.addTextChangedListener(
- new ValidationTextWatcher(dialogBinding.inputName, List.of(new IconNameRule())));
+ private void showLoadingState() {
+ binding.loadingProgressBar.setVisibility(View.VISIBLE);
+ binding.iconsRecyclerView.setVisibility(View.GONE);
+ binding.emptyStateText.setVisibility(View.GONE);
+ binding.searchEditText.setEnabled(false);
}
- private void setupColorsList(DialogImportIconBinding dialogBinding) {
- final MutableLiveData colorPreview =
- new MutableLiveData<>(
- DynamicColorHelper.resolveDynamicColor(
- getContext(),
- DynamicColorHelper.getColorModel(
- com.google.android.material.R.attr.colorOnSurface)));
+ private void showSuccessState(@NonNull MainUiState state) {
+ binding.loadingProgressBar.setVisibility(View.GONE);
+ binding.emptyStateText.setVisibility(View.GONE);
+ binding.iconsRecyclerView.setVisibility(View.VISIBLE);
+ binding.searchEditText.setEnabled(true);
- List colorsNames = DynamicColorHelper.getDisplayNames();
- colorsNames.add(0, "None");
- colorsNames.add(1, "Custom");
- dialogBinding.txtListColors.setAdapter(
- new ArrayAdapter<>(
- requireContext(), android.R.layout.simple_list_item_1, colorsNames));
- dialogBinding.txtListColors.setOnItemSelectedListener(
- new AdapterView.OnItemSelectedListener() {
- @Override
- public void onItemSelected(
- AdapterView> parent, View view, int position, long id) {
- dialogBinding.inputColorLayout.setVisibility(
- (position == 1) ? View.VISIBLE : View.GONE);
- try {
- if (position == 0) {
- colorPreview.postValue(Color.BLACK);
- } else if (position == 1) {
- colorPreview.postValue(
- Color.parseColor(
- String.valueOf(
- dialogBinding.inputColor.getText())));
- } else {
- colorPreview.postValue(
- DynamicColorHelper.resolveDynamicColor(
- getContext(),
- DynamicColorHelper.getColorModel(
- DynamicColorHelper.getDynamicColors()
- .get(Math.max(0, position - 2))
- .getAttrId())));
- }
- } catch (Exception e) {
- colorPreview.postValue(Color.BLACK);
- }
- }
+ adapter.setOriginalList(state.getIcons());
+ binding.searchInputLayout.setHint("Search in " + state.getIcons().size() + " icon");
+ }
- @Override
- public void onNothingSelected(AdapterView> parent) {}
- });
+ private void showEmptyState(String message) {
+ binding.loadingProgressBar.setVisibility(View.GONE);
+ binding.iconsRecyclerView.setVisibility(View.GONE);
+ binding.emptyStateText.setVisibility(View.VISIBLE);
+ binding.emptyStateText.setText(message);
+ binding.searchEditText.setEnabled(true);
+ }
- dialogBinding.inputColor.addTextChangedListener(
- new ValidationTextWatcher(
- dialogBinding.inputColor,
- List.of(new HexColorRule()),
- (text, state) -> {
- if (state) {
- colorPreview.postValue(Color.parseColor(text));
- }
- }));
+ private void showImportDialog(@NonNull IconModel model) {
+ IdeProjectService projectService = Main.getInstance().getProjectService();
+ IProject currentProject = projectService != null ? projectService.getCurrentProject() : null;
+ dialogManager.showImportDialog(model, currentProject);
+ }
- colorPreview.observeForever(
- value -> {
- dialogBinding.iconPreview.setColorFilter(value, PorterDuff.Mode.SRC_IN);
- });
+ @Override
+ public void onDestroyView() {
+ // RecyclerView only calls onDetachedFromRecyclerView when the adapter is removed,
+ // which is where IconsAdapter shuts down its executors.
+ if (binding != null) {
+ binding.searchEditText.removeTextChangedListener(adapter);
+ binding.iconsRecyclerView.setAdapter(null);
+ }
+ super.onDestroyView();
+ binding = null;
}
}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/PluginFragment.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/PluginFragment.java
index b760c4836..7f65609ba 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/PluginFragment.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/fragments/PluginFragment.java
@@ -4,10 +4,13 @@
import android.view.LayoutInflater;
import dev.omar.plugin.iconsrepo.Main;
import com.itsaky.androidide.plugins.base.PluginFragmentHelper;
+
+import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
public class PluginFragment extends Fragment {
+ @NonNull
@Override
public LayoutInflater onGetLayoutInflater(Bundle savedInstanceState) {
var inflater = super.onGetLayoutInflater(savedInstanceState);
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainUiState.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainUiState.java
new file mode 100644
index 000000000..6e1ebe486
--- /dev/null
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainUiState.java
@@ -0,0 +1,79 @@
+package dev.omar.plugin.iconsrepo.ui.viewmodel;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
+
+public class MainUiState {
+
+ public enum Status {
+ LOADING,
+ SUCCESS,
+ EMPTY,
+ ERROR
+ }
+
+ private final Status status;
+ private final List icons;
+ private final String errorMessage;
+
+ private MainUiState(@NonNull Status status, @NonNull List icons, @Nullable String errorMessage) {
+ this.status = status;
+ this.icons = icons;
+ this.errorMessage = errorMessage;
+ }
+
+ public static MainUiState loading() {
+ return new MainUiState(Status.LOADING, Collections.emptyList(), null);
+ }
+
+ public static MainUiState success(@NonNull List icons) {
+ if (icons.isEmpty()) {
+ return empty();
+ }
+ return new MainUiState(Status.SUCCESS, icons, null);
+ }
+
+ public static MainUiState empty() {
+ return new MainUiState(Status.EMPTY, Collections.emptyList(), null);
+ }
+
+ public static MainUiState error(@NonNull String errorMessage) {
+ return new MainUiState(Status.ERROR, Collections.emptyList(), errorMessage);
+ }
+
+ @NonNull
+ public Status getStatus() {
+ return status;
+ }
+
+ @NonNull
+ public List getIcons() {
+ return icons;
+ }
+
+ @Nullable
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ public boolean isLoading() {
+ return status == Status.LOADING;
+ }
+
+ public boolean isSuccess() {
+ return status == Status.SUCCESS;
+ }
+
+ public boolean isEmpty() {
+ return status == Status.EMPTY;
+ }
+
+ public boolean isError() {
+ return status == Status.ERROR;
+ }
+}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModel.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModel.java
new file mode 100644
index 000000000..c1e7af9ed
--- /dev/null
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModel.java
@@ -0,0 +1,46 @@
+package dev.omar.plugin.iconsrepo.ui.viewmodel;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+import java.util.List;
+
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
+import dev.omar.plugin.iconsrepo.data.repository.IconRepository;
+
+public class MainViewModel extends ViewModel {
+
+ private final IconRepository iconRepository;
+ private final MutableLiveData uiState = new MutableLiveData<>(MainUiState.loading());
+
+ public MainViewModel(@NonNull IconRepository iconRepository) {
+ this.iconRepository = iconRepository;
+ }
+
+ @NonNull
+ public LiveData getUiState() {
+ return uiState;
+ }
+
+ public void loadIcons() {
+ uiState.setValue(MainUiState.loading());
+ iconRepository.loadAllIconsAsync(new IconRepository.LoadIconsCallback() {
+ @Override
+ public void onLoaded(List list) {
+ if (list == null || list.isEmpty()) {
+ uiState.setValue(MainUiState.empty());
+ } else {
+ uiState.setValue(MainUiState.success(list));
+ }
+ }
+
+ @Override
+ public void onError(Throwable th) {
+ String msg = th != null && th.getMessage() != null ? th.getMessage() : "Unknown error";
+ uiState.setValue(MainUiState.error(msg));
+ }
+ });
+ }
+}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModelFactory.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModelFactory.java
new file mode 100644
index 000000000..1f03f0174
--- /dev/null
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModelFactory.java
@@ -0,0 +1,26 @@
+package dev.omar.plugin.iconsrepo.ui.viewmodel;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
+import dev.omar.plugin.iconsrepo.data.repository.IconRepository;
+
+public class MainViewModelFactory implements ViewModelProvider.Factory {
+
+ private final IconRepository repository;
+
+ public MainViewModelFactory(@NonNull IconRepository repository) {
+ this.repository = repository;
+ }
+
+ @NonNull
+ @Override
+ @SuppressWarnings("unchecked")
+ public T create(@NonNull Class modelClass) {
+ if (modelClass.isAssignableFrom(MainViewModel.class)) {
+ return (T) new MainViewModel(repository);
+ }
+ throw new IllegalArgumentException("Unknown ViewModel class: " + modelClass.getName());
+ }
+}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/DynamicColorHelper.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/DynamicColorHelper.java
index df391dc91..5c46f355d 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/DynamicColorHelper.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/DynamicColorHelper.java
@@ -1,7 +1,6 @@
package dev.omar.plugin.iconsrepo.utils;
import android.content.Context;
-import android.content.res.Resources;
import android.graphics.Color;
import android.util.TypedValue;
@@ -16,15 +15,27 @@ public final class DynamicColorHelper {
private DynamicColorHelper() {
// Prevent instantiation
}
-public static ColorReferenceModel getColorModel(int resAttr){
- for (ColorReferenceModel model :
- getDynamicColors()) {
- if (resAttr == model.getAttrId()){
- return model;
+
+ public static ColorReferenceModel getColorModel(int resAttr) {
+ for (ColorReferenceModel model : getDynamicColors()) {
+ if (resAttr == model.getAttrId()) {
+ return model;
+ }
}
+ return getDynamicColors().get(0);
}
- return getDynamicColors().get(0);
-}
+
+ @NonNull
+ public static ColorReferenceModel getDefaultColorModel() {
+ List colors = getDynamicColors();
+ for (ColorReferenceModel model : colors) {
+ if ("colorOnSurface".equals(model.getDisplayName())) {
+ return model;
+ }
+ }
+ return colors.get(0);
+ }
+
@NonNull
public static List getDynamicColors() {
return Arrays.asList(
@@ -126,7 +137,7 @@ public static List getDynamicColors() {
* @return The resolved color integer, or {@link Color#BLACK} if resolution fails.
*/
public static int resolveDynamicColor(Context context, @NonNull ColorReferenceModel model) {
- if(context != null){
+ if (context != null) {
Integer attrId = model.getAttrId();
if (attrId != null) {
TypedValue typedValue = new TypedValue();
@@ -179,6 +190,7 @@ public String getDisplayName() {
return displayName;
}
+ @NonNull
@Override
public String toString() {
return "ColorReferenceModel{"
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndex.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndex.java
index 9e1194be8..cf3b71c16 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndex.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndex.java
@@ -39,7 +39,7 @@ public List search(String query) {
String normalizedQuery = query.toLowerCase().trim();
if (searchCache.containsKey(normalizedQuery)) {
- return new ArrayList<>(searchCache.get(normalizedQuery));
+ return new ArrayList<>(Objects.requireNonNull(searchCache.get(normalizedQuery)));
}
Set resultSet = new HashSet<>();
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndexV2.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndexV2.java
new file mode 100644
index 000000000..772017b6f
--- /dev/null
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndexV2.java
@@ -0,0 +1,189 @@
+package dev.omar.plugin.iconsrepo.utils;
+
+import java.util.*;
+
+public class FastSearchIndexV2 {
+
+
+ private static final class IntList {
+ int[] data = new int[4];
+ int size;
+
+ void add(int v) {
+ if (size == data.length) {
+ data = Arrays.copyOf(data, data.length * 2);
+ }
+ data[size++] = v;
+ }
+ }
+
+
+ private final List allNames;
+ private final String[] normalized; // الأسماء مُجهّزة مسبقاً
+ private final Map prefixMap; // بادئات الكلمات
+ private final Map wordMap; // الكلمات الكاملة (البحث في أي مكان)
+ private final Map cache; // الكاش يخزن BitSet (أصغر بكثير)
+ private static final int MAX_CACHE = 100;
+
+ public FastSearchIndexV2(List names) {
+ this.allNames = new ArrayList<>(names);
+ this.normalized = new String[names.size()];
+ this.prefixMap = new HashMap<>();
+ this.wordMap = new HashMap<>();
+ this.cache = new LinkedHashMap(16, 0.75f, true) {
+ @Override
+ protected boolean removeEldestEntry(Map.Entry eldest) {
+ return size() > MAX_CACHE;
+ }
+ };
+ buildIndex();
+ }
+
+ private void buildIndex() {
+ for (int i = 0; i < allNames.size(); i++) {
+ // تخزين النسخة المُحسّنة مرة واحدة فقط
+ String norm = allNames.get(i).toLowerCase(Locale.ROOT).trim();
+ normalized[i] = norm;
+
+ // تقسيم ذكي: يفصل بالمسافات والنقاط والشرطات والشرطات السفلية
+ // مثال: "ic_home_outline" → ["ic", "home", "outline"]
+ String[] words = norm.split("[\\s._-]+");
+
+ for (String word : words) {
+ if (word.isEmpty()) continue;
+
+ // فهرس الكلمات الكاملة (للبحث في أي مكان)
+ addToMap(wordMap, word, i);
+
+ // فهرس البادئات (للبحث الفوري بالبادئة)
+ for (int len = 1; len <= word.length(); len++) {
+ addToMap(prefixMap, word.substring(0, len), i);
+ }
+ }
+ }
+ }
+
+ private void addToMap(Map map, String key, int idx) {
+ IntList list = map.get(key);
+ if (list == null) {
+ list = new IntList();
+ map.put(key, list);
+ }
+ list.add(idx);
+ }
+
+ // ========== 3. البحث المتقدم ==========
+ public List search(String query) {
+ if (query == null || query.trim().isEmpty()) {
+ return getAllIndices();
+ }
+
+ String q = query.toLowerCase(Locale.ROOT).trim();
+
+ // التحقق من الكاش
+ BitSet cached = cache.get(q);
+ if (cached != null) {
+ return bitSetToList(cached);
+ }
+
+ // تحليل الاستعلام: دعم - للاستبعاد
+ String[] parts = q.split("\\s+");
+ List mustHave = new ArrayList<>();
+ List mustNot = new ArrayList<>();
+
+ for (String part : parts) {
+ if (part.startsWith("-") && part.length() > 1) {
+ mustNot.add(part.substring(1)); // استبعاد
+ } else {
+ mustHave.add(part); // تضمين
+ }
+ }
+
+ // ========== منطق AND للتضمين ==========
+ BitSet result = null;
+
+ for (String term : mustHave) {
+ BitSet matches = findBitSet(term);
+ if (matches == null) {
+ return new ArrayList<>(); // كلمة مطلوبة غير موجودة
+ }
+
+ if (result == null) {
+ result = (BitSet) matches.clone();
+ } else {
+ result.and(matches); // تقاطع (AND)
+ }
+
+ if (result.isEmpty()) {
+ return new ArrayList<>(); // لا يوجد تقاطع
+ }
+ }
+
+ // إذا لم يُدخل المستخدم كلمات تضمين، ابدأ بكل النتائج
+ if (result == null) {
+ result = new BitSet(allNames.size());
+ result.set(0, allNames.size());
+ }
+
+ // ========== منطق NOT للاستبعاد ==========
+ for (String term : mustNot) {
+ BitSet matches = findBitSet(term);
+ if (matches != null) {
+ result.andNot(matches); // استبعاد
+ }
+ }
+
+ // تخزين في الكاش وإرجاع
+ cache.put(q, (BitSet) result.clone());
+ return bitSetToList(result);
+ }
+
+ // ========== 4. البحث الهرمي (أسرع → أبطأ) ==========
+ private BitSet findBitSet(String term) {
+ // المرحلة 1: البحث في بادئات الكلمات (O(1) - فوري)
+ IntList list = prefixMap.get(term);
+
+ // المرحلة 2: البحث في الكلمات الكاملة (O(1))
+ if (list == null) {
+ list = wordMap.get(term);
+ }
+
+ // المرحلة 3: البحث في أي مكان (Contains - أبطأ لكن نادر)
+ if (list == null) {
+ list = containsSearch(term);
+ if (list == null) return null;
+ }
+
+ // تحويل IntList إلى BitSet (سريع جداً)
+ BitSet bs = new BitSet(allNames.size());
+ for (int i = 0; i < list.size; i++) {
+ bs.set(list.data[i]);
+ }
+ return bs;
+ }
+
+ // بحث Contains (أي مكان في الاسم) - نادر الاستخدام
+ private IntList containsSearch(String term) {
+ IntList result = new IntList();
+ for (int i = 0; i < normalized.length; i++) {
+ if (normalized[i].contains(term)) {
+ result.add(i);
+ }
+ }
+ return result.size > 0 ? result : null;
+ }
+
+ private List getAllIndices() {
+ List all = new ArrayList<>(allNames.size());
+ for (int i = 0; i < allNames.size(); i++) all.add(i);
+ return all;
+ }
+
+ private List bitSetToList(BitSet bs) {
+ List list = new ArrayList<>(bs.cardinality());
+ for (int i = bs.nextSetBit(0); i >= 0; i = bs.nextSetBit(i + 1)) {
+ list.add(i);
+ }
+ return list;
+ }
+}
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/IconTrie.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/IconTrie.java
index 6d9b38ac9..34ce80aa9 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/IconTrie.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/IconTrie.java
@@ -1,10 +1,11 @@
package dev.omar.plugin.iconsrepo.utils;
+import androidx.annotation.NonNull;
import androidx.collection.ArrayMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import dev.omar.plugin.iconsrepo.models.IconModel;
+import dev.omar.plugin.iconsrepo.data.models.IconModel;
public class IconTrie {
@@ -19,14 +20,14 @@ public void clear() {
root = new Node();
}
- public void build(List icons) {
+ public void build(@NonNull List icons) {
clear();
for (IconModel icon : icons) {
insert(icon);
}
}
- private void insert(IconModel model) {
+ private void insert(@NonNull IconModel model) {
String name = model.getIconName().toLowerCase(Locale.ROOT);
Node current = root;
for (int i = 0; i < name.length(); i++) {
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/ImageUtils.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/ImageUtils.java
index d5e045184..65ba8b483 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/ImageUtils.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/ImageUtils.java
@@ -7,13 +7,14 @@
import android.util.Config;
import android.graphics.drawable.Drawable;
+import androidx.annotation.NonNull;
+
public final class ImageUtils {
public static Bitmap drawable2Bitmap(Drawable drawable) {
Bitmap createBitmap;
Canvas canvas;
- if (drawable instanceof BitmapDrawable) {
- BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
+ if (drawable instanceof BitmapDrawable bitmapDrawable) {
if (bitmapDrawable.getBitmap() != null) {
return bitmapDrawable.getBitmap();
}
@@ -46,7 +47,8 @@ public static Bitmap drawable2Bitmap(Drawable drawable) {
return createBitmap;
}
- public static Bitmap drawColor(Bitmap bitmap, int color) {
+ @NonNull
+ public static Bitmap drawColor(@NonNull Bitmap bitmap, int color) {
Paint paint = new Paint(1);
paint.setColor(color);
Bitmap createBitmap =
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/SvgUtils.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/SvgUtils.java
index 5741df59c..3178bd96e 100644
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/SvgUtils.java
+++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/SvgUtils.java
@@ -1,10 +1,12 @@
-package pro.sketchware.utility;
+package dev.omar.plugin.iconsrepo.utils;
import android.util.Log;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import org.jetbrains.annotations.Contract;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserFactory;
import org.xmlpull.v1.XmlSerializer;
@@ -128,7 +130,7 @@ private boolean shouldApplyFillColor(String tag) {
|| "ellipse".equals(tag) || "polygon".equals(tag) || "polyline".equals(tag);
}
- private boolean hasFillAttribute(XmlPullParser parser) {
+ private boolean hasFillAttribute(@NonNull XmlPullParser parser) {
for (int i = 0; i < parser.getAttributeCount(); i++) {
if ("fill".equals(parser.getAttributeName(i))) {
return true;
@@ -152,7 +154,9 @@ private static class SvgAttributes {
}
}
- private SvgAttributes extractSvgAttributes(XmlPullParser parser) throws Exception {
+ @NonNull
+ @Contract("_ -> new")
+ private SvgAttributes extractSvgAttributes(@NonNull XmlPullParser parser) throws Exception {
while (parser.getEventType() != XmlPullParser.START_TAG || !"svg".equals(parser.getName())) {
parser.next();
}
@@ -192,8 +196,8 @@ private SvgAttributes extractSvgAttributes(XmlPullParser parser) throws Exceptio
return new SvgAttributes(width, height, viewportWidth, viewportHeight);
}
- private void writeVectorDrawable(XmlSerializer serializer, SvgAttributes attributes,
- XmlPullParser parser, @Nullable String customFillColor) throws Exception {
+ private void writeVectorDrawable(@NonNull XmlSerializer serializer, @NonNull SvgAttributes attributes,
+ @NonNull XmlPullParser parser, @Nullable String customFillColor) throws Exception {
serializer.startDocument("UTF-8", true);
serializer.startTag(null, "vector");
@@ -236,7 +240,7 @@ private void writeVectorDrawable(XmlSerializer serializer, SvgAttributes attribu
serializer.endDocument();
}
- private void writePath(XmlSerializer serializer, XmlPullParser parser,
+ private void writePath(XmlSerializer serializer, @NonNull XmlPullParser parser,
@Nullable String inheritedFill) throws Exception {
String pathData = parser.getAttributeValue(null, "d");
String fill = parser.getAttributeValue(null, "fill");
@@ -266,7 +270,7 @@ private void writePath(XmlSerializer serializer, XmlPullParser parser,
}
}
- private void writePathFromData(XmlSerializer serializer, String pathData,
+ private void writePathFromData(@NonNull XmlSerializer serializer, String pathData,
@Nullable String fill) throws Exception {
serializer.startTag(null, "path");
serializer.attribute(null, "android:pathData", pathData);
@@ -274,7 +278,7 @@ private void writePathFromData(XmlSerializer serializer, String pathData,
serializer.endTag(null, "path");
}
- private String convertShapeToPath(XmlPullParser parser) {
+ private String convertShapeToPath(@NonNull XmlPullParser parser) {
String tagName = parser.getName();
switch (tagName) {
case "circle":
@@ -310,12 +314,15 @@ private float safeParseFloat(String s) {
}
}
+ @NonNull
+ @Contract(pure = true)
private String createCirclePath(float cx, float cy, float r) {
return "M " + (cx - r) + "," + cy +
" A " + r + "," + r + " 0 0 1 " + (cx + r) + "," + cy +
" A " + r + "," + r + " 0 0 1 " + (cx - r) + "," + cy + " Z";
}
+ @NonNull
private String createRectPath(float x, float y, float width, float height,
float rx, float ry) {
if (rx <= 0f && ry <= 0f) {
@@ -335,6 +342,8 @@ private String createRectPath(float x, float y, float width, float height,
}
}
+ @NonNull
+ @Contract(pure = true)
private String createEllipsePath(float cx, float cy, float rx, float ry) {
return "M " + (cx - rx) + "," + cy +
" A " + rx + "," + ry + " 0 0 1 " + (cx + rx) + "," + cy +
diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/Utils.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/Utils.java
deleted file mode 100644
index 842b7fda6..000000000
--- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/Utils.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package dev.omar.plugin.iconsrepo.utils;
-import android.content.ClipboardManager;
-import android.content.Context;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public final class Utils {
-
- private Utils() {
-
- }
- public static CharSequence getClipboardText(Context context) {
- ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
- if(cm.hasPrimaryClip()){
- return cm.getPrimaryClip().getItemAt(0).getText();
- }
- return null;
- }
-
- public static byte[] readAllBytes(InputStream in) throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte[] buffer = new byte[4096];
- int len;
- while ((len = in.read(buffer)) != -1) {
- out.write(buffer, 0, len);
- }
- return out.toByteArray();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/Icons-Repository/src/main/res/layout/dialog_import_icon.xml b/plugins/Icons-Repository/src/main/res/layout/dialog_import_icon.xml
index fa23cf237..bc601c25a 100644
--- a/plugins/Icons-Repository/src/main/res/layout/dialog_import_icon.xml
+++ b/plugins/Icons-Repository/src/main/res/layout/dialog_import_icon.xml
@@ -1,96 +1,174 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingStart="24dp"
+ android:paddingEnd="24dp"
+ android:paddingTop="12dp"
+ android:paddingBottom="16dp"
+ android:animateLayoutChanges="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/Icons-Repository/src/main/res/layout/fragment_main.xml b/plugins/Icons-Repository/src/main/res/layout/fragment_main.xml
index d4fff06e1..dd45a94e3 100644
--- a/plugins/Icons-Repository/src/main/res/layout/fragment_main.xml
+++ b/plugins/Icons-Repository/src/main/res/layout/fragment_main.xml
@@ -4,12 +4,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="match_parent"
android:orientation="vertical"
- android:background="?colorSurface"
+ android:layout_height="match_parent"
+ android:background="?attr/colorSurface"
android:padding="16dp">
-
+
-
+ android:layout_width="match_parent">
-
-
-
+ android:visibility="visible" />
-
+ android:padding="12dp"
+ tools:ignore="UselessParent">
@@ -36,7 +39,8 @@
android:maxLines="2"
android:ellipsize="end"
android:textSize="11sp"
- android:text="Home" />
+ android:text="Home"
+ tools:ignore="HardcodedText" />
diff --git a/plugins/Icons-Repository/src/main/res/values-night/theme_overlays.xml b/plugins/Icons-Repository/src/main/res/values-night/theme_overlays.xml
deleted file mode 100644
index a7b3afec8..000000000
--- a/plugins/Icons-Repository/src/main/res/values-night/theme_overlays.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
diff --git a/plugins/Icons-Repository/src/main/res/values-night/themes.xml b/plugins/Icons-Repository/src/main/res/values-night/themes.xml
index ff92d6d3d..d83be07de 100644
--- a/plugins/Icons-Repository/src/main/res/values-night/themes.xml
+++ b/plugins/Icons-Repository/src/main/res/values-night/themes.xml
@@ -1,5 +1,5 @@
-
-
-
diff --git a/plugins/Icons-Repository/src/main/res/values/themes.xml b/plugins/Icons-Repository/src/main/res/values/themes.xml
index ff92d6d3d..d83be07de 100644
--- a/plugins/Icons-Repository/src/main/res/values/themes.xml
+++ b/plugins/Icons-Repository/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
-