diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
deleted file mode 100644
index dc282a8..0000000
Binary files a/.idea/caches/gradle_models.ser and /dev/null differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fdfbbec..2e5d354 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,11 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="D:/Android/gradle-4.10.2" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 60c8d9a..c7c27cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,44 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="10">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="9">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-        </list>
-      </value>
-    </option>
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (3)" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index be8337f..5ad4278 100644
--- a/README.md
+++ b/README.md
@@ -7,21 +7,18 @@ Type-safe HTTP client for Android and Java by Square, Inc.
 implement Basic Authorization 
 
 
-
 download
 ======
 
 Gradle
-
 latest version on jitpack [![](https://jitpack.io/v/alishatergholi/RestClient.svg)](https://jitpack.io/#alishatergholi/RestClient)
-
 ```groovy
     repositories{
         maven { url 'https://jitpack.io' }
     }
     
     dependencies {
-        implementation 'com.github.alishatergholi:restclient:latest_version'
+        implementation 'com.github.alishatergholi:rest-client:latest_version'
     }
 ```
 
@@ -30,22 +27,20 @@ How do i use RestClient
 =======================
 ```java
     RestClient client = new RestClient
-            .Builder(context)
-            
-            /* you can add Accept encoding for encode your response */
-            /* for now we just support gzip */
-            .setAcceptEnconding(EncodingType.GZIP) 
-            
-            /* for add custom header you need 
+             .Builder(context)
+             /* you can add Accept encoding for encode your response */
+             /* for now we just support gzip */
+             .setAcceptEnconding(EncodingType.GZIP) 
+             /* for add custom header you need 
              ArrayMap<String,String> header = new ArrayMap<>();
              header.put("appid","0e8f8fd2-1acb-11e7-8ab0-ac162d7938f0");
              header.put("accept-language", "fa");
-            .setHeader(header)
+             .setHeader(header)
              */
              /* for add Authorization Header */
              .setAuthorization("Authorization url","clientId","client",AuthType.BASIC_AUTH)
              .setUserInfo("username for Authorization","password for Authorization")
-            .build();
+             .build();
     
     //for add body use.
     RequestParams params = new RequestParams(RequestBodyType.FormData);
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 0b5cb52..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-apply plugin: 'com.android.application'
-
-
-android {
-    compileSdkVersion project.compileSdkVersion
-    defaultConfig {
-        applicationId "ir.vasl.restclient"
-        minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
-        versionCode project.versionCode
-        versionName project.versionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    implementation project(':library')
-}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..9c9f9d4
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,38 @@
+plugins {
+    id("com.android.application")
+}
+
+android {
+    compileSdkVersion(28)
+    defaultConfig {
+        minSdkVersion(15)
+        targetSdkVersion(28)
+        buildToolsVersion = "28.0.3"
+        versionCode  = 8
+        versionName  = "1.0.8"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        getByName("release"){
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility  = JavaVersion.VERSION_1_8
+        targetCompatibility  = JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
+    implementation("androidx.appcompat:appcompat:1.0.2")
+//    implementation("com.github.alishatergholi:rest-client:v1.0.8")
+    testImplementation("junit:junit:4.12")
+    implementation(project(":library"))
+    androidTestImplementation("androidx.test:runner:1.1.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1")
+}
+
+
+
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..2f9dc5a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/androidTest/java/com/github/restclient/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/github/restclient/ExampleInstrumentedTest.java
index d98eab9..bc9359d 100644
--- a/app/src/androidTest/java/com/github/restclient/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/github/restclient/ExampleInstrumentedTest.java
@@ -1,12 +1,13 @@
 package com.github.restclient;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
 import static org.junit.Assert.*;
 
 /**
diff --git a/app/src/main/java/com/github/restclient/MainActivity.java b/app/src/main/java/com/github/restclient/MainActivity.java
index c23f444..68157e4 100644
--- a/app/src/main/java/com/github/restclient/MainActivity.java
+++ b/app/src/main/java/com/github/restclient/MainActivity.java
@@ -9,6 +9,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.collection.ArrayMap;
+
 import com.github.library.RestClient;
 
 import com.github.library.enums.AuthType;
@@ -35,20 +36,14 @@ protected void onCreate(Bundle savedInstanceState) {
             RequestParams params = new RequestParams(RequestBodyType.FormData);
             params.put("page", "1");
 
-            restClient.POST("https://google.com", "", new RequestParams(), new ResponseJsonHandler() {
-                        @Override
-                        protected void onSuccess(JSONObject result) {
-                            Log.d(TAG, "response " + result);
-                        }
-
-                        @Override
-                        protected void onSuccess(JSONArray result) {
-
-                        }
+            restClient.POST("https://google.com",
+                    "",
+                    new RequestParams(),
+                    new ResponseJsonHandler() {
 
                         @Override
                         protected void onSuccess(String result) {
-
+                            Log.d(TAG, "response " + result);
                         }
 
                         @Override
@@ -66,11 +61,9 @@ private void initRestClient() {
         header.put("accept-language", "en");
 
         restClient = new RestClient.Builder(this)
-
                 .setAuthorization("http://sandbox.vaslapp.com/oauth/token",
                         "c3bdf6c5-508f-48ae-9af4-243a24072e31", "LnDbEo3yDDcswKMC3h4H", AuthType.BASIC_AUTH)
                 .setUserInfo("android-XoaM8ODAYVcKnB16ob8N", "DOI0qOIa0KT6ViYmS1k6")
-
                 .setHeader(header)
                 .build();
 
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 79e4b6f..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    
-    repositories {
-        google()
-        jcenter()
-        maven { url "https://jitpack.io" }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven { url "https://jitpack.io" }
-    }
-    project.ext{
-        minSdkVersion = 15
-        targetSdkVersion = 28
-        compileSdkVersion  = 28
-        buildToolsVersion  = '28.0.3'
-        versionCode = 8
-        versionName = "1.0.8"
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..362b1f1
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        maven("https://jitpack.io")
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:3.3.1")
+        classpath("com.github.dcendents:android-maven-gradle-plugin:2.1")
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven("https://jitpack.io")
+    }
+
+}
+
+task<Delete>("clean") {
+    delete(rootProject.buildDir)
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5b3984..f2ba598 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 02 14:19:07 IRST 2019
+#Mon Feb 18 12:25:12 IRST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-all.zip
diff --git a/library/build.gradle b/library/build.gradle
deleted file mode 100644
index 467daee..0000000
--- a/library/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven' // ADD THIS
-
-group='com.github.rest-client'
-
-android {
-    compileSdkVersion project.compileSdkVersion
-    defaultConfig {
-        minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
-        versionCode project.versionCode
-        versionName project.versionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        debug{
-            buildConfigField "boolean", "enableDebugLogging", "true"
-        }
-        release {
-            minifyEnabled false
-            buildConfigField "boolean", "enableDebugLogging", "false"
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-}
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
new file mode 100644
index 0000000..4078f0b
--- /dev/null
+++ b/library/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.library")
+    id("com.github.dcendents.android-maven") // ADD THIS
+}
+
+group   = "com.github.rest-client"
+version = "1.0.9"
+
+android {
+    compileSdkVersion(28)
+    defaultConfig {
+        minSdkVersion(15)
+        targetSdkVersion(28)
+        buildToolsVersion = "28.0.3"
+        versionCode = 9
+        versionName = "1.0.9"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        getByName("debug"){
+            buildConfigField("Boolean","enableDebugLogging", "true")
+        }
+        getByName("release"){
+            isMinifyEnabled = false
+            buildConfigField("Boolean","enableDebugLogging", "true")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility  = JavaVersion.VERSION_1_8
+        targetCompatibility  = JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20")
+    implementation("androidx.appcompat:appcompat:1.0.2")
+    implementation("com.squareup.okhttp3:okhttp:3.12.0")
+    //implementation("androidx.annotation:annotation:1.0.1")
+    testImplementation("junit:junit:4.12")
+    androidTestImplementation("androidx.test:runner:1.1.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1")
+}
diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro
index f1b4245..2f9dc5a 100644
--- a/library/proguard-rules.pro
+++ b/library/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/library/src/main/java/com/github/library/RestClientHelper.java b/library/src/main/java/com/github/library/RestClientHelper.java
new file mode 100644
index 0000000..0f904f0
--- /dev/null
+++ b/library/src/main/java/com/github/library/RestClientHelper.java
@@ -0,0 +1,67 @@
+package com.github.library;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.net.Uri;
+import android.webkit.MimeTypeMap;
+
+import com.github.library.helper.LogHelper;
+import com.github.library.requestMethod.baseMethod;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class RestClientHelper {
+
+    private static LogHelper logHelper = new LogHelper(baseMethod.class);
+
+    protected static String getMimeType(Context context, Uri url) {
+        String type = null;
+        try {
+            if (url.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
+                ContentResolver cr = context.getContentResolver();
+                type = cr.getType(url);
+            } else {
+                String fileExtension = MimeTypeMap.getFileExtensionFromUrl(url.toString());
+                type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension.toLowerCase());
+            }
+        } catch (Exception e) {
+            logHelper.e("getMimeType", e.getMessage());
+        }
+        return type;
+    }
+
+    protected static String getFileName(String filepath) {
+
+        try {
+            return filepath.substring(filepath.lastIndexOf("/") + 1);
+        } catch (Exception e) {
+            logHelper.e("getFileName",e);
+            return "";
+        }
+    }
+
+    protected static byte[] ImageToBytesCompressed(File file) {
+        try {
+            byte[] bytesArray = new byte[(int) file.length()];
+            try {
+                FileInputStream fis = new FileInputStream(file);
+                fis.read(bytesArray); //read file into bytes[]
+                fis.close();
+
+            } catch (FileNotFoundException ex) {
+                logHelper.e("ImageToBytesCompressed",ex);
+                return null;
+            } catch (IOException ex) {
+                logHelper.e("ImageToBytesCompressed",ex);
+                return null;
+            }
+            return bytesArray;
+        } catch (Exception e) {
+            logHelper.e("ImageToBytesCompressed",e);
+        }
+        return null;
+    }
+}
diff --git a/library/src/main/java/com/github/library/model/FileModel.java b/library/src/main/java/com/github/library/model/FileModel.java
new file mode 100644
index 0000000..d62adb0
--- /dev/null
+++ b/library/src/main/java/com/github/library/model/FileModel.java
@@ -0,0 +1,44 @@
+package com.github.library.model;
+
+import android.provider.MediaStore;
+
+import okhttp3.MediaType;
+
+public class FileModel {
+
+    byte[] file;
+
+    MediaType mimeType;
+
+    String filenName;
+
+    public FileModel(byte[] file, MediaType mimeType, String filenName) {
+        this.file = file;
+        this.mimeType = mimeType;
+        this.filenName = filenName;
+    }
+
+    public String getFilenName() {
+        return filenName;
+    }
+
+    public void setFilenName(String filenName) {
+        this.filenName = filenName;
+    }
+
+    public byte[] getFile() {
+        return file;
+    }
+
+    public void setFile(byte[] file) {
+        this.file = file;
+    }
+
+    public MediaType getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(MediaType mimeType) {
+        this.mimeType = mimeType;
+    }
+}
diff --git a/library/src/main/java/com/github/library/requestMethod/POST.java b/library/src/main/java/com/github/library/requestMethod/POST.java
index 017bfde..2acddc7 100644
--- a/library/src/main/java/com/github/library/requestMethod/POST.java
+++ b/library/src/main/java/com/github/library/requestMethod/POST.java
@@ -3,26 +3,34 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import java.io.IOException;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.collection.ArrayMap;
 import com.github.library.Interface.OAuthResponseCallback;
+import com.github.library.Interface.ResultHandler;
 import com.github.library.enums.ErrorCode;
 import com.github.library.helper.general;
 import com.github.library.model.AuthModel;
+import com.github.library.model.FileModel;
 import com.github.library.model.OAuthResponse;
 import com.github.library.oauth2.OAuth2Client;
 import com.github.library.response.ResponseJsonHandler;
 import com.github.library.response.ResponseTextHandler;
+import com.github.library.utils.RequestBodyProgressive;
 import com.github.library.utils.RequestParams;
-import com.github.library.Interface.ResultHandler;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
 import okhttp3.Call;
 import okhttp3.Callback;
+import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class POST extends baseMethod {
 
@@ -133,7 +141,7 @@ public void run() {
         }
     }
 
-    //    static class LoggingInterceptor implements Interceptor {
+//    static class LoggingInterceptor implements Interceptor {
 //        @Override public Response intercept(Interceptor.Chain chain) throws IOException {
 //            Request request = chain.request();
 //            long t1 = System.nanoTime();
@@ -145,113 +153,104 @@ public void run() {
 //        }
 //    }
 
-    //region upload File multipart
-//    synchronized public static void PostFile (
-//            @NonNull final Context context,
-//            @NonNull final ResultType apiType,
-//            @NonNull final String url,
-//            @NonNull final RequestParams params,
-//            @NonNull final ResultHandler responder) {
-//        try {
-//
-//            OAuth2Client client = new OAuth2Client
-//                    .Builder(property.getClientId(), property.getclientSecret(), property.getSite())
-//                    .appId(property.getAppId())
-//                    .username(property.getUserName())
-//                    .password(property.getPassword())
-//                    .build();
-//
-//            client.requestAccessToken(response -> {
-//
-//                if (response.isSuccessful()) {
-//                    try {
-//                        final Long startTime = getTimeMillisecond();
-//                        MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM);
-//                        LinkedHashMap<String, Object> parameters = params.getParams();
-//                        for (String key : parameters.keySet()) {
-//                            builder.addFormDataPart(key, (String) parameters.get(key));
-//                        }
-//                        LinkedHashMap<String, File> fileParams = params.getFileParams();
-//                        for (String key : fileParams.keySet()) {
-//                            File uploadFile = fileParams.get(key);
-//                            if (uploadFile != null) {
-//                                try {
-//                                    String filePath = uploadFile.getAbsolutePath();
-//                                    final MediaType type = MediaType.parse(getMimeType(context, Uri.fromFile(uploadFile)));
-//                                    final byte[] body = ImageToBytesCompressed(uploadFile);
-//                                    if (body == null)
-//                                        return;
-//                                    builder.addFormDataPart(key, getFileName(filePath), RequestBody.create(type, body));
-//                                } catch (Exception e) {
-//                                    new Handler(Looper.getMainLooper()).post(() -> responder.onFailure(ErrorCode.ERROR_EXCEPTION_FILE_NOT_FOUND));
-//                                }
-//                            }
-//                        }
-//                        RequestBodyProgressive progressiveBuilder = new RequestBodyProgressive(builder.build(), (bytesWritten, contentLength) -> {
-//                            logHelper.d("bytesWritten : " + bytesWritten, "totalSize : " + contentLength);
-//                            new Handler(Looper.getMainLooper()).post(() -> {
-//                                Double percent = (double) bytesWritten / (double) contentLength;
-//                                percent = Math.floor(percent * 100) / 1;
-//                                responder.onProgress(percent);
-//
-//                            });
-//                        });
-//                        Request.Builder request = new Request.Builder()
-//                                .url(url)
-//                                .addHeader("accept-language"    , "fa")
-//                                .addHeader("cache-control"      , "no-cache")
-//                                .addHeader("os"                 , "android")
-//                                .addHeader("Accept-Encoding"    , "gzip")
-//                                .addHeader("Authorization"      , String.format("Bearer %s", response.getAccessToken()))
-//                                .addHeader("appid"              , property.getAppId())
-//                                .post(progressiveBuilder);
-//
-//                        switch (apiType) {
-//                            case Json:
-//                                request.addHeader("Content-Type", "application/json");
-//                                request.addHeader("Accept"      , "application/json");
-//                                break;
-//                            default:
-//                                request.addHeader("Content-Type", "application/x-www-form-urlencoded");
-//                                request.addHeader("Accept"      , "application/octet-stream");
-//                                break;
-//                        }
-//                        getClient().newCall(request.build()).enqueue(new Callback() {
-//                            @Override
-//                            public void onFailure(@NonNull Call call, @NonNull IOException e) {
-//                                logHelper.d( "url : " + url + " - duration : " + calcTime(startTime) + " second");
-//                                new Handler(Looper.getMainLooper()).post(() -> responder.onFailure(ErrorCode.ServerConnectionError));
-//                            }
-//
-//                            @Override
-//                            public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
-//                                if (response.isSuccessful()) {
-//                                    ResponseBody body = response.body();
-//                                    if (body != null) {
-//                                        final byte[] result = body.source().readByteArray();
-//                                        logHelper.d("url : " + url + " - duration : " + calcTime(startTime) + " second - size " + getFileSize(result));
-//                                        new Handler(Looper.getMainLooper()).post(() -> responder.onSuccess(result));
-//                                    }
-//                                } else {
-//                                    logHelper.d("url : " + url + " - duration : " + calcTime(startTime) + " second");
-//                                    new Handler(Looper.getMainLooper()).post(() -> {
-//                                        responder.onFailure(ErrorCode.ParseException);
-//                                    });
-//                                }
-//                            }
-//                        });
-//                    } catch (Exception e) {
-//                        new Handler(Looper.getMainLooper()).post(() -> responder.onFailure(ErrorCode.Exception));
-//                    }
-//                } else {
-//                    new Handler(Looper.getMainLooper()).post(() -> responder.onFailure(ErrorCode.AuthorizationException));
-//                }
-//            });
-//        } catch (Exception ex) {
-//            logHelper.e("Exception", ex.getMessage());
-//            new Handler(Looper.getMainLooper()).post(() -> responder.onFailure(ErrorCode.ParseException));
-//        }
-//    }
-    //endregion
+    public synchronized static void file_no_Auth(
+            @NonNull OkHttpClient client,
+            @NonNull final String url,
+            @Nullable String tag,
+            @NonNull AuthModel authModel,
+            @NonNull RequestParams params,
+            @NonNull final ResultHandler responder) {
+        final Long startTime = getTimeMillisecond();
+        try {
+            MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+            LinkedHashMap<String, Object> parameters = params.getParams();
+            for (String key : parameters.keySet()) {
+                builder.addFormDataPart(key, (String) Objects.requireNonNull(parameters.get(key)));
+            }
+            LinkedHashMap<String, FileModel> fileParams = params.getFileParams();
+            for (String key : fileParams.keySet()) {
+                FileModel uploadFile = fileParams.get(key);
+                if (uploadFile != null) {
+                    builder.addFormDataPart(key, uploadFile.getFilenName(), RequestBody.create(uploadFile.getMimeType(), uploadFile.getFile()));
+                }
+            }
+            RequestBodyProgressive progressiveBuilder = new RequestBodyProgressive(builder.build(), (bytesWritten, contentLength) -> {
+                new Handler(Looper.getMainLooper()).post(() -> {
+                    Double percent = (double) bytesWritten / (double) contentLength;
+                    percent = Math.floor(percent * 100) / 1;
+                    responder.onProgress(percent,(long) bytesWritten,(long)contentLength);
+                });
+            });
+            Request.Builder request = new Request.Builder()
+                    .url(url)
+                    .addHeader("accept-language"    , "fa")
+                    .addHeader("cache-control"      , "no-cache")
+                    .addHeader("os"                 , "android")
+                    .post(progressiveBuilder);
+            switch (authModel.getEncodingType()) {
+                case GZIP:
+                    request.addHeader("Accept-Encoding", "gzip");
+                    break;
+            }
+
+            if (responder instanceof ResponseTextHandler) {
+                request.addHeader("Content-Type", "application/text");
+                request.addHeader("Accept", "application/text");
+            } else if (responder instanceof ResponseJsonHandler) {
+                request.addHeader("Content-Type", "application/json; charset=utf-8");
+                request.addHeader("Accept", "application/json");
+            } else {
+                request.addHeader("Content-Type", "application/x-www-form-urlencoded");
+                request.addHeader("Accept", "application/octet-stream");
+            }
+
+            client.newCall(request.build()).enqueue(new Callback() {
+                @Override
+                public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                    new Handler(Looper.getMainLooper()).post(() -> responder.onFailure(url,startTime,ErrorCode.ServerConnectionError));
+                }
+
+                @Override
+                public void onResponse(@NonNull Call call, @NonNull Response response) {
+                    responder.onResultHandler(startTime,response);
+                }
+            });
+        } catch (Exception e) {
+            new Handler(Looper.getMainLooper()).post(() -> responder.onFailure(url,startTime,ErrorCode.Exception));
+        }
+    }
+
+    public synchronized static void file_basic_Auth(
+            @NonNull final OkHttpClient client,
+            @NonNull final String url,
+            @Nullable final String tag,
+            @NonNull final AuthModel authModel,
+            @NonNull final RequestParams params,
+            @NonNull final ResultHandler responder) {
+        final Long startTime = getTimeMillisecond();
+        try {
+            final ArrayMap<String, String> headers = authModel.getHeaders();
+            OAuth2Client auth = new OAuth2Client(client, headers, authModel);
+            auth.requestAccessToken(response -> {
+                if (response.isSuccessful()) {
+                    switch (authModel.getAuthType()) {
+                        case BASIC_AUTH:
+                            headers.put("Authorization", String.format("Bearer %s", response.getAccessToken()));
+                            break;
+                    }
+                    authModel.setHeaders(headers);
+                    file_no_Auth(client, url, tag, authModel, params, responder);
+                } else {
+                    new Handler(Looper.getMainLooper()).post(() -> {
+                        responder.onFailure(url, startTime, ErrorCode.AuthorizationException);
+                    });
+                }
+            });
+        } catch (Exception ex) {
+            new Handler(Looper.getMainLooper()).post(() -> {
+                responder.onFailure(url, startTime, ErrorCode.RuntimeException);
+            });
+        }
+    }
 
 }
diff --git a/library/src/main/java/com/github/library/requestMethod/baseMethod.java b/library/src/main/java/com/github/library/requestMethod/baseMethod.java
index 084bb40..f56c05a 100644
--- a/library/src/main/java/com/github/library/requestMethod/baseMethod.java
+++ b/library/src/main/java/com/github/library/requestMethod/baseMethod.java
@@ -18,7 +18,6 @@
 
 public abstract class baseMethod {
 
-    private static LogHelper logHelper = new LogHelper(baseMethod.class);
 
     protected static String calcTime(Long startTime) {
         Long duration = getTimeMillisecond() - startTime;
@@ -29,52 +28,6 @@ protected static Long getTimeMillisecond() {
         return System.currentTimeMillis();
     }
 
-    protected static String getMimeType(Context context, Uri url) {
-        String type = null;
-        try {
-            if (url.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
-                ContentResolver cr = context.getContentResolver();
-                type = cr.getType(url);
-            } else {
-                String fileExtension = MimeTypeMap.getFileExtensionFromUrl(url.toString());
-                type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension.toLowerCase());
-            }
-        } catch (Exception e) {
-            logHelper.e("getMimeType", e.getMessage());
-        }
-        return type;
-    }
-
-    protected static String getFileName(String filepath) {
-
-        try {
-            return filepath.substring(filepath.lastIndexOf("/") + 1);
-        } catch (Exception e) {
-            logHelper.e("getFileName",e);
-            return "";
-        }
-    }
-
-    protected static byte[] ImageToBytesCompressed(File file) {
-        try {
-            byte[] bytesArray = new byte[(int) file.length()];
-            try {
-                FileInputStream fis = new FileInputStream(file);
-                fis.read(bytesArray); //read file into bytes[]
-                fis.close();
 
-            } catch (FileNotFoundException ex) {
-                logHelper.e("ImageToBytesCompressed",ex);
-                return null;
-            } catch (IOException ex) {
-                logHelper.e("ImageToBytesCompressed",ex);
-                return null;
-            }
-            return bytesArray;
-        } catch (Exception e) {
-            logHelper.e("ImageToBytesCompressed",e);
-        }
-        return null;
-    }
 
 }
diff --git a/library/src/main/java/com/github/library/utils/RequestParams.java b/library/src/main/java/com/github/library/utils/RequestParams.java
index 4b3abca..0d97d3e 100644
--- a/library/src/main/java/com/github/library/utils/RequestParams.java
+++ b/library/src/main/java/com/github/library/utils/RequestParams.java
@@ -12,6 +12,8 @@
 import com.github.library.enums.RequestBodyType;
 import com.github.library.helper.LogHelper;
 import com.github.library.helper.general;
+import com.github.library.model.FileModel;
+
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
@@ -30,7 +32,7 @@ public class RequestParams {
 
     private LinkedHashMap<String, Object> params = new LinkedHashMap<>();
 
-    private LinkedHashMap<String, File> fileParams = new LinkedHashMap<>();
+    private LinkedHashMap<String, FileModel> fileParams = new LinkedHashMap<>();
 
     private LinkedHashMap<String, List<Object>> paramsArray = new LinkedHashMap<>();
 
@@ -83,7 +85,7 @@ public void put(String key, Double value) {
         params.put(key, value);
     }
 
-    public void put(String key, File value){
+    public void put(String key, FileModel value){
         if (general.StringIsEmptyOrNull(key) ||  value == null){
             return;
         }
@@ -195,7 +197,7 @@ public LinkedHashMap<String, Object> getParams() {
         return params;
     }
 
-    public LinkedHashMap<String, File> getFileParams() {
+    public LinkedHashMap<String, FileModel> getFileParams() {
         return fileParams;
     }
 
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 3306997..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app', ':library'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..7853fb8
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1 @@
+include(":app", ":library")