clean code pictograms view

OTTAA-Project · Nov 22, 2022 · a0c425e · a0c425e
1 parent 7ccd2c5
commit a0c425e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...ctogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/GameGroupView.java b/...ctogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/GameGroupView.java
@@ -87,7 +87,7 @@ protected void setData() {
             Drawable drawable = findResource(pictogramsLibraryGameGroup.getPictogram());
             glideAttatcher.setHeight(IconHeight).setWidth(IconWidth).useDiskCacheStrategy().loadDrawable(drawable, this.icon);
         } else {
-            selectIcon(pictogramsLibraryGameGroup,glideAttatcher);
+            selectIcon(pictogramsLibraryGameGroup, this.icon);
         }
     }
 
@@ -134,7 +134,7 @@ public void setData(int height, int with) {
             Drawable drawable = findResource(pictogramsLibraryGameGroup.getPictogram());
             glideAttatcher.setHeight(height).setWidth(with).useDiskCacheStrategy().loadDrawable(drawable, this.icon);
         } else {
-            selectIcon(pictogramsLibraryGameGroup,glideAttatcher);
+            selectIcon(pictogramsLibraryGameGroup, this.icon);
         }
      }
 

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
@@ -101,7 +101,7 @@ protected void setData() {
             Drawable drawable = findResource(pictogramsLibraryGroup.getPictogram());
             glideAttatcher.setHeight(IconHeight).setWidth(IconWidth).useDiskCacheStrategy().setRadius(25).UseCornerRadius(true).loadDrawable(drawable, this.icon);
         } else {
-            selectIcon(pictogramsLibraryGroup,glideAttatcher);
+            selectIcon(pictogramsLibraryGroup,this.icon);
          }
     }
 
@@ -141,7 +141,7 @@ public void setData(int height, int with) {
             Drawable drawable = findResource(pictogramsLibraryGroup.getPictogram());
             glideAttatcher.setHeight(height).setWidth(with).useDiskCacheStrategy().setRadius(25).UseCornerRadius(true).loadDrawable(drawable, this.icon);
         } else {
-            selectIcon(pictogramsLibraryGroup,glideAttatcher);
+            selectIcon(pictogramsLibraryGroup,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
@@ -177,7 +177,7 @@ protected void setData(){
                 glideAttatcher.useDiskCacheStrategy().loadDrawable(Uri.parse(pictogramsLibraryPictogram.getPictogram()),this.icon);
             }
         }else{
-            selectIcon(pictogramsLibraryPictogram,glideAttatcher);
+            selectIcon(pictogramsLibraryPictogram,this.icon);
         }
     }
 

diff --git a/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/TarjetView.java b/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/TarjetView.java
@@ -79,13 +79,13 @@ public void selectIcon(){
 
     }
 
-    protected void selectIcon(final OTTAAProjectObjects object,GlideAttatcher glideAttatcher) {
+    protected void selectIcon(final OTTAAProjectObjects object,ImageView icon) {
       String path  = object.getEditedPictogram();
       File picture=new File(path);
       if(picture.exists())
-          glideAttatcher.useDiskCacheStrategy().loadDrawable(object,this.icon);
+          glideAttatcher.useDiskCacheStrategy().loadDrawable(object,icon);
       else
-          glideAttatcher.useDiskCacheStrategy().loadDrawable(Uri.parse(object.getUrl()),this.icon);
+          glideAttatcher.useDiskCacheStrategy().loadDrawable(Uri.parse(object.getUrl()),icon);
     }
 
     public void setGlideAttatcher(GlideAttatcher glideAttatcher) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -177,7 +177,7 @@ protected void setData(){ @@
                     glideAttatcher.useDiskCacheStrategy().loadDrawable(Uri.parse(pictogramsLibraryPictogram.getPictogram()),this.icon);
                 }
             }else{
-                selectIcon(pictogramsLibraryPictogram,glideAttatcher);
+                selectIcon(pictogramsLibraryPictogram,this.icon);
             }
         }
@@ Expand Down @@