move some activity intent actions to SimpleActivity

This commit is contained in:
tibbi 2016-12-06 18:03:27 +01:00
parent 6f11b05e25
commit 3e779c0a98
2 changed files with 17 additions and 4 deletions

View file

@ -78,7 +78,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
true true
} }
R.id.camera -> { R.id.camera -> {
startActivity(Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA)) launchCamera()
true true
} }
R.id.show_all -> { R.id.show_all -> {
@ -86,11 +86,11 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
true true
} }
R.id.settings -> { R.id.settings -> {
startActivity(Intent(applicationContext, SettingsActivity::class.java)) launchSettings()
true true
} }
R.id.about -> { R.id.about -> {
startActivity(Intent(applicationContext, AboutActivity::class.java)) launchAbout()
true true
} }
else -> super.onOptionsItemSelected(item) else -> super.onOptionsItemSelected(item)

View file

@ -5,13 +5,14 @@ import android.app.Activity
import android.content.Intent import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.provider.MediaStore
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import com.simplemobiletools.filepicker.extensions.isShowingWritePermissions import com.simplemobiletools.filepicker.extensions.isShowingWritePermissions
import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.helpers.Config import com.simplemobiletools.gallery.helpers.Config
import com.simplemobiletools.gallery.helpers.OPEN_DOCUMENT_TREE import com.simplemobiletools.gallery.helpers.OPEN_DOCUMENT_TREE
import com.simplemobiletools.gallery.R
import java.io.File import java.io.File
open class SimpleActivity : AppCompatActivity() { open class SimpleActivity : AppCompatActivity() {
@ -53,6 +54,18 @@ open class SimpleActivity : AppCompatActivity() {
contentResolver.takePersistableUriPermission(treeUri, takeFlags) contentResolver.takePersistableUriPermission(treeUri, takeFlags)
} }
fun launchCamera() {
startActivity(Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA))
}
fun launchSettings() {
startActivity(Intent(applicationContext, SettingsActivity::class.java))
}
fun launchAbout() {
startActivity(Intent(applicationContext, AboutActivity::class.java))
}
fun isShowingPermDialog(file: File) = isShowingWritePermissions(file, mConfig.treeUri, OPEN_DOCUMENT_TREE) fun isShowingPermDialog(file: File) = isShowingWritePermissions(file, mConfig.treeUri, OPEN_DOCUMENT_TREE)
fun showSystemUI() { fun showSystemUI() {