appending .pro to the package name

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

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.simplemobiletools.gallery"
+    package="com.simplemobiletools.gallery.pro"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

app/src/main/kotlin/com/simplemobiletools/gallery/models/ThumbnailItem.kt

@@ -1,3 +0,0 @@
-package com.simplemobiletools.gallery.models
-
-open class ThumbnailItem

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

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

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 {

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 {

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 {

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() {

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)

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() {

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

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
 

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

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.*

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()

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(

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

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
 

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

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
 

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.*
 

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.*
 

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.*
 

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

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<Medium>) : FragmentStatePagerAdapter(fm) {
     private val fragments = HashMap<Int, ViewPagerFragment>()

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,

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() {

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) :

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,

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) {

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<String>, 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() {

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) {

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) {

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() {

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) {

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) {

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) {

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) {

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) {

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

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<Medium>.getDirMediaTypes(): Int {
     var types = 0

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
 

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()

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

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

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

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

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

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

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() {

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) {

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
 

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 {

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

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

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.*
 

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

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.*

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 {

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 {

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
 

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 {

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)

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)])

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

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.*
 

app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/ThumbnailItem.kt

@@ -0,0 +1,3 @@
+package com.simplemobiletools.gallery.pro.models
+
+open class ThumbnailItem

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()

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
 

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() {

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

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

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

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

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) {

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) {

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

app/src/main/res/layout/activity_settings.xml

@@ -12,28 +12,6 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/settings_upgrade_to_pro_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
-            android:paddingBottom="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_upgrade_to_pro"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/upgrade_to_pro"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_customize_colors_holder"
             android:layout_width="match_parent"

app/src/main/res/layout/directory_item_grid.xml

@@ -8,7 +8,7 @@
     android:focusable="true"
     android:padding="1px">
 
-    <com.simplemobiletools.gallery.views.MySquareImageView
+    <com.simplemobiletools.gallery.pro.views.MySquareImageView
         android:id="@+id/dir_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

app/src/main/res/layout/directory_item_list.xml

@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/small_margin"
     android:paddingTop="@dimen/small_margin">
 
-    <com.simplemobiletools.gallery.views.MySquareImageView
+    <com.simplemobiletools.gallery.pro.views.MySquareImageView
         android:id="@+id/dir_thumbnail"
         android:layout_width="@dimen/list_view_folder_thumbnail_size"
         android:layout_height="@dimen/list_view_folder_thumbnail_size"/>

app/src/main/res/layout/pager_photo_item.xml

@@ -47,7 +47,7 @@
         android:visibility="gone"
         tools:text="My image\nAnother line"/>
 
-    <com.simplemobiletools.gallery.views.MediaSideScroll
+    <com.simplemobiletools.gallery.pro.views.MediaSideScroll
         android:id="@+id/photo_brightness_controller"
         android:layout_width="@dimen/media_side_slider_width"
         android:layout_height="match_parent"
@@ -71,12 +71,12 @@
         android:textColor="@android:color/white"
         android:textSize="@dimen/extra_big_text_size"/>
 
-    <com.simplemobiletools.gallery.views.InstantItemSwitch
+    <com.simplemobiletools.gallery.pro.views.InstantItemSwitch
         android:id="@+id/instant_prev_item"
         android:layout_width="@dimen/instant_change_bar_width"
         android:layout_height="match_parent"/>
 
-    <com.simplemobiletools.gallery.views.InstantItemSwitch
+    <com.simplemobiletools.gallery.pro.views.InstantItemSwitch
         android:id="@+id/instant_next_item"
         android:layout_width="@dimen/instant_change_bar_width"
         android:layout_height="match_parent"

app/src/main/res/layout/pager_video_item.xml

@@ -17,24 +17,24 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"/>
 
-    <com.simplemobiletools.gallery.views.MediaSideScroll
+    <com.simplemobiletools.gallery.pro.views.MediaSideScroll
         android:id="@+id/video_volume_controller"
         android:layout_width="@dimen/media_side_slider_width"
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"/>
 
-    <com.simplemobiletools.gallery.views.MediaSideScroll
+    <com.simplemobiletools.gallery.pro.views.MediaSideScroll
         android:id="@+id/video_brightness_controller"
         android:layout_width="@dimen/media_side_slider_width"
         android:layout_height="match_parent"/>
 
-    <com.simplemobiletools.gallery.views.InstantItemSwitch
+    <com.simplemobiletools.gallery.pro.views.InstantItemSwitch
         android:id="@+id/instant_prev_item"
         android:layout_width="@dimen/instant_change_bar_width"
         android:layout_height="match_parent"/>
 
-    <com.simplemobiletools.gallery.views.InstantItemSwitch
+    <com.simplemobiletools.gallery.pro.views.InstantItemSwitch
         android:id="@+id/instant_next_item"
         android:layout_width="@dimen/instant_change_bar_width"
         android:layout_height="match_parent"

app/src/main/res/layout/photo_video_item_grid.xml

@@ -8,7 +8,7 @@
     android:focusable="true"
     android:padding="1px">
 
-    <com.simplemobiletools.gallery.views.MySquareImageView
+    <com.simplemobiletools.gallery.pro.views.MySquareImageView
         android:id="@+id/medium_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

app/src/main/res/layout/photo_video_item_list.xml

@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/small_margin"
     android:paddingTop="@dimen/small_margin">
 
-    <com.simplemobiletools.gallery.views.MySquareImageView
+    <com.simplemobiletools.gallery.pro.views.MySquareImageView
         android:id="@+id/medium_thumbnail"
         android:layout_width="@dimen/list_view_folder_thumbnail_size"
         android:layout_height="@dimen/list_view_folder_thumbnail_size"/>