url new function with firebase

OTTAA-Project · Oct 28, 2022 · eef085c · eef085c
1 parent e6ad2c2
commit eef085c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/GroupView.java b/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/GroupView.java
@@ -141,8 +141,14 @@ public void setCustom_Texto(String t) {
     @Override
     public void selectIcon() {
         File picto = new File(pictogramsLibraryGroup.getEditedPictogram());
+        File picto2 = picto;
+        if(!pictogramsLibraryGroup.getEditedPictogram().contains(".debug"))
+            picto2 = new File(pictogramsLibraryGroup.getEditedPictogram().replace("com.stonefacesoft.ottaa","com.stonefacesoft.ottaa.debug"));
         if (picto.exists())
             glideAttatcher.useDiskCacheStrategy().UseCornerRadius(true).setRadius(25).loadDrawable(picto, this.icon);
+        else if(picto2.exists()){
+            glideAttatcher.useDiskCacheStrategy().UseCornerRadius(true).setRadius(25).loadDrawable(picto2, this.icon);
+        }
         else
             glideAttatcher.useDiskCacheStrategy().UseCornerRadius(true).setRadius(25).loadDrawable(Uri.parse(pictogramsLibraryGroup.getUrl()), this.icon);
     }

diff --git a/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/PictoView.java b/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/PictoView.java
@@ -81,9 +81,7 @@ private void init() {
     public void setCustom_Color(Integer color) {
         this.Custom_Color = color;
         //Img.setBackgroundColor(color);
-
         Color.setColorFilter(color);
-
         invalidate();
         requestLayout();
     }
@@ -197,8 +195,13 @@ protected Drawable findResource() {
     public void selectIcon(){
         try{
             File picto=new File(pictogramsLibraryPictogram.getEditedPictogram());
+            File picto2= picto;
+            if(!pictogramsLibraryPictogram.getEditedPictogram().contains(".debug"))
+             picto2 =new File(pictogramsLibraryPictogram.getEditedPictogram().replace("com.stonefacesoft.ottaa","com.stonefacesoft.ottaa.debug"));
             if(picto.exists())
                 glideAttatcher.useDiskCacheStrategy().loadDrawable(picto,this.icon);
+            else if(picto2.exists())
+                glideAttatcher.useDiskCacheStrategy().loadDrawable(picto2,this.icon);
             else
                 glideAttatcher.useDiskCacheStrategy().loadDrawable(Uri.parse(pictogramsLibraryPictogram.getUrl()),this.icon);
         }catch (Exception ex){