From b21b2d52d16808e266eeeaa3ba7d5ef20cad007d Mon Sep 17 00:00:00 2001 From: gonojuarez Date: Tue, 22 Nov 2022 13:04:00 -0300 Subject: [PATCH] clean code pictograms view --- .../stonefacesoft/pictogramslibrary/view/GameGroupView.java | 4 ++-- .../com/stonefacesoft/pictogramslibrary/view/GroupView.java | 4 ++-- .../com/stonefacesoft/pictogramslibrary/view/PictoView.java | 2 +- .../com/stonefacesoft/pictogramslibrary/view/TarjetView.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/GameGroupView.java b/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/GameGroupView.java index c69d5d2..210019e 100644 --- a/app/pictogramslibrary/src/main/java/com/stonefacesoft/pictogramslibrary/view/GameGroupView.java +++ b/app/pictogramslibrary/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, this.icon); + selectIcon(pictogramsLibraryGameGroup, this.icon,glideAttatcher); } } @@ -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, this.icon); + selectIcon(pictogramsLibraryGameGroup, this.icon,glideAttatcher); } } 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 index 5f10bb9..894cd66 100644 --- 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,this.icon); + selectIcon(pictogramsLibraryGroup,this.icon,glideAttatcher); } } @@ -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,this.icon); + selectIcon(pictogramsLibraryGroup,this.icon,glideAttatcher); } } 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 index 0a77634..a8134f4 100644 --- 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,this.icon); + selectIcon(pictogramsLibraryPictogram,this.icon,glideAttatcher); } } 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 index 3ce6ccf..40063f1 100644 --- 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,7 +79,7 @@ public void selectIcon(){ } - protected void selectIcon(final OTTAAProjectObjects object,ImageView icon) { + protected void selectIcon(final OTTAAProjectObjects object,ImageView icon,GlideAttatcher glideAttatcher) { String path = object.getEditedPictogram(); File picture=new File(path); if(picture.exists())