Add files via upload

app/build.gradle

@@ -26,4 +26,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    compile project(path: ':photto')
 }

app/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.gungoronline.photto">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

app/src/main/java/com/gungoronline/photto/MainActivity.java

@@ -1,7 +1,6 @@
 package com.gungoronline.photto;
 
 import androidx.appcompat.app.AppCompatActivity;
-
 import android.os.Bundle;
 
 public class MainActivity extends AppCompatActivity {
@@ -10,5 +9,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+
     }
 }

photto/src/main/AndroidManifest.xml

@@ -1,2 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gungoronline.photto" />
+    package="com.gungoronline.photto" >
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+</manifest>

photto/src/main/java/com/gungoronline/photto/Model/Photto.java

@@ -4,14 +4,18 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.util.Base64;
+import android.util.Log;
 import android.widget.ImageView;
+
 import androidx.annotation.Nullable;
 
 import com.gungoronline.photto.Helper.ImageLibrary;
 
+import java.io.File;
 import java.io.InputStream;
 
 public class Photto {
@@ -23,6 +27,7 @@ public class Photto {
     private int drawableResourceId;
     private InputStream inputStream;
     private byte[] decodedString;
+    private File file;
 
 
     public Photto(PhottoBuilder phottoBuilder) {
@@ -34,6 +39,11 @@ public Photto(PhottoBuilder phottoBuilder) {
         this.drawableResourceId = phottoBuilder.drawableResourceId;
         this.inputStream = phottoBuilder.inputStream;
         this.decodedString = phottoBuilder.decodedString;
+        this.file = phottoBuilder.file;
+    }
+
+    public File getFile() {
+        return file;
     }
 
     public Uri getUri() {
@@ -82,10 +92,30 @@ public static class PhottoBuilder {
         private int drawableResourceId;
         private InputStream inputStream;
         private byte[] decodedString;
+        private File file;
 
         Photto photto;
         ImageLibrary il;
 
+        public interface ImageLoadListener {
+            public void onImageLoaded();
+
+            public void onError(int errorCode);
+
+            public void onImageLoading();
+        }
+
+        private ImageLoadListener imageLoadListener;
+
+        public boolean networkConnection() {
+            ConnectivityManager conMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (conMgr.getActiveNetworkInfo() != null && conMgr.getActiveNetworkInfo().isAvailable() && conMgr.getActiveNetworkInfo().isConnected()) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
 
         private String reverseString(String str) {
             String reverse = "";
@@ -98,17 +128,41 @@ private String reverseString(String str) {
         public PhottoBuilder(Context context, String url, ImageView into) {
             this.context = context;
             this.url = url;
-            String str = reverseString(url.replaceAll("[^a-zA-Z0-9]", ""));
-            this.uniqueName = str.substring(60);
+            if (!url.isEmpty()) {
+                String str = reverseString(url.replaceAll("[^a-zA-Z0-9]", ""));
+                this.uniqueName = str.substring(60);
+            } else {
+                imageLoadListener.onError(2);
+            }
             this.into = into;
         }
 
+        public PhottoBuilder(Context context, String url, ImageLoadListener imageLoadListener, ImageView into) {
+            this.context = context;
+            this.url = url;
+            if (!url.isEmpty()) {
+                String str = reverseString(url.replaceAll("[^a-zA-Z0-9]", ""));
+                this.uniqueName = str.substring(60);
+            } else {
+                imageLoadListener.onError(2);
+            }
+            this.into = into;
+            this.imageLoadListener = imageLoadListener;
+        }
+
+
         public PhottoBuilder(Context context, Uri uri, ImageView into) {
             this.context = context;
             this.uri = uri;
             this.into = into;
         }
 
+        public PhottoBuilder(Context context, File file, ImageView into) {
+            this.context = context;
+            this.file = file;
+            this.into = into;
+        }
+
         public PhottoBuilder(Context context, int drawableResourceId, ImageView into) {
             this.context = context;
             this.drawableResourceId = drawableResourceId;
@@ -181,23 +235,54 @@ protected void onPostExecute(Void aVoid) {
                     if (photto.getUri() != null) {
                         into.setImageURI(photto.uri);
                     } else if (photto.getUrl() != null) {
-                        into.setImageBitmap(il.loadImageFromStorage("/data/data/" + context.getPackageName() + "/app_imageDir", uniqueName + ".jpg"));
+                        if (!photto.getUrl().isEmpty()) {
+                            if (networkConnection()) {
+                                if (imageLoadListener != null) {
+                                    into.setImageBitmap(il.loadImageFromStorage("/data/data/" + context.getPackageName() + "/app_imageDir", uniqueName + ".jpg"));
+                                    imageLoadListener.onImageLoaded();
+                                }
+                            } else {
+                                Bitmap bp = il.loadImageFromStorage("/data/data/" + context.getPackageName() + "/app_imageDir", uniqueName + ".jpg");
+                                if (bp != null) {
+                                    into.setImageBitmap(bp);
+                                }
+                            }
+                        }
+
                     } else if (photto.getDrawableResourceId() != 0) {
                         into.setImageResource(photto.drawableResourceId);
                     } else if (photto.getInputStream() != null) {
                         into.setImageDrawable(Drawable.createFromStream(inputStream, null));
                     } else if (photto.getDecodedString() != null) {
                         Bitmap bitmap = BitmapFactory.decodeByteArray(decodedString, 0, decodedString.length);
                         into.setImageBitmap(bitmap);
+                    } else if (photto.getFile() != null) {
+                        into.setImageBitmap(BitmapFactory.decodeFile(photto.getFile().getAbsolutePath()));
                     }
+
                 }
 
                 @Override
                 protected Void doInBackground(Void... voids) {
                     if (photto.getUrl() != null) {
-                        if (il.isImageInStorage("/data/data/" + context.getPackageName() + "/app_imageDir", uniqueName + ".jpg") == false) {
-                            Bitmap bitmap = il.getBitmapFromURL(url);
-                            il.saveImageToInternalStorage(bitmap, uniqueName + ".jpg", context.getApplicationContext());
+
+                        if (!photto.getUrl().isEmpty()) {
+                            if (networkConnection()) {
+                                if (il.isImageInStorage("/data/data/" + context.getPackageName() + "/app_imageDir", uniqueName + ".jpg") == false) {
+                                    Bitmap bitmap = il.getBitmapFromURL(url);
+                                    il.saveImageToInternalStorage(bitmap, uniqueName + ".jpg", context.getApplicationContext());
+                                }
+                                if (imageLoadListener != null) {
+                                    imageLoadListener.onImageLoading();
+                                }
+                            } else {
+                                Bitmap bp = il.loadImageFromStorage("/data/data/" + context.getPackageName() + "/app_imageDir", uniqueName + ".jpg");
+                                if (bp != null) {
+                                    imageLoadListener.onError(3);
+                                } else {
+                                    imageLoadListener.onError(1);
+                                }
+                            }
                         }
                     }
                     return null;

photto/src/main/java/com/gungoronline/photto/Model/PhottoError.java

@@ -0,0 +1,7 @@
+package com.gungoronline.photto.Model;
+
+public class PhottoError {
+    public static int NETWORK_ERROR = 1;
+    public static int URL_IS_BLANK = 2;
+    public static int NETWORK_ERROR_BUT_CACHE = 3;
+}

photto/src/main/res/layout/activity_main.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
+    tools:context=".MainActivity">
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>