From 9589c257bcb2e9a68007a0ea8c81f25917e45184 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Nov 2018 21:25:51 +0100 Subject: [PATCH] appending .pro to the package name --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../gallery/models/ThumbnailItem.kt | 3 -- .../gallery/{ => pro}/App.kt | 2 +- .../{ => pro}/activities/EditActivity.kt | 18 +++++----- .../activities/ExcludedFoldersActivity.kt | 8 ++--- .../activities/HiddenFoldersActivity.kt | 12 +++---- .../activities/IncludedFoldersActivity.kt | 8 ++--- .../{ => pro}/activities/MainActivity.kt | 36 ++++++++----------- .../{ => pro}/activities/MediaActivity.kt | 35 +++++++++--------- .../activities/PanoramaPhotoActivity.kt | 8 ++--- .../activities/PanoramaVideoActivity.kt | 14 ++++---- .../{ => pro}/activities/PhotoActivity.kt | 2 +- .../activities/PhotoVideoActivity.kt | 16 ++++----- .../activities/SetWallpaperActivity.kt | 4 +-- .../{ => pro}/activities/SettingsActivity.kt | 26 +++++--------- .../{ => pro}/activities/SimpleActivity.kt | 4 +-- .../{ => pro}/activities/SplashActivity.kt | 2 +- .../{ => pro}/activities/VideoActivity.kt | 2 +- .../{ => pro}/activities/ViewPagerActivity.kt | 28 +++++++-------- .../{ => pro}/adapters/DirectoryAdapter.kt | 18 +++++----- .../{ => pro}/adapters/FiltersAdapter.kt | 6 ++-- .../adapters/ManageFoldersAdapter.kt | 6 ++-- .../adapters/ManageHiddenFoldersAdapter.kt | 8 ++--- .../{ => pro}/adapters/MediaAdapter.kt | 18 +++++----- .../{ => pro}/adapters/MyPagerAdapter.kt | 14 ++++---- .../{ => pro}/asynctasks/GetMediaAsynctask.kt | 18 +++++----- .../{ => pro}/databases/GalleryDatabase.kt | 12 +++---- .../{ => pro}/dialogs/ChangeGroupingDialog.kt | 8 ++--- .../{ => pro}/dialogs/ChangeSortingDialog.kt | 8 ++--- .../dialogs/DeleteWithRememberDialog.kt | 4 +-- .../{ => pro}/dialogs/ExcludeFolderDialog.kt | 14 ++++---- .../{ => pro}/dialogs/FilterMediaDialog.kt | 8 ++--- .../dialogs/ManageBottomActionsDialog.kt | 8 ++--- .../dialogs/ManageExtendedDetailsDialog.kt | 12 +++---- .../{ => pro}/dialogs/PickDirectoryDialog.kt | 18 +++++----- .../{ => pro}/dialogs/PickMediumDialog.kt | 20 +++++------ .../gallery/{ => pro}/dialogs/ResizeDialog.kt | 4 +-- .../gallery/{ => pro}/dialogs/SaveAsDialog.kt | 4 +-- .../{ => pro}/dialogs/SlideshowDialog.kt | 10 +++--- .../gallery/{ => pro}/extensions/Activity.kt | 14 ++++---- .../gallery/{ => pro}/extensions/ArrayList.kt | 6 ++-- .../gallery/{ => pro}/extensions/Context.kt | 26 +++++++------- .../gallery/{ => pro}/extensions/File.kt | 4 +-- .../{ => pro}/extensions/FileDirItem.kt | 2 +- .../gallery/{ => pro}/extensions/Resources.kt | 2 +- .../gallery/{ => pro}/extensions/String.kt | 2 +- .../gallery/{ => pro}/extensions/View.kt | 2 +- .../{ => pro}/fragments/PhotoFragment.kt | 24 ++++++------- .../{ => pro}/fragments/VideoFragment.kt | 16 ++++----- .../{ => pro}/fragments/ViewPagerFragment.kt | 8 ++--- .../gallery/{ => pro}/helpers/Config.kt | 6 ++-- .../gallery/{ => pro}/helpers/Constants.kt | 2 +- .../helpers/FilterThumbnailsManager.kt | 4 +-- .../helpers/GlideRotateTransformation.kt | 2 +- .../{ => pro}/helpers/IsoTypeReader.kt | 2 +- .../gallery/{ => pro}/helpers/MediaFetcher.kt | 12 +++---- .../{ => pro}/helpers/PicassoDecoder.kt | 2 +- .../{ => pro}/helpers/PicassoRegionDecoder.kt | 2 +- .../{ => pro}/interfaces/DirectoryDao.kt | 6 ++-- .../interfaces/DirectoryOperationsListener.kt | 4 +-- .../interfaces/MediaOperationsListener.kt | 2 +- .../gallery/{ => pro}/interfaces/MediumDao.kt | 4 +-- .../gallery/{ => pro}/models/AlbumCover.kt | 2 +- .../gallery/{ => pro}/models/Directory.kt | 6 ++-- .../gallery/{ => pro}/models/FilterItem.kt | 2 +- .../gallery/{ => pro}/models/Medium.kt | 4 +-- .../gallery/pro/models/ThumbnailItem.kt | 3 ++ .../{ => pro}/models/ThumbnailSection.kt | 2 +- .../gallery/{ => pro}/objects/MyExecutor.kt | 2 +- .../receivers/RefreshMediaReceiver.kt | 8 ++--- .../gallery/{ => pro}/svg/SvgDecoder.kt | 2 +- .../{ => pro}/svg/SvgDrawableTranscoder.kt | 2 +- .../gallery/{ => pro}/svg/SvgModule.kt | 2 +- .../{ => pro}/svg/SvgSoftwareLayerSetter.kt | 2 +- .../{ => pro}/views/InstantItemSwitch.kt | 6 ++-- .../{ => pro}/views/MediaSideScroll.kt | 12 +++---- .../{ => pro}/views/MySquareImageView.kt | 2 +- app/src/main/res/layout/activity_settings.xml | 22 ------------ .../main/res/layout/directory_item_grid.xml | 2 +- .../main/res/layout/directory_item_list.xml | 2 +- app/src/main/res/layout/pager_photo_item.xml | 6 ++-- app/src/main/res/layout/pager_video_item.xml | 8 ++--- .../main/res/layout/photo_video_item_grid.xml | 2 +- .../main/res/layout/photo_video_item_list.xml | 2 +- 85 files changed, 335 insertions(+), 370 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailItem.kt rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/App.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/EditActivity.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/ExcludedFoldersActivity.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/HiddenFoldersActivity.kt (83%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/IncludedFoldersActivity.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/MainActivity.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/MediaActivity.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/PanoramaPhotoActivity.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/PanoramaVideoActivity.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/PhotoActivity.kt (79%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/PhotoVideoActivity.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/SetWallpaperActivity.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/SettingsActivity.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/SimpleActivity.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/SplashActivity.kt (83%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/VideoActivity.kt (79%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/activities/ViewPagerActivity.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/adapters/DirectoryAdapter.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/adapters/FiltersAdapter.kt (92%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/adapters/ManageFoldersAdapter.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/adapters/ManageHiddenFoldersAdapter.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/adapters/MediaAdapter.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/adapters/MyPagerAdapter.kt (81%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/asynctasks/GetMediaAsynctask.kt (76%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/databases/GalleryDatabase.kt (76%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/ChangeGroupingDialog.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/ChangeSortingDialog.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/DeleteWithRememberDialog.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/ExcludeFolderDialog.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/FilterMediaDialog.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/ManageBottomActionsDialog.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/ManageExtendedDetailsDialog.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/PickDirectoryDialog.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/PickMediumDialog.kt (86%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/ResizeDialog.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/SaveAsDialog.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/dialogs/SlideshowDialog.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/Activity.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/ArrayList.kt (72%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/Context.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/File.kt (78%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/FileDirItem.kt (81%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/Resources.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/String.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/extensions/View.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/fragments/PhotoFragment.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/fragments/VideoFragment.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/fragments/ViewPagerFragment.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/Config.kt (99%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/Constants.kt (99%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/FilterThumbnailsManager.kt (86%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/GlideRotateTransformation.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/IsoTypeReader.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/MediaFetcher.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/PicassoDecoder.kt (92%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/helpers/PicassoRegionDecoder.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/interfaces/DirectoryDao.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/interfaces/DirectoryOperationsListener.kt (67%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/interfaces/MediaOperationsListener.kt (81%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/interfaces/MediumDao.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/models/AlbumCover.kt (54%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/models/Directory.kt (90%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/models/FilterItem.kt (75%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/models/Medium.kt (96%) create mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailItem.kt rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/models/ThumbnailSection.kt (57%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/objects/MyExecutor.kt (70%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/receivers/RefreshMediaReceiver.kt (81%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/svg/SvgDecoder.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/svg/SvgDrawableTranscoder.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/svg/SvgModule.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/svg/SvgSoftwareLayerSetter.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/views/InstantItemSwitch.kt (92%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/views/MediaSideScroll.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/gallery/{ => pro}/views/MySquareImageView.kt (92%) diff --git a/app/build.gradle b/app/build.gradle index 05dbcdec6..ac0633404 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion "28.0.3" defaultConfig { - applicationId "com.simplemobiletools.gallery" + applicationId "com.simplemobiletools.gallery.pro" minSdkVersion 21 targetSdkVersion 28 versionCode 207 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 86ed4b512..a33b0c153 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailItem.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailItem.kt deleted file mode 100644 index f53c5df10..000000000 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailItem.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.simplemobiletools.gallery.models - -open class ThumbnailItem diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/App.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/gallery/App.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/App.kt index 8bb567298..670ba17a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/App.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery +package com.simplemobiletools.gallery.pro import androidx.multidex.MultiDexApplication import com.github.ajalt.reprint.core.Reprint diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt index 6d4ceeb76..b71a979e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.app.Activity import android.content.Intent @@ -25,14 +25,14 @@ import com.simplemobiletools.commons.helpers.OTG_PATH import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.REAL_FILE_PATH import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.FiltersAdapter -import com.simplemobiletools.gallery.dialogs.ResizeDialog -import com.simplemobiletools.gallery.dialogs.SaveAsDialog -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.extensions.openEditor -import com.simplemobiletools.gallery.helpers.FilterThumbnailsManager -import com.simplemobiletools.gallery.models.FilterItem +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.FiltersAdapter +import com.simplemobiletools.gallery.pro.dialogs.ResizeDialog +import com.simplemobiletools.gallery.pro.dialogs.SaveAsDialog +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.openEditor +import com.simplemobiletools.gallery.pro.helpers.FilterThumbnailsManager +import com.simplemobiletools.gallery.pro.models.FilterItem import com.theartofdev.edmodo.cropper.CropImageView import com.zomato.photofilters.FilterPack import com.zomato.photofilters.imageprocessors.Filter diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ExcludedFoldersActivity.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ExcludedFoldersActivity.kt index 4d3a1883a..0d3f96fdc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ExcludedFoldersActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.os.Bundle import android.view.Menu @@ -6,9 +6,9 @@ import android.view.MenuItem import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.ManageFoldersAdapter -import com.simplemobiletools.gallery.extensions.config +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.ManageFoldersAdapter +import com.simplemobiletools.gallery.pro.extensions.config import kotlinx.android.synthetic.main.activity_manage_folders.* class ExcludedFoldersActivity : SimpleActivity(), RefreshRecyclerViewListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/HiddenFoldersActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/HiddenFoldersActivity.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/HiddenFoldersActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/HiddenFoldersActivity.kt index c46135c98..98d5eb9d9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/HiddenFoldersActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/HiddenFoldersActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.os.Bundle import android.view.Menu @@ -6,11 +6,11 @@ import android.view.MenuItem import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.ManageHiddenFoldersAdapter -import com.simplemobiletools.gallery.extensions.addNoMedia -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.extensions.getNoMediaFolders +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.ManageHiddenFoldersAdapter +import com.simplemobiletools.gallery.pro.extensions.addNoMedia +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.getNoMediaFolders import kotlinx.android.synthetic.main.activity_manage_folders.* class HiddenFoldersActivity : SimpleActivity(), RefreshRecyclerViewListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/IncludedFoldersActivity.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/IncludedFoldersActivity.kt index 4a4d1339e..b6be4add2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/IncludedFoldersActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.os.Bundle import android.view.Menu @@ -7,9 +7,9 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.scanPathRecursively import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.ManageFoldersAdapter -import com.simplemobiletools.gallery.extensions.config +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.ManageFoldersAdapter +import com.simplemobiletools.gallery.pro.extensions.config import kotlinx.android.synthetic.main.activity_manage_folders.* class IncludedFoldersActivity : SimpleActivity(), RefreshRecyclerViewListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index c79ef6987..5a8925adc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.app.Activity import android.app.SearchManager @@ -20,7 +20,6 @@ import androidx.recyclerview.widget.RecyclerView import com.simplemobiletools.commons.dialogs.CreateNewFolderDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.dialogs.UpgradeToProDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FileDirItem @@ -28,20 +27,20 @@ import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.models.Release import com.simplemobiletools.commons.views.MyGridLayoutManager import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.gallery.BuildConfig -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.DirectoryAdapter -import com.simplemobiletools.gallery.databases.GalleryDatabase -import com.simplemobiletools.gallery.dialogs.ChangeSortingDialog -import com.simplemobiletools.gallery.dialogs.FilterMediaDialog -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.interfaces.DirectoryDao -import com.simplemobiletools.gallery.interfaces.DirectoryOperationsListener -import com.simplemobiletools.gallery.interfaces.MediumDao -import com.simplemobiletools.gallery.models.AlbumCover -import com.simplemobiletools.gallery.models.Directory -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.BuildConfig +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.DirectoryAdapter +import com.simplemobiletools.gallery.pro.databases.GalleryDatabase +import com.simplemobiletools.gallery.pro.dialogs.ChangeSortingDialog +import com.simplemobiletools.gallery.pro.dialogs.FilterMediaDialog +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.interfaces.DirectoryDao +import com.simplemobiletools.gallery.pro.interfaces.DirectoryOperationsListener +import com.simplemobiletools.gallery.pro.interfaces.MediumDao +import com.simplemobiletools.gallery.pro.models.AlbumCover +import com.simplemobiletools.gallery.pro.models.Directory +import com.simplemobiletools.gallery.pro.models.Medium import kotlinx.android.synthetic.main.activity_main.* import java.io.* import java.util.* @@ -148,11 +147,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { config.filterMedia += TYPE_SVGS } } - - if (!config.wasInitialUpgradeToProShown) { - UpgradeToProDialog(this) - config.wasInitialUpgradeToProShown = true - } } override fun onStart() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt index cd0eb87dc..4dca15ec7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.app.Activity import android.app.SearchManager @@ -31,21 +31,21 @@ import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.views.MyGridLayoutManager import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.MediaAdapter -import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask -import com.simplemobiletools.gallery.dialogs.ChangeGroupingDialog -import com.simplemobiletools.gallery.dialogs.ChangeSortingDialog -import com.simplemobiletools.gallery.dialogs.ExcludeFolderDialog -import com.simplemobiletools.gallery.dialogs.FilterMediaDialog -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.interfaces.DirectoryDao -import com.simplemobiletools.gallery.interfaces.MediaOperationsListener -import com.simplemobiletools.gallery.interfaces.MediumDao -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.models.ThumbnailItem -import com.simplemobiletools.gallery.models.ThumbnailSection +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.MediaAdapter +import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask +import com.simplemobiletools.gallery.pro.dialogs.ChangeGroupingDialog +import com.simplemobiletools.gallery.pro.dialogs.ChangeSortingDialog +import com.simplemobiletools.gallery.pro.dialogs.ExcludeFolderDialog +import com.simplemobiletools.gallery.pro.dialogs.FilterMediaDialog +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.interfaces.DirectoryDao +import com.simplemobiletools.gallery.pro.interfaces.MediaOperationsListener +import com.simplemobiletools.gallery.pro.interfaces.MediumDao +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem +import com.simplemobiletools.gallery.pro.models.ThumbnailSection import kotlinx.android.synthetic.main.activity_media.* import java.io.File import java.io.IOException @@ -260,7 +260,8 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener { private fun startSlideshow() { if (mMedia.isNotEmpty()) { Intent(this, ViewPagerActivity::class.java).apply { - val item = mMedia.firstOrNull { it is Medium } as? Medium ?: return + val item = mMedia.firstOrNull { it is Medium } as? Medium + ?: return putExtra(PATH, item.path) putExtra(SHOW_ALL, mShowAll) putExtra(SLIDESHOW_START_ON_ENTER, true) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaPhotoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaPhotoActivity.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaPhotoActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaPhotoActivity.kt index a1dfb2664..0af37fd0b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaPhotoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaPhotoActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.content.res.Configuration import android.graphics.Bitmap @@ -17,9 +17,9 @@ import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.isPiePlus -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.PATH +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.PATH import kotlinx.android.synthetic.main.activity_panorama_photo.* open class PanoramaPhotoActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaVideoActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt index 3e65534ff..7518add3c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaVideoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.content.res.Configuration import android.graphics.Color @@ -19,12 +19,12 @@ import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.isPiePlus -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.HIDE_PLAY_PAUSE_DELAY -import com.simplemobiletools.gallery.helpers.MIN_SKIP_LENGTH -import com.simplemobiletools.gallery.helpers.PATH -import com.simplemobiletools.gallery.helpers.PLAY_PAUSE_VISIBLE_ALPHA +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.HIDE_PLAY_PAUSE_DELAY +import com.simplemobiletools.gallery.pro.helpers.MIN_SKIP_LENGTH +import com.simplemobiletools.gallery.pro.helpers.PATH +import com.simplemobiletools.gallery.pro.helpers.PLAY_PAUSE_VISIBLE_ALPHA import kotlinx.android.synthetic.main.activity_panorama_video.* import kotlinx.android.synthetic.main.bottom_video_time_holder.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoActivity.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoActivity.kt index 44e83dbfd..95c439d3a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.os.Bundle diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt index 19465cb20..7199811e9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.content.Intent import android.content.res.Configuration @@ -16,13 +16,13 @@ import com.simplemobiletools.commons.helpers.IS_FROM_GALLERY import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.REAL_FILE_PATH import com.simplemobiletools.commons.helpers.isPiePlus -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.fragments.PhotoFragment -import com.simplemobiletools.gallery.fragments.VideoFragment -import com.simplemobiletools.gallery.fragments.ViewPagerFragment -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.fragments.PhotoFragment +import com.simplemobiletools.gallery.pro.fragments.VideoFragment +import com.simplemobiletools.gallery.pro.fragments.ViewPagerFragment +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.models.Medium import kotlinx.android.synthetic.main.bottom_actions.* import kotlinx.android.synthetic.main.fragment_holder.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SetWallpaperActivity.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SetWallpaperActivity.kt index 8fd8dcfb5..946e0176f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SetWallpaperActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.annotation.SuppressLint import android.app.Activity @@ -13,7 +13,7 @@ import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.helpers.isNougatPlus import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.gallery.R +import com.simplemobiletools.gallery.pro.R import com.theartofdev.edmodo.cropper.CropImageView import kotlinx.android.synthetic.main.activity_set_wallpaper.* import kotlinx.android.synthetic.main.bottom_set_wallpaper_actions.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt index 82583cf37..71a424365 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.content.Intent import android.os.Bundle @@ -10,14 +10,14 @@ import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS import com.simplemobiletools.commons.helpers.sumByLong import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.dialogs.ManageBottomActionsDialog -import com.simplemobiletools.gallery.dialogs.ManageExtendedDetailsDialog -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.extensions.emptyTheRecycleBin -import com.simplemobiletools.gallery.extensions.galleryDB -import com.simplemobiletools.gallery.extensions.showRecycleBinEmptyingDialog -import com.simplemobiletools.gallery.helpers.* +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.dialogs.ManageBottomActionsDialog +import com.simplemobiletools.gallery.pro.dialogs.ManageExtendedDetailsDialog +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.emptyTheRecycleBin +import com.simplemobiletools.gallery.pro.extensions.galleryDB +import com.simplemobiletools.gallery.pro.extensions.showRecycleBinEmptyingDialog +import com.simplemobiletools.gallery.pro.helpers.* import kotlinx.android.synthetic.main.activity_settings.* import java.util.* @@ -32,7 +32,6 @@ class SettingsActivity : SimpleActivity() { override fun onResume() { super.onResume() - setupUpgradeToPro() setupCustomizeColors() setupUseEnglish() setupManageIncludedFolders() @@ -87,13 +86,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupUpgradeToPro() { - settings_upgrade_to_pro_holder.beGoneIf(isAProApp()) - settings_upgrade_to_pro_holder.setOnClickListener { - launchUpgradeToProIntent() - } - } - private fun setupCustomizeColors() { settings_customize_colors_holder.setOnClickListener { startCustomizationActivity() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SimpleActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SimpleActivity.kt index 627ff7da9..603355ac0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SimpleActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.gallery.R +import com.simplemobiletools.gallery.pro.R open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SplashActivity.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/SplashActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SplashActivity.kt index a0d0c7acd..20c9c9387 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.content.Intent import com.simplemobiletools.commons.activities.BaseSplashActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/VideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoActivity.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/VideoActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoActivity.kt index 7ca92e902..78fa61955 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/VideoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.os.Bundle diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt index 920745ec6..55dc39a86 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.activities +package com.simplemobiletools.gallery.pro.activities import android.animation.Animator import android.animation.ValueAnimator @@ -33,19 +33,19 @@ import com.simplemobiletools.commons.dialogs.RenameItemDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.MyPagerAdapter -import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask -import com.simplemobiletools.gallery.dialogs.DeleteWithRememberDialog -import com.simplemobiletools.gallery.dialogs.SaveAsDialog -import com.simplemobiletools.gallery.dialogs.SlideshowDialog -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.fragments.PhotoFragment -import com.simplemobiletools.gallery.fragments.VideoFragment -import com.simplemobiletools.gallery.fragments.ViewPagerFragment -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.models.ThumbnailItem +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.MyPagerAdapter +import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask +import com.simplemobiletools.gallery.pro.dialogs.DeleteWithRememberDialog +import com.simplemobiletools.gallery.pro.dialogs.SaveAsDialog +import com.simplemobiletools.gallery.pro.dialogs.SlideshowDialog +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.fragments.PhotoFragment +import com.simplemobiletools.gallery.pro.fragments.VideoFragment +import com.simplemobiletools.gallery.pro.fragments.ViewPagerFragment +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem import kotlinx.android.synthetic.main.activity_medium.* import kotlinx.android.synthetic.main.bottom_actions.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt index 58418c0fd..30c358160 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.adapters +package com.simplemobiletools.gallery.pro.adapters import android.view.Menu import android.view.View @@ -16,14 +16,14 @@ import com.simplemobiletools.commons.helpers.OTG_PATH import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.dialogs.ExcludeFolderDialog -import com.simplemobiletools.gallery.dialogs.PickMediumDialog -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.interfaces.DirectoryOperationsListener -import com.simplemobiletools.gallery.models.AlbumCover -import com.simplemobiletools.gallery.models.Directory +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.dialogs.ExcludeFolderDialog +import com.simplemobiletools.gallery.pro.dialogs.PickMediumDialog +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.interfaces.DirectoryOperationsListener +import com.simplemobiletools.gallery.pro.models.AlbumCover +import com.simplemobiletools.gallery.pro.models.Directory import kotlinx.android.synthetic.main.directory_item_list.view.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/FiltersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/FiltersAdapter.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/gallery/adapters/FiltersAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/FiltersAdapter.kt index db8aa9c7d..b614787b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/FiltersAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/FiltersAdapter.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.gallery.adapters +package com.simplemobiletools.gallery.pro.adapters import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.models.FilterItem +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.models.FilterItem import kotlinx.android.synthetic.main.editor_filter_item.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageFoldersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageFoldersAdapter.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageFoldersAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageFoldersAdapter.kt index 592c00d79..ed6b8a1c4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageFoldersAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageFoldersAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.adapters +package com.simplemobiletools.gallery.pro.adapters import android.view.Menu import android.view.View @@ -7,8 +7,8 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config import kotlinx.android.synthetic.main.item_manage_folder.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageHiddenFoldersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageHiddenFoldersAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt index 95e2c053f..209ce1e40 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageHiddenFoldersAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.adapters +package com.simplemobiletools.gallery.pro.adapters import android.view.Menu import android.view.View @@ -8,9 +8,9 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.isPathOnSD import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.extensions.removeNoMedia +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.removeNoMedia import kotlinx.android.synthetic.main.item_manage_folder.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt index 14cb627d0..df1cb2e51 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.adapters +package com.simplemobiletools.gallery.pro.adapters import android.content.ContentProviderOperation import android.media.ExifInterface @@ -20,14 +20,14 @@ import com.simplemobiletools.commons.helpers.OTG_PATH import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.dialogs.DeleteWithRememberDialog -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.VIEW_TYPE_LIST -import com.simplemobiletools.gallery.interfaces.MediaOperationsListener -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.models.ThumbnailItem -import com.simplemobiletools.gallery.models.ThumbnailSection +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.dialogs.DeleteWithRememberDialog +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.VIEW_TYPE_LIST +import com.simplemobiletools.gallery.pro.interfaces.MediaOperationsListener +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem +import com.simplemobiletools.gallery.pro.models.ThumbnailSection import kotlinx.android.synthetic.main.photo_video_item_grid.view.* import kotlinx.android.synthetic.main.thumbnail_section.view.* import java.text.SimpleDateFormat diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MyPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MyPagerAdapter.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MyPagerAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MyPagerAdapter.kt index 10190b4a1..dad510f72 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MyPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MyPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.adapters +package com.simplemobiletools.gallery.pro.adapters import android.os.Bundle import android.os.Parcelable @@ -7,12 +7,12 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter import androidx.viewpager.widget.PagerAdapter -import com.simplemobiletools.gallery.activities.ViewPagerActivity -import com.simplemobiletools.gallery.fragments.PhotoFragment -import com.simplemobiletools.gallery.fragments.VideoFragment -import com.simplemobiletools.gallery.fragments.ViewPagerFragment -import com.simplemobiletools.gallery.helpers.MEDIUM -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.activities.ViewPagerActivity +import com.simplemobiletools.gallery.pro.fragments.PhotoFragment +import com.simplemobiletools.gallery.pro.fragments.VideoFragment +import com.simplemobiletools.gallery.pro.fragments.ViewPagerFragment +import com.simplemobiletools.gallery.pro.helpers.MEDIUM +import com.simplemobiletools.gallery.pro.models.Medium class MyPagerAdapter(val activity: ViewPagerActivity, fm: FragmentManager, val media: MutableList) : FragmentStatePagerAdapter(fm) { private val fragments = HashMap() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/asynctasks/GetMediaAsynctask.kt similarity index 76% rename from app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/asynctasks/GetMediaAsynctask.kt index 26004f645..d33bf5335 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/asynctasks/GetMediaAsynctask.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.gallery.asynctasks +package com.simplemobiletools.gallery.pro.asynctasks import android.content.Context import android.os.AsyncTask import com.simplemobiletools.commons.helpers.SORT_BY_DATE_TAKEN -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.extensions.getFavoritePaths -import com.simplemobiletools.gallery.helpers.FAVORITES -import com.simplemobiletools.gallery.helpers.MediaFetcher -import com.simplemobiletools.gallery.helpers.RECYCLE_BIN -import com.simplemobiletools.gallery.helpers.SHOW_ALL -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.models.ThumbnailItem +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.getFavoritePaths +import com.simplemobiletools.gallery.pro.helpers.FAVORITES +import com.simplemobiletools.gallery.pro.helpers.MediaFetcher +import com.simplemobiletools.gallery.pro.helpers.RECYCLE_BIN +import com.simplemobiletools.gallery.pro.helpers.SHOW_ALL +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem import java.util.* class GetMediaAsynctask(val context: Context, val mPath: String, val isPickImage: Boolean = false, val isPickVideo: Boolean = false, diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt similarity index 76% rename from app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt index 104a250cf..54c3b1d0f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/databases/GalleryDatabase.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.gallery.databases +package com.simplemobiletools.gallery.pro.databases import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase -import com.simplemobiletools.gallery.objects.MyExecutor -import com.simplemobiletools.gallery.interfaces.DirectoryDao -import com.simplemobiletools.gallery.interfaces.MediumDao -import com.simplemobiletools.gallery.models.Directory -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.objects.MyExecutor +import com.simplemobiletools.gallery.pro.interfaces.DirectoryDao +import com.simplemobiletools.gallery.pro.interfaces.MediumDao +import com.simplemobiletools.gallery.pro.models.Directory +import com.simplemobiletools.gallery.pro.models.Medium @Database(entities = [(Directory::class), (Medium::class)], version = 4) abstract class GalleryDatabase : RoomDatabase() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeGroupingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeGroupingDialog.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeGroupingDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeGroupingDialog.kt index 614759165..90d1bdf6c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeGroupingDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeGroupingDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import android.content.DialogInterface import android.view.View @@ -6,9 +6,9 @@ import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.helpers.* +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.helpers.* import kotlinx.android.synthetic.main.dialog_change_grouping.view.* class ChangeGroupingDialog(val activity: BaseSimpleActivity, val path: String = "", val callback: () -> Unit) : diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt index aebce7915..5dfbe80cb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeSortingDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import android.content.DialogInterface import android.view.View @@ -7,9 +7,9 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.helpers.SHOW_ALL +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.helpers.SHOW_ALL import kotlinx.android.synthetic.main.dialog_change_sorting.view.* class ChangeSortingDialog(val activity: BaseSimpleActivity, val isDirectorySorting: Boolean, showFolderCheckbox: Boolean, diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/DeleteWithRememberDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/DeleteWithRememberDialog.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/DeleteWithRememberDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/DeleteWithRememberDialog.kt index ab702845b..c570820b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/DeleteWithRememberDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/DeleteWithRememberDialog.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import android.app.Activity import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.gallery.R +import com.simplemobiletools.gallery.pro.R import kotlinx.android.synthetic.main.dialog_delete_with_remember.view.* class DeleteWithRememberDialog(val activity: Activity, val message: String, val callback: (remember: Boolean) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ExcludeFolderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ExcludeFolderDialog.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ExcludeFolderDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ExcludeFolderDialog.kt index 6cb546a04..8575f75a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ExcludeFolderDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ExcludeFolderDialog.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs -import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import android.widget.RadioButton import android.widget.RadioGroup +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getBasePath import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config import kotlinx.android.synthetic.main.dialog_exclude_folder.view.* class ExcludeFolderDialog(val activity: BaseSimpleActivity, val selectedPaths: List, val callback: () -> Unit) { @@ -34,11 +34,11 @@ class ExcludeFolderDialog(val activity: BaseSimpleActivity, val selectedPaths: L } AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() }) + .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() } .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this) - } + activity.setupDialogStuff(view, this) + } } private fun dialogConfirmed() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/FilterMediaDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/FilterMediaDialog.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/FilterMediaDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/FilterMediaDialog.kt index 4d5387c58..0802d5c67 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/FilterMediaDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/FilterMediaDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.helpers.* +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.helpers.* import kotlinx.android.synthetic.main.dialog_filter_media.view.* class FilterMediaDialog(val activity: BaseSimpleActivity, val callback: (result: Int) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ManageBottomActionsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ManageBottomActionsDialog.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ManageBottomActionsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ManageBottomActionsDialog.kt index 42b99ee2c..94a16c3be 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ManageBottomActionsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ManageBottomActionsDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.helpers.* +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.helpers.* import kotlinx.android.synthetic.main.dialog_manage_bottom_actions.view.* class ManageBottomActionsDialog(val activity: BaseSimpleActivity, val callback: (result: Int) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ManageExtendedDetailsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ManageExtendedDetailsDialog.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ManageExtendedDetailsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ManageExtendedDetailsDialog.kt index 8ee6eb1d8..e1d6dbf18 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ManageExtendedDetailsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ManageExtendedDetailsDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.helpers.* +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.helpers.* import kotlinx.android.synthetic.main.dialog_manage_extended_details.view.* class ManageExtendedDetailsDialog(val activity: BaseSimpleActivity, val callback: (result: Int) -> Unit) { @@ -31,8 +31,8 @@ class ManageExtendedDetailsDialog(val activity: BaseSimpleActivity, val callback .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() } .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this) - } + activity.setupDialogStuff(view, this) + } } private fun dialogConfirmed() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt index dae7ed654..3bf2aa3d4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.RecyclerView @@ -6,14 +6,14 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.views.MyGridLayoutManager -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.DirectoryAdapter -import com.simplemobiletools.gallery.extensions.addTempFolderIfNeeded -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.extensions.getCachedDirectories -import com.simplemobiletools.gallery.extensions.getSortedDirectories -import com.simplemobiletools.gallery.helpers.VIEW_TYPE_GRID -import com.simplemobiletools.gallery.models.Directory +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.DirectoryAdapter +import com.simplemobiletools.gallery.pro.extensions.addTempFolderIfNeeded +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.getCachedDirectories +import com.simplemobiletools.gallery.pro.extensions.getSortedDirectories +import com.simplemobiletools.gallery.pro.helpers.VIEW_TYPE_GRID +import com.simplemobiletools.gallery.pro.models.Directory import kotlinx.android.synthetic.main.dialog_directory_picker.view.* class PickDirectoryDialog(val activity: BaseSimpleActivity, val sourcePath: String, val callback: (path: String) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickMediumDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickMediumDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt index 056603a3a..ae5675356 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickMediumDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickMediumDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.RecyclerView @@ -7,15 +7,15 @@ import com.simplemobiletools.commons.extensions.beGoneIf import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.views.MyGridLayoutManager -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.adapters.MediaAdapter -import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.extensions.getCachedMedia -import com.simplemobiletools.gallery.helpers.SHOW_ALL -import com.simplemobiletools.gallery.helpers.VIEW_TYPE_GRID -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.models.ThumbnailItem +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.adapters.MediaAdapter +import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.getCachedMedia +import com.simplemobiletools.gallery.pro.helpers.SHOW_ALL +import com.simplemobiletools.gallery.pro.helpers.VIEW_TYPE_GRID +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem import kotlinx.android.synthetic.main.dialog_medium_picker.view.* class PickMediumDialog(val activity: BaseSimpleActivity, val path: String, val callback: (path: String) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ResizeDialog.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ResizeDialog.kt index e34ead6c6..c7c10050e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ResizeDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import android.graphics.Point import android.widget.EditText import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.gallery.R +import com.simplemobiletools.gallery.pro.R import kotlinx.android.synthetic.main.resize_image.view.* class ResizeDialog(val activity: BaseSimpleActivity, val size: Point, val callback: (newSize: Point) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt index 35dc95274..614fb7bfc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SaveAsDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.gallery.R +import com.simplemobiletools.gallery.pro.R import kotlinx.android.synthetic.main.dialog_save_as.view.* class SaveAsDialog(val activity: BaseSimpleActivity, val path: String, val appendFilename: Boolean, val callback: (savePath: String) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SlideshowDialog.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SlideshowDialog.kt index 16e38f058..486b8886d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SlideshowDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/SlideshowDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.gallery.dialogs +package com.simplemobiletools.gallery.pro.dialogs -import androidx.appcompat.app.AlertDialog import android.view.View +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.hideKeyboard import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.helpers.SLIDESHOW_DEFAULT_INTERVAL +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.helpers.SLIDESHOW_DEFAULT_INTERVAL import kotlinx.android.synthetic.main.dialog_slideshow.view.* class SlideshowDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt index 211d1f3d0..83f1bc600 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions import android.app.Activity import android.content.Intent @@ -11,12 +11,12 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FAQItem import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.gallery.BuildConfig -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.activities.SimpleActivity -import com.simplemobiletools.gallery.dialogs.PickDirectoryDialog -import com.simplemobiletools.gallery.helpers.NOMEDIA -import com.simplemobiletools.gallery.interfaces.MediumDao +import com.simplemobiletools.gallery.pro.BuildConfig +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.activities.SimpleActivity +import com.simplemobiletools.gallery.pro.dialogs.PickDirectoryDialog +import com.simplemobiletools.gallery.pro.helpers.NOMEDIA +import com.simplemobiletools.gallery.pro.interfaces.MediumDao import java.io.File import java.io.InputStream import java.io.OutputStream diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/ArrayList.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ArrayList.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/ArrayList.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ArrayList.kt index b72d4cf52..27289c37f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/ArrayList.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ArrayList.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.models.Medium fun ArrayList.getDirMediaTypes(): Int { var types = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt index 2bc1d7c69..dfb74bc2f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions import android.content.Context import android.content.Intent @@ -18,18 +18,18 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.activities.SettingsActivity -import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask -import com.simplemobiletools.gallery.databases.GalleryDatabase -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.interfaces.DirectoryDao -import com.simplemobiletools.gallery.interfaces.MediumDao -import com.simplemobiletools.gallery.models.Directory -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.models.ThumbnailItem -import com.simplemobiletools.gallery.svg.SvgSoftwareLayerSetter -import com.simplemobiletools.gallery.views.MySquareImageView +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.activities.SettingsActivity +import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask +import com.simplemobiletools.gallery.pro.databases.GalleryDatabase +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.interfaces.DirectoryDao +import com.simplemobiletools.gallery.pro.interfaces.MediumDao +import com.simplemobiletools.gallery.pro.models.Directory +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem +import com.simplemobiletools.gallery.pro.svg.SvgSoftwareLayerSetter +import com.simplemobiletools.gallery.pro.views.MySquareImageView import pl.droidsonroids.gif.GifDrawable import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/File.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/File.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/File.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/File.kt index 024a3ff63..90b02aac1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/File.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/File.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions -import com.simplemobiletools.gallery.helpers.NOMEDIA +import com.simplemobiletools.gallery.pro.helpers.NOMEDIA import java.io.File fun File.containsNoMedia() = isDirectory && File(this, NOMEDIA).exists() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/FileDirItem.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/FileDirItem.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/FileDirItem.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/FileDirItem.kt index b9f637574..726fcc8a9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/FileDirItem.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/FileDirItem.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions import android.os.Environment import com.simplemobiletools.commons.models.FileDirItem diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Resources.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Resources.kt index 73a56c5ba..d086fb7a5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Resources.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions import android.content.Context import android.content.res.Resources diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/String.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt index ad9a4ec58..4e5808a33 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/String.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/String.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions import com.bumptech.glide.signature.ObjectKey import com.simplemobiletools.commons.helpers.OTG_PATH diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/View.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/View.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/View.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/View.kt index cf1459c54..24107d2a2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/View.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/View.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.extensions +package com.simplemobiletools.gallery.pro.extensions import android.os.SystemClock import android.view.MotionEvent diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt index 28897383b..0580e2a48 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.fragments +package com.simplemobiletools.gallery.pro.fragments import android.content.Intent import android.content.res.Configuration @@ -28,17 +28,17 @@ import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.OTG_PATH -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.activities.PanoramaPhotoActivity -import com.simplemobiletools.gallery.activities.PhotoActivity -import com.simplemobiletools.gallery.activities.ViewPagerActivity -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.MEDIUM -import com.simplemobiletools.gallery.helpers.PATH -import com.simplemobiletools.gallery.helpers.PicassoDecoder -import com.simplemobiletools.gallery.helpers.PicassoRegionDecoder -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.svg.SvgSoftwareLayerSetter +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.activities.PanoramaPhotoActivity +import com.simplemobiletools.gallery.pro.activities.PhotoActivity +import com.simplemobiletools.gallery.pro.activities.ViewPagerActivity +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.MEDIUM +import com.simplemobiletools.gallery.pro.helpers.PATH +import com.simplemobiletools.gallery.pro.helpers.PicassoDecoder +import com.simplemobiletools.gallery.pro.helpers.PicassoRegionDecoder +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.svg.SvgSoftwareLayerSetter import com.squareup.picasso.Callback import com.squareup.picasso.Picasso import it.sephiroth.android.library.exif2.ExifInterface diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt index 580d06091..7618cdf9d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.fragments +package com.simplemobiletools.gallery.pro.fragments import android.content.Intent import android.content.res.Configuration @@ -26,13 +26,13 @@ import com.google.android.exoplayer2.upstream.DataSpec import com.google.android.exoplayer2.upstream.FileDataSource import com.google.android.exoplayer2.video.VideoListener import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.activities.PanoramaVideoActivity -import com.simplemobiletools.gallery.activities.VideoActivity -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.views.MediaSideScroll +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.activities.PanoramaVideoActivity +import com.simplemobiletools.gallery.pro.activities.VideoActivity +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.views.MediaSideScroll import kotlinx.android.synthetic.main.bottom_video_time_holder.view.* import kotlinx.android.synthetic.main.pager_video_item.view.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/ViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/gallery/fragments/ViewPagerFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt index 3a999e10d..26e42fcc2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/ViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.gallery.fragments +package com.simplemobiletools.gallery.pro.fragments import android.view.MotionEvent import androidx.fragment.app.Fragment import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.OTG_PATH -import com.simplemobiletools.gallery.extensions.config -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.models.Medium import java.io.File abstract class ViewPagerFragment : Fragment() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt index e194cb0fa..cb8be5ace 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import android.content.Context import android.content.res.Configuration @@ -8,8 +8,8 @@ import com.google.gson.reflect.TypeToken import com.simplemobiletools.commons.helpers.BaseConfig import com.simplemobiletools.commons.helpers.SORT_BY_DATE_MODIFIED import com.simplemobiletools.commons.helpers.SORT_DESCENDING -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.models.AlbumCover +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.models.AlbumCover import java.util.* class Config(context: Context) : BaseConfig(context) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt index 5efefb58f..ab2e18712 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import com.simplemobiletools.commons.helpers.MONTH_SECONDS diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/FilterThumbnailsManager.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/FilterThumbnailsManager.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/FilterThumbnailsManager.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/FilterThumbnailsManager.kt index 204f54f3b..ae043ddde 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/FilterThumbnailsManager.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/FilterThumbnailsManager.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import android.graphics.Bitmap -import com.simplemobiletools.gallery.models.FilterItem +import com.simplemobiletools.gallery.pro.models.FilterItem import java.util.* class FilterThumbnailsManager { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideRotateTransformation.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GlideRotateTransformation.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideRotateTransformation.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GlideRotateTransformation.kt index 5f34c6ced..619694642 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideRotateTransformation.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GlideRotateTransformation.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import android.graphics.Bitmap import android.graphics.Matrix diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/IsoTypeReader.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/IsoTypeReader.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/IsoTypeReader.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/IsoTypeReader.kt index 70d6f6afa..d8c33e72d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/IsoTypeReader.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/IsoTypeReader.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import java.io.UnsupportedEncodingException import java.nio.ByteBuffer diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index eaa1b7be5..4dab1cf17 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import android.content.Context import android.database.Cursor @@ -7,11 +7,11 @@ import android.provider.MediaStore import android.text.format.DateFormat import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.* -import com.simplemobiletools.gallery.models.Medium -import com.simplemobiletools.gallery.models.ThumbnailItem -import com.simplemobiletools.gallery.models.ThumbnailSection +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.extensions.* +import com.simplemobiletools.gallery.pro.models.Medium +import com.simplemobiletools.gallery.pro.models.ThumbnailItem +import com.simplemobiletools.gallery.pro.models.ThumbnailSection import java.io.File import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/PicassoDecoder.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/PicassoDecoder.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/PicassoDecoder.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/PicassoDecoder.kt index 16dd85760..1ff60708d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/PicassoDecoder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/PicassoDecoder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/PicassoRegionDecoder.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/PicassoRegionDecoder.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/PicassoRegionDecoder.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/PicassoRegionDecoder.kt index b96ed9deb..d0f8a7f41 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/PicassoRegionDecoder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/PicassoRegionDecoder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.pro.helpers import android.content.Context import android.graphics.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/DirectoryDao.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/DirectoryDao.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/DirectoryDao.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/DirectoryDao.kt index ce55fa3f4..78641ebf9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/DirectoryDao.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/DirectoryDao.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.gallery.interfaces +package com.simplemobiletools.gallery.pro.interfaces import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy.REPLACE import androidx.room.Query -import com.simplemobiletools.gallery.helpers.RECYCLE_BIN -import com.simplemobiletools.gallery.models.Directory +import com.simplemobiletools.gallery.pro.helpers.RECYCLE_BIN +import com.simplemobiletools.gallery.pro.models.Directory @Dao interface DirectoryDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/DirectoryOperationsListener.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/DirectoryOperationsListener.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/DirectoryOperationsListener.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/DirectoryOperationsListener.kt index 760ed78f4..b4f265969 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/DirectoryOperationsListener.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/DirectoryOperationsListener.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.gallery.interfaces +package com.simplemobiletools.gallery.pro.interfaces -import com.simplemobiletools.gallery.models.Directory +import com.simplemobiletools.gallery.pro.models.Directory import java.io.File interface DirectoryOperationsListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/MediaOperationsListener.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediaOperationsListener.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/MediaOperationsListener.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediaOperationsListener.kt index 77e877fd8..7e384003c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/MediaOperationsListener.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediaOperationsListener.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.interfaces +package com.simplemobiletools.gallery.pro.interfaces import com.simplemobiletools.commons.models.FileDirItem diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/MediumDao.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/MediumDao.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt index 5a02476b0..bf2d68d9f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/interfaces/MediumDao.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.gallery.interfaces +package com.simplemobiletools.gallery.pro.interfaces import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.OnConflictStrategy.REPLACE import androidx.room.Query -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.models.Medium @Dao interface MediumDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/AlbumCover.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/AlbumCover.kt similarity index 54% rename from app/src/main/kotlin/com/simplemobiletools/gallery/models/AlbumCover.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/AlbumCover.kt index f5937ad08..c4afd11b1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/AlbumCover.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/AlbumCover.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.gallery.models +package com.simplemobiletools.gallery.pro.models data class AlbumCover(val path: String, val tmb: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt index e73002b51..c5b90b860 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.models +package com.simplemobiletools.gallery.pro.models import androidx.room.ColumnInfo import androidx.room.Entity @@ -10,8 +10,8 @@ import com.simplemobiletools.commons.helpers.SORT_BY_DATE_MODIFIED import com.simplemobiletools.commons.helpers.SORT_BY_NAME import com.simplemobiletools.commons.helpers.SORT_BY_PATH import com.simplemobiletools.commons.helpers.SORT_BY_SIZE -import com.simplemobiletools.gallery.helpers.FAVORITES -import com.simplemobiletools.gallery.helpers.RECYCLE_BIN +import com.simplemobiletools.gallery.pro.helpers.FAVORITES +import com.simplemobiletools.gallery.pro.helpers.RECYCLE_BIN import java.io.Serializable @Entity(tableName = "directories", indices = [Index(value = ["path"], unique = true)]) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/FilterItem.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/FilterItem.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/gallery/models/FilterItem.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/FilterItem.kt index f2dd7f2d6..ce826e57e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/FilterItem.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/FilterItem.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.models +package com.simplemobiletools.gallery.pro.models import android.graphics.Bitmap import com.zomato.photofilters.imageprocessors.Filter diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt index 093a62991..68f8008a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Medium.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.models +package com.simplemobiletools.gallery.pro.models import androidx.room.ColumnInfo import androidx.room.Entity @@ -11,7 +11,7 @@ import com.simplemobiletools.commons.helpers.SORT_BY_DATE_MODIFIED import com.simplemobiletools.commons.helpers.SORT_BY_NAME import com.simplemobiletools.commons.helpers.SORT_BY_PATH import com.simplemobiletools.commons.helpers.SORT_BY_SIZE -import com.simplemobiletools.gallery.helpers.* +import com.simplemobiletools.gallery.pro.helpers.* import java.io.Serializable import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailItem.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailItem.kt new file mode 100644 index 000000000..4d2deaa31 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailItem.kt @@ -0,0 +1,3 @@ +package com.simplemobiletools.gallery.pro.models + +open class ThumbnailItem diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailSection.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailSection.kt similarity index 57% rename from app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailSection.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailSection.kt index fc501383f..1655cad89 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailSection.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailSection.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.gallery.models +package com.simplemobiletools.gallery.pro.models data class ThumbnailSection(val title: String) : ThumbnailItem() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/objects/MyExecutor.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/objects/MyExecutor.kt similarity index 70% rename from app/src/main/kotlin/com/simplemobiletools/gallery/objects/MyExecutor.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/objects/MyExecutor.kt index c4ff990a9..bc2d57129 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/objects/MyExecutor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/objects/MyExecutor.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.objects +package com.simplemobiletools.gallery.pro.objects import java.util.concurrent.Executors diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/receivers/RefreshMediaReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/receivers/RefreshMediaReceiver.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/gallery/receivers/RefreshMediaReceiver.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/receivers/RefreshMediaReceiver.kt index d9ece1f20..01e4591e2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/receivers/RefreshMediaReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/receivers/RefreshMediaReceiver.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.gallery.receivers +package com.simplemobiletools.gallery.pro.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.REFRESH_PATH -import com.simplemobiletools.gallery.extensions.galleryDB -import com.simplemobiletools.gallery.helpers.* -import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.pro.extensions.galleryDB +import com.simplemobiletools.gallery.pro.helpers.* +import com.simplemobiletools.gallery.pro.models.Medium import java.io.File class RefreshMediaReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgDecoder.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgDecoder.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgDecoder.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgDecoder.kt index 3765db0e3..7bc47c9f8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgDecoder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgDecoder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.svg +package com.simplemobiletools.gallery.pro.svg import com.bumptech.glide.load.Options import com.bumptech.glide.load.ResourceDecoder diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgDrawableTranscoder.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgDrawableTranscoder.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgDrawableTranscoder.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgDrawableTranscoder.kt index 96dbe3492..e447136e9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgDrawableTranscoder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgDrawableTranscoder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.svg +package com.simplemobiletools.gallery.pro.svg import android.graphics.drawable.PictureDrawable import com.bumptech.glide.load.Options diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgModule.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgModule.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgModule.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgModule.kt index a6e4f3efb..ee15a2274 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgModule.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgModule.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.svg +package com.simplemobiletools.gallery.pro.svg import android.content.Context import android.graphics.drawable.PictureDrawable diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgSoftwareLayerSetter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgSoftwareLayerSetter.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgSoftwareLayerSetter.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgSoftwareLayerSetter.kt index 043d26e27..c766ab651 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/svg/SvgSoftwareLayerSetter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/svg/SvgSoftwareLayerSetter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.svg +package com.simplemobiletools.gallery.pro.svg import android.graphics.drawable.PictureDrawable import android.widget.ImageView diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/views/InstantItemSwitch.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/InstantItemSwitch.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/gallery/views/InstantItemSwitch.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/InstantItemSwitch.kt index bdfe1264a..c21e2f642 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/views/InstantItemSwitch.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/InstantItemSwitch.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.gallery.views +package com.simplemobiletools.gallery.pro.views import android.content.Context import android.util.AttributeSet import android.view.MotionEvent import android.view.ViewGroup import android.widget.RelativeLayout -import com.simplemobiletools.gallery.helpers.CLICK_MAX_DURATION -import com.simplemobiletools.gallery.helpers.DRAG_THRESHOLD +import com.simplemobiletools.gallery.pro.helpers.CLICK_MAX_DURATION +import com.simplemobiletools.gallery.pro.helpers.DRAG_THRESHOLD // handle only one finger clicks, pass other events to the parent view and ignore it when received again class InstantItemSwitch(context: Context, attrs: AttributeSet) : RelativeLayout(context, attrs) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/views/MediaSideScroll.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MediaSideScroll.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/gallery/views/MediaSideScroll.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MediaSideScroll.kt index bfb394eeb..916550f21 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/views/MediaSideScroll.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MediaSideScroll.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.views +package com.simplemobiletools.gallery.pro.views import android.app.Activity import android.content.Context @@ -10,11 +10,11 @@ import android.view.MotionEvent import android.view.ViewGroup import android.widget.RelativeLayout import android.widget.TextView -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.activities.ViewPagerActivity -import com.simplemobiletools.gallery.extensions.audioManager -import com.simplemobiletools.gallery.helpers.CLICK_MAX_DURATION -import com.simplemobiletools.gallery.helpers.DRAG_THRESHOLD +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.activities.ViewPagerActivity +import com.simplemobiletools.gallery.pro.extensions.audioManager +import com.simplemobiletools.gallery.pro.helpers.CLICK_MAX_DURATION +import com.simplemobiletools.gallery.pro.helpers.DRAG_THRESHOLD // allow horizontal swipes through the layout, else it can cause glitches at zoomed in images class MediaSideScroll(context: Context, attrs: AttributeSet) : RelativeLayout(context, attrs) { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/views/MySquareImageView.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MySquareImageView.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/gallery/views/MySquareImageView.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MySquareImageView.kt index 39a2f74be..24cde1c2a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/views/MySquareImageView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MySquareImageView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.views +package com.simplemobiletools.gallery.pro.views import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index d46e510fe..97c1633a3 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -12,28 +12,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - diff --git a/app/src/main/res/layout/directory_item_list.xml b/app/src/main/res/layout/directory_item_list.xml index 7e125cf5c..a22820f5b 100644 --- a/app/src/main/res/layout/directory_item_list.xml +++ b/app/src/main/res/layout/directory_item_list.xml @@ -9,7 +9,7 @@ android:paddingLeft="@dimen/small_margin" android:paddingTop="@dimen/small_margin"> - diff --git a/app/src/main/res/layout/pager_photo_item.xml b/app/src/main/res/layout/pager_photo_item.xml index 4bb227f80..f99e39b8c 100644 --- a/app/src/main/res/layout/pager_photo_item.xml +++ b/app/src/main/res/layout/pager_photo_item.xml @@ -47,7 +47,7 @@ android:visibility="gone" tools:text="My image\nAnother line"/> - - - - - - - - diff --git a/app/src/main/res/layout/photo_video_item_list.xml b/app/src/main/res/layout/photo_video_item_list.xml index 8e8046e0a..e24bbfa2f 100644 --- a/app/src/main/res/layout/photo_video_item_list.xml +++ b/app/src/main/res/layout/photo_video_item_list.xml @@ -9,7 +9,7 @@ android:paddingLeft="@dimen/small_margin" android:paddingTop="@dimen/small_margin"> -