PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

move some constants outside of the constants object

Browse source
This commit is contained in:
tibbi 2016-12-04 12:02:48 +01:00
parent b3f285f7f4
commit 56ba895302
8 changed files with 29 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/gallery/Constants.kt
View file

@ -23,14 +23,12 @@ val SORT_DESCENDING = 1024
// global intents // global intents
val OPEN_DOCUMENT_TREE = 1000 val OPEN_DOCUMENT_TREE = 1000
object Constants { val DIRECTORY = "directory"
val DIRECTORY = "directory" val MEDIUM = "medium"
val MEDIUM = "medium" val GET_IMAGE_INTENT = "get_image_intent"
val GET_IMAGE_INTENT = "get_image_intent" val GET_VIDEO_INTENT = "get_video_intent"
val GET_VIDEO_INTENT = "get_video_intent" val GET_ANY_INTENT = "get_any_intent"
val GET_ANY_INTENT = "get_any_intent" val SET_WALLPAPER_INTENT = "set_wallpaper_intent"
val SET_WALLPAPER_INTENT = "set_wallpaper_intent"
}
val REQUEST_EDIT_IMAGE = 1 val REQUEST_EDIT_IMAGE = 1
val REQUEST_SET_WALLPAPER = 2 val REQUEST_SET_WALLPAPER = 2

14
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
View file

@ -14,9 +14,7 @@ import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import com.simplemobiletools.filepicker.extensions.* import com.simplemobiletools.filepicker.extensions.*
import com.simplemobiletools.gallery.Constants import com.simplemobiletools.gallery.*
import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.Utils
import com.simplemobiletools.gallery.adapters.DirectoryAdapter import com.simplemobiletools.gallery.adapters.DirectoryAdapter
import com.simplemobiletools.gallery.asynctasks.GetDirectoriesAsynctask import com.simplemobiletools.gallery.asynctasks.GetDirectoriesAsynctask
import com.simplemobiletools.gallery.dialogs.ChangeSortingDialog import com.simplemobiletools.gallery.dialogs.ChangeSortingDialog
@ -277,15 +275,15 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
fun itemClicked(path: String) { fun itemClicked(path: String) {
Intent(this, MediaActivity::class.java).apply { Intent(this, MediaActivity::class.java).apply {
putExtra(Constants.DIRECTORY, path) putExtra(DIRECTORY, path)
if (mIsSetWallpaperIntent) { if (mIsSetWallpaperIntent) {
putExtra(Constants.SET_WALLPAPER_INTENT, true) putExtra(SET_WALLPAPER_INTENT, true)
startActivityForResult(this, PICK_WALLPAPER) startActivityForResult(this, PICK_WALLPAPER)
} else { } else {
putExtra(Constants.GET_IMAGE_INTENT, mIsPickImageIntent || mIsGetImageContentIntent) putExtra(GET_IMAGE_INTENT, mIsPickImageIntent || mIsGetImageContentIntent)
putExtra(Constants.GET_VIDEO_INTENT, mIsPickVideoIntent || mIsGetVideoContentIntent) putExtra(GET_VIDEO_INTENT, mIsPickVideoIntent || mIsGetVideoContentIntent)
putExtra(Constants.GET_ANY_INTENT, mIsGetAnyContentIntent) putExtra(GET_ANY_INTENT, mIsGetAnyContentIntent)
startActivityForResult(this, PICK_MEDIA) startActivityForResult(this, PICK_MEDIA)
} }
} }

15
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
View file

@ -16,8 +16,7 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.request.animation.GlideAnimation import com.bumptech.glide.request.animation.GlideAnimation
import com.bumptech.glide.request.target.SimpleTarget import com.bumptech.glide.request.target.SimpleTarget
import com.simplemobiletools.filepicker.extensions.* import com.simplemobiletools.filepicker.extensions.*
import com.simplemobiletools.gallery.Constants import com.simplemobiletools.gallery.*
import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.adapters.MediaAdapter import com.simplemobiletools.gallery.adapters.MediaAdapter
import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask
import com.simplemobiletools.gallery.dialogs.ChangeSortingDialog import com.simplemobiletools.gallery.dialogs.ChangeSortingDialog
@ -48,13 +47,13 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_media) setContentView(R.layout.activity_media)
intent.apply { intent.apply {
mIsGetImageIntent = getBooleanExtra(Constants.GET_IMAGE_INTENT, false) mIsGetImageIntent = getBooleanExtra(GET_IMAGE_INTENT, false)
mIsGetVideoIntent = getBooleanExtra(Constants.GET_VIDEO_INTENT, false) mIsGetVideoIntent = getBooleanExtra(GET_VIDEO_INTENT, false)
mIsGetAnyIntent = getBooleanExtra(Constants.GET_ANY_INTENT, false) mIsGetAnyIntent = getBooleanExtra(GET_ANY_INTENT, false)
} }
media_holder.setOnRefreshListener({ getMedia() }) media_holder.setOnRefreshListener({ getMedia() })
mPath = intent.getStringExtra(Constants.DIRECTORY) mPath = intent.getStringExtra(DIRECTORY)
mToBeDeleted = ArrayList<String>() mToBeDeleted = ArrayList<String>()
mMedia = ArrayList<Medium>() mMedia = ArrayList<Medium>()
} }
@ -260,7 +259,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
} }
} }
private fun isSetWallpaperIntent() = intent.getBooleanExtra(Constants.SET_WALLPAPER_INTENT, false) private fun isSetWallpaperIntent() = intent.getBooleanExtra(SET_WALLPAPER_INTENT, false)
fun itemClicked(path: String) { fun itemClicked(path: String) {
if (isSetWallpaperIntent()) { if (isSetWallpaperIntent()) {
@ -294,7 +293,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
finish() finish()
} else { } else {
Intent(this, ViewPagerActivity::class.java).apply { Intent(this, ViewPagerActivity::class.java).apply {
putExtra(Constants.MEDIUM, path) putExtra(MEDIUM, path)
startActivity(this) startActivity(this)
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
View file

@ -7,7 +7,7 @@ import android.os.Bundle
import android.provider.MediaStore import android.provider.MediaStore
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import com.simplemobiletools.gallery.Constants import com.simplemobiletools.gallery.MEDIUM
import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.fragments.PhotoFragment import com.simplemobiletools.gallery.fragments.PhotoFragment
import com.simplemobiletools.gallery.fragments.VideoFragment import com.simplemobiletools.gallery.fragments.VideoFragment
@ -32,7 +32,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentClic
if (mUri.scheme == "file") { if (mUri.scheme == "file") {
Intent(this, ViewPagerActivity::class.java).apply { Intent(this, ViewPagerActivity::class.java).apply {
putExtra(Constants.MEDIUM, mUri.path) putExtra(MEDIUM, mUri.path)
startActivity(this) startActivity(this)
} }
finish() finish()
@ -42,7 +42,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentClic
val bundle = Bundle() val bundle = Bundle()
val file = File(mUri.toString()) val file = File(mUri.toString())
val medium = Medium(file.name, mUri.toString(), mIsVideo, 0, file.length()) val medium = Medium(file.name, mUri.toString(), mIsVideo, 0, file.length())
bundle.putSerializable(Constants.MEDIUM, medium) bundle.putSerializable(MEDIUM, medium)
if (savedInstanceState == null) { if (savedInstanceState == null) {
mFragment = if (mIsVideo) VideoFragment() else PhotoFragment() mFragment = if (mIsVideo) VideoFragment() else PhotoFragment()

2
app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
View file

@ -64,7 +64,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
cursor?.close() cursor?.close()
} }
} else { } else {
mPath = intent.getStringExtra(Constants.MEDIUM) mPath = intent.getStringExtra(MEDIUM)
} }
if (mPath.isEmpty()) { if (mPath.isEmpty()) {

4
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MyPagerAdapter.kt
View file

@ -5,7 +5,7 @@ import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentStatePagerAdapter import android.support.v4.app.FragmentStatePagerAdapter
import android.util.SparseArray import android.util.SparseArray
import com.simplemobiletools.gallery.Constants import com.simplemobiletools.gallery.MEDIUM
import com.simplemobiletools.gallery.activities.ViewPagerActivity import com.simplemobiletools.gallery.activities.ViewPagerActivity
import com.simplemobiletools.gallery.fragments.PhotoFragment import com.simplemobiletools.gallery.fragments.PhotoFragment
import com.simplemobiletools.gallery.fragments.VideoFragment import com.simplemobiletools.gallery.fragments.VideoFragment
@ -24,7 +24,7 @@ class MyPagerAdapter(val activity: ViewPagerActivity, fm: FragmentManager, val m
override fun getItem(position: Int): Fragment { override fun getItem(position: Int): Fragment {
val medium = media[position] val medium = media[position]
val bundle = Bundle() val bundle = Bundle()
bundle.putSerializable(Constants.MEDIUM, medium) bundle.putSerializable(MEDIUM, medium)
val fragment: ViewPagerFragment val fragment: ViewPagerFragment
if (medium.isVideo) { if (medium.isVideo) {

4
app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
View file

@ -9,7 +9,7 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.ImageSource
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
import com.simplemobiletools.gallery.Constants import com.simplemobiletools.gallery.MEDIUM
import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.extensions.getRealPathFromURI import com.simplemobiletools.gallery.extensions.getRealPathFromURI
import com.simplemobiletools.gallery.models.Medium import com.simplemobiletools.gallery.models.Medium
@ -22,7 +22,7 @@ class PhotoFragment : ViewPagerFragment(), View.OnClickListener {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
val view = inflater.inflate(R.layout.pager_photo_item, container, false) val view = inflater.inflate(R.layout.pager_photo_item, container, false)
medium = arguments.getSerializable(Constants.MEDIUM) as Medium medium = arguments.getSerializable(MEDIUM) as Medium
if (medium.path.startsWith("content://")) if (medium.path.startsWith("content://"))
medium.path = context.getRealPathFromURI(Uri.parse(medium.path)) ?: "" medium.path = context.getRealPathFromURI(Uri.parse(medium.path)) ?: ""

4
app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
View file

@ -14,7 +14,7 @@ import android.view.animation.AnimationUtils
import android.widget.SeekBar import android.widget.SeekBar
import android.widget.TextView import android.widget.TextView
import com.simplemobiletools.gallery.Config import com.simplemobiletools.gallery.Config
import com.simplemobiletools.gallery.Constants import com.simplemobiletools.gallery.MEDIUM
import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.Utils import com.simplemobiletools.gallery.Utils
import com.simplemobiletools.gallery.models.Medium import com.simplemobiletools.gallery.models.Medium
@ -51,7 +51,7 @@ class VideoFragment : ViewPagerFragment(), View.OnClickListener, SurfaceHolder.C
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
mView = inflater.inflate(R.layout.pager_video_item, container, false) mView = inflater.inflate(R.layout.pager_video_item, container, false)
mMedium = arguments.getSerializable(Constants.MEDIUM) as Medium mMedium = arguments.getSerializable(MEDIUM) as Medium
if (savedInstanceState != null) { if (savedInstanceState != null) {
mCurrTime = savedInstanceState.getInt(PROGRESS) mCurrTime = savedInstanceState.getInt(PROGRESS)
} }