diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt index 7bd7bac29..e6b75aecb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt @@ -77,7 +77,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener { showSortingDialog() true } - R.id.camera -> { + R.id.open_camera -> { launchCamera() true } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt index f9adba4bc..88ed7b30b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt @@ -107,6 +107,9 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener { menu.findItem(R.id.unhide_folder).isVisible = isFolderHidden && !mShowAll menu.findItem(R.id.folder_view).isVisible = mShowAll + menu.findItem(R.id.open_camera).isVisible = mShowAll + menu.findItem(R.id.settings).isVisible = mShowAll + menu.findItem(R.id.about).isVisible = mShowAll return true } @@ -121,6 +124,10 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener { toggleFilenameVisibility() true } + R.id.open_camera -> { + launchCamera() + true + } R.id.folder_view -> { switchToFolderView() true @@ -133,6 +140,14 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener { unhideFolder() true } + R.id.settings -> { + launchSettings() + true + } + R.id.about -> { + launchAbout() + true + } else -> super.onOptionsItemSelected(item) } } diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 268318060..1ccd86b4a 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -7,7 +7,7 @@ android:title="@string/sort_by" app:showAsAction="ifRoom"/> diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml index 72a4fbced..ea91cb7e1 100644 --- a/app/src/main/res/menu/menu_media.xml +++ b/app/src/main/res/menu/menu_media.xml @@ -11,6 +11,11 @@ android:icon="@mipmap/toggle_filename" android:title="@string/toggle_filename" app:showAsAction="ifRoom"/> + + +