diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt index b589f85b..013580a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt @@ -2,12 +2,11 @@ package com.simplemobiletools.filemanager.pro.activities import android.graphics.Paint import android.os.Bundle -import android.view.Menu -import android.view.MenuItem import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getProperPrimaryColor import com.simplemobiletools.commons.extensions.getProperTextColor +import com.simplemobiletools.commons.helpers.NavigationIcon import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener import com.simplemobiletools.filemanager.pro.R import com.simplemobiletools.filemanager.pro.adapters.ManageFavoritesAdapter @@ -18,21 +17,23 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_favorites) + setupOptionsMenu() updateFavorites() } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { - menuInflater.inflate(R.menu.menu_favorites, menu) - updateMenuItemColors(menu) - return true + override fun onResume() { + super.onResume() + setupToolbar(manage_favorites_toolbar, NavigationIcon.Arrow) } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.add_favorite -> addFavorite() - else -> return super.onOptionsItemSelected(item) + private fun setupOptionsMenu() { + manage_favorites_toolbar.setOnMenuItemClickListener { menuItem -> + when (menuItem.itemId) { + R.id.add_favorite -> addFavorite() + else -> return@setOnMenuItemClickListener false + } + return@setOnMenuItemClickListener true } - return true } private fun updateFavorites() { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt index 66867157..f48aa060 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt @@ -10,6 +10,7 @@ import androidx.appcompat.widget.SearchView import androidx.core.view.MenuItemCompat import androidx.recyclerview.widget.GridLayoutManager import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.NavigationIcon import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST import com.simplemobiletools.commons.helpers.ensureBackgroundThread @@ -26,7 +27,6 @@ import com.simplemobiletools.filemanager.pro.helpers.* import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener import com.simplemobiletools.filemanager.pro.models.ListItem import kotlinx.android.synthetic.main.activity_mimetypes.* -import kotlinx.android.synthetic.main.items_fragment.view.* import java.util.* class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { @@ -41,8 +41,11 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_mimetypes) + setupOptionsMenu() + refreshMenuItems() + currentMimeType = intent.getStringExtra(SHOW_MIMETYPE) ?: return - title = getString( + mimetypes_toolbar.title = getString( when (currentMimeType) { IMAGES -> R.string.images VIDEOS -> R.string.videos @@ -65,17 +68,15 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { mimetypes_fastscroller.updateColors(getProperPrimaryColor()) } - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.menu, menu) - setupSearch(menu) - updateMenuItemColors(menu) - return true + override fun onResume() { + super.onResume() + setupToolbar(mimetypes_toolbar, NavigationIcon.Arrow, searchMenuItem = searchMenuItem) } - override fun onPrepareOptionsMenu(menu: Menu?): Boolean { + private fun refreshMenuItems() { val currentViewType = config.getFolderViewType(currentMimeType) - menu!!.apply { + mimetypes_toolbar.menu.apply { findItem(R.id.add_favorite).isVisible = false findItem(R.id.remove_favorite).isVisible = false findItem(R.id.go_to_favorite).isVisible = false @@ -92,23 +93,23 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { findItem(R.id.increase_column_count).isVisible = currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt < MAX_COLUMN_COUNT findItem(R.id.reduce_column_count).isVisible = currentViewType == VIEW_TYPE_GRID && config.fileColumnCnt > 1 } - - return true } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.sort -> showSortingDialog() - R.id.toggle_filename -> toggleFilenameVisibility() - R.id.change_view_type -> changeViewType() - R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden() - R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden() - R.id.increase_column_count -> increaseColumnCount() - R.id.reduce_column_count -> reduceColumnCount() - else -> return super.onOptionsItemSelected(item) + private fun setupOptionsMenu() { + setupSearch(mimetypes_toolbar.menu) + mimetypes_toolbar.setOnMenuItemClickListener { menuItem -> + when (menuItem.itemId) { + R.id.sort -> showSortingDialog() + R.id.toggle_filename -> toggleFilenameVisibility() + R.id.change_view_type -> changeViewType() + R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden() + R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden() + R.id.increase_column_count -> increaseColumnCount() + R.id.reduce_column_count -> reduceColumnCount() + else -> return@setOnMenuItemClickListener false + } + return@setOnMenuItemClickListener true } - - return true } override fun refreshFragment() { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt index 4a99250d..70c17af5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt @@ -6,12 +6,11 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.print.PrintAttributes import android.print.PrintManager -import android.view.Menu -import android.view.MenuItem import android.view.WindowInsetsController import android.view.WindowManager import com.github.barteksc.pdfviewer.scroll.DefaultScrollHandle import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.NavigationIcon import com.simplemobiletools.commons.helpers.REAL_FILE_PATH import com.simplemobiletools.commons.helpers.isPiePlus import com.simplemobiletools.commons.helpers.isRPlus @@ -27,9 +26,10 @@ class PDFViewerActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { useDynamicTheme = false - super.onCreate(savedInstanceState) setContentView(R.layout.activity_pdf_viewer) + setupOptionsMenu() + refreshMenuItems() if (checkAppSideloading()) { return @@ -41,7 +41,7 @@ class PDFViewerActivity : SimpleActivity() { if (intent.extras?.containsKey(REAL_FILE_PATH) == true) { realFilePath = intent.extras?.get(REAL_FILE_PATH)?.toString() ?: "" - supportActionBar?.title = realFilePath.getFilenameFromPath() + pdf_viewer_toolbar.title = realFilePath.getFilenameFromPath() } checkIntent() @@ -55,24 +55,24 @@ class PDFViewerActivity : SimpleActivity() { supportActionBar?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) window.statusBarColor = Color.TRANSPARENT setTranslucentNavigation() + setupToolbar(pdf_viewer_toolbar, NavigationIcon.Arrow) } - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.menu_pdf_viewer, menu) - menu.apply { + private fun setupOptionsMenu() { + pdf_viewer_toolbar.setOnMenuItemClickListener { menuItem -> + when (menuItem.itemId) { + R.id.menu_print -> printText() + else -> return@setOnMenuItemClickListener false + } + return@setOnMenuItemClickListener true + } + } + + + private fun refreshMenuItems() { + pdf_viewer_toolbar.menu.apply { findItem(R.id.menu_print).isVisible = realFilePath.isNotEmpty() } - - updateMenuItemColors(menu, forceWhiteIcons = true) - return true - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.menu_print -> printText() - else -> return super.onOptionsItemSelected(item) - } - return true } private fun checkIntent() { @@ -98,7 +98,7 @@ class PDFViewerActivity : SimpleActivity() { val filename = getFilenameFromUri(uri) if (filename.isNotEmpty()) { - supportActionBar?.title = filename + pdf_viewer_toolbar.title = filename } } diff --git a/app/src/main/res/layout/activity_favorites.xml b/app/src/main/res/layout/activity_favorites.xml index fa4c8e01..5c876ca2 100644 --- a/app/src/main/res/layout/activity_favorites.xml +++ b/app/src/main/res/layout/activity_favorites.xml @@ -1,48 +1,71 @@ - + android:layout_height="match_parent"> - + android:layout_height="wrap_content"> - + + + + + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + - + + + + + + diff --git a/app/src/main/res/layout/activity_mimetypes.xml b/app/src/main/res/layout/activity_mimetypes.xml index b50e0a79..9fd03365 100644 --- a/app/src/main/res/layout/activity_mimetypes.xml +++ b/app/src/main/res/layout/activity_mimetypes.xml @@ -1,54 +1,77 @@ - + android:id="@+id/mimetypes_coordinator" + android:layout_width="match_parent" + android:layout_height="match_parent"> - - - - - - + android:layout_height="?attr/actionBarSize" + android:background="@color/color_primary" + app:menu="@menu/menu" + app:title="" + app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> - - + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_pdf_viewer.xml b/app/src/main/res/layout/activity_pdf_viewer.xml index ec6fffb1..a07d3de0 100644 --- a/app/src/main/res/layout/activity_pdf_viewer.xml +++ b/app/src/main/res/layout/activity_pdf_viewer.xml @@ -1,19 +1,43 @@ - + android:layout_height="match_parent"> - + android:layout_height="wrap_content"> - + + + + + android:layout_height="wrap_content" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + + + + + +