From b6cfeb730aa48f0b790a97e3440d2a3d31bfb7d7 Mon Sep 17 00:00:00 2001 From: yaturner Date: Fri, 13 Nov 2026 11:24:01 -0800 Subject: [PATCH 1/5] ADFA-6655 | Import Icons Repository source from upstream e083ffa Copy src/ verbatim from omar-haidar/IconsRepository-Plugin at e083ffa (2026-10-22). The addons copy was last synced from upstream 252e73a (2026-05-19). Upstream adds a view-model layer, ModuleDiscoveryEngine, IconImportDialogManager and FastSearchIndexV2, and moves models/ and repository/ under data/. This commit is the unmodified upstream source only, so the next commit shows exactly what addons changes on top. It drops the addons lifecycle fixes and manifest entries; the next commit restores them. Build files are untouched here, so this commit alone does not build. Co-Authored-By: Claude Opus 5.5 --- .../src/main/AndroidManifest.xml | 26 +- .../dev/omar/plugin/iconsrepo/BasePlugin.java | 30 +- .../java/dev/omar/plugin/iconsrepo/Main.java | 27 +- .../data/importer/AppPathResolver.java | 133 ++++---- .../data/importer/AssetIconSource.java | 6 +- .../data/importer/ImportIconResult.java | 26 +- .../iconsrepo/data/importer/ImportParams.java | 7 +- .../data/importer/ImportPathResolver.java | 8 +- .../data/importer/ModuleDiscoveryEngine.java | 249 +++++++++++++++ .../data/importer/SvgToVectorImporter.java | 54 +++- .../{ => data}/models/IconModel.java | 21 +- .../{ => data}/repository/IconRepository.java | 68 ++-- .../data/validation/IconNameRule.java | 2 +- .../validation/ValidationTextWatcher.java | 6 +- .../iconsrepo/domain/IconImportUseCase.java | 56 ++++ .../ui/adapter/IconModelDiffCallback.java | 2 +- .../iconsrepo/ui/adapter/IconViewHolder.java | 98 +++--- .../iconsrepo/ui/adapter/IconsAdapter.java | 38 +-- .../ui/dialog/IconImportDialogManager.java | 237 ++++++++++++++ .../iconsrepo/ui/fragments/MainFragment.java | 290 +++++------------- .../ui/fragments/PluginFragment.java | 3 + .../iconsrepo/ui/viewmodel/MainUiState.java | 79 +++++ .../iconsrepo/ui/viewmodel/MainViewModel.java | 46 +++ .../ui/viewmodel/MainViewModelFactory.java | 26 ++ .../iconsrepo/utils/DynamicColorHelper.java | 30 +- .../iconsrepo/utils/FastSearchIndex.java | 2 +- .../iconsrepo/utils/FastSearchIndexV2.java | 189 ++++++++++++ .../omar/plugin/iconsrepo/utils/IconTrie.java | 7 +- .../plugin/iconsrepo/utils/ImageUtils.java | 8 +- .../omar/plugin/iconsrepo/utils/SvgUtils.java | 25 +- .../omar/plugin/iconsrepo/utils/Utils.java | 32 -- .../main/res/layout/dialog_import_icon.xml | 260 ++++++++++------ .../src/main/res/layout/fragment_main.xml | 25 +- .../src/main/res/layout/item_icon.xml | 10 +- .../main/res/values-night/theme_overlays.xml | 98 ------ .../src/main/res/values-night/themes.xml | 2 +- .../src/main/res/values/colors.xml | 2 +- .../src/main/res/values/strings.xml | 10 +- .../src/main/res/values/theme_overlays.xml | 98 ------ .../src/main/res/values/themes.xml | 2 +- 40 files changed, 1486 insertions(+), 852 deletions(-) create mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ModuleDiscoveryEngine.java rename plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/{ => data}/models/IconModel.java (75%) rename plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/{ => data}/repository/IconRepository.java (61%) create mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/domain/IconImportUseCase.java create mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/dialog/IconImportDialogManager.java create mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainUiState.java create mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModel.java create mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/viewmodel/MainViewModelFactory.java create mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/FastSearchIndexV2.java delete mode 100644 plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/utils/Utils.java delete mode 100644 plugins/Icons-Repository/src/main/res/values-night/theme_overlays.xml delete mode 100644 plugins/Icons-Repository/src/main/res/values/theme_overlays.xml diff --git a/plugins/Icons-Repository/src/main/AndroidManifest.xml b/plugins/Icons-Repository/src/main/AndroidManifest.xml index da4eb5f76..e806aca25 100644 --- a/plugins/Icons-Repository/src/main/AndroidManifest.xml +++ b/plugins/Icons-Repository/src/main/AndroidManifest.xml @@ -1,9 +1,11 @@ - + + android:label="IconsRepository" + android:theme="@style/PluginTheme" + tools:ignore="MissingApplicationIcon"> - + android:value="IconsRepository" /> + @@ -23,11 +25,11 @@ android:value="assets/icon_night.png" /> + android:value="2.0.3" /> + android:value="A plugin to help add drawable icons to your Android project on the `CodeOnTheGo` IDE." /> - - + android:value="26.42" /> - - diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/BasePlugin.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/BasePlugin.java index 55fc072bf..fb9eb2c87 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/BasePlugin.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/BasePlugin.java @@ -1,8 +1,9 @@ package dev.omar.plugin.iconsrepo; import android.content.Context; -import android.view.LayoutInflater; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.itsaky.androidide.plugins.IPlugin; @@ -16,12 +17,12 @@ import com.itsaky.androidide.plugins.extensions.FabAction; import com.itsaky.androidide.plugins.extensions.MenuItem; import com.itsaky.androidide.plugins.extensions.NavigationItem; -import com.itsaky.androidide.plugins.extensions.ProjectType; import com.itsaky.androidide.plugins.extensions.TabItem; import com.itsaky.androidide.plugins.extensions.ToolbarAction; import com.itsaky.androidide.plugins.extensions.UIExtension; import com.itsaky.androidide.plugins.services.IdeProjectService; + import java.util.Collections; import java.util.List; import java.util.Set; @@ -33,7 +34,7 @@ public abstract class BasePlugin implements IPlugin, UIExtension, EditorTabExten @Override - public boolean initialize(PluginContext context) { + public boolean initialize(@NonNull PluginContext context) { try { this.context = context; this.projectService = getServices().get(IdeProjectService.class); @@ -83,16 +84,15 @@ public boolean deactivate() { } @Override - public void dispose() { - projectService = null; - context = null; - } + public void dispose() {} + @Nullable @Override public List getMainEditorTabs() { return null; } + @Nullable @Override public List getSideMenuItems() { return null; @@ -100,41 +100,47 @@ public List getSideMenuItems() { @Override - public void onEditorTabSelected(String tabId, Fragment fragment) {} + public void onEditorTabSelected(@NonNull String tabId, @NonNull Fragment fragment) {} @Override - public void onEditorTabClosed(String tabId) {} + public void onEditorTabClosed(@NonNull String tabId) {} @Override - public boolean canCloseEditorTab(String tabId) { + public boolean canCloseEditorTab(@NonNull String tabId) { return true; } + @Nullable @Override public List getMainMenuItems() { return null; } + @Nullable @Override - public List getContextMenuItems(ContextMenuContext _context) { + public List getContextMenuItems(@NonNull ContextMenuContext _context) { return null; } + @Nullable @Override public List getEditorTabs() { return null; } + @Nullable @Override public List getToolbarActions() { return null; } + @Nullable @Override public List getFabActions() { return null; } - + @NonNull + @Override public Set getHiddenToolbarActionIds() { return Collections.emptySet(); } diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java index 4d2d0c0e5..3e49c2c64 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java @@ -1,18 +1,19 @@ package dev.omar.plugin.iconsrepo; +import androidx.annotation.NonNull; + import com.itsaky.androidide.plugins.PluginContext; import com.itsaky.androidide.plugins.extensions.EditorTabItem; import com.itsaky.androidide.plugins.extensions.NavigationItem; import com.itsaky.androidide.plugins.services.IdeEditorTabService; -import dev.omar.plugin.iconsrepo.repository.IconRepository; +import dev.omar.plugin.iconsrepo.data.repository.IconRepository; import dev.omar.plugin.iconsrepo.ui.fragments.MainFragment; -import java.io.File; -import java.io.FileWriter; import java.util.Collections; import java.util.List; +import java.util.Set; public class Main extends BasePlugin { @@ -26,6 +27,7 @@ public static Main getInstance() { return instance; } + @NonNull @Override public List getMainEditorTabs() { return Collections.singletonList( @@ -33,9 +35,7 @@ public List getMainEditorTabs() { PLUGIN_ID, "Icons Repository", R.drawable.ic_category, - () -> { - return new MainFragment(); - }, + MainFragment::new, true, false, 10, @@ -44,6 +44,7 @@ public List getMainEditorTabs() { "No description")); } + @NonNull @Override public List getSideMenuItems() { return Collections.singletonList( @@ -82,17 +83,7 @@ private void openFragment() { @Override public void onInitialized(PluginContext context) { instance = this; - - } - - @Override - public void dispose() { - if (iconRepository != null) { - iconRepository.shutdown(); - iconRepository = null; - } - instance = null; - super.dispose(); + } @Override @@ -106,4 +97,6 @@ public IconRepository getIconRepository() { } return iconRepository; } + + } diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AppPathResolver.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AppPathResolver.java index 10fc3d8b7..42fe27b74 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AppPathResolver.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AppPathResolver.java @@ -2,94 +2,105 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.itsaky.androidide.plugins.extensions.IModule; -import com.itsaky.androidide.plugins.extensions.ModuleType; -import com.itsaky.androidide.plugins.extensions.SourceSet; -import com.itsaky.androidide.plugins.extensions.ProjectType; import com.itsaky.androidide.plugins.extensions.IProject; +import com.itsaky.androidide.plugins.extensions.SourceSet; + import java.io.File; -import dev.omar.plugin.iconsrepo.data.importer.ImportPathResolver; +import java.util.ArrayList; import java.util.Collections; import java.util.List; public class AppPathResolver implements ImportPathResolver { + public static final String TARGET_ALL_MODULES = "ALL"; + + private final String targetModuleName; + + public AppPathResolver() { + this(null); + } + + public AppPathResolver(@Nullable String targetModuleName) { + this.targetModuleName = targetModuleName; + } + @Override public File getDrawableDirectory(IProject project) { - File file = new File(getDrawablePath(project)); - if(!file.exists() && file.canWrite()){ - file.mkdirs(); + List dirs = getDrawableDirectories(project); + if (!dirs.isEmpty()) { + return dirs.get(0); } - return file; + File fallback = new File(project.getRootDir(), "app/src/main/res/drawable"); + if (!fallback.exists() && fallback.getParentFile() != null) { + fallback.mkdirs(); + } + return fallback; } - @NonNull - private String getDrawablePath(IProject project) { - return new File(getResDir(project), "drawable").getAbsolutePath(); - } + @Override + public List getDrawableDirectories(IProject project) { + if (project == null) { + return Collections.emptyList(); + } - @Nullable - private IModule getAppModule(@NonNull IProject project) { - if (project.getType() == ProjectType.GRADLE_PLUGIN) { - return new IModule() { - @NonNull - @Override - public String getName() { - return project.getName(); - } + List availableModules = getAvailableModules(project); + List targetDirectories = new ArrayList<>(); - @NonNull - @Override - public ModuleType getType() { - return ModuleType.ANDROID_APP; - } + boolean isAllModules = targetModuleName == null + || TARGET_ALL_MODULES.equalsIgnoreCase(targetModuleName) + || targetModuleName.startsWith("All modules") + || targetModuleName.startsWith("جميع"); - @NonNull - @Override - public File getProjectDir() { - return project.getRootDir(); + for (IModule module : availableModules) { + if (isAllModules || matchesModuleName(module, targetModuleName)) { + File drawableDir = getDrawableDirForModule(module); + if (drawableDir != null) { + if (!drawableDir.exists() && drawableDir.getParentFile() != null && drawableDir.getParentFile().canWrite()) { + drawableDir.mkdirs(); + } + targetDirectories.add(drawableDir); } + } + } - @NonNull - @Override - public List getSourceSets() { - File main = new File(getProjectDir(), "src/main"); - return Collections.singletonList( - new SourceSet( - main.getName(), - List.of(new File(main, "java")), - List.of(new File(main, "res")))); - } - }; - } else { - for (IModule module : project.getModules()) { - if (module.getName().equals("app")) { - return module; - } + if (targetDirectories.isEmpty()) { + File fallback = new File(project.getRootDir(), "app/src/main/res/drawable"); + if (!fallback.exists() && fallback.getParentFile() != null && fallback.getParentFile().canWrite()) { + fallback.mkdirs(); } + targetDirectories.add(fallback); } - return null; + return targetDirectories; } - @Nullable - private SourceSet getMainSourceSet(@NonNull IModule module) { - for (SourceSet source : module.getSourceSets()) { - if (source.getName().equals("main")) { - return source; - } - } - return null; + @NonNull + public static List getAvailableModules(@Nullable IProject project) { + return ModuleDiscoveryEngine.discoverModules(project); + } + + private static boolean matchesModuleName(@NonNull IModule module, @NonNull String target) { + return ModuleDiscoveryEngine.matchesModuleName(module, target); } @Nullable - private File getResDir(IProject project) { - SourceSet source = getMainSourceSet(getAppModule(project)); - for (File file : source.getResourceDirs()) { - if (file.getName().equals("res")) { - return file; + public static File getDrawableDirForModule(@NonNull IModule module) { + if (module.getSourceSets() != null) { + for (SourceSet source : module.getSourceSets()) { + if ("main".equalsIgnoreCase(source.getName())) { + if (source.getResourceDirs() != null) { + for (File resDir : source.getResourceDirs()) { + if (resDir != null && ("res".equalsIgnoreCase(resDir.getName()) || resDir.getPath().endsWith("res"))) { + return new File(resDir, "drawable"); + } + } + } + } } } - return null; + File mainResDir = new File(module.getProjectDir(), "src/main/res"); + return new File(mainResDir, "drawable"); } } diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AssetIconSource.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AssetIconSource.java index 2688a5fac..d4dbe3bdb 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AssetIconSource.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/AssetIconSource.java @@ -1,15 +1,15 @@ package dev.omar.plugin.iconsrepo.data.importer; import dev.omar.plugin.iconsrepo.data.importer.IconSource; -import dev.omar.plugin.iconsrepo.models.IconModel; +import dev.omar.plugin.iconsrepo.data.models.IconModel; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.IOException; public class AssetIconSource implements IconSource { - private String name; - private byte[] data; + private final String name; + private final byte[] data; public AssetIconSource(String name, byte[] data) { this.name = name; diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportIconResult.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportIconResult.java index 3b62b5a5c..a2e846a9e 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportIconResult.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportIconResult.java @@ -4,37 +4,21 @@ import org.jetbrains.annotations.Contract; -public class ImportIconResult { - private boolean isSuccess; - private String message; - +public record ImportIconResult(boolean isSuccess, String message) { public ImportIconResult(boolean isSucces) { - this(isSucces,null); - } - - public ImportIconResult(boolean isSucces, String message) { - this.isSuccess = isSucces; - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public String getMessage() { - return message; + this(isSucces, null); } @NonNull @Contract(value = " -> new", pure = true) - public static ImportIconResult success(){ + public static ImportIconResult success() { return new ImportIconResult(true); } @NonNull @Contract(value = "_ -> new", pure = true) - public static ImportIconResult error(String error){ - return new ImportIconResult(false,error); + public static ImportIconResult error(String error) { + return new ImportIconResult(false, error); } } diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportParams.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportParams.java index a4907cbd2..a97c52785 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportParams.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportParams.java @@ -1,7 +1,6 @@ package dev.omar.plugin.iconsrepo.data.importer; import com.itsaky.androidide.plugins.extensions.IProject; -import dev.omar.plugin.iconsrepo.data.importer.IconSource; public class ImportParams { @@ -9,11 +8,17 @@ public class ImportParams { public IProject currentProject; public IconSource source; public ImportPathResolver dest; + public String targetModule; public ImportParams(IProject currentProject, IconSource source, ImportPathResolver dest) { + this(currentProject, source, dest, null); + } + + public ImportParams(IProject currentProject, IconSource source, ImportPathResolver dest, String targetModule) { this.currentProject = currentProject; this.source = source; this.dest = dest; + this.targetModule = targetModule; } public ImportParams useTint(String tint) { diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportPathResolver.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportPathResolver.java index a1ec3bb16..fd02e5fdc 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportPathResolver.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ImportPathResolver.java @@ -1,8 +1,12 @@ package dev.omar.plugin.iconsrepo.data.importer; + import com.itsaky.androidide.plugins.extensions.IProject; import java.io.File; +import java.util.List; public interface ImportPathResolver { - File getDrawableDirectory(IProject project); -} \ No newline at end of file + File getDrawableDirectory(IProject project); + + List getDrawableDirectories(IProject project); +} diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ModuleDiscoveryEngine.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ModuleDiscoveryEngine.java new file mode 100644 index 000000000..6a932cabe --- /dev/null +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/ModuleDiscoveryEngine.java @@ -0,0 +1,249 @@ +package dev.omar.plugin.iconsrepo.data.importer; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +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.SourceSet; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class ModuleDiscoveryEngine { + + private static final Pattern INCLUDE_PATTERN = + Pattern.compile("include\\s*\\(?\\s*([^\\)]+)", Pattern.CASE_INSENSITIVE); + private static final Pattern QUOTED_MODULE_PATTERN = + Pattern.compile("['\"](:[a-zA-Z0-9_:-]+)['\"]"); + + @NonNull + public static List discoverModules(@Nullable IProject project) { + if (project == null) { + return Collections.emptyList(); + } + + Map moduleMap = new LinkedHashMap<>(); + File rootDir = project.getRootDir(); + if (rootDir == null) { + return Collections.emptyList(); + } + + String rootModuleName = ":" + getProjectName(project, rootDir); + + try { + List ideModules = project.getModules(); + if (ideModules != null) { + for (IModule module : ideModules) { + if (module != null && module.getName() != null) { + String name = module.getName(); + if ("app".equalsIgnoreCase(name) && !new File(rootDir, "app").exists() && isValidAndroidModuleDir(rootDir)) { + moduleMap.put(rootModuleName, createSyntheticModule(rootModuleName, rootDir)); + } else { + String normName = normalizeModuleName(name); + moduleMap.put(normName, module); + } + } + } + } + } catch (Exception ignored) { + } + + Map settingsModules = parseSettingsGradle(rootDir); + for (Map.Entry entry : settingsModules.entrySet()) { + String normName = entry.getKey(); + File moduleDir = entry.getValue(); + if (!moduleMap.containsKey(normName) && isValidAndroidModuleDir(moduleDir)) { + moduleMap.put(normName, createSyntheticModule(normName, moduleDir)); + } + } + + Map fsModules = new LinkedHashMap<>(); + scanFileSystemModules(rootDir, rootDir, fsModules, 5); + for (Map.Entry entry : fsModules.entrySet()) { + String normName = entry.getKey(); + File moduleDir = entry.getValue(); + if (!moduleMap.containsKey(normName)) { + moduleMap.put(normName, createSyntheticModule(normName, moduleDir)); + } + } + + if (isValidAndroidModuleDir(rootDir) && !moduleMap.containsKey(rootModuleName)) { + boolean hasSubmodules = false; + for (String key : moduleMap.keySet()) { + if (!key.equalsIgnoreCase(rootModuleName)) { + hasSubmodules = true; + break; + } + } + if (!hasSubmodules) { + moduleMap.put(rootModuleName, createSyntheticModule(rootModuleName, rootDir)); + } + } + + if (moduleMap.isEmpty()) { + File defaultAppDir = new File(rootDir, "app"); + if (defaultAppDir.exists()) { + moduleMap.put(":app", createSyntheticModule(":app", defaultAppDir)); + } else { + moduleMap.put(rootModuleName, createSyntheticModule(rootModuleName, rootDir)); + } + } + + List result = new ArrayList<>(moduleMap.values()); + result.sort(Comparator.comparing(m -> normalizeModuleName(m.getName()))); + return result; + } + + @NonNull + public static String getProjectName(@Nullable IProject project, @NonNull File rootDir) { + if (project != null && project.getName() != null && !project.getName().trim().isEmpty() && !"app".equalsIgnoreCase(project.getName())) { + return project.getName().trim(); + } + return rootDir.getName(); + } + + @NonNull + public static String normalizeModuleName(@NonNull String rawName) { + String trimmed = rawName.trim(); + return trimmed.startsWith(":") ? trimmed : ":" + trimmed; + } + + public static boolean matchesModuleName(@NonNull IModule module, @NonNull String target) { + String modNorm = normalizeModuleName(module.getName()); + String targetNorm = normalizeModuleName(target); + + if (modNorm.equalsIgnoreCase(targetNorm)) { + return true; + } + + int lastColonMod = modNorm.lastIndexOf(':'); + String leafMod = lastColonMod >= 0 ? modNorm.substring(lastColonMod + 1) : modNorm; + + int lastColonTarget = targetNorm.lastIndexOf(':'); + String leafTarget = lastColonTarget >= 0 ? targetNorm.substring(lastColonTarget + 1) : targetNorm; + + return leafMod.equalsIgnoreCase(leafTarget); + } + + private static Map parseSettingsGradle(File rootDir) { + Map result = new LinkedHashMap<>(); + File settingsGroovy = new File(rootDir, "settings.gradle"); + File settingsKts = new File(rootDir, "settings.gradle.kts"); + + File settingsFile = settingsGroovy.exists() ? settingsGroovy : (settingsKts.exists() ? settingsKts : null); + if (settingsFile == null) { + return result; + } + + try (BufferedReader reader = new BufferedReader(new FileReader(settingsFile))) { + String line; + while ((line = reader.readLine()) != null) { + String trimmedLine = line.trim(); + if (trimmedLine.startsWith("//") || trimmedLine.startsWith("/*")) { + continue; + } + Matcher includeMatcher = INCLUDE_PATTERN.matcher(trimmedLine); + if (includeMatcher.find()) { + String includeBody = includeMatcher.group(1); + if (includeBody != null) { + Matcher moduleMatcher = QUOTED_MODULE_PATTERN.matcher(includeBody); + while (moduleMatcher.find()) { + String rawModule = moduleMatcher.group(1); + if (rawModule != null) { + String modName = normalizeModuleName(rawModule); + String relativePath = modName.substring(1).replace(':', File.separatorChar); + File modDir = new File(rootDir, relativePath); + result.put(modName, modDir); + } + } + } + } + } + } catch (Exception ignored) { + } + return result; + } + + private static void scanFileSystemModules(File currentDir, File rootDir, Map discovered, int depth) { + if (currentDir == null || !currentDir.isDirectory() || depth <= 0) { + return; + } + + String name = currentDir.getName(); + if (name.startsWith(".") || "build".equalsIgnoreCase(name) || "bin".equalsIgnoreCase(name) + || "out".equalsIgnoreCase(name) || "node_modules".equalsIgnoreCase(name)) { + return; + } + + if (!currentDir.equals(rootDir) && isValidAndroidModuleDir(currentDir)) { + try { + String relative = rootDir.toPath().relativize(currentDir.toPath()).toString().replace('\\', '/'); + String modName = ":" + relative.replace('/', ':'); + discovered.put(modName, currentDir); + } catch (Exception ignored) { + } + } + + File[] children = currentDir.listFiles(File::isDirectory); + if (children != null) { + for (File child : children) { + scanFileSystemModules(child, rootDir, discovered, depth - 1); + } + } + } + + public static boolean isValidAndroidModuleDir(File dir) { + if (dir == null || !dir.isDirectory()) { + return false; + } + File buildGradle = new File(dir, "build.gradle"); + File buildGradleKts = new File(dir, "build.gradle.kts"); + File srcMain = new File(dir, "src/main"); + + return (buildGradle.exists() || buildGradleKts.exists()) && srcMain.exists(); + } + + public static IModule createSyntheticModule(@NonNull String moduleName, @NonNull File moduleDir) { + return new IModule() { + @NonNull + @Override + public String getName() { + return moduleName; + } + + @NonNull + @Override + public ModuleType getType() { + return ModuleType.ANDROID_APP; + } + + @NonNull + @Override + public File getProjectDir() { + return moduleDir; + } + + @NonNull + @Override + public List getSourceSets() { + File mainDir = new File(moduleDir, "src/main"); + File javaDir = new File(mainDir, "java"); + File resDir = new File(mainDir, "res"); + return Collections.singletonList( + new SourceSet("main", List.of(javaDir), List.of(resDir)) + ); + } + }; + } +} diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/SvgToVectorImporter.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/SvgToVectorImporter.java index 770aa8d2d..0697ab9ed 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/SvgToVectorImporter.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/importer/SvgToVectorImporter.java @@ -1,14 +1,20 @@ package dev.omar.plugin.iconsrepo.data.importer; -import dev.omar.plugin.iconsrepo.utils.Utils; +import android.os.Build; import org.xmlpull.v1.XmlPullParserFactory; import org.xmlpull.v1.XmlSerializer; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -32,20 +38,26 @@ public ImportIconResult importIcon(ImportParams params) { return ImportIconResult.error("No path data found in SVG"); } - // توليد XML بشكل عادي أولاً String rawXml = buildVectorXml(params, pathData); - - File destDir = params.dest.getDrawableDirectory(params.currentProject); String fileName = sanitizeFileName(params.source.getName()) + ".xml"; - File outputFile = new File(destDir, fileName); - if (outputFile.exists()) { - return ImportIconResult.error("File already exists: " + outputFile.getName()); + List destDirs = params.dest.getDrawableDirectories(params.currentProject); + if (destDirs.isEmpty()) { + return ImportIconResult.error("No target drawable directory found"); + } + + int importedCount = 0; + for (File destDir : destDirs) { + File outputFile = new File(destDir, fileName); + Path parentPath = Objects.requireNonNull(outputFile.getParentFile()).toPath(); + Files.createDirectories(parentPath); + Files.write(outputFile.toPath(), rawXml.getBytes(StandardCharsets.UTF_8)); + importedCount++; } - Path parentPath = outputFile.getParentFile().toPath(); - Files.createDirectories(parentPath); - Files.write(outputFile.toPath(), rawXml.getBytes(StandardCharsets.UTF_8)); + if (importedCount == 0) { + return ImportIconResult.error("Failed to import icon to target directories"); + } return ImportIconResult.success(); } catch (Exception e) { @@ -55,13 +67,29 @@ public ImportIconResult importIcon(ImportParams params) { private String extractPathData(InputStream svgStream) throws IOException { try (svgStream) { - String content = new String(Utils.readAllBytes(svgStream), StandardCharsets.UTF_8); + String content; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + content = new String(svgStream.readAllBytes(), StandardCharsets.UTF_8); + } else { + content = new String(readAllBytes(svgStream), StandardCharsets.UTF_8); + } Matcher matcher = PATH_D_PATTERN.matcher(content); return matcher.find() ? matcher.group(1) : null; } } - /** يبني نص XML خام (بدون تنسيق) متوافق مع Android VectorDrawable. */ + private byte[] readAllBytes(InputStream in) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int len; + byte[] buff = new byte[1024]; + while ((len = in.read(buff)) != -1) { + out.write(buff, 0, len); + } + out.flush(); + out.close(); + return out.toByteArray(); + } + private String buildVectorXml(ImportParams params, String pathData) throws Exception { XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); factory.setNamespaceAware(true); diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/models/IconModel.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/models/IconModel.java similarity index 75% rename from plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/models/IconModel.java rename to plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/models/IconModel.java index 5bf452db1..cfcd0f310 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/models/IconModel.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/models/IconModel.java @@ -1,4 +1,4 @@ -package dev.omar.plugin.iconsrepo.models; +package dev.omar.plugin.iconsrepo.data.models; import com.caverock.androidsvg.SVG; import com.caverock.androidsvg.SVGParseException; @@ -9,8 +9,8 @@ public class IconModel { - private String iconName; - private byte[] data; + private final String iconName; + private final byte[] data; private SVG svgIcon; public IconModel(String iconName, byte[] data) { @@ -23,30 +23,30 @@ public String getIconName() { } public SVG getSvgIcon() throws SVGParseException { - if(this.svgIcon == null){ + if (this.svgIcon == null) { ByteArrayInputStream in = new ByteArrayInputStream(getData()); this.svgIcon = SVG.getFromInputStream(in); try { - in.close(); - } catch(Exception err) { + in.close(); + } catch (Exception ignored) { } } return this.svgIcon; } public byte[] getData() { - return this.data; + return this.data; } public InputStream newInputStream() { - return new ByteArrayInputStream(getData()); + return new ByteArrayInputStream(getData()); } @Override public int hashCode() { int result = 17; result = 31 * result + (iconName != null ? iconName.hashCode() : 0); - result = 31 * result + svgIcon.hashCode(); + result = 31 * result + (svgIcon != null ? svgIcon.hashCode() : 0); return result; } @@ -59,7 +59,6 @@ public boolean equals(Object obj) { if (!Objects.equals(iconName, other.iconName)) return false; - return Objects.equals(data, other.data); + return Arrays.equals(data, other.data); } - } diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/repository/IconRepository.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/repository/IconRepository.java similarity index 61% rename from plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/repository/IconRepository.java rename to plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/repository/IconRepository.java index cf770a7ba..0b6d70fe2 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/repository/IconRepository.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/repository/IconRepository.java @@ -1,18 +1,16 @@ -package dev.omar.plugin.iconsrepo.repository; +package dev.omar.plugin.iconsrepo.data.repository; import android.content.Context; import android.content.res.AssetManager; - import android.os.Handler; import android.os.Looper; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; -import com.caverock.androidsvg.SVG; import com.itsaky.androidide.plugins.base.PluginFragmentHelper; -import dev.omar.plugin.iconsrepo.Main; -import java.io.ByteArrayInputStream; + +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -23,15 +21,14 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import dev.omar.plugin.iconsrepo.models.IconModel; -import dev.omar.plugin.iconsrepo.utils.Utils; +import dev.omar.plugin.iconsrepo.Main; +import dev.omar.plugin.iconsrepo.data.models.IconModel; public class IconRepository { - private Context context; - private final String zipFileName = "material_icon.zip"; - private ExecutorService executor = Executors.newSingleThreadExecutor(); - private List iconsList; + private final Context context; + private final ExecutorService executor = Executors.newSingleThreadExecutor(); + private final List iconsList; public IconRepository(Context context) { if (context == null) { @@ -39,39 +36,26 @@ public IconRepository(Context context) { } else { this.context = context; } - iconsList = new LinkedList(); + iconsList = new LinkedList<>(); } public interface LoadIconsCallback { - public void onLoadded(List list); - - public void onError(Throwable th); - } + void onLoaded(List list); - public void shutdown() { - executor.shutdownNow(); - if (iconsList != null) { - iconsList.clear(); - } - context = null; + void onError(Throwable th); } public void loadAllIconsAsync(final LoadIconsCallback callback) { if (callback == null) return; - if (executor.isShutdown()) return; executor.submit( () -> { try { final List list = loadAllIcons(); runOnUiThread( - () -> { - callback.onLoadded(list); - }); + () -> callback.onLoaded(list)); } catch (Exception err) { runOnUiThread( - () -> { - callback.onError(err); - }); + () -> callback.onError(err)); } }); } @@ -89,28 +73,25 @@ public List loadAllIcons() throws IOException { AssetManager assets = context.getAssets(); + String zipFileName = "material_icon.zip"; try (InputStream inputStream = assets.open(zipFileName); - ZipInputStream zipIn = new ZipInputStream(inputStream)) { + ZipInputStream zipIn = new ZipInputStream(inputStream)) { ZipEntry entry; while ((entry = zipIn.getNextEntry()) != null) { - // نتجاهل المجلدات والملفات التي ليست بصيغة SVG if (entry.isDirectory() || !entry.getName().toLowerCase().endsWith(".svg")) { continue; } - // استخراج اسم الأيقونة بدون مسار وبدون امتداد - String fullName = entry.getName(); // مثال: svg/home.svg + String fullName = entry.getName(); String iconName = extractIconName(fullName); - // قراءة بيانات SVG إلى مصفوفة بايتات - byte[] iconData = Utils.readAllBytes(zipIn); + byte[] iconData = readEntryBytes(zipIn); - // تجاهل الأيقونات الفارغة - if (iconData != null && iconData.length > 0) { + if (iconData.length > 0) { try { icons.add(new IconModel(iconName, iconData)); - } catch (Exception err) { + } catch (Exception ignored) { } } @@ -131,4 +112,15 @@ private String extractIconName(@NonNull String path) { } return fileName; } + + @NonNull + private byte[] readEntryBytes(@NonNull ZipInputStream zipIn) throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + byte[] buffer = new byte[4096]; + int len; + while ((len = zipIn.read(buffer)) != -1) { + baos.write(buffer, 0, len); + } + return baos.toByteArray(); + } } diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/IconNameRule.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/IconNameRule.java index caafc773e..e02a9115e 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/IconNameRule.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/IconNameRule.java @@ -31,7 +31,7 @@ public boolean isValid(String input) { input = input.trim(); // Length check (optional but practical) - if (input.length() == 0 || input.length() > 100) return false; + if (input.isEmpty() || input.length() > 100) return false; // Pattern check if (!input.matches(PATTERN)) return false; diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/ValidationTextWatcher.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/ValidationTextWatcher.java index 0a8cba91a..2e8e8606a 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/ValidationTextWatcher.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/data/validation/ValidationTextWatcher.java @@ -11,9 +11,9 @@ public class ValidationTextWatcher implements TextWatcher { - private TextInputEditText inputEditText; - private List rules; - private OnAfterValidOperation listener; + private final TextInputEditText inputEditText; + private final List rules; + private final OnAfterValidOperation listener; public ValidationTextWatcher(TextInputEditText inputEditText, List rules, OnAfterValidOperation listener) { this.inputEditText = inputEditText; diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/domain/IconImportUseCase.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/domain/IconImportUseCase.java new file mode 100644 index 000000000..79b3b34a4 --- /dev/null +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/domain/IconImportUseCase.java @@ -0,0 +1,56 @@ +package dev.omar.plugin.iconsrepo.domain; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.itsaky.androidide.plugins.extensions.IProject; + +import dev.omar.plugin.iconsrepo.data.importer.AppPathResolver; +import dev.omar.plugin.iconsrepo.data.importer.AssetIconSource; +import dev.omar.plugin.iconsrepo.data.importer.IconImporter; +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 dev.omar.plugin.iconsrepo.data.models.IconModel; + +public class IconImportUseCase { + + private final IconImporter importer; + + public IconImportUseCase() { + this(new SvgToVectorImporter()); + } + + public IconImportUseCase(@NonNull IconImporter importer) { + this.importer = importer; + } + + @NonNull + public ImportIconResult execute( + @Nullable IProject project, + @NonNull IconModel iconModel, + @NonNull String name, + @Nullable String colorTint) { + return execute(project, iconModel, name, colorTint, AppPathResolver.TARGET_ALL_MODULES); + } + + @NonNull + public ImportIconResult execute( + @Nullable IProject project, + @NonNull IconModel iconModel, + @NonNull String name, + @Nullable String colorTint, + @Nullable String targetModuleName) { + + AppPathResolver pathResolver = new AppPathResolver(targetModuleName); + ImportParams params = new ImportParams( + project, + new AssetIconSource(name, iconModel.getData()), + pathResolver, + targetModuleName + ); + params.useTint(colorTint); + + return importer.importIcon(params); + } +} 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..a455d10ce 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 @@ -2,32 +2,53 @@ import android.graphics.Bitmap; import android.graphics.drawable.PictureDrawable; +import android.os.Handler; +import android.os.Looper; import android.view.View; import androidx.annotation.NonNull; import androidx.appcompat.widget.AppCompatImageView; +import androidx.collection.LruCache; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; 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.data.models.IconModel; import dev.omar.plugin.iconsrepo.utils.ImageUtils; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + public class IconViewHolder extends RecyclerView.ViewHolder { private AppCompatImageView icon; private MaterialTextView txt; private IconsAdapter adapter; + private static ExecutorService renderExecutor; + private static Handler mainHandler; private IconModel currentModel; + private static final LruCache iconsCache = + new LruCache(8 * 1024) { + @Override + protected int sizeOf(String keyword, @NonNull Bitmap bitmap) { + return bitmap.getByteCount() / 1024; + } + }; + public IconViewHolder(View view, IconsAdapter adapter) { super(view); this.adapter = adapter; icon = view.findViewById(R.id.iconImageView); txt = view.findViewById(R.id.iconNameTextView); + + if (renderExecutor == null) { + renderExecutor = Executors.newFixedThreadPool(4); // 4 threads للـSVG rendering + mainHandler = new Handler(Looper.getMainLooper()); + } } public void bindView(@NonNull final IconModel model) { @@ -48,51 +69,44 @@ public void bindView(@NonNull final IconModel model) { icon.setImageResource(R.drawable.ic_category); - Bitmap cacheIcon = adapter.getIconsCache().get(model.getIconName()); + Bitmap cacheIcon = iconsCache.get(model.getIconName()); if (cacheIcon != null) { icon.setImageBitmap(cacheIcon); return; } - if (adapter.getRenderExecutor().isShutdown()) return; - - adapter.getRenderExecutor() - .execute( - () -> { - try { - PictureDrawable pd = - new PictureDrawable(model.getSvgIcon().renderToPicture()); - - Bitmap rawBitmap = ImageUtils.drawable2Bitmap(pd); - Bitmap coloredBitmap = - ImageUtils.drawColor( - rawBitmap, - ContextCompat.getColor( - icon.getContext(), - R.color.m3_theme_Secondary)); - - adapter.getIconsCache().put(model.getIconName(), coloredBitmap); - adapter.getMainHandler() - .post( - () -> { - if (currentModel == model) { - icon.setImageBitmap(coloredBitmap); - } - }); - if (rawBitmap != coloredBitmap) { - rawBitmap.recycle(); - } - - } catch (Exception err) { - adapter.getMainHandler() - .post( - () -> { - if (currentModel == model) { - icon.setImageResource( - R.drawable.ic_category); - } - }); - } - }); + renderExecutor.execute( + () -> { + try { + PictureDrawable pd = + new PictureDrawable(model.getSvgIcon().renderToPicture()); + + Bitmap rawBitmap = ImageUtils.drawable2Bitmap(pd); + Bitmap coloredBitmap = + ImageUtils.drawColor( + rawBitmap, + ContextCompat.getColor( + icon.getContext(), R.color.m3_theme_Secondary)); + + iconsCache.put(model.getIconName(), coloredBitmap); + mainHandler.post( + () -> { + if (currentModel == model) { + icon.setImageBitmap(coloredBitmap); + } + }); + if (rawBitmap != coloredBitmap) { + rawBitmap.recycle(); + } + + } catch (Exception err) { + mainHandler.post( + () -> { + if (currentModel == model) { + icon.setImageResource(R.drawable.ic_category); + } + }); + } + }); } } 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..9dcd565b7 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 @@ -1,7 +1,6 @@ package dev.omar.plugin.iconsrepo.ui.adapter; import android.annotation.SuppressLint; -import android.graphics.Bitmap; import android.os.Handler; import android.os.Looper; import android.text.Editable; @@ -13,28 +12,26 @@ import android.widget.Filterable; import androidx.annotation.NonNull; -import androidx.collection.LruCache; 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; - private final LruCache iconsCache; OnItemClickListener itemClickListener; private String currentQuery = ""; @@ -45,26 +42,7 @@ public IconsAdapter() { super(new IconModelDiffCallback()); originalList = new ArrayList<>(); searchExecutor = Executors.newSingleThreadExecutor(); - renderExecutor = Executors.newFixedThreadPool(4); mainHandler = new Handler(Looper.getMainLooper()); - iconsCache = new LruCache(8 * 1024) { - @Override - protected int sizeOf(String keyword, @NonNull Bitmap bitmap) { - return bitmap.getByteCount() / 1024; - } - }; - } - - ExecutorService getRenderExecutor() { - return renderExecutor; - } - - Handler getMainHandler() { - return mainHandler; - } - - LruCache getIconsCache() { - return iconsCache; } public void setOriginalList(List fullList) { @@ -75,7 +53,7 @@ public void setOriginalList(List fullList) { for (IconModel model : fullList) { names.add(model.getIconName()); } - searchIndex = new FastSearchIndex(names); + searchIndex = new FastSearchIndexV2(names); }); submitList(fullList); } @@ -154,13 +132,7 @@ public void setOnItemClickListener(OnItemClickListener itemClickListener) { @Override public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) { super.onDetachedFromRecyclerView(recyclerView); - if (pendingSearch != null) { - mainHandler.removeCallbacks(pendingSearch); - pendingSearch = null; - } - searchExecutor.shutdownNow(); - renderExecutor.shutdownNow(); - iconsCache.evictAll(); + searchExecutor.shutdown(); } @Override 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..f2c846e5f --- /dev/null +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/dialog/IconImportDialogManager.java @@ -0,0 +1,237 @@ +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.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.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(); + + alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { + if (handleImportSubmitted(binding, currentProject, model)) { + alertDialog.dismiss(); + } + }); + } + + 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..bbc18495c 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,139 @@ 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.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 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); } 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() { + 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 @@ - + + + +

Icons Repository guide

+

+ Icons Repository adds Material icons to your project as vector drawables, from inside + Code on the Go. The whole catalog is bundled with the plugin, so it works offline. +

+ +

Opening the catalog

+

+ Tap Icons Repository in the side menu. The catalog opens as an editor tab with a + grid of icons. The first time it opens, the icons take a moment to load. +

+ + +

+ Type in the search field to filter the grid by icon name, for example arrow, + home or settings. Tap the clear button at the end of the field to + show every icon again. +

+ +

Importing an icon

+

Tap an icon to open the import dialog. The preview at the top shows the icon with the chosen tint.

+ + + + + + + + + + + + + + +
FieldWhat it does
Icon name + The drawable's resource name and file name. Use lowercase letters, digits and + single underscores, starting with a letter and not ending with an underscore, for + example ic_arrow_back. Java keywords such as class are + not allowed. The name starts filled in from the icon's name. +
Target module + Which module receives the icon. All modules writes a copy into every Android + module the plugin finds in the project. Pick one module to write it only there. +
Color + The tint. None leaves the icon untinted, so it draws in black. A theme color + such as colorPrimary is written as ?attr/colorPrimary, + so the icon follows your app's theme. Custom shows a field for a hex value in + #RRGGBB or #AARRGGBB form. +
+

+ Tap Import to write the icon. If the name or color is not valid, the field shows + an error and nothing is written. Cancel closes the dialog without changing + anything. +

+ +

What gets written

+

+ Each import writes one file, res/drawable/<name>.xml, in the main source + set of each target module. It is a 24dp vector drawable, and you use it like any other + drawable, for example @drawable/ic_arrow_back in a layout or + R.drawable.ic_arrow_back in code. +

+

+ An existing file with the same name is replaced without asking. Pick a new name if + you want to keep the old drawable. +

+ +

Getting help

+

+ Long-press the search icons, an icon in the grid, or any field or button in the import + dialog to see a short explanation of it. +

+ + + diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java index 6070a0342..e78f02bb5 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/Main.java @@ -4,18 +4,21 @@ import androidx.annotation.NonNull; import com.itsaky.androidide.plugins.PluginContext; +import com.itsaky.androidide.plugins.extensions.DocumentationExtension; import com.itsaky.androidide.plugins.extensions.EditorTabItem; import com.itsaky.androidide.plugins.extensions.NavigationItem; +import com.itsaky.androidide.plugins.extensions.PluginTooltipEntry; import com.itsaky.androidide.plugins.services.IdeEditorTabService; import dev.omar.plugin.iconsrepo.data.repository.IconRepository; +import dev.omar.plugin.iconsrepo.help.IconsRepositoryHelp; import dev.omar.plugin.iconsrepo.ui.fragments.MainFragment; import java.util.Collections; import java.util.List; import java.util.Set; -public class Main extends BasePlugin { +public class Main extends BasePlugin implements DocumentationExtension { public static final String PLUGIN_ID = "dev.omar.plugin.iconsrepo"; @@ -41,7 +44,7 @@ public List getMainEditorTabs() { 10, true, true, - "No description")); + IconsRepositoryHelp.EDITOR_TAB_TOOLTIP)); } @NonNull @@ -55,7 +58,8 @@ public List getSideMenuItems() { true, true, "No description", - 10,"No tooltip", + 10, + IconsRepositoryHelp.TAG_MAIN, () -> { openFragment(); return null; @@ -100,6 +104,31 @@ public String getPluginId() { return PLUGIN_ID; } + @NonNull + @Override + public String getTooltipCategory() { + return IconsRepositoryHelp.CATEGORY; + } + + @NonNull + @Override + public List getTooltipEntries() { + return IconsRepositoryHelp.entries(); + } + + @Override + public boolean onDocumentationInstall() { + return true; + } + + @Override + public void onDocumentationUninstall() {} + + @Override + public String getTier3DocsAssetPath() { + return IconsRepositoryHelp.DOCS_ASSET_PATH; + } + public IconRepository getIconRepository() { if(iconRepository == null) { iconRepository = new IconRepository(getContext()); diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java new file mode 100644 index 000000000..b9c56d05c --- /dev/null +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java @@ -0,0 +1,159 @@ +package dev.omar.plugin.iconsrepo.help; + +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.google.android.material.textfield.TextInputLayout; +import com.itsaky.androidide.plugins.ServiceRegistry; +import com.itsaky.androidide.plugins.base.PluginFragmentHelper; +import com.itsaky.androidide.plugins.extensions.PluginTooltipButton; +import com.itsaky.androidide.plugins.extensions.PluginTooltipEntry; +import com.itsaky.androidide.plugins.services.IdeTooltipService; + +import dev.omar.plugin.iconsrepo.Main; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** Tooltip entries (Tier 1 and 2), the Tier 3 page, and long-press wiring for every UI element. */ +public final class IconsRepositoryHelp { + + /** The host resolves plugin tooltips under exactly "plugin_" + plugin.id. */ + public static final String CATEGORY = "plugin_" + Main.PLUGIN_ID; + + /** Assets subdirectory holding the Tier 3 page. */ + public static final String DOCS_ASSET_PATH = "docs"; + + public static final String TAG_MAIN = "icons_repository.main"; + public static final String TAG_SEARCH = "icons_repository.search"; + public static final String TAG_ICON = "icons_repository.icon"; + public static final String TAG_NAME = "icons_repository.name"; + public static final String TAG_MODULE = "icons_repository.module"; + public static final String TAG_COLOR = "icons_repository.color"; + public static final String TAG_IMPORT = "icons_repository.import"; + + /** Literal tooltip for the editor tab, which takes text rather than a tag. */ + public static final String EDITOR_TAB_TOOLTIP = + "Browse the Material icon catalog and add icons to your project as vector drawables."; + + private IconsRepositoryHelp() {} + + @NonNull + public static List 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, + "Import writes the drawable; Cancel closes the dialog 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/IconViewHolder.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/adapter/IconViewHolder.java index ddd72655d..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,6 +12,7 @@ import com.google.android.material.textview.MaterialTextView; import dev.omar.plugin.iconsrepo.R; +import dev.omar.plugin.iconsrepo.help.IconsRepositoryHelp; import dev.omar.plugin.iconsrepo.data.models.IconModel; import dev.omar.plugin.iconsrepo.utils.ImageUtils; @@ -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/dialog/IconImportDialogManager.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/ui/dialog/IconImportDialogManager.java index f2c846e5f..cb4bfb90f 100644 --- 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 @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; +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; @@ -72,6 +73,7 @@ public void showImportDialog( dialogBuilder.setNegativeButton("Cancel", null); final AlertDialog alertDialog = dialogBuilder.show(); + wireHelp(binding, alertDialog); alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { if (handleImportSubmitted(binding, currentProject, model)) { @@ -80,6 +82,17 @@ public void showImportDialog( }); } + private void wireHelp(@NonNull DialogImportIconBinding binding, @NonNull AlertDialog dialog) { + IconsRepositoryHelp.wire(binding.iconPreview, IconsRepositoryHelp.TAG_IMPORT); + 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); + 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); 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 691c7f20a..90396eee4 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 @@ -15,6 +15,7 @@ import com.itsaky.androidide.plugins.extensions.IProject; import com.itsaky.androidide.plugins.services.IdeProjectService; +import dev.omar.plugin.iconsrepo.help.IconsRepositoryHelp; import dev.omar.plugin.iconsrepo.Main; import dev.omar.plugin.iconsrepo.R; import dev.omar.plugin.iconsrepo.databinding.FragmentMainBinding; @@ -64,6 +65,7 @@ private void initViewsAndAdapter() { binding.searchEditText.addTextChangedListener(adapter); binding.iconsRecyclerView.setAdapter(adapter); + IconsRepositoryHelp.wireFieldIcons(binding.searchInputLayout, IconsRepositoryHelp.TAG_SEARCH); } private void setupRecyclerView() { From 257e5d1ed644c00abd5716f7b95995849f369636 Mon Sep 17 00:00:00 2001 From: yaturner Date: Fri, 13 Nov 2026 11:50:53 -0800 Subject: [PATCH 5/5] ADFA-6655 | Show the text fields' icons so their tooltips can be reached On device (Code on the Go release C-r-1112-1729), the search, icon name and hex color fields rendered without the start and clear icons their layouts declare with app:startIconDrawable / app:endIconMode, so the tooltips wired to those icons had nothing to long-press. The cause was not pinned down: other app: attributes in the same layouts (card corner radius, stroke) do apply. Set the start icon and clear-text end icon in code before wiring the tooltips. Verified on a Pixel 6 Pro: the icons appear, the clear button works, and long-press shows each field's tooltip. Also mention the preview in the import tooltip's summary, since the preview shares that entry. Co-Authored-By: Claude Opus 5.5 --- .../dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java | 2 +- .../plugin/iconsrepo/ui/dialog/IconImportDialogManager.java | 6 ++++++ .../omar/plugin/iconsrepo/ui/fragments/MainFragment.java | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java index b9c56d05c..8d90a2c64 100644 --- a/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java +++ b/plugins/Icons-Repository/src/main/java/dev/omar/plugin/iconsrepo/help/IconsRepositoryHelp.java @@ -100,7 +100,7 @@ public static List entries() { "index.html"), entry( TAG_IMPORT, - "Import writes the drawable; Cancel closes the dialog without changes.", + "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" 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 index cb4bfb90f..01eeb933a 100644 --- 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 @@ -16,12 +16,14 @@ 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; @@ -84,10 +86,14 @@ public void showImportDialog( 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); 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 90396eee4..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 @@ -17,6 +17,8 @@ import dev.omar.plugin.iconsrepo.help.IconsRepositoryHelp; import dev.omar.plugin.iconsrepo.Main; +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.data.models.IconModel; @@ -65,6 +67,8 @@ private void initViewsAndAdapter() { 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); }