Image Full Screen

chathuralakmal · Oct 31, 2017 · 2d1b218 · 2d1b218
1 parent e6582cf
commit 2d1b218
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 67 deletions.
diff --git a/.idea/libraries/AndroidImagePopup_1_0_7.xml b/.idea/libraries/AndroidImagePopup_1_0_7.xml
diff --git a/.idea/libraries/animated_vector_drawable_25_3_1.xml b/.idea/libraries/animated_vector_drawable_25_3_1.xml
diff --git a/.idea/libraries/appcompat_v7_25_3_1.xml b/.idea/libraries/appcompat_v7_25_3_1.xml
diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml
diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml
diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/hamcrest_library_1_3.xml
diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml
diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml
diff --git a/.idea/libraries/support_annotations_25_3_1.xml b/.idea/libraries/support_annotations_25_3_1.xml
diff --git a/.idea/libraries/support_compat_25_3_1.xml b/.idea/libraries/support_compat_25_3_1.xml
diff --git a/.idea/libraries/support_core_ui_25_3_1.xml b/.idea/libraries/support_core_ui_25_3_1.xml
diff --git a/.idea/libraries/support_core_utils_25_3_1.xml b/.idea/libraries/support_core_utils_25_3_1.xml
diff --git a/.idea/libraries/support_fragment_25_3_1.xml b/.idea/libraries/support_fragment_25_3_1.xml
diff --git a/.idea/libraries/support_media_compat_25_3_1.xml b/.idea/libraries/support_media_compat_25_3_1.xml
diff --git a/.idea/libraries/support_v4_25_3_1.xml b/.idea/libraries/support_v4_25_3_1.xml
diff --git a/.idea/libraries/support_vector_drawable_25_3_1.xml b/.idea/libraries/support_vector_drawable_25_3_1.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/com/fexcon/imgpopup/MainActivity.java b/app/src/main/java/com/fexcon/imgpopup/MainActivity.java
@@ -24,8 +24,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.e("Width",""+Resources.getSystem().getDisplayMetrics().widthPixels);
         final ImagePopup imagePopup = new ImagePopup(this);
         imagePopup.setBackgroundColor(Color.BLACK);
-//        imagePopup.setWindowHeight(Resources.getSystem().getDisplayMetrics().heightPixels);
-//        imagePopup.setWindowWidth(Resources.getSystem().getDisplayMetrics().widthPixels);
+        imagePopup.setFullScreen(true);
         imagePopup.setHideCloseIcon(true);
         imagePopup.setImageOnClickClose(true);
 
@@ -34,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Picasso.with(this).load(photoUrl).into(imageView);
         // to use it when the same photo are in the image
-//         imagePopup.initiatePopup(imageView.getDrawable());
+        // imagePopup.initiatePopup(imageView.getDrawable());
 
         // to download the image from url if you want different resolution or different image
         imagePopup.initiatePopupWithPicasso(photoUrl);

diff --git a/imageviewpopup/src/main/java/com/ceylonlabs/imageviewpopup/ImagePopup.java b/imageviewpopup/src/main/java/com/ceylonlabs/imageviewpopup/ImagePopup.java
@@ -35,6 +35,7 @@ public class ImagePopup extends ImageView {
     private int windowWidth = 0;
     private boolean imageOnClickClose;
     private boolean hideCloseIcon;
+    private boolean fullScreen;
 
     private int backgroundColor = Color.parseColor("#FFFFFF");
 
@@ -96,6 +97,14 @@ public void setHideCloseIcon(boolean hideCloseIcon) {
         this.hideCloseIcon = hideCloseIcon;
     }
 
+    public boolean isFullScreen() {
+        return fullScreen;
+    }
+
+    public void setFullScreen(boolean fullScreen) {
+        this.fullScreen = fullScreen;
+    }
+
     public void initiatePopup(Drawable drawable) {
 
         try {
@@ -189,7 +198,6 @@ public void initiatePopupWithPicasso(File imageFile) {
     public void initiatePopupWithGlide(String imageUrl) {
 
         try {
-//            Log.e("Image", "initiatePopupWithGlide");
 
             LayoutInflater inflater = (LayoutInflater) context.getSystemService(context.LAYOUT_INFLATER_SERVICE);
 
@@ -223,13 +231,16 @@ public void viewPopup() {
         int width = metrics.widthPixels;
         int height = metrics.heightPixels;
 
-        if (windowHeight != 0 || windowWidth != 0) {
-            width = windowWidth;
-            height = windowHeight;
+        if(isFullScreen()) {
             popupWindow = new PopupWindow(layout, (width), (height), true);
-        }else{
-
-            popupWindow = new PopupWindow(layout, (int) (width * .8), (int) (height * .6), true);
+        }else {
+            if (windowHeight != 0 || windowWidth != 0) {
+                width = windowWidth;
+                height = windowHeight;
+                popupWindow = new PopupWindow(layout, (width), (height), true);
+            } else {
+                popupWindow = new PopupWindow(layout, (int) (width * .8), (int) (height * .6), true);
+            }
         }