diff --git a/app/build.gradle b/app/build.gradle index fdf331c9c..0a0875f52 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,8 +43,7 @@ dependencies { compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1' compile 'com.booking:rtlviewpager:1.0.1' compile 'com.simplemobiletools:fileproperties:1.0.7@aar' - compile 'com.simplemobiletools:filepicker:1.6.1@aar' - compile 'com.simplemobiletools:commons:1.1.17' + compile 'com.simplemobiletools:commons:1.2.0' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt index b1477989c..797236491 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt @@ -8,10 +8,10 @@ import android.os.Bundle import android.util.Log import android.view.Menu import android.view.MenuItem -import com.simplemobiletools.filepicker.extensions.getFileDocument -import com.simplemobiletools.filepicker.extensions.needsStupidWritePermissions -import com.simplemobiletools.filepicker.extensions.scanPath -import com.simplemobiletools.filepicker.extensions.toast +import com.simplemobiletools.commons.extensions.getFileDocument +import com.simplemobiletools.commons.extensions.needsStupidWritePermissions +import com.simplemobiletools.commons.extensions.scanPath +import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.dialogs.ResizeDialog import com.simplemobiletools.gallery.dialogs.SaveAsDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt index e32600722..2d37b23e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt @@ -14,7 +14,7 @@ import android.support.v7.widget.GridLayoutManager import android.view.Menu import android.view.MenuItem import android.view.View -import com.simplemobiletools.filepicker.extensions.* +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.adapters.DirectoryAdapter import com.simplemobiletools.gallery.asynctasks.GetDirectoriesAsynctask diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt index 2d89192f7..baf400c94 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt @@ -13,7 +13,7 @@ import android.view.MenuItem import com.bumptech.glide.Glide import com.bumptech.glide.request.animation.GlideAnimation import com.bumptech.glide.request.target.SimpleTarget -import com.simplemobiletools.filepicker.extensions.* +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.adapters.MediaAdapter import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt index b2446e9e8..594f1afba 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt @@ -8,7 +8,7 @@ import android.net.Uri import android.os.Bundle import android.view.Menu import android.view.MenuItem -import com.simplemobiletools.filepicker.extensions.toast +import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.gallery.R import com.theartofdev.edmodo.cropper.CropImageView import kotlinx.android.synthetic.main.activity_edit.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt index 79a7e25ce..be0f76d08 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt @@ -10,9 +10,9 @@ import android.support.v4.view.ViewPager import android.view.Menu import android.view.MenuItem import android.view.View +import com.simplemobiletools.commons.asynctasks.CopyMoveTask import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.filepicker.asynctasks.CopyMoveTask -import com.simplemobiletools.filepicker.extensions.* +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.fileproperties.dialogs.PropertiesDialog import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.adapters.MyPagerAdapter diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt index 82f8e7c81..166df9a72 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt @@ -12,12 +12,12 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.DecodeFormat import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.signature.StringSignature +import com.simplemobiletools.commons.asynctasks.CopyMoveTask import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.filepicker.asynctasks.CopyMoveTask -import com.simplemobiletools.filepicker.extensions.isAStorageRootFolder -import com.simplemobiletools.filepicker.extensions.isImageVideoGif -import com.simplemobiletools.filepicker.extensions.scanPaths -import com.simplemobiletools.filepicker.extensions.toast +import com.simplemobiletools.commons.extensions.isAStorageRootFolder +import com.simplemobiletools.commons.extensions.isImageVideoGif +import com.simplemobiletools.commons.extensions.scanPaths +import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.fileproperties.dialogs.PropertiesDialog import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt index 8c7a47931..cef0d9ca5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt @@ -12,9 +12,9 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.DecodeFormat import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.signature.StringSignature +import com.simplemobiletools.commons.asynctasks.CopyMoveTask import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.filepicker.asynctasks.CopyMoveTask -import com.simplemobiletools.filepicker.extensions.toast +import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.fileproperties.dialogs.PropertiesDialog import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt index 60b1088df..69f9fe488 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt @@ -4,7 +4,7 @@ import android.content.Context import android.database.Cursor import android.os.AsyncTask import android.provider.MediaStore -import com.simplemobiletools.filepicker.extensions.scanFiles +import com.simplemobiletools.commons.extensions.scanFiles import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.extensions.getHumanizedFilename import com.simplemobiletools.gallery.extensions.getLongValue diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt index a78ebf901..cc785020d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt @@ -4,7 +4,7 @@ import android.content.Context import android.database.Cursor import android.os.AsyncTask import android.provider.MediaStore -import com.simplemobiletools.filepicker.extensions.scanFiles +import com.simplemobiletools.commons.extensions.scanFiles import com.simplemobiletools.gallery.extensions.getLongValue import com.simplemobiletools.gallery.extensions.getStringValue import com.simplemobiletools.gallery.helpers.Config diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt index 87e7c57fb..1c296f519 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt @@ -4,12 +4,8 @@ import android.support.v4.util.Pair import android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.ViewGroup -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.filepicker.asynctasks.CopyMoveTask -import com.simplemobiletools.filepicker.extensions.humanizePath -import com.simplemobiletools.filepicker.extensions.isPathOnSD -import com.simplemobiletools.filepicker.extensions.scanFiles -import com.simplemobiletools.filepicker.extensions.toast +import com.simplemobiletools.commons.asynctasks.CopyMoveTask +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity import com.simplemobiletools.gallery.helpers.Config diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt index 702b941d6..731328add 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt @@ -5,8 +5,8 @@ import android.support.v7.app.AlertDialog import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup +import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.filepicker.dialogs.FilePickerDialog import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity import com.simplemobiletools.gallery.adapters.DirectoryAdapter diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt index cacc2dc53..282d61484 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt @@ -4,8 +4,7 @@ import android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.ViewGroup import android.view.WindowManager -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.filepicker.extensions.* +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity import com.simplemobiletools.gallery.helpers.Config diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt index e331d697b..297b6afd6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt @@ -4,8 +4,7 @@ import android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.ViewGroup import android.view.WindowManager -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.filepicker.extensions.* +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity import com.simplemobiletools.gallery.helpers.Config diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt index fb156fb7e..533f0056f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt @@ -8,8 +8,8 @@ import android.view.LayoutInflater import android.view.WindowManager import android.widget.EditText import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.filepicker.extensions.toast -import com.simplemobiletools.filepicker.extensions.value +import com.simplemobiletools.commons.extensions.toast +import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity import kotlinx.android.synthetic.main.resize_image.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt index 545f0ddf3..844f11204 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt @@ -4,9 +4,8 @@ import android.app.Activity import android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.WindowManager -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.filepicker.dialogs.FilePickerDialog -import com.simplemobiletools.filepicker.extensions.* +import com.simplemobiletools.commons.dialogs.FilePickerDialog +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.R import kotlinx.android.synthetic.main.rename_file.view.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt index 7958dfe3c..8ec3768c7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt @@ -10,9 +10,9 @@ import android.view.KeyCharacterMap import android.view.KeyEvent import android.view.View import android.view.ViewConfiguration +import com.simplemobiletools.commons.extensions.getMimeType +import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.filepicker.extensions.getMimeType -import com.simplemobiletools.filepicker.extensions.toast import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity import com.simplemobiletools.gallery.helpers.REQUEST_EDIT_IMAGE @@ -111,7 +111,7 @@ fun Activity.hasNavBar(): Boolean { fun SimpleActivity.launchAbout() { startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_SUBSAMPLING or LICENSE_GLIDE or LICENSE_CROPPER or - LICENSE_MULTISELECT or LICENSE_RTL or LICENSE_FILEPICKER or LICENSE_FILEPROPERTIES) + LICENSE_MULTISELECT or LICENSE_RTL or LICENSE_FILEPROPERTIES) } fun AppCompatActivity.showSystemUI() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt index 524e192e7..b7e39d603 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.database.Cursor import android.net.Uri import android.provider.MediaStore -import com.simplemobiletools.filepicker.extensions.humanizePath +import com.simplemobiletools.commons.extensions.humanizePath import com.simplemobiletools.gallery.activities.SettingsActivity fun Context.getRealPathFromURI(uri: Uri): String? { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d72b74be8..dd5c049b8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d4ea85338..63473991a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 867e498ac..ef81da376 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ee67b6e1d..8205c5407 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 41cf6b29c..d664fc10d 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c081c01d3..db3ef05cb 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5a9a97af3..6e5e009fe 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1debe00ff..52cb7037c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a1cccc2da..4bec69d07 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -111,7 +111,6 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e231f3216..8cf8b0e7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -111,7 +111,6 @@